From 889a7cdd24dda04a139b2b77d626e984d6db6781 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 17 Sep 2019 02:20:24 +0200
Subject: [PATCH 001/171] Intermediate commit

---
 deployment/helm/human-connection/.helmignore  | 22 +++++++++++++++++++
 deployment/helm/human-connection/Chart.yaml   |  5 +++++
 .../human-connection/templates/configmap.yml  | 21 ++++++++++++++++++
 deployment/helm/human-connection/values.yaml  |  1 +
 4 files changed, 49 insertions(+)
 create mode 100644 deployment/helm/human-connection/.helmignore
 create mode 100644 deployment/helm/human-connection/Chart.yaml
 create mode 100644 deployment/helm/human-connection/templates/configmap.yml
 create mode 100644 deployment/helm/human-connection/values.yaml

diff --git a/deployment/helm/human-connection/.helmignore b/deployment/helm/human-connection/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/deployment/helm/human-connection/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
new file mode 100644
index 000000000..ab0d80bb1
--- /dev/null
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: human-connection
+version: 0.1.0
diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
new file mode 100644
index 000000000..82973fd69
--- /dev/null
+++ b/deployment/helm/human-connection/templates/configmap.yml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ .Release.Name }}-configmap
+dath:
+  SMTP_HOST: "mailserver.human-connection"
+  SMTP_PORT: "25"
+  GRAPHQL_PORT: "4000"
+  GRAPHQL_URI: "http://nitro-backend.human-connection:4000"
+  NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687"
+  NEO4J_AUTH: "none"
+  CLIENT_URI: "https://{{ .Values.domain }}"
+  NEO4J_apoc_import_file_enabled: "true"
+  NEO4J_dbms_memory_pagecache_size: "490M"
+  NEO4J_dbms_memory_heap_max__size: "500M"
+  NEO4J_dbms_memory_heap_initial__size: "500M"
+  NEO4J_dbms_security_procedures_unrestricted: "algo.*,apoc.*"
+  VERSION: "0.1.0"
+  SENTRY_DSN_WEBAPP: ""
+  SENTRY_DSN_BACKEND: ""
+  COMMIT: ""
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
new file mode 100644
index 000000000..0fe0dc898
--- /dev/null
+++ b/deployment/helm/human-connection/values.yaml
@@ -0,0 +1 @@
+domain: nitro-staging.human-connection.org

From caf2bc79cfa343d90e6550e4808fa72478c28d56 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 17 Sep 2019 13:41:49 +0200
Subject: [PATCH 002/171] Start to write a helm chart for Human Connection

---
 deployment/helm/human-connection/Chart.yaml   |  2 +-
 .../human-connection/templates/configmap.yml  | 28 ++++++------
 .../templates/deployment-backend.yaml         | 45 +++++++++++++++++++
 deployment/helm/human-connection/values.yaml  | 31 +++++++++++++
 4 files changed, 90 insertions(+), 16 deletions(-)
 create mode 100644 deployment/helm/human-connection/templates/deployment-backend.yaml

diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
index ab0d80bb1..1cfe9378b 100644
--- a/deployment/helm/human-connection/Chart.yaml
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
-description: A Helm chart for Kubernetes
+description: A Helm chart for Human Connection
 name: human-connection
 version: 0.1.0
diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
index 82973fd69..d298f1b08 100644
--- a/deployment/helm/human-connection/templates/configmap.yml
+++ b/deployment/helm/human-connection/templates/configmap.yml
@@ -3,19 +3,17 @@ kind: ConfigMap
 metadata:
   name:  {{ .Release.Name }}-configmap
 dath:
-  SMTP_HOST: "mailserver.human-connection"
-  SMTP_PORT: "25"
-  GRAPHQL_PORT: "4000"
-  GRAPHQL_URI: "http://nitro-backend.human-connection:4000"
-  NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687"
-  NEO4J_AUTH: "none"
+  GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
+  NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687"
   CLIENT_URI: "https://{{ .Values.domain }}"
-  NEO4J_apoc_import_file_enabled: "true"
-  NEO4J_dbms_memory_pagecache_size: "490M"
-  NEO4J_dbms_memory_heap_max__size: "500M"
-  NEO4J_dbms_memory_heap_initial__size: "500M"
-  NEO4J_dbms_security_procedures_unrestricted: "algo.*,apoc.*"
-  VERSION: "0.1.0"
-  SENTRY_DSN_WEBAPP: ""
-  SENTRY_DSN_BACKEND: ""
-  COMMIT: ""
+  NEO4J_apoc_import_file_enabled: {{ .Values.neo4j.apoc_import_file_enabled }}
+  NEO4J_dbms_memory_pagecache_size: {{ .Values.neo4j.dbms_memory_pagecache_size }}
+  NEO4J_dbms_memory_heap_max__size: {{ .Values.neo4j.dbms_memory_heap_max__size }}
+  NEO4J_dbms_memory_heap_initial__size: {{ .Values.neo4j.dbms_memory_heap_initial__size }}
+  NEO4J_dbms_security_procedures_unrestricted: {{ .Values.neo4j.dbms_security_procedures_unrestricted }}
+  VERSION: {{ .Chart.AppVersion }}
+  SENTRY_DSN_WEBAPP: {{ .Values.sentry.dsn_webapp }}
+  SENTRY_DSN_BACKEND: {{ .Values.sentry.dsn_backend }}
+  COMMIT: {{ .Values.commit }}
+  SMTP_HOST: {{ .Values.smtp.host }}
+  SMTP_PORT: {{ .Values.smtp.port }}
diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployment-backend.yaml
new file mode 100644
index 000000000..596036fd2
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-backend.yaml
@@ -0,0 +1,45 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-backend
+spec:
+  replicas: 1
+  minReadySeconds: 15
+  progressDeadlineSeconds: 60
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: "100%"
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-backend
+  template:
+    metadata:
+      name: deployment-backend
+      annotations:
+        backup.velero.io/backup-volumes: uploads
+      labels:
+        human-connection.org/commit: {{ .Values.commit }}
+        human-connection.org/selector: deployment-backend
+    spec:
+      containers:
+      - name: backend
+        image: humanconnection/nitro-backend:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        ports:
+        - containerPort: 4000
+        envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-configmap
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+        # volumeMounts:
+        #   - mountPath: /nitro-backend/public/uploads
+        #     name: uploads
+      # volumes:
+      # - name: uploads
+      #   persistentVolumeClaim:
+      #     claimName: uploads-claim
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+status: {}
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 0fe0dc898..c15537a83 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -1 +1,32 @@
 domain: nitro-staging.human-connection.org
+commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
+pullPolicy: Always
+
+# configs
+smtp:
+  host: "mailserver.human-connection"
+  port: "25"
+neo4j:
+  apoc_import_file_enabled: "true"
+  dbms_memory_pagecache_size: "490M"
+  dbms_memory_heap_max__size: "500M"
+  dbms_memory_heap_initial__size: "500M"
+  dbms_security_procedures_unrestricted: "algo.*,apoc.*"
+sentry:
+  dsn_webapp:
+  dsn_backend:
+
+# secrets
+jwt_secret: b/&&7b78BF&fv/Vd
+private_key_passphrase: a7dsf78sadg87ad87sfagsadg78
+mapbox:
+  token: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+mongodb:
+  username:
+  password:
+neo4j:
+  username:
+  password:
+smtp:
+  username:
+  password:

From a2a71975abdba9a806add1477da0e0f14a6f7700 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 17 Sep 2019 20:01:34 +0200
Subject: [PATCH 003/171] Templates for webapp+neo4j, use camelCase

---
 .../human-connection/templates/configmap.yml  | 13 ++---
 .../templates/deployment-neo4j.yaml           | 55 +++++++++++++++++++
 .../templates/deployment-web.yaml             | 37 +++++++++++++
 deployment/helm/human-connection/values.yaml  | 35 +++++-------
 4 files changed, 110 insertions(+), 30 deletions(-)
 create mode 100644 deployment/helm/human-connection/templates/deployment-neo4j.yaml
 create mode 100644 deployment/helm/human-connection/templates/deployment-web.yaml

diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
index d298f1b08..8be7b517e 100644
--- a/deployment/helm/human-connection/templates/configmap.yml
+++ b/deployment/helm/human-connection/templates/configmap.yml
@@ -6,14 +6,9 @@ dath:
   GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
   NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687"
   CLIENT_URI: "https://{{ .Values.domain }}"
-  NEO4J_apoc_import_file_enabled: {{ .Values.neo4j.apoc_import_file_enabled }}
-  NEO4J_dbms_memory_pagecache_size: {{ .Values.neo4j.dbms_memory_pagecache_size }}
-  NEO4J_dbms_memory_heap_max__size: {{ .Values.neo4j.dbms_memory_heap_max__size }}
-  NEO4J_dbms_memory_heap_initial__size: {{ .Values.neo4j.dbms_memory_heap_initial__size }}
-  NEO4J_dbms_security_procedures_unrestricted: {{ .Values.neo4j.dbms_security_procedures_unrestricted }}
   VERSION: {{ .Chart.AppVersion }}
-  SENTRY_DSN_WEBAPP: {{ .Values.sentry.dsn_webapp }}
-  SENTRY_DSN_BACKEND: {{ .Values.sentry.dsn_backend }}
+  SENTRY_DSN_WEBAPP: {{ .Values.sentryDsnWebapp }}
+  SENTRY_DSN_BACKEND: {{ .Values.sentryDsnBackend }}
   COMMIT: {{ .Values.commit }}
-  SMTP_HOST: {{ .Values.smtp.host }}
-  SMTP_PORT: {{ .Values.smtp.port }}
+  SMTP_HOST: {{ .Values.smtpHost }}
+  SMTP_PORT: {{ .Values.smtpPort }}
diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
new file mode 100644
index 000000000..692533abf
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
@@ -0,0 +1,55 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-neo4j
+spec:
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: "100%"
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-neo4j
+  template:
+    metadata:
+      name: neo4j
+      annotations:
+        backup.velero.io/backup-volumes: neo4j-data
+      labels:
+        human-connection.org/commit: {{ .Values.commit }}
+        human-connection.org/selector: deployment-neo4j
+    spec:
+      containers:
+      - name: neo4j
+        image: humanconnection/neo4j:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        ports:
+        - containerPort: 7687
+        - containerPort: 7474
+        # resources:
+        #   requests:
+        #     memory: "2G"
+        #   limits:
+        #     memory: "8G"
+        env:
+        - name: NEO4J_dbms_security_procedures_unrestricted
+          value: "algo.*,apoc.*"
+          {{- range $key, $val := .Values.neo4jConfig }}
+        - name: NEO4J_{{ $key }}
+          value: {{ $val | quote }}
+          {{- end}}
+        envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-configmap
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+        # volumeMounts:
+        #   - mountPath: /data/
+        #     name: neo4j-data
+      # volumes:
+      # - name: neo4j-data
+      #   persistentVolumeClaim:
+      #     claimName: neo4j-data-claim
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
diff --git a/deployment/helm/human-connection/templates/deployment-web.yaml b/deployment/helm/human-connection/templates/deployment-web.yaml
new file mode 100644
index 000000000..0e432774f
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-web.yaml
@@ -0,0 +1,37 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-webapp
+spec:
+  replicas: 2
+  minReadySeconds: 15
+  progressDeadlineSeconds: 60
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-webapp
+  template:
+    metadata:
+      name: webapp
+      labels:
+        human-connection.org/commit: {{ .Values.commit }}
+        human-connection.org/selector: deployment-webapp
+    spec:
+      containers:
+      - name: webapp
+        image: humanconnection/nitro-web:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-configmap
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+        env:
+        - name: HOST
+          value: 0.0.0.0
+        ports:
+        - containerPort: 3000
+        resources: {}
+        imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+status: {}
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index c15537a83..25a346fae 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -3,30 +3,23 @@ commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
 pullPolicy: Always
 
 # configs
-smtp:
-  host: "mailserver.human-connection"
-  port: "25"
-neo4j:
+smtpHost: "mailserver.human-connection"
+smtpPort: "25"
+smtpUsername:
+smtpPassword:
+sentryDsnWebapp:
+sentryDsnBackend:
+neo4jConfig:
   apoc_import_file_enabled: "true"
   dbms_memory_pagecache_size: "490M"
   dbms_memory_heap_max__size: "500M"
   dbms_memory_heap_initial__size: "500M"
-  dbms_security_procedures_unrestricted: "algo.*,apoc.*"
-sentry:
-  dsn_webapp:
-  dsn_backend:
 
 # secrets
-jwt_secret: b/&&7b78BF&fv/Vd
-private_key_passphrase: a7dsf78sadg87ad87sfagsadg78
-mapbox:
-  token: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
-mongodb:
-  username:
-  password:
-neo4j:
-  username:
-  password:
-smtp:
-  username:
-  password:
+jwtSecret: b/&&7b78BF&fv/Vd
+privateKeyPassphrase: a7dsf78sadg87ad87sfagsadg78
+mapboxToken: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+mongodbUsername:
+mongodbPassword:
+neo4jUsername:
+neo4jPassword:

From fccf53a176789ecc728032bda99cc2f55ab018b8 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 17 Sep 2019 23:28:17 +0200
Subject: [PATCH 004/171] Implement services and maintenance deployment

Also found:
```
Some users have raised concerns that the Neo4j image changes file permissions on the host machine.

By default, Neo4j runs as the user neo4j who only exists in the container, not on the host. That means that it's hard to set up mount folders on the host which this new user has write permissions for. We have updated the error messaging with advice about how to fix file permission errors. We also introduced writability checks and reduced the amount of file permission changes the image will perform. This has been found to interfere with some Kubernetes setups, so is currently an opt-in feature.

To enforce stricter file permissions checking you can pass this environment variable to the container:

--env SECURE_FILE_PERMISSIONS=yes
```
from https://hub.docker.com/_/neo4j

Implemented the above :point_up:
---
 .../templates/deployment-maintenance.yaml     | 26 +++++++++++++++++++
 .../templates/deployment-neo4j.yaml           |  2 ++
 .../templates/service-backend.yaml            | 11 ++++++++
 .../templates/service-maintenance.yaml        | 11 ++++++++
 .../templates/service-neo4j.yaml              | 14 ++++++++++
 .../templates/service-webapp.yaml             | 11 ++++++++
 6 files changed, 75 insertions(+)
 create mode 100644 deployment/helm/human-connection/templates/deployment-maintenance.yaml
 create mode 100644 deployment/helm/human-connection/templates/service-backend.yaml
 create mode 100644 deployment/helm/human-connection/templates/service-maintenance.yaml
 create mode 100644 deployment/helm/human-connection/templates/service-neo4j.yaml
 create mode 100644 deployment/helm/human-connection/templates/service-webapp.yaml

diff --git a/deployment/helm/human-connection/templates/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployment-maintenance.yaml
new file mode 100644
index 000000000..8ce4442b9
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-maintenance.yaml
@@ -0,0 +1,26 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-maintenance
+spec:
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-maintenance
+  template:
+    metadata:
+      labels:
+        human-connection.org/commit: {{ .Values.commit }}
+        human-connection.org/selector: deployment-maintenance
+      name: maintenance
+    spec:
+      containers:
+        - name: maintenance
+          env:
+            - name: HOST
+              value: 0.0.0.0
+          image: humanconnection/maintenance:latest
+          ports:
+            - containerPort: 80
+          imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
index 692533abf..290f79332 100644
--- a/deployment/helm/human-connection/templates/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
@@ -35,6 +35,8 @@ spec:
         env:
         - name: NEO4J_dbms_security_procedures_unrestricted
           value: "algo.*,apoc.*"
+        - name: SECURE_FILE_PERMISSIONS
+          value: "yes"
           {{- range $key, $val := .Values.neo4jConfig }}
         - name: NEO4J_{{ $key }}
           value: {{ $val | quote }}
diff --git a/deployment/helm/human-connection/templates/service-backend.yaml b/deployment/helm/human-connection/templates/service-backend.yaml
new file mode 100644
index 000000000..b9d40ef8a
--- /dev/null
+++ b/deployment/helm/human-connection/templates/service-backend.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name:  {{ .Release.Name }}-backend
+spec:
+  ports:
+    - name: graphql
+      port: 4000
+      targetPort: 4000
+  selector:
+    human-connection.org/selector: deployment-backend
diff --git a/deployment/helm/human-connection/templates/service-maintenance.yaml b/deployment/helm/human-connection/templates/service-maintenance.yaml
new file mode 100644
index 000000000..a82473e2e
--- /dev/null
+++ b/deployment/helm/human-connection/templates/service-maintenance.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name:  {{ .Release.Name }}-maintenance
+spec:
+  ports:
+    - name: web
+      port: 80
+      targetPort: 80
+  selector:
+    human-connection.org/selector: deployment-maintenance
diff --git a/deployment/helm/human-connection/templates/service-neo4j.yaml b/deployment/helm/human-connection/templates/service-neo4j.yaml
new file mode 100644
index 000000000..547dad6c7
--- /dev/null
+++ b/deployment/helm/human-connection/templates/service-neo4j.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name:  {{ .Release.Name }}-neo4j
+spec:
+  ports:
+  - name: bolt
+    port: 7687
+    targetPort: 7687
+  - name: web
+    port: 7474
+    targetPort: 7474
+  selector:
+    human-connection.org/selector: deployment-neo4j
diff --git a/deployment/helm/human-connection/templates/service-webapp.yaml b/deployment/helm/human-connection/templates/service-webapp.yaml
new file mode 100644
index 000000000..c1a9771ee
--- /dev/null
+++ b/deployment/helm/human-connection/templates/service-webapp.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name:  {{ .Release.Name }}-webapp
+spec:
+  ports:
+    - name: web
+      port: 3000
+      targetPort: 3000
+  selector:
+    human-connection.org/selector: deployment-webapp

From 18ffafcabce8a46fba55d0b33950847caa95ff1b Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 18 Sep 2019 00:05:00 +0200
Subject: [PATCH 005/171] Assign the neo4j pod at least 1G memory

I just went into memory issues when creating all the pods. Neo4j was in
a crash loop with exit code 137. Apparently this one:

https://success.docker.com/article/what-causes-a-container-to-exit-with-code-137
---
 .../human-connection/templates/deployment-neo4j.yaml   | 10 +++++-----
 deployment/helm/human-connection/values.yaml           |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
index 290f79332..3818af2ef 100644
--- a/deployment/helm/human-connection/templates/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
@@ -27,11 +27,11 @@ spec:
         ports:
         - containerPort: 7687
         - containerPort: 7474
-        # resources:
-        #   requests:
-        #     memory: "2G"
-        #   limits:
-        #     memory: "8G"
+        resources:
+          requests:
+            memory: {{ .Values.neo4jResourceRequestsMemory | default "1G" | quote }}
+          limits:
+            memory: {{ .Values.neo4jResourceLimitsMemory | default "1G" | quote }}
         env:
         - name: NEO4J_dbms_security_procedures_unrestricted
           value: "algo.*,apoc.*"
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 25a346fae..77d799861 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -9,6 +9,8 @@ smtpUsername:
 smtpPassword:
 sentryDsnWebapp:
 sentryDsnBackend:
+neo4jResourceRequestsMemory: "1G"
+neo4jResourceLimitsMemory: "1G"
 neo4jConfig:
   apoc_import_file_enabled: "true"
   dbms_memory_pagecache_size: "490M"
@@ -21,5 +23,5 @@ privateKeyPassphrase: a7dsf78sadg87ad87sfagsadg78
 mapboxToken: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
 mongodbUsername:
 mongodbPassword:
-neo4jUsername:
-neo4jPassword:
+neo4jUsername: neo4j
+neo4jPassword: neo4j

From c189b620739b9aca1344054ed8dc28c3f5f9cf09 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 18 Sep 2019 00:19:24 +0200
Subject: [PATCH 006/171] Set app version

---
 deployment/helm/human-connection/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
index 1cfe9378b..0f303ade0 100644
--- a/deployment/helm/human-connection/Chart.yaml
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.0"
+appVersion: "0.1.0"
 description: A Helm chart for Human Connection
 name: human-connection
 version: 0.1.0

From c8c345be485d0b3516eb6787d8b432c74487d4e7 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 18 Sep 2019 01:19:06 +0200
Subject: [PATCH 007/171] Fixup bug dath

---
 deployment/helm/human-connection/templates/configmap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
index 8be7b517e..dec2c2bac 100644
--- a/deployment/helm/human-connection/templates/configmap.yml
+++ b/deployment/helm/human-connection/templates/configmap.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  {{ .Release.Name }}-configmap
-dath:
+data:
   GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
   NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687"
   CLIENT_URI: "https://{{ .Values.domain }}"

From 6e0b7c86e17fff78464aef34726c091b645cb8c9 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 18 Sep 2019 01:19:50 +0200
Subject: [PATCH 008/171] Conditionally deploy mailserver

---
 .../human-connection/templates/configmap.yml  |  5 +++
 .../templates/deployment-mailserver.yaml      | 34 +++++++++++++++++++
 .../templates/service-mailserver.yaml         | 16 +++++++++
 deployment/helm/human-connection/values.yaml  |  1 +
 4 files changed, 56 insertions(+)
 create mode 100644 deployment/helm/human-connection/templates/deployment-mailserver.yaml
 create mode 100644 deployment/helm/human-connection/templates/service-mailserver.yaml

diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
index dec2c2bac..4c57a7e94 100644
--- a/deployment/helm/human-connection/templates/configmap.yml
+++ b/deployment/helm/human-connection/templates/configmap.yml
@@ -10,5 +10,10 @@ data:
   SENTRY_DSN_WEBAPP: {{ .Values.sentryDsnWebapp }}
   SENTRY_DSN_BACKEND: {{ .Values.sentryDsnBackend }}
   COMMIT: {{ .Values.commit }}
+{{- if .Values.developmentMailserverDomain }}
+  SMTP_HOST: {{ .Release.Name }}-mailserver
+  SMTP_PORT: "25"
+{{- else }}
   SMTP_HOST: {{ .Values.smtpHost }}
   SMTP_PORT: {{ .Values.smtpPort }}
+{{- end }}
diff --git a/deployment/helm/human-connection/templates/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployment-mailserver.yaml
new file mode 100644
index 000000000..685cabea0
--- /dev/null
+++ b/deployment/helm/human-connection/templates/deployment-mailserver.yaml
@@ -0,0 +1,34 @@
+{{- if .Values.developmentMailserverDomain }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name:  {{ .Release.Name }}-mailserver
+spec:
+  replicas: 1
+  minReadySeconds: 15
+  progressDeadlineSeconds: 60
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-mailserver
+  template:
+    metadata:
+      labels:
+        human-connection.org/selector: deployment-mailserver
+      name: mailserver
+    spec:
+      containers:
+      - name: mailserver
+        image: djfarrelly/maildev
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        ports:
+        - containerPort: 80
+        - containerPort: 25
+        envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-configmap
+        - secretRef:
+            name: {{ .Release.Name }}-secrets
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+status: {}
+{{- end}}
diff --git a/deployment/helm/human-connection/templates/service-mailserver.yaml b/deployment/helm/human-connection/templates/service-mailserver.yaml
new file mode 100644
index 000000000..e5e22aa37
--- /dev/null
+++ b/deployment/helm/human-connection/templates/service-mailserver.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.developmentMailserverDomain }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-mailserver
+spec:
+  ports:
+  - name: web
+    port: 80
+    targetPort: 80
+  - name: smtp
+    port: 25
+    targetPort: 25
+  selector:
+    human-connection.org/selector: deployment-mailserver
+{{- end}}
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 77d799861..6db2f87fd 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -3,6 +3,7 @@ commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
 pullPolicy: Always
 
 # configs
+developmentMailserverDomain: "nitro-mailserver.human-connection.org"
 smtpHost: "mailserver.human-connection"
 smtpPort: "25"
 smtpUsername:

From 2363c285e146b8a76864bab1eec0e8d8961fb07e Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 18 Sep 2019 02:12:50 +0200
Subject: [PATCH 009/171] Implement ingress and letsencrypt issuers

---
 .../templates/ingress.template.yaml           | 31 +++++++++++++++++++
 .../templates/letsencrypt-prod.yaml           | 11 +++++++
 .../templates/letsencrypt-staging.yaml        | 11 +++++++
 deployment/helm/human-connection/values.yaml  |  5 ++-
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 deployment/helm/human-connection/templates/ingress.template.yaml
 create mode 100644 deployment/helm/human-connection/templates/letsencrypt-prod.yaml
 create mode 100644 deployment/helm/human-connection/templates/letsencrypt-staging.yaml

diff --git a/deployment/helm/human-connection/templates/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress.template.yaml
new file mode 100644
index 000000000..99c3fbb78
--- /dev/null
+++ b/deployment/helm/human-connection/templates/ingress.template.yaml
@@ -0,0 +1,31 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name:  {{ .Release.Name }}-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    certmanager.k8s.io/issuer: {{ .Values.letsencryptIssuer }}
+    certmanager.k8s.io/acme-challenge-type: http01
+    nginx.ingress.kubernetes.io/proxy-body-size: 6m
+spec:
+  tls:
+    - hosts:
+        - {{ .Values.humanConnectionDomain }}
+      secretName: tls
+  rules:
+    - host: {{ .Values.humanConnectionDomain }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: webapp
+              servicePort: 3000
+{{- if .Values.developmentMailserverDomain }}
+    - host: {{ .Values.developmentMailserverDomain }}
+      http:
+        paths:
+        - path: /
+          backend:
+            serviceName: {{ .Release.Name }}-mailserver
+            servicePort: 80
+{{- end }}
diff --git a/deployment/helm/human-connection/templates/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/letsencrypt-prod.yaml
new file mode 100644
index 000000000..9801fb974
--- /dev/null
+++ b/deployment/helm/human-connection/templates/letsencrypt-prod.yaml
@@ -0,0 +1,11 @@
+apiVersion: certmanager.k8s.io/v1alpha1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-letsencrypt-prod
+spec:
+  acme:
+    server: https://acme-v02.api.letsencrypt.org/directory
+    email: {{ .Values.supportEmail }}
+    privateKeySecretRef:
+      name: letsencrypt-prod
+    http01: {}
diff --git a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
new file mode 100644
index 000000000..2bb6784a8
--- /dev/null
+++ b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
@@ -0,0 +1,11 @@
+apiVersion: certmanager.k8s.io/v1alpha1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-letsencrypt-staging
+spec:
+  acme:
+    server: https://acme-staging-v02.api.letsencrypt.org/directory
+    email: {{ .Values.supportEmail }}
+    privateKeySecretRef:
+      name: letsencrypt-staging
+    http01: {}
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 6db2f87fd..f5fd5a6aa 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -3,7 +3,10 @@ commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
 pullPolicy: Always
 
 # configs
-developmentMailserverDomain: "nitro-mailserver.human-connection.org"
+developmentMailserverDomain: "helm-nitro-mailserver.human-connection.org"
+humanConnectionDomain: "helm-staging.human-connection.org"
+supportEmail: "developer@human-connection.org"
+letsencryptIssuer: "letsencrypt-staging"
 smtpHost: "mailserver.human-connection"
 smtpPort: "25"
 smtpUsername:

From b9676271ea1baf158c9f22bbde6210b807e2d917 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 19 Dec 2019 17:46:25 +0100
Subject: [PATCH 010/171] Delete teaser image

---
 .../ContributionForm/ContributionForm.vue     | 19 +++++++++++++++++++
 webapp/components/TeaserImage/TeaserImage.vue |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index eeba47b72..fd54d4948 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -7,6 +7,12 @@
     @submit="submit"
   >
     <template slot-scope="{ errors }">
+      <ds-button
+        @click.prevent="deleteImage"
+        icon="close"
+        v-show="showDeleteButton != ''"
+        class="delete-image"
+      ></ds-button>
       <hc-teaser-image
         :contribution="contribution"
         @addTeaserImage="addTeaserImage"
@@ -175,6 +181,7 @@ export default {
       users: [],
       contentMin: 3,
       hashtags: [],
+      showDeleteButton: this.contribution ? this.contribution.image : false,
     }
   },
   computed: {
@@ -238,6 +245,11 @@ export default {
     categoryIds(categories) {
       return categories.map(c => c.id)
     },
+    deleteImage() {
+      this.form.image = ''
+      this.contribution.image = ''
+      this.showDeleteButton = ''
+    },
   },
   apollo: {
     User: {
@@ -297,4 +309,11 @@ export default {
     cursor: default;
   }
 }
+.delete-image {
+  right: 3px;
+  position: relative;
+  z-index: 1;
+  float: right;
+  top: 42px;
+}
 </style>
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 95d94d70f..9a203fc9c 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -12,7 +12,7 @@
       <ds-button @click.stop.prevent="cropImage" class="crop-confirm" primary>
         {{ $t('contribution.teaserImage.cropperConfirm') }}
       </ds-button>
-      <ds-button @click="cancelCrop" class="crop-cancel" icon="close"></ds-button>
+      <ds-button @click.prevent="cancelCrop" class="crop-cancel" icon="close"></ds-button>
     </div>
     <div
       :class="{
@@ -118,6 +118,7 @@ export default {
         const croppedImageFile = new File([blob], this.file.name, { type: this.file.type })
         this.$emit('addTeaserImage', croppedImageFile)
         this.$emit('addImageAspectRatio', imageAspectRatio)
+        this.$emit('showDeleteButton', this.file.name)
       }, 'image/jpeg')
     },
     setupPreview(canvas) {

From f06b04178fcc620f732116a3f7292a634f2d4ca5 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 6 Jan 2020 10:43:32 +0100
Subject: [PATCH 011/171] add vscode settings.json to gitignore

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

diff --git a/.gitignore b/.gitignore
index 928dae262..e6b3e4ab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ cypress.env.json
 **/coverage
 
 release/
-*~
\ No newline at end of file
+*~
+.vscode/settings.json
\ No newline at end of file

From e61387bc5a9110609cc9c558ce2847eb1dfe2746 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 6 Jan 2020 10:48:17 +0100
Subject: [PATCH 012/171] change settings and rmove gitignore

---
 .gitignore            | 3 +--
 .vscode/settings.json | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e6b3e4ab8..928dae262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,4 @@ cypress.env.json
 **/coverage
 
 release/
-*~
-.vscode/settings.json
\ No newline at end of file
+*~
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2091e5e03..179c5ffe3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,5 +8,8 @@
     }
   ],
   "editor.formatOnSave": false,
-  "eslint.autoFixOnSave": true
+  "eslint.autoFixOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
 }

From cd8b2447419e152f546a96bb3534c54735289fc7 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Mon, 6 Jan 2020 10:57:48 +0100
Subject: [PATCH 013/171] Update
 webapp/components/ContributionForm/ContributionForm.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

showDeleteButton change

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
---
 webapp/components/ContributionForm/ContributionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 8370c0385..579a7b3de 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -204,7 +204,7 @@ export default {
       users: [],
       contentMin: 3,
       hashtags: [],
-      showDeleteButton: this.contribution ? this.contribution.image : false,
+      showDeleteButton: !!this.contribution,
       elem: null,
     }
   },

From f8c0a34194a13b94ce68f26697ef248eaf543a41 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 6 Jan 2020 11:06:59 +0100
Subject: [PATCH 014/171] Proposed changes accepted and incorporated

---
 webapp/components/ContributionForm/ContributionForm.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 8370c0385..d1f27059b 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -10,7 +10,7 @@
       <ds-button
         @click.prevent="deleteImage"
         icon="close"
-        v-show="showDeleteButton != ''"
+        v-if="showDeleteButton"
         class="delete-image"
       ></ds-button>
       <hc-teaser-image
@@ -272,9 +272,9 @@ export default {
       return categories.map(c => c.id)
     },
     deleteImage() {
-      this.form.image = ''
-      this.contribution.image = ''
-      this.showDeleteButton = ''
+      this.form.image = null
+      this.contribution.image = null
+      this.showDeleteButton = false
     },
   },
   apollo: {

From f7847594345ddbc2711e1513f06bb6695130118c Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 15 Jan 2020 08:34:49 +0100
Subject: [PATCH 015/171] delete .vscode / settings.json

delete .vscode / settings.json
---
 .vscode/settings.json | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 179c5ffe3..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    {
-      "language": "vue",
-      "autoFix": true
-    }
-  ],
-  "editor.formatOnSave": false,
-  "eslint.autoFixOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  }
-}

From 75753444ea8e1d581e1305fa60f8817a4ea6085b Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 15 Jan 2020 18:48:37 +0100
Subject: [PATCH 016/171] fix: delete picture and thumbnail in post

---
 webapp/components/ContributionForm/ContributionForm.vue | 9 +++++----
 webapp/components/TeaserImage/TeaserImage.vue           | 5 ++++-
 webapp/components/Upload/index.vue                      | 1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index a38d59181..e836b7aef 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -10,10 +10,11 @@
       <ds-button
         @click.prevent="deleteImage"
         icon="close"
-        v-if="showDeleteButton"
+        v-if="contribution.image || form.teaserImage"
         class="delete-image"
       ></ds-button>
       <hc-teaser-image
+        ref="deleteImage"
         :contribution="contribution"
         @addTeaserImage="addTeaserImage"
         :class="{ '--blur-image': form.blurImage }"
@@ -204,7 +205,6 @@ export default {
       users: [],
       contentMin: 3,
       hashtags: [],
-      showDeleteButton: !!this.contribution,
       elem: null,
     }
   },
@@ -272,9 +272,10 @@ export default {
       return categories.map(c => c.id)
     },
     deleteImage() {
-      this.form.image = null
       this.contribution.image = null
-      this.showDeleteButton = false
+      this.form.image = null
+      this.form.teaserImage = null
+       this.$refs.deleteImage.deleteImage()
     },
   },
   apollo: {
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index d5913665b..70efe6d54 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -71,6 +71,9 @@ export default {
     },
   },
   methods: {
+    deleteImage() {
+       this.clearImages()
+    },
     template() {
       return `<div class="dz-preview dz-file-preview">
                 <div class="dz-image">
@@ -207,7 +210,7 @@ export default {
 }
 
 .hc-drag-marker-update-post {
-  opacity: 0;
+  opacity: 0.1;
 }
 
 .contribution-form-footer {
diff --git a/webapp/components/Upload/index.vue b/webapp/components/Upload/index.vue
index 66e7203cc..c78b4649b 100644
--- a/webapp/components/Upload/index.vue
+++ b/webapp/components/Upload/index.vue
@@ -157,7 +157,6 @@ export default {
     border-radius: 100%;
     border: 1px dashed hsl(0, 0%, 25%);
   }
-
   .hc-attachments-upload-area:hover & {
     opacity: 1;
   }

From 2e7f7746798f7ccef1da3be9ef30f36eb633f49e Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 15 Jan 2020 18:49:32 +0100
Subject: [PATCH 017/171] fix: lint

---
 webapp/components/ContributionForm/ContributionForm.vue | 2 +-
 webapp/components/TeaserImage/TeaserImage.vue           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index e836b7aef..019d63d56 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -275,7 +275,7 @@ export default {
       this.contribution.image = null
       this.form.image = null
       this.form.teaserImage = null
-       this.$refs.deleteImage.deleteImage()
+      this.$refs.deleteImage.deleteImage()
     },
   },
   apollo: {
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 70efe6d54..0ba8977e5 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -72,7 +72,7 @@ export default {
   },
   methods: {
     deleteImage() {
-       this.clearImages()
+      this.clearImages()
     },
     template() {
       return `<div class="dz-preview dz-file-preview">

From c1743ce1d037f3b3b9730f7d9d2c4386604bfa0d Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 15 Jan 2020 18:58:42 +0100
Subject: [PATCH 018/171] fix: lint, test

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

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 019d63d56..24b51fc31 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -8,9 +8,9 @@
   >
     <template slot-scope="{ errors }">
       <ds-button
+        v-if="(contribution && contribution.image) || form.teaserImage"
         @click.prevent="deleteImage"
         icon="close"
-        v-if="contribution.image || form.teaserImage"
         class="delete-image"
       ></ds-button>
       <hc-teaser-image
@@ -23,7 +23,7 @@
         <img
           v-if="contribution"
           class="contribution-image"
-          :src="contribution.image | proxyApiUrl"
+          :src="contribution.image || proxyApiUrl"
         />
       </hc-teaser-image>
 

From a8132d23da6f70534659aed9697361821afd109d Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 15 Jan 2020 20:18:36 +0100
Subject: [PATCH 019/171] fix: spec, delete teasureImage

---
 webapp/components/ContributionForm/ContributionForm.spec.js | 6 ++++++
 webapp/components/TeaserImage/TeaserImage.vue               | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 2f0f2e30d..c56f24a6a 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -235,6 +235,12 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
+        it('deleted a teaser image', async () => {
+          expectedParams.variables.imageUpload = imageUpload
+          wrapper.find(TeaserImage).vm.$emit('addTeaserImage', imageUpload)
+          wrapper.find(TeaserImage).vm.$emit('deleteImage', null)
+        })
+
         it('content is valid with just a link', async () => {
           await wrapper.vm.updateEditorContent(
             '<a href="https://www.youtube.com/watch?v=smoEelV6FUk" target="_blank"></a>',
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 0ba8977e5..0e5458232 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -71,9 +71,6 @@ export default {
     },
   },
   methods: {
-    deleteImage() {
-      this.clearImages()
-    },
     template() {
       return `<div class="dz-preview dz-file-preview">
                 <div class="dz-image">
@@ -105,6 +102,9 @@ export default {
       this.oldImage = contributionImage
       if (contributionImage) contributionImage.remove()
     },
+    deleteImage() {
+      this.clearImages()
+    },
     initCropper() {
       this.image = new Image()
       this.image.src = URL.createObjectURL(this.file)

From 3be5dee08b3a1853d86b7c01f768bf4920784be9 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 24 Jan 2020 17:25:45 +0100
Subject: [PATCH 020/171] Draft: Setup subsriptions for backend+frontend

Please clean up this commit and squash it later on.
---
 backend/package.json                  |  1 +
 backend/src/config/index.js           |  1 +
 backend/src/index.js                  |  7 +++--
 backend/src/schema/resolvers/posts.js | 12 ++++++++
 backend/src/schema/types/schema.gql   |  4 +++
 backend/src/server.js                 | 43 ++++++++++++++++++++-------
 backend/yarn.lock                     |  7 ++++-
 webapp/pages/index.vue                | 40 +++++++++++++++++++++++++
 webapp/plugins/apollo-config.js       |  3 +-
 9 files changed, 102 insertions(+), 16 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 2a83c7f01..d33f9e14a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -96,6 +96,7 @@
     "request": "~2.88.0",
     "sanitize-html": "~1.21.1",
     "slug": "~2.1.0",
+    "subscriptions-transport-ws": "^0.9.16",
     "trunc-html": "~1.1.2",
     "uuid": "~3.4.0",
     "validator": "^12.1.0",
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 2f8d0ed22..59ab20af7 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -49,6 +49,7 @@ export const serverConfigs = {
   CLIENT_URI,
   GRAPHQL_URI,
   PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true',
+  SUBSCRIPTIONS_PATH: '/subscriptions',
 }
 
 export const developmentConfigs = {
diff --git a/backend/src/index.js b/backend/src/index.js
index 98354dc1f..0eb4f51b6 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -1,9 +1,10 @@
 import createServer from './server'
 import CONFIG from './config'
 
-const { app } = createServer()
+const { app, server, httpServer } = createServer()
 const url = new URL(CONFIG.GRAPHQL_URI)
-app.listen({ port: url.port }, () => {
+httpServer.listen({ port: url.port }, () => {
   /* eslint-disable-next-line no-console */
-  console.log(`GraphQLServer ready at ${CONFIG.GRAPHQL_URI} 🚀`)
+  console.log(`🚀 Server ready at http://localhost:${url.port}${server.graphqlPath}`)
+  console.log(`🚀 Subscriptions ready at ws://localhost:${url.port}${server.subscriptionsPath}`)
 })
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index af8165997..f8609f7a6 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -5,6 +5,11 @@ import { UserInputError } from 'apollo-server'
 import fileUpload from './fileUpload'
 import Resolver from './helpers/Resolver'
 import { filterForMutedUsers } from './helpers/filterForMutedUsers'
+import { PubSub } from 'apollo-server'
+
+const pubsub = new PubSub();
+const POST_ADDED = 'POST_ADDED';
+
 
 const maintainPinnedPosts = params => {
   const pinnedPostFilter = { pinned: true }
@@ -17,6 +22,12 @@ const maintainPinnedPosts = params => {
 }
 
 export default {
+  Subscription: {
+    postAdded: {
+      // Additional event labels can be passed to asyncIterator creation
+      subscribe: () => pubsub.asyncIterator([POST_ADDED]),
+    },
+  },
   Query: {
     Post: async (object, params, context, resolveInfo) => {
       params = await filterForMutedUsers(params, context)
@@ -102,6 +113,7 @@ export default {
       })
       try {
         const [post] = await writeTxResultPromise
+        pubsub.publish(POST_ADDED, { postAdded: post });
         return post
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 23c2ded4d..b3df61af2 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -1,3 +1,7 @@
+type Subscription {
+  postAdded: Post
+}
+
 type Mutation {
   # Get a JWT Token for the given Email and password
   login(email: String!, password: String!): String!
diff --git a/backend/src/server.js b/backend/src/server.js
index 02e166b71..22431bd7f 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -1,6 +1,9 @@
 import express from 'express'
+import http from 'http'
 import helmet from 'helmet'
 import { ApolloServer } from 'apollo-server-express'
+
+
 import CONFIG from './config'
 import middleware from './middleware'
 import { getNeode, getDriver } from './db/neo4j'
@@ -8,19 +11,28 @@ import decode from './jwt/decode'
 import schema from './schema'
 import webfinger from './activitypub/routes/webfinger'
 
+
 const driver = getDriver()
 const neode = getNeode()
 
-export const context = async ({ req }) => {
-  const user = await decode(driver, req.headers.authorization)
-  return {
-    driver,
-    neode,
-    user,
-    req,
-    cypherParams: {
-      currentUserId: user ? user.id : null,
-    },
+const getContext = async (req) => {
+    const user = await decode(driver, req.headers.authorization)
+    return {
+      driver,
+      neode,
+      user,
+      req,
+      cypherParams: {
+        currentUserId: user ? user.id : null,
+      },
+    }
+}
+export const context = async (options) => {
+  const { connection, req } = options
+  if (connection) {
+    return connection.context
+  } else {
+    return getContext(req)
   }
 }
 
@@ -28,6 +40,12 @@ const createServer = options => {
   const defaults = {
     context,
     schema: middleware(schema),
+    subscriptions: {
+      onConnect: (connectionParams, webSocket) => {
+        console.log('connectionParams', connectionParams)
+        return getContext(connectionParams)
+      },
+    },
     debug: !!CONFIG.DEBUG,
     tracing: !!CONFIG.DEBUG,
     formatError: error => {
@@ -46,8 +64,11 @@ const createServer = options => {
   app.use('/.well-known/', webfinger())
   app.use(express.static('public'))
   server.applyMiddleware({ app, path: '/' })
+  const httpServer = http.createServer(app);
+  server.installSubscriptionHandlers(httpServer);
 
-  return { server, app }
+
+  return { server, httpServer, app }
 }
 
 export default createServer
diff --git a/backend/yarn.lock b/backend/yarn.lock
index caf302820..9d3e0e571 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1175,7 +1175,7 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.10.5", "@metascraper/helpers@^5.10.6":
+"@metascraper/helpers@^5.10.6":
   version "5.10.6"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.10.6.tgz#0b786607212925a577926fd0cd0313a49de3499c"
   integrity sha512-/jvhlM3RKGYMoUK8D8S1r3tN03/EYizCqWF7zDx0aBMC8Ihp33DRGs9oNdsgkgwzVF7O/YpDm55l9K+qVJlsyQ==
@@ -7918,6 +7918,11 @@ serve-static@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 609c3d800..f0089979d 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -74,6 +74,16 @@ import { mapGetters, mapMutations } from 'vuex'
 import { filterPosts } from '~/graphql/PostQuery.js'
 import PostMutations from '~/graphql/PostMutations'
 import UpdateQuery from '~/components/utils/UpdateQuery'
+import gql from 'graphql-tag'
+import {
+  userFragment,
+  postFragment,
+  commentFragment,
+  postCountsFragment,
+  userCountsFragment,
+  locationAndBadgesFragment,
+  tagsCategoriesAndPinnedFragment,
+} from '~/graphql/Fragments'
 
 export default {
   components: {
@@ -213,6 +223,36 @@ export default {
         this.posts = Post
       },
       fetchPolicy: 'cache-and-network',
+      subscribeToMore: {
+        document: gql`
+    ${userFragment}
+    ${userCountsFragment}
+    ${locationAndBadgesFragment('EN')}
+    ${postFragment}
+    ${postCountsFragment}
+    ${tagsCategoriesAndPinnedFragment}
+
+        subscription Post {
+          postAdded {
+            ...post
+            ...postCounts
+            ...tagsCategoriesAndPinned
+            author {
+              ...user
+              ...userCounts
+              ...locationAndBadges
+            }
+          }
+        }`,
+        // Mutate the previous result
+        updateQuery: (previousResult, { subscriptionData }) => {
+          console.log('previousResult', previousResult)
+          console.log('subscriptionData', subscriptionData)
+          const { data: { postAdded: newPost } } = subscriptionData
+          return { Post: [newPost, ...previousResult.Post] }
+          // Here, return the new result from the previous with the new data
+        },
+      }
     },
   },
 }
diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js
index 4bf05f178..a4487c0bb 100644
--- a/webapp/plugins/apollo-config.js
+++ b/webapp/plugins/apollo-config.js
@@ -9,6 +9,7 @@ export default ({ app }) => {
   const backendUrl = process.env.GRAPHQL_URI || 'http://localhost:4000'
 
   return {
+    wsEndpoint: 'ws://localhost:4000/graphql', // optional
     httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {
       credentials: 'same-origin',
@@ -16,7 +17,7 @@ export default ({ app }) => {
     credentials: true,
     tokenName: 'human-connection-token',
     persisting: false,
-    websocketsOnly: false,
+    websocketsOnly: true,
     cache: new InMemoryCache({ fragmentMatcher }),
   }
 }

From a28eb8c91f60a13784f7ac666db4940747953056 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 24 Jan 2020 18:23:59 +0100
Subject: [PATCH 021/171] Start subscriptions for notifications

---
 .../notifications/notificationsMiddleware.js  | 16 ++++++--
 backend/src/schema/resolvers/notifications.js |  9 +++++
 backend/src/schema/resolvers/posts.js         |  6 +--
 backend/src/schema/types/schema.gql           |  4 --
 .../src/schema/types/type/Subscription.gql    |  4 ++
 backend/src/server.js                         |  1 -
 .../NotificationMenu/NotificationMenu.vue     | 21 +++++++----
 webapp/graphql/User.js                        | 37 +++++++++++++++++++
 webapp/pages/index.vue                        |  4 --
 9 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 backend/src/schema/types/type/Subscription.gql

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 837193773..ca59be780 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -1,5 +1,9 @@
 import extractMentionedUsers from './mentions/extractMentionedUsers'
 import { validateNotifyUsers } from '../validation/validationMiddleware'
+import { PubSub } from 'apollo-server'
+
+const pubsub = new PubSub()
+const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
 
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
@@ -74,12 +78,18 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
     WHEN notification.createdAt IS NULL
     THEN notification END ).createdAt = toString(datetime())
     SET notification.updatedAt = toString(datetime())
+    RETURN notification
   `
   const session = context.driver.session()
+  const writeTxResultPromise = session.writeTransaction(async transaction => {
+    const notificationTransactionResponse = await transaction.run(mentionedCypher, { id, idsOfUsers, reason })
+    return notificationTransactionResponse.records.map(record => record.get('notification').properties)
+  })
   try {
-    await session.writeTransaction(transaction => {
-      return transaction.run(mentionedCypher, { id, idsOfUsers, reason })
-    })
+    const [notification] = await writeTxResultPromise
+    return pubsub.publish(NOTIFICATION_ADDED, { notificationAdded: notification })
+  } catch (error) {
+    throw new Error(error)
   } finally {
     session.close()
   }
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 31369a8c7..f92292bfc 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -1,4 +1,8 @@
 import log from './helpers/databaseLogger'
+import { PubSub } from 'apollo-server'
+
+const pubsub = new PubSub()
+const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
 
 const resourceTypes = ['Post', 'Comment']
 
@@ -16,6 +20,11 @@ const transformReturnType = record => {
 }
 
 export default {
+  Subscription: {
+    notificationAdded: {
+      subscribe: () => pubsub.asyncIterator([NOTIFICATION_ADDED]),
+    },
+  },
   Query: {
     notifications: async (_parent, args, context, _resolveInfo) => {
       const { user: currentUser } = context
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index f8609f7a6..11f6eebc3 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -7,8 +7,8 @@ import Resolver from './helpers/Resolver'
 import { filterForMutedUsers } from './helpers/filterForMutedUsers'
 import { PubSub } from 'apollo-server'
 
-const pubsub = new PubSub();
-const POST_ADDED = 'POST_ADDED';
+const pubsub = new PubSub()
+const POST_ADDED = 'POST_ADDED'
 
 
 const maintainPinnedPosts = params => {
@@ -113,7 +113,7 @@ export default {
       })
       try {
         const [post] = await writeTxResultPromise
-        pubsub.publish(POST_ADDED, { postAdded: post });
+        pubsub.publish(POST_ADDED, { postAdded: post })
         return post
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index b3df61af2..23c2ded4d 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -1,7 +1,3 @@
-type Subscription {
-  postAdded: Post
-}
-
 type Mutation {
   # Get a JWT Token for the given Email and password
   login(email: String!, password: String!): String!
diff --git a/backend/src/schema/types/type/Subscription.gql b/backend/src/schema/types/type/Subscription.gql
new file mode 100644
index 000000000..a2f8b11b9
--- /dev/null
+++ b/backend/src/schema/types/type/Subscription.gql
@@ -0,0 +1,4 @@
+type Subscription {
+  postAdded: Post
+  notificationAdded: NOTIFIED
+}
\ No newline at end of file
diff --git a/backend/src/server.js b/backend/src/server.js
index 22431bd7f..d20fa5e63 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -42,7 +42,6 @@ const createServer = options => {
     schema: middleware(schema),
     subscriptions: {
       onConnect: (connectionParams, webSocket) => {
-        console.log('connectionParams', connectionParams)
         return getContext(connectionParams)
       },
     },
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index a3b085db9..b18203b45 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -22,13 +22,13 @@
 </template>
 
 <script>
+import unionBy from 'lodash/unionBy'
 import { NOTIFICATIONS_POLL_INTERVAL } from '~/constants/notifications'
 import { notificationQuery, markAsReadMutation } from '~/graphql/User'
-import unionBy from 'lodash/unionBy'
-
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import Dropdown from '~/components/Dropdown'
 import NotificationList from '../NotificationList/NotificationList'
+import { notificationAdded } from '~/graphql/User'
 
 export default {
   name: 'NotificationMenu',
@@ -77,11 +77,18 @@ export default {
           orderBy: 'updatedAt_desc',
         }
       },
-      pollInterval: NOTIFICATIONS_POLL_INTERVAL,
-      update({ notifications }) {
-        return unionBy(notifications, this.notifications, notification => notification.id).sort(
-          (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
-        )
+      // pollInterval: NOTIFICATIONS_POLL_INTERVAL,
+      // update({ notifications }) {
+      //   return unionBy(notifications, this.notifications, notification => notification.id).sort(
+      //     (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
+      //   )
+      // },
+      subscribeToMore: {
+        document: notificationAdded(),
+        updateQuery: (previousResult, { subscriptionData }) => {
+          const { data: { notificationAdded: newNotification } } = subscriptionData
+          return { notifications: [newNotification, ...previousResult.notifications] }
+        },
       },
       error(error) {
         this.$toast.error(error.message)
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 8962830dc..d2bbae895 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -130,6 +130,43 @@ export const markAsReadMutation = i18n => {
   `
 }
 
+export const notificationAdded = () => {
+  return gql`
+    ${userFragment}
+    ${commentFragment}
+    ${postFragment}
+
+    subscription notifications {
+      notificationAdded {
+        id
+        read
+        reason
+        createdAt
+        from {
+          __typename
+          ... on Post {
+            ...post
+            author {
+              ...user
+            }
+          }
+          ... on Comment {
+            ...comment
+            author {
+              ...user
+            }
+            post {
+              ...post
+              author {
+                ...user
+              }
+            }
+          }
+        }
+      }
+    }
+  `
+}
 export const followUserMutation = i18n => {
   return gql`
     ${userFragment}
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index f0089979d..5d42aab3b 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -244,13 +244,9 @@ export default {
             }
           }
         }`,
-        // Mutate the previous result
         updateQuery: (previousResult, { subscriptionData }) => {
-          console.log('previousResult', previousResult)
-          console.log('subscriptionData', subscriptionData)
           const { data: { postAdded: newPost } } = subscriptionData
           return { Post: [newPost, ...previousResult.Post] }
-          // Here, return the new result from the previous with the new data
         },
       }
     },

From 7cfd61ecf2321d96f91d973cda022c17c635a21b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Jan 2020 18:28:44 +0100
Subject: [PATCH 022/171] Error page added

---
 webapp/layouts/error.vue     | 12 ++++++++++++
 webapp/locales/de.json       |  4 ++++
 webapp/locales/en.json       |  4 ++++
 webapp/pages/profile/_id.vue |  2 +-
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 webapp/layouts/error.vue

diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue
new file mode 100644
index 000000000..d11755ad4
--- /dev/null
+++ b/webapp/layouts/error.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="container">
+    <h1>{{ $t(error.message) }}</h1>
+    <nuxt-link to="/">{{ $t('error-pages.back-to-index') }}</nuxt-link>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['error'],
+}
+</script>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d52a9817c..a3135c011 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -798,5 +798,9 @@
         "donations-for": "Spenden für",
         "donate-now": "Jetzt spenden",
         "amount-of-total": "{amount} von {total} € erreicht"
+    },
+    "error-pages" : {
+	"user-not-found": "Dieser Benutzer konnte nicht gefunden werden",
+	"back-to-index": "Zurück zur Startseite"
     }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 1906a5f6f..f8dea3914 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -798,6 +798,10 @@
       "title": "In addition, we regularly hold events where you can also share your impressions and ask questions. You can find a current overview here:",
       "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>"
     }
+  },
+  "error-pages" : {
+    "user-not-found": "This user could not be found",
+    "back-to-index": "Back to index page"
   }
 }
 
diff --git a/webapp/pages/profile/_id.vue b/webapp/pages/profile/_id.vue
index 992e5efce..6b57e3b2d 100644
--- a/webapp/pages/profile/_id.vue
+++ b/webapp/pages/profile/_id.vue
@@ -23,7 +23,7 @@ const options = {
       }
     }
   `,
-  message: 'This user could not be found',
+  message: 'error-pages.user-not-found',
   path: 'profile',
 }
 const persistentLinks = PersistentLinks(options)

From 9948f4ef201ee66339663442a84ca8ffd48afea5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 20 Jan 2020 11:24:18 +0100
Subject: [PATCH 023/171] improved layout, key-name changed

---
 webapp/layouts/error.vue     | 23 +++++++++++++++++++++--
 webapp/locales/de.json       |  2 +-
 webapp/locales/en.json       |  2 +-
 webapp/pages/profile/_id.vue |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue
index d11755ad4..0b8c37bec 100644
--- a/webapp/layouts/error.vue
+++ b/webapp/layouts/error.vue
@@ -1,6 +1,9 @@
 <template>
-  <div class="container">
-    <h1>{{ $t(error.message) }}</h1>
+  <div class="error-container">
+    <base-icon class="error-icon" name="exclamation-circle" />
+    <br />
+    <span class="error-message">{{ $t(error.message) }}</span>
+    <br />
     <nuxt-link to="/">{{ $t('error-pages.back-to-index') }}</nuxt-link>
   </div>
 </template>
@@ -10,3 +13,19 @@ export default {
   props: ['error'],
 }
 </script>
+<style lang="scss">
+.error-container {
+  text-align: center;
+  padding: $space-small;
+}
+.error-message {
+  font-size: $font-size-x-large;
+  font-weight: $font-weight-bold;
+  color: $text-color-softer;
+  margin: $space-base;
+}
+.error-icon {
+  font-size: $font-size-xxx-large;
+  color: $text-color-softer;
+}
+</style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a3135c011..21a717c6b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -800,7 +800,7 @@
         "amount-of-total": "{amount} von {total} € erreicht"
     },
     "error-pages" : {
-	"user-not-found": "Dieser Benutzer konnte nicht gefunden werden",
+	"profile-not-found": "Dieses Profil konnte nicht gefunden werden",
 	"back-to-index": "Zurück zur Startseite"
     }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f8dea3914..54121af20 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -800,7 +800,7 @@
     }
   },
   "error-pages" : {
-    "user-not-found": "This user could not be found",
+    "user-not-found": "This profile could not be found",
     "back-to-index": "Back to index page"
   }
 }
diff --git a/webapp/pages/profile/_id.vue b/webapp/pages/profile/_id.vue
index 6b57e3b2d..b9bbef83e 100644
--- a/webapp/pages/profile/_id.vue
+++ b/webapp/pages/profile/_id.vue
@@ -23,7 +23,7 @@ const options = {
       }
     }
   `,
-  message: 'error-pages.user-not-found',
+  message: 'error-pages.profile-not-found',
   path: 'profile',
 }
 const persistentLinks = PersistentLinks(options)

From 04ff82f880c1efec4f5bc732ff77cda97fa3a18b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 20 Jan 2020 11:29:26 +0100
Subject: [PATCH 024/171] Cypress test fixed

---
 cypress/integration/common/steps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 9a5c02d08..44d2ada64 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -300,7 +300,7 @@ Then(
     cy.visit(route, {
       failOnStatusCode: false
     });
-    cy.get(".error").should("contain", message);
+    cy.get(".error-message").should("contain", message);
   }
 );
 

From a4907f2bcb4cea68a0bc6bf5828d15c7487d1fc9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 20 Jan 2020 12:57:14 +0100
Subject: [PATCH 025/171] localised error message for cannot edit post

---
 webapp/locales/de.json         |  4 +++-
 webapp/locales/en.json         |  6 ++++--
 webapp/pages/post/_id.vue      | 20 ++++++++++----------
 webapp/pages/post/edit/_id.vue |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 21a717c6b..1a396fa01 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -801,6 +801,8 @@
     },
     "error-pages" : {
 	"profile-not-found": "Dieses Profil konnte nicht gefunden werden",
-	"back-to-index": "Zurück zur Startseite"
+	"back-to-index": "Zurück zur Startseite",
+	"post-not-found": "Dieser Beitrag konnte nicht gefunden werden",
+        "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden"
     }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 54121af20..3138af41f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -800,8 +800,10 @@
     }
   },
   "error-pages" : {
-    "user-not-found": "This profile could not be found",
-    "back-to-index": "Back to index page"
+    "profile-not-found": "This profile could not be found",
+    "back-to-index": "Back to index page",
+    "post-not-found": "This post could not be found",
+    "cannot-edit-post": "This post cannot be edited"
   }
 }
 
diff --git a/webapp/pages/post/_id.vue b/webapp/pages/post/_id.vue
index a02afd3b9..92795606f 100644
--- a/webapp/pages/post/_id.vue
+++ b/webapp/pages/post/_id.vue
@@ -35,7 +35,7 @@ const options = {
     }
   `,
   path: 'post',
-  message: 'This post could not be found',
+  message: 'error-pages.post-not-found',
 }
 const persistentLinks = PersistentLinks(options)
 
@@ -55,14 +55,14 @@ export default {
             },
             // TODO implement
             /* {
-              name: this.$t('common.letsTalk'),
-              path: `/post/${id}/${slug}#lets-talk`
-            }, */
+			    name: this.$t('common.letsTalk'),
+			    path: `/post/${id}/${slug}#lets-talk`
+			    }, */
             // TODO implement
             /* {
-              name: this.$t('common.versus'),
-              path: `/post/${id}/${slug}#versus`
-            } */
+			    name: this.$t('common.versus'),
+			    path: `/post/${id}/${slug}#versus`
+			    } */
           ],
         },
         {
@@ -71,9 +71,9 @@ export default {
         },
         // TODO implement
         /* {
-          name: this.$t('common.takeAction'),
-          path: `/post/${id}/${slug}/take-action`
-        } */
+		    name: this.$t('common.takeAction'),
+		    path: `/post/${id}/${slug}/take-action`
+		    } */
       ]
     },
   },
diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue
index c79d2b70e..d269a04d8 100644
--- a/webapp/pages/post/edit/_id.vue
+++ b/webapp/pages/post/edit/_id.vue
@@ -38,7 +38,7 @@ export default {
       variables: { id },
     })
     if (contribution.author.id !== store.getters['auth/user'].id) {
-      error({ statusCode: 403, message: "You can't edit that!" })
+      error({ statusCode: 403, message: 'error-pages.cannot-edit-post' })
     }
     return { contribution }
   },

From 7315cacb5a6057b17e6552f3358713266d6c85aa Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 20 Jan 2020 22:55:22 +0100
Subject: [PATCH 026/171] Text for 403 error is localized I hacked the
 error.vue to catch the default 404 error message and to display a localized
 message instead. I found no better way to do it. Any ideas?

---
 webapp/layouts/error.vue         | 5 ++++-
 webapp/locales/de.json           | 4 +++-
 webapp/locales/en.json           | 4 +++-
 webapp/middleware/isAdmin.js     | 2 +-
 webapp/middleware/isModerator.js | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue
index 0b8c37bec..ab4f5e5bb 100644
--- a/webapp/layouts/error.vue
+++ b/webapp/layouts/error.vue
@@ -2,7 +2,10 @@
   <div class="error-container">
     <base-icon class="error-icon" name="exclamation-circle" />
     <br />
-    <span class="error-message">{{ $t(error.message) }}</span>
+    <span v-if="error.message === 'This page could not be found'" class="error-message">
+      {{ $t('error-pages.default') }}
+    </span>
+    <span v-else class="error-message">{{ $t(error.message) }}</span>
     <br />
     <nuxt-link to="/">{{ $t('error-pages.back-to-index') }}</nuxt-link>
   </div>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 1a396fa01..ae4b5bfc1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -803,6 +803,8 @@
 	"profile-not-found": "Dieses Profil konnte nicht gefunden werden",
 	"back-to-index": "Zurück zur Startseite",
 	"post-not-found": "Dieser Beitrag konnte nicht gefunden werden",
-        "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden"
+        "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden",
+	"default": "Diese Seite konnte nicht gefunden werden",
+	"not-authorized": "Kein Zugang zu dieser Seite"
     }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 3138af41f..cb0d3ca07 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -803,7 +803,9 @@
     "profile-not-found": "This profile could not be found",
     "back-to-index": "Back to index page",
     "post-not-found": "This post could not be found",
-    "cannot-edit-post": "This post cannot be edited"
+    "cannot-edit-post": "This post cannot be edited",
+    "default": "This page could not be found",
+    "not-authorized": "Not authorized to this page"
   }
 }
 
diff --git a/webapp/middleware/isAdmin.js b/webapp/middleware/isAdmin.js
index 4db10bbb6..12b6c5bac 100644
--- a/webapp/middleware/isAdmin.js
+++ b/webapp/middleware/isAdmin.js
@@ -1,5 +1,5 @@
 export default ({ store, error }) => {
   if (!store.getters['auth/isAdmin']) {
-    return error({ statusCode: 403 })
+    return error({ statusCode: 403, message: 'error-pages.not-authorized' })
   }
 }
diff --git a/webapp/middleware/isModerator.js b/webapp/middleware/isModerator.js
index e99793a3e..9b17badea 100644
--- a/webapp/middleware/isModerator.js
+++ b/webapp/middleware/isModerator.js
@@ -1,5 +1,5 @@
 export default ({ store, error }) => {
   if (!store.getters['auth/isModerator']) {
-    return error({ statusCode: 403 })
+    return error({ statusCode: 403, message: 'error-pages.not-authorized' })
   }
 }

From b05e997743b417c175af1e05b6fc068f1746a69a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 28 Jan 2020 20:55:08 +0100
Subject: [PATCH 027/171] Update templates and deploy to develop

- proof of concept that this works!
---
 .../human-connection/templates/configmap.yml  |  19 ----
 .../templates/deployment-backend.yaml         |  39 ++++---
 .../templates/deployment-mailserver.yaml      |   3 +-
 .../templates/deployment-maintenance.yaml     |   3 +-
 .../templates/deployment-neo4j.yaml           |  19 ++--
 .../templates/deployment-web.yaml             |   3 +-
 .../templates/ingress.template.yaml           |  10 +-
 .../templates/letsencrypt-prod.yaml           |  11 +-
 .../templates/letsencrypt-staging.yaml        |  11 +-
 .../templates/service-backend.yaml            |   1 +
 .../templates/service-neo4j.yaml              |   1 +
 .../templates/service-webapp.yaml             |   4 +-
 deployment/helm/human-connection/values.yaml  |  26 ++---
 .../human-connection/deployment-backend.yaml  | 105 ++++++++++--------
 14 files changed, 134 insertions(+), 121 deletions(-)
 delete mode 100644 deployment/helm/human-connection/templates/configmap.yml

diff --git a/deployment/helm/human-connection/templates/configmap.yml b/deployment/helm/human-connection/templates/configmap.yml
deleted file mode 100644
index 4c57a7e94..000000000
--- a/deployment/helm/human-connection/templates/configmap.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:  {{ .Release.Name }}-configmap
-data:
-  GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000"
-  NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687"
-  CLIENT_URI: "https://{{ .Values.domain }}"
-  VERSION: {{ .Chart.AppVersion }}
-  SENTRY_DSN_WEBAPP: {{ .Values.sentryDsnWebapp }}
-  SENTRY_DSN_BACKEND: {{ .Values.sentryDsnBackend }}
-  COMMIT: {{ .Values.commit }}
-{{- if .Values.developmentMailserverDomain }}
-  SMTP_HOST: {{ .Release.Name }}-mailserver
-  SMTP_PORT: "25"
-{{- else }}
-  SMTP_HOST: {{ .Values.smtpHost }}
-  SMTP_PORT: {{ .Values.smtpPort }}
-{{- end }}
diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployment-backend.yaml
index 596036fd2..b921934b2 100644
--- a/deployment/helm/human-connection/templates/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployment-backend.yaml
@@ -1,7 +1,8 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-backend
+  namespace: human-connection
 spec:
   replicas: 1
   minReadySeconds: 15
@@ -23,23 +24,33 @@ spec:
         human-connection.org/selector: deployment-backend
     spec:
       containers:
-      - name: backend
-        image: humanconnection/nitro-backend:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        ports:
-        - containerPort: 4000
-        envFrom:
+      - envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
         - secretRef:
             name: {{ .Release.Name }}-secrets
-        # volumeMounts:
-        #   - mountPath: /nitro-backend/public/uploads
-        #     name: uploads
-      # volumes:
-      # - name: uploads
-      #   persistentVolumeClaim:
-      #     claimName: uploads-claim
+        image: humanconnection/nitro-backend:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: nitro-backend
+        ports:
+        - containerPort: 4000
+          protocol: TCP
+        resources: {}
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+          - mountPath: /nitro-backend/public/uploads
+            name: uploads
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: uploads
+        persistentVolumeClaim:
+          claimName: uploads-claim
+      dnsPolicy: ClusterFirst
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
 status: {}
diff --git a/deployment/helm/human-connection/templates/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployment-mailserver.yaml
index 685cabea0..4bc8eaadc 100644
--- a/deployment/helm/human-connection/templates/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployment-mailserver.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.developmentMailserverDomain }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-mailserver
+  namespace: human-connection
 spec:
   replicas: 1
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployment-maintenance.yaml
index 8ce4442b9..c414fb452 100644
--- a/deployment/helm/human-connection/templates/deployment-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/deployment-maintenance.yaml
@@ -1,7 +1,8 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-maintenance
+  namespace: human-connection
 spec:
   selector:
     matchLabels:
diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
index 3818af2ef..c157832dd 100644
--- a/deployment/helm/human-connection/templates/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployment-neo4j.yaml
@@ -1,7 +1,8 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-neo4j
+  namespace: human-connection
 spec:
   replicas: 1
   strategy:
@@ -44,14 +45,12 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
-        - secretRef:
-            name: {{ .Release.Name }}-secrets
-        # volumeMounts:
-        #   - mountPath: /data/
-        #     name: neo4j-data
-      # volumes:
-      # - name: neo4j-data
-      #   persistentVolumeClaim:
-      #     claimName: neo4j-data-claim
+        volumeMounts:
+          - mountPath: /data/
+            name: neo4j-data
+      volumes:
+      - name: neo4j-data
+        persistentVolumeClaim:
+          claimName: neo4j-data-claim
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
diff --git a/deployment/helm/human-connection/templates/deployment-web.yaml b/deployment/helm/human-connection/templates/deployment-web.yaml
index 0e432774f..1f8930612 100644
--- a/deployment/helm/human-connection/templates/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployment-web.yaml
@@ -1,7 +1,8 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-webapp
+  namespace: human-connection
 spec:
   replicas: 2
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress.template.yaml
index 99c3fbb78..12ef4c9c4 100644
--- a/deployment/helm/human-connection/templates/ingress.template.yaml
+++ b/deployment/helm/human-connection/templates/ingress.template.yaml
@@ -2,15 +2,15 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name:  {{ .Release.Name }}-ingress
+  namespace: human-connection
   annotations:
     kubernetes.io/ingress.class: "nginx"
-    certmanager.k8s.io/issuer: {{ .Values.letsencryptIssuer }}
-    certmanager.k8s.io/acme-challenge-type: http01
-    nginx.ingress.kubernetes.io/proxy-body-size: 6m
+    cert-manager.io/cluster-issuer: {{ .Values.letsencryptIssuer }}
+    nginx.ingress.kubernetes.io/proxy-body-size: 10m
 spec:
   tls:
     - hosts:
-        - {{ .Values.humanConnectionDomain }}
+      - {{ .Values.humanConnectionDomain }}
       secretName: tls
   rules:
     - host: {{ .Values.humanConnectionDomain }}
@@ -18,7 +18,7 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: webapp
+              serviceName: {{ .Release.Name }}-webapp
               servicePort: 3000
 {{- if .Values.developmentMailserverDomain }}
     - host: {{ .Values.developmentMailserverDomain }}
diff --git a/deployment/helm/human-connection/templates/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/letsencrypt-prod.yaml
index 9801fb974..65bd160e1 100644
--- a/deployment/helm/human-connection/templates/letsencrypt-prod.yaml
+++ b/deployment/helm/human-connection/templates/letsencrypt-prod.yaml
@@ -1,11 +1,14 @@
-apiVersion: certmanager.k8s.io/v1alpha1
-kind: Issuer
+apiVersion: cert-manager.io/v1alpha2
+kind: ClusterIssuer
 metadata:
-  name: {{ .Release.Name }}-letsencrypt-prod
+  name: letsencrypt-prod
 spec:
   acme:
     server: https://acme-v02.api.letsencrypt.org/directory
     email: {{ .Values.supportEmail }}
     privateKeySecretRef:
       name: letsencrypt-prod
-    http01: {}
+    solvers:
+    - http01:
+        ingress:
+          class: nginx
diff --git a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
index 2bb6784a8..27889f5db 100644
--- a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
+++ b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
@@ -1,11 +1,14 @@
-apiVersion: certmanager.k8s.io/v1alpha1
-kind: Issuer
+apiVersion: cert-manager.io/v1alpha2
+kind: ClusterIssuer
 metadata:
-  name: {{ .Release.Name }}-letsencrypt-staging
+  name: letsencrypt-staging
 spec:
   acme:
     server: https://acme-staging-v02.api.letsencrypt.org/directory
     email: {{ .Values.supportEmail }}
     privateKeySecretRef:
       name: letsencrypt-staging
-    http01: {}
+    solvers:
+    - http01:
+        ingress:
+          class: nginx
\ No newline at end of file
diff --git a/deployment/helm/human-connection/templates/service-backend.yaml b/deployment/helm/human-connection/templates/service-backend.yaml
index b9d40ef8a..d750703a8 100644
--- a/deployment/helm/human-connection/templates/service-backend.yaml
+++ b/deployment/helm/human-connection/templates/service-backend.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-backend
+  namespace: human-connection
 spec:
   ports:
     - name: graphql
diff --git a/deployment/helm/human-connection/templates/service-neo4j.yaml b/deployment/helm/human-connection/templates/service-neo4j.yaml
index 547dad6c7..ec3bb1b6c 100644
--- a/deployment/helm/human-connection/templates/service-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/service-neo4j.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-neo4j
+  namespace: human-connection
 spec:
   ports:
   - name: bolt
diff --git a/deployment/helm/human-connection/templates/service-webapp.yaml b/deployment/helm/human-connection/templates/service-webapp.yaml
index c1a9771ee..f6ea7206f 100644
--- a/deployment/helm/human-connection/templates/service-webapp.yaml
+++ b/deployment/helm/human-connection/templates/service-webapp.yaml
@@ -2,10 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-webapp
+  namespace: human-connection
 spec:
   ports:
-    - name: web
+    - name: {{ .Release.Name }}-webapp
       port: 3000
+      protocol: TCP
       targetPort: 3000
   selector:
     human-connection.org/selector: deployment-webapp
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index f5fd5a6aa..044341e0c 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -1,20 +1,20 @@
-domain: nitro-staging.human-connection.org
+domain: develop.human-connection.org
 commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
 pullPolicy: Always
 
 # configs
-developmentMailserverDomain: "helm-nitro-mailserver.human-connection.org"
-humanConnectionDomain: "helm-staging.human-connection.org"
-supportEmail: "developer@human-connection.org"
-letsencryptIssuer: "letsencrypt-staging"
+developmentMailserverDomain: "mailserver.human-connection.org"
+humanConnectionDomain: "develop.human-connection.org"
+supportEmail: "devcom@human-connection.org"
+letsencryptIssuer: "letsencrypt-prod"
 smtpHost: "mailserver.human-connection"
 smtpPort: "25"
 smtpUsername:
 smtpPassword:
-sentryDsnWebapp:
-sentryDsnBackend:
+sentryDsnWebapp: "https://f6a31aa8f406426187cb45ae6dacdbeb@nitro-sentry.human-connection.org/7"
+sentryDsnBackend: "https://44e0f3fb04894fbfbcf898f2bcf652de@nitro-sentry.human-connection.org/6"
 neo4jResourceRequestsMemory: "1G"
-neo4jResourceLimitsMemory: "1G"
+neo4jResourceLimitsMemory: "2G"
 neo4jConfig:
   apoc_import_file_enabled: "true"
   dbms_memory_pagecache_size: "490M"
@@ -22,10 +22,6 @@ neo4jConfig:
   dbms_memory_heap_initial__size: "500M"
 
 # secrets
-jwtSecret: b/&&7b78BF&fv/Vd
-privateKeyPassphrase: a7dsf78sadg87ad87sfagsadg78
-mapboxToken: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
-mongodbUsername:
-mongodbPassword:
-neo4jUsername: neo4j
-neo4jPassword: neo4j
+jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA=="
+privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
+mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E="
diff --git a/deployment/human-connection/deployment-backend.yaml b/deployment/human-connection/deployment-backend.yaml
index 51f0eb43c..7d93ebf73 100644
--- a/deployment/human-connection/deployment-backend.yaml
+++ b/deployment/human-connection/deployment-backend.yaml
@@ -1,47 +1,60 @@
----
-  apiVersion: extensions/v1beta1
-  kind: Deployment
-  metadata:
-    name: nitro-backend
-    namespace: human-connection
-  spec:
-    replicas: 1
-    minReadySeconds: 15
-    progressDeadlineSeconds: 60
-    strategy:
-      rollingUpdate:
-        maxSurge: 0
-        maxUnavailable: "100%"
-    selector:
-      matchLabels:
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  labels:
+    human-connection.org/commit: COMMIT
+    human-connection.org/selector: deployment-human-connection-backend
+  name: nitro-backend
+  namespace: human-connection
+spec:
+  minReadySeconds: 15
+  progressDeadlineSeconds: 60
+  replicas: 1
+  revisionHistoryLimit: 2147483647
+  selector:
+    matchLabels:
+      human-connection.org/selector: deployment-human-connection-backend
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 100%
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        backup.velero.io/backup-volumes: uploads
+      creationTimestamp: null
+      labels:
+        human-connection.org/commit: COMMIT
         human-connection.org/selector: deployment-human-connection-backend
-    template:
-      metadata:
-        annotations:
-          backup.velero.io/backup-volumes: uploads
-        labels:
-          human-connection.org/commit: COMMIT
-          human-connection.org/selector: deployment-human-connection-backend
-        name: "nitro-backend"
-      spec:
-        containers:
-        - name: nitro-backend
-          image: humanconnection/nitro-backend:latest
-          imagePullPolicy: Always
-          ports:
-          - containerPort: 4000
-          envFrom:
-          - configMapRef:
-              name: configmap
-          - secretRef:
-              name: human-connection
-          volumeMounts:
-            - mountPath: /nitro-backend/public/uploads
-              name: uploads
-        volumes:
-        - name: uploads
-          persistentVolumeClaim:
-            claimName: uploads-claim
-        restartPolicy: Always
-        terminationGracePeriodSeconds: 30
-  status: {}
+      name: nitro-backend
+    spec:
+      containers:
+      - envFrom:
+        - configMapRef:
+            name: configmap
+        - secretRef:
+            name: human-connection
+        image: humanconnection/nitro-backend:latest
+        imagePullPolicy: Always
+        name: nitro-backend
+        ports:
+        - containerPort: 4000
+          protocol: TCP
+        resources: {}
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /nitro-backend/public/uploads
+          name: uploads
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: uploads
+        persistentVolumeClaim:
+          claimName: uploads-claim
+status: {}

From 1c10f3769c94adf3f09cb5dd075f2fc60dafd3fa Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 28 Jan 2020 20:57:55 +0100
Subject: [PATCH 028/171] Drop nitro prefix

---
 .../helm/human-connection/templates/deployment-backend.yaml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployment-backend.yaml
index b921934b2..2febeab84 100644
--- a/deployment/helm/human-connection/templates/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployment-backend.yaml
@@ -31,7 +31,7 @@ spec:
             name: {{ .Release.Name }}-secrets
         image: humanconnection/nitro-backend:latest
         imagePullPolicy: {{ .Values.pullPolicy }}
-        name: nitro-backend
+        name: backend
         ports:
         - containerPort: 4000
           protocol: TCP

From 6a1079ac4287d95ec310dc5533a2aa286cae162d Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 28 Jan 2020 21:05:26 +0100
Subject: [PATCH 029/171] Clean up

---
 .../templates/deployment-backend.yaml                 | 11 ++++-------
 .../templates/letsencrypt-staging.yaml                |  2 +-
 deployment/helm/human-connection/values.yaml          |  2 --
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployment-backend.yaml
index 2febeab84..e30e66431 100644
--- a/deployment/helm/human-connection/templates/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployment-backend.yaml
@@ -24,14 +24,14 @@ spec:
         human-connection.org/selector: deployment-backend
     spec:
       containers:
-      - envFrom:
+      - name: backend
+        image: humanconnection/nitro-backend:latest
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
         - secretRef:
             name: {{ .Release.Name }}-secrets
-        image: humanconnection/nitro-backend:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: backend
         ports:
         - containerPort: 4000
           protocol: TCP
@@ -50,7 +50,4 @@ spec:
       - name: uploads
         persistentVolumeClaim:
           claimName: uploads-claim
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
 status: {}
diff --git a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
index 27889f5db..f8315c9be 100644
--- a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
+++ b/deployment/helm/human-connection/templates/letsencrypt-staging.yaml
@@ -11,4 +11,4 @@ spec:
     solvers:
     - http01:
         ingress:
-          class: nginx
\ No newline at end of file
+          class: nginx
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 044341e0c..8efcd0c06 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -11,8 +11,6 @@ smtpHost: "mailserver.human-connection"
 smtpPort: "25"
 smtpUsername:
 smtpPassword:
-sentryDsnWebapp: "https://f6a31aa8f406426187cb45ae6dacdbeb@nitro-sentry.human-connection.org/7"
-sentryDsnBackend: "https://44e0f3fb04894fbfbcf898f2bcf652de@nitro-sentry.human-connection.org/6"
 neo4jResourceRequestsMemory: "1G"
 neo4jResourceLimitsMemory: "2G"
 neo4jConfig:

From 31790a9ebc17cedcf6698ddd0f53b271c3129f8f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 28 Jan 2020 16:23:56 +0100
Subject: [PATCH 030/171] Imported images from
 https://github.com/Human-Connection/WebApp/blob/develop/static/assets/svg/errors/

---
 webapp/static/img/svg/errors/error403.svg |  1 +
 webapp/static/img/svg/errors/error404.svg |  1 +
 webapp/static/img/svg/errors/error500.svg |  1 +
 webapp/static/img/svg/errors/error503.svg | 15 +++++++++++++++
 4 files changed, 18 insertions(+)
 create mode 100644 webapp/static/img/svg/errors/error403.svg
 create mode 100644 webapp/static/img/svg/errors/error404.svg
 create mode 100644 webapp/static/img/svg/errors/error500.svg
 create mode 100644 webapp/static/img/svg/errors/error503.svg

diff --git a/webapp/static/img/svg/errors/error403.svg b/webapp/static/img/svg/errors/error403.svg
new file mode 100644
index 000000000..e52d00a7a
--- /dev/null
+++ b/webapp/static/img/svg/errors/error403.svg
@@ -0,0 +1 @@
+<svg width="784" height="355" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="M254.932 354.445V0H0v354.445h254.932z"/></defs><g fill="none" fill-rule="evenodd"><g fill="#15A338"><path d="M74.4 217.4h59.2v-60h66v60h38v54h-38V333h-66v-61.6H.8v-47.6L89.2 53h68.4zM701 166.6l13.2 2c40.8 6.4 69.6 33.2 69.6 76.4 0 53.6-42 91.2-107.2 91.2-38.4 0-78.8-13.6-104.4-34l28.8-54c20.8 22.4 44.8 34 70 34 28 0 43.2-13.6 43.2-36.4 0-23.6-15.6-35.2-43.6-35.2h-44.8v-38l62.4-64.8h-102V53.4H771v40.4l-70 72.8z"/></g><g transform="translate(269 .1)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path d="M183.356 112.487c-16.899-8.258-35.81-13.04-55.896-13.04-20.07 0-38.99 4.782-55.88 13.04v-10.123c.09-29.468 25.064-53.389 55.88-53.389 30.823 0 55.806 23.921 55.896 53.389v10.123zM127.46 286.506c-32.87 0-59.52-26.657-59.52-59.543 0-32.894 26.65-59.543 59.52-59.543 32.885 0 59.535 26.65 59.535 59.543 0 32.886-26.65 59.543-59.535 59.543zm102.353-135.331v-53.01h-.205C227.365 43.56 182.568 0 127.46 0 71.736 0 26.494 44.587 25.229 100.054h-.115v51.12C9.406 172.393 0 198.524 0 226.965c0 70.414 57.063 127.483 127.46 127.483 70.404 0 127.476-57.07 127.476-127.484 0-28.44-9.415-54.571-25.123-75.788z" fill="#15A338" mask="url(#b)"/></g><path d="M396.708 198C381.96 198 370 209.973 370 224.723c0 14.766 11.961 26.723 26.708 26.723 14.754 0 26.716-11.957 26.716-26.723 0-14.75-11.962-26.723-26.716-26.723" fill="#15A338"/></g></svg>
diff --git a/webapp/static/img/svg/errors/error404.svg b/webapp/static/img/svg/errors/error404.svg
new file mode 100644
index 000000000..78f019410
--- /dev/null
+++ b/webapp/static/img/svg/errors/error404.svg
@@ -0,0 +1 @@
+<svg width="798" height="299" xmlns="http://www.w3.org/2000/svg"><g fill="#15A338" fill-rule="evenodd"><path d="M74.4 178.4h59.2v-60h66v60h38v54h-38V294h-66v-61.6H.8v-47.6L89.2 14h68.4zM634.4 178.4h59.2v-60h66v60h38v54h-38V294h-66v-61.6H560.8v-47.6L649.2 14h68.4zM459.291 137.33c-14.026 0-25.407-11.337-25.407-25.346 0-13.993 11.38-25.347 25.407-25.347 14.028 0 25.407 11.354 25.407 25.347 0 14.01-11.38 25.346-25.407 25.346m-143.974-25.346c0-13.993 11.38-25.347 25.407-25.347 14.028 0 25.407 11.354 25.407 25.347 0 14.01-11.38 25.346-25.407 25.346-14.026 0-25.407-11.337-25.407-25.346M400 0C272.963 0 273 118.282 273 118.282v180.455l31.773-42.199 31.718 42.2 31.722-42.2 31.724 42.2 31.723-42.2 31.725 42.2 31.75-42.2 31.864 42.2V118.281S527.036 0 400 0"/></g></svg>
diff --git a/webapp/static/img/svg/errors/error500.svg b/webapp/static/img/svg/errors/error500.svg
new file mode 100644
index 000000000..5a95d7bf6
--- /dev/null
+++ b/webapp/static/img/svg/errors/error500.svg
@@ -0,0 +1 @@
+<svg width="862" height="295" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="M0 291.938h320.326V0H0z"/></defs><g fill="none" fill-rule="evenodd"><path d="M207.8 61.4H89v45.2h25.2c64 0 106 34.4 106 84.4 0 58.8-44 96.8-111.6 96.8-36.8 0-78.8-14-108-34.8L29 199c20.8 22.4 46 34.4 71.2 34.4 27.6 0 43.6-13.6 43.6-37.6 0-22-16-34.8-43.6-34.8-14.4 0-58.8.8-76 2V5h183.6v56.4zM737.8.6c79.2 0 123.6 50.8 123.6 142 0 91.6-44.4 142.4-123.6 142.4-80 0-124.4-50.8-124.4-142.4 0-91.2 44.4-142 124.4-142zm0 52c-36 0-51.2 26-51.2 90s15.2 90.4 51.2 90.4c35.2 0 50.8-26.4 50.8-90.4s-15.6-90-50.8-90z" fill="#15A338"/><g transform="translate(259 3)"><path d="M201.573 225.61c2.054-2.432 3.08-5.84 3.08-10.222v-17.307h-27.28v17.307c0 4.382 1.11 7.79 3.331 10.222 2.222 2.432 5.742 3.648 10.56 3.648 4.82 0 8.256-1.216 10.31-3.648zm-33.377 14.657c-4.526-5.38-6.789-13.063-6.789-23.05v-19.136H100V179h120.745v39.465c0 9.097-2.389 16.351-7.166 21.76-4.777 5.41-12.173 8.113-22.189 8.113-10.937 0-18.669-2.691-23.194-8.07z" fill="#2B3E51"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path d="M89.126 43.769h201.197V29.325H89.126V43.77zM29.562 262.612h260.76V73.094H29.563v189.518zm7.264-233.63c4.037 0 7.309 3.245 7.309 7.25 0 4.003-3.272 7.25-7.309 7.25-4.036 0-7.308-3.247-7.308-7.25 0-4.005 3.272-7.25 7.308-7.25zm30.003 0c4.037 0 7.309 3.245 7.309 7.25 0 4.003-3.272 7.25-7.309 7.25-4.036 0-7.308-3.247-7.308-7.25 0-4.005 3.272-7.25 7.308-7.25zM14.896 0C6.718 0 0 6.358 0 14.473v262.912c0 8.112 6.718 14.553 14.896 14.553h290.437c8.184 0 14.993-6.44 14.993-14.553V14.473c0-8.115-6.81-14.473-14.993-14.473H14.896z" fill="#15A338" mask="url(#b)"/><path fill="#2B3E51" mask="url(#b)" d="M125.223 139.58l-18.367-18.226 18.364-18.22L112.97 91l-18.365 18.217L76.244 91 64 103.135l18.366 18.227L64 139.58l12.244 12.145 18.362-18.217 18.372 18.217zM257.223 139.58l-18.367-18.226 18.364-18.22L244.97 91l-18.365 18.217L208.244 91 196 103.135l18.366 18.227L196 139.58l12.244 12.145 18.362-18.217 18.372 18.217z"/></g></g></svg>
diff --git a/webapp/static/img/svg/errors/error503.svg b/webapp/static/img/svg/errors/error503.svg
new file mode 100644
index 000000000..45b7b0cf7
--- /dev/null
+++ b/webapp/static/img/svg/errors/error503.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="337px" height="321px" viewBox="0 0 337 321" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+    <title>error503</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="503" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-640.000000, -436.000000)">
+        <g id="error503" transform="translate(677.000000, 448.000000)" stroke="#15A338">
+            <path d="M23,78 C23,78 0.472708484,58.7674286 12.569864,33.4285714 C22.3467086,12.9257143 12.5698641,0 12.5698641,0" id="Shape" stroke-width="24" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M105,78 C105,78 82.515107,58.7674286 94.5894946,33.4285714 C104.347938,12.9257143 91,0 91,0" id="Shape" stroke-width="24" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M184,78 C184,78 162.117131,58.7674286 173.868231,33.4285714 C183.365397,12.9257143 170,0 170,0" id="Shape" stroke-width="24" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M216.747698,117.502501 C216.816054,117.501636 216.816054,117.501636 216.914009,117.500836 C217.752363,117.495016 218.875668,117.515107 220.247365,117.57846 C222.273569,117.672042 224.466592,117.844732 226.791846,118.115862 C233.348315,118.880359 239.918816,120.288968 246.256007,122.56612 C255.378326,125.844057 263.323498,130.674554 269.530968,137.535503 C277.281082,146.101495 281.5,157.058686 281.5,169.686689 C281.5,181.130077 276.974862,191.199601 269.158994,199.342184 C263.362264,205.381227 256.05231,210.113117 247.592891,213.920546 C241.478569,216.67249 235.09011,218.791782 228.722361,220.401814 C226.502828,220.963004 224.429572,221.424297 222.543378,221.79491 C221.343629,222.030646 220.421671,222.191016 219.819764,222.283843 L198.5,225.571812 L198.5,117.751385 L216.747698,117.502501 Z M198.022116,134.417042 C198.044416,134.676705 198.075444,135.079942 198.111936,135.619961 C198.168252,136.453331 198.223453,137.409499 198.274253,138.48171 C199.28809,159.880271 197.508718,184.815295 190.549878,209.096749 C184.243903,231.100167 174.218648,249.842298 159.580557,264.032921 C141.845328,281.226006 118.461725,290.5 89.9575722,290.5 C61.5953781,290.5 38.299342,281.214477 20.6050574,264.016028 C6.01737351,249.837125 -4.00776548,231.115642 -10.356649,209.133315 C-17.4115137,184.706603 -19.2561999,159.6517 -18.3028627,138.280133 C-18.2255633,136.547261 -18.1442647,135.272186 -18.0818103,134.502935 L-16.7013644,117.5 L196.569277,117.5 L198.022116,134.417042 Z" id="Combined-Shape" stroke-width="37"></path>
+        </g>
+    </g>
+</svg>

From d4e496b9e646079d19b5270135ca6878b08f8b10 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 28 Jan 2020 16:46:55 +0100
Subject: [PATCH 031/171] error image rendered

---
 webapp/layouts/error.spec.js | 47 ++++++++++++++++++++++++++++++++++++
 webapp/layouts/error.vue     | 24 +++++++++++++++---
 webapp/locales/de.json       |  7 ++++--
 webapp/locales/en.json       |  7 ++++--
 4 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 webapp/layouts/error.spec.js

diff --git a/webapp/layouts/error.spec.js b/webapp/layouts/error.spec.js
new file mode 100644
index 000000000..95234ec5f
--- /dev/null
+++ b/webapp/layouts/error.spec.js
@@ -0,0 +1,47 @@
+import { config, shallowMount } from '@vue/test-utils'
+import Error from './error.vue'
+
+const localVue = global.localVue
+
+config.stubs['nuxt-link'] = '<span><slot /></span>'
+
+describe('error.vue', () => {
+  let mocks, wrapper
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn(key => key),
+    }
+  })
+
+  const Wrapper = (propsData = {}) => {
+    return shallowMount(Error, { mocks, propsData, localVue })
+  }
+
+  describe('shallowMount', () => {
+    it('renders default error message', () => {
+      wrapper = Wrapper({ error: {} })
+      expect(wrapper.find('.error-message').text()).toBe('error-pages.default')
+    })
+
+    it('renders error message to given statusCode', () => {
+      wrapper = Wrapper({ error: { statusCode: 404 } })
+      expect(wrapper.find('.error-message').text()).toBe('error-pages.404-default')
+    })
+
+    it('renders error message to given custom key', () => {
+      wrapper = Wrapper({ error: { statusCode: 404, key: 'my-custom-key' } })
+      expect(wrapper.find('.error-message').text()).toBe('my-custom-key')
+    })
+
+    it('has a link to index page', () => {
+      wrapper = Wrapper({ error: {} })
+      expect(wrapper.find('span[to="/"]').text()).toBe('error-pages.back-to-index')
+    })
+
+    it('has an image related to the status code', () => {
+      wrapper = Wrapper({ error: { statusCode: 404 } })
+      expect(wrapper.find('.error-image').attributes('src')).toBe('/img/svg/errors/error404.svg')
+    })
+  })
+})
diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue
index ab4f5e5bb..4394a5cdb 100644
--- a/webapp/layouts/error.vue
+++ b/webapp/layouts/error.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="error-container">
-    <base-icon class="error-icon" name="exclamation-circle" />
+    <img class="error-image" :src="image" />
     <br />
     <span v-if="error.message === 'This page could not be found'" class="error-message">
       {{ $t('error-pages.default') }}
@@ -14,6 +14,20 @@
 <script>
 export default {
   props: ['error'],
+  computed: {
+    message() {
+      const mapping = {
+        403: 'error-pages.403-default',
+        404: 'error-pages.404-default',
+        500: 'error-pages.500-default',
+        503: 'error-pages.503-default',
+      }
+      return this.error.key || mapping[this.error.statusCode] || 'error-pages.default'
+    },
+    image() {
+      return `/img/svg/errors/error${this.error.statusCode ? this.error.statusCode : '500'}.svg`
+    },
+  },
 }
 </script>
 <style lang="scss">
@@ -27,8 +41,10 @@ export default {
   color: $text-color-softer;
   margin: $space-base;
 }
-.error-icon {
-  font-size: $font-size-xxx-large;
-  color: $text-color-softer;
+.error-image {
+  width: 70%;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
 }
 </style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index ae4b5bfc1..6ccaea780 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -804,7 +804,10 @@
 	"back-to-index": "Zurück zur Startseite",
 	"post-not-found": "Dieser Beitrag konnte nicht gefunden werden",
         "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden",
-	"default": "Diese Seite konnte nicht gefunden werden",
-	"not-authorized": "Kein Zugang zu dieser Seite"
+	"403-default": "Kein Zugang zu dieser Seite",
+	"404-default": "Diese Seite konnte nicht gefunden werden",
+	"500-default": "Internal Server Error",
+	"503-default": "Dienst steht nicht zur Verfügung",
+	"default": "Ein Fehler ist aufgetreten"
     }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index cb0d3ca07..d8e374033 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -804,8 +804,11 @@
     "back-to-index": "Back to index page",
     "post-not-found": "This post could not be found",
     "cannot-edit-post": "This post cannot be edited",
-    "default": "This page could not be found",
-    "not-authorized": "Not authorized to this page"
+    "404-default": "This page could not be found",
+    "403-default": "Not authorized to this page",
+    "500-default": "Internal Server Error",
+    "503-default": "Service Unavailable",
+    "default": "An error occurred"
   }
 }
 

From d20c94b45336ff8ec6bfd2b8959330ba4fee0889 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 28 Jan 2020 22:26:54 +0100
Subject: [PATCH 032/171] Image size reduced

---
 webapp/layouts/error.vue | 4 ++--
 webapp/locales/de.json   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue
index 4394a5cdb..657f96266 100644
--- a/webapp/layouts/error.vue
+++ b/webapp/layouts/error.vue
@@ -25,7 +25,7 @@ export default {
       return this.error.key || mapping[this.error.statusCode] || 'error-pages.default'
     },
     image() {
-      return `/img/svg/errors/error${this.error.statusCode ? this.error.statusCode : '500'}.svg`
+      return `/img/svg/errors/error${this.error.statusCode || '500'}.svg`
     },
   },
 }
@@ -42,7 +42,7 @@ export default {
   margin: $space-base;
 }
 .error-image {
-  width: 70%;
+  width: 30%;
   display: block;
   margin-left: auto;
   margin-right: auto;
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6ccaea780..7cd58159c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -803,7 +803,7 @@
 	"profile-not-found": "Dieses Profil konnte nicht gefunden werden",
 	"back-to-index": "Zurück zur Startseite",
 	"post-not-found": "Dieser Beitrag konnte nicht gefunden werden",
-        "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden",
+	"cannot-edit-post": "Dieser Beitrag kann nicht editiert werden",
 	"403-default": "Kein Zugang zu dieser Seite",
 	"404-default": "Diese Seite konnte nicht gefunden werden",
 	"500-default": "Internal Server Error",

From ee5a2349c04a7c1afb26731f6175ad92053bb28b Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 00:00:38 +0100
Subject: [PATCH 033/171] build(deps): Add rosie for factories

Why have I not seen this before?
---
 backend/package.json |  1 +
 backend/yarn.lock    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/backend/package.json b/backend/package.json
index e9e0f44a3..749972021 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -127,6 +127,7 @@
     "jest": "~25.1.0",
     "nodemon": "~2.0.2",
     "prettier": "~1.19.1",
+    "rosie": "^2.0.1",
     "supertest": "~4.0.2"
   }
 }
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 8f4cfc9a2..65570ab94 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -7754,6 +7754,11 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
+rosie@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rosie/-/rosie-2.0.1.tgz#c250c4787ce450b72aa9eff26509f68589814fa2"
+  integrity sha1-wlDEeHzkULcqqe/yZQn2hYmBT6I=
+
 router-ips@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/router-ips/-/router-ips-1.0.0.tgz#44e00858ebebc0133d58e40b2cd8a1fbb04203f5"
@@ -7918,6 +7923,11 @@ serve-static@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"

From 63939fa9e0c3138abbe7e3a048f9e146fb53b123 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 00:10:51 +0100
Subject: [PATCH 034/171] Refactor all dependencies without dependencies

---
 backend/src/factories/badges.js               | 24 ++++++-----
 backend/src/factories/categories.js           | 23 +++++-----
 backend/src/factories/donations.js            | 23 +++++-----
 backend/src/factories/emailAddresses.js       | 26 ++++++------
 backend/src/factories/locations.js            | 42 +++++++++++--------
 backend/src/factories/reports.js              | 13 +++++-
 backend/src/factories/socialMedia.js          | 22 ++++++----
 backend/src/factories/tags.js                 | 20 ++++++---
 .../src/factories/unverifiedEmailAddresses.js | 13 +++++-
 9 files changed, 128 insertions(+), 78 deletions(-)

diff --git a/backend/src/factories/badges.js b/backend/src/factories/badges.js
index 5f0482460..3c981ae8a 100644
--- a/backend/src/factories/badges.js
+++ b/backend/src/factories/badges.js
@@ -1,15 +1,19 @@
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('badge')
+  .attr('type', 'crowdfunding')
+  .attr('status', 'permanent')
+  .after((buildObject, options) => {
+    return neode.create('Badge', buildObject)
+  })
+
 export default function create() {
   return {
-    factory: async ({ args, neodeInstance }) => {
-      const defaults = {
-        type: 'crowdfunding',
-        status: 'permanent',
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      return neodeInstance.create('Badge', args)
+    factory: ({ args, neodeInstance }) => {
+      return Factory.build('badge', args)
     },
   }
 }
diff --git a/backend/src/factories/categories.js b/backend/src/factories/categories.js
index d3f5fed21..5dd89efbe 100644
--- a/backend/src/factories/categories.js
+++ b/backend/src/factories/categories.js
@@ -1,18 +1,21 @@
 import uuid from 'uuid/v4'
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('category')
+  .attr('id', uuid)
+  .attr('icon', 'img/badges/fundraisingbox_de_airship.svg')
+  .attr('name', 'Some category name')
+  .after((buildObject, options) => {
+    return neode.create('Category', buildObject)
+  })
 
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      const defaults = {
-        id: uuid(),
-        icon: 'img/badges/fundraisingbox_de_airship.svg',
-        name: 'Some category name',
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      return neodeInstance.create('Category', args)
+      return Factory.build('category', args)
     },
   }
 }
diff --git a/backend/src/factories/donations.js b/backend/src/factories/donations.js
index e22cdb6d7..a17c2511a 100644
--- a/backend/src/factories/donations.js
+++ b/backend/src/factories/donations.js
@@ -1,18 +1,21 @@
 import uuid from 'uuid/v4'
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('donations')
+  .attr('id', uuid)
+  .attr('goal', 15000)
+  .attr('progress', 0)
+  .after((buildObject, options) => {
+    return neode.create('Donations', buildObject)
+  })
 
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      const defaults = {
-        id: uuid(),
-        goal: 15000,
-        progress: 0,
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      return neodeInstance.create('Donations', args)
+      return Factory.build('donations', args)
     },
   }
 }
diff --git a/backend/src/factories/emailAddresses.js b/backend/src/factories/emailAddresses.js
index 41b1fe96c..8be427058 100644
--- a/backend/src/factories/emailAddresses.js
+++ b/backend/src/factories/emailAddresses.js
@@ -1,22 +1,24 @@
 import faker from 'faker'
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
 
-export function defaults({ args }) {
-  const defaults = {
-    email: faker.internet.email(),
-    verifiedAt: new Date().toISOString(),
-  }
-  args = {
-    ...defaults,
-    ...args,
-  }
-  return args
+export const defaults = {
+  email: faker.internet.email,
+  verifiedAt: () => new Date().toISOString(),
 }
 
+const neode = getNeode()
+
+Factory.define('emailAddress')
+  .attr(defaults)
+  .after((buildObject, options) => {
+    return neode.create('EmailAddress', buildObject)
+  })
+
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      args = defaults({ args })
-      return neodeInstance.create('EmailAddress', args)
+      return Factory.build('emailAddress', args)
     },
   }
 }
diff --git a/backend/src/factories/locations.js b/backend/src/factories/locations.js
index 99b666de8..29b6c3098 100644
--- a/backend/src/factories/locations.js
+++ b/backend/src/factories/locations.js
@@ -1,24 +1,30 @@
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('location')
+  .attrs({
+    name: 'Germany',
+    namePT: 'Alemanha',
+    nameDE: 'Deutschland',
+    nameES: 'Alemania',
+    nameNL: 'Duitsland',
+    namePL: 'Niemcy',
+    nameFR: 'Allemagne',
+    nameIT: 'Germania',
+    nameEN: 'Germany',
+    id: 'country.10743216036480410',
+    type: 'country',
+  })
+  .after((buildObject, options) => {
+    return neode.create('Location', buildObject)
+  })
+
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      const defaults = {
-        name: 'Germany',
-        namePT: 'Alemanha',
-        nameDE: 'Deutschland',
-        nameES: 'Alemania',
-        nameNL: 'Duitsland',
-        namePL: 'Niemcy',
-        nameFR: 'Allemagne',
-        nameIT: 'Germania',
-        nameEN: 'Germany',
-        id: 'country.10743216036480410',
-        type: 'country',
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      return neodeInstance.create('Location', args)
+      return Factory.build('location', args)
     },
   }
 }
diff --git a/backend/src/factories/reports.js b/backend/src/factories/reports.js
index e2d5ec4dc..9e3024e35 100644
--- a/backend/src/factories/reports.js
+++ b/backend/src/factories/reports.js
@@ -1,7 +1,16 @@
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('report').after((buildObject, options) => {
+  return neode.create('Report', buildObject)
+})
+
 export default function create() {
   return {
-    factory: async ({ args, neodeInstance }) => {
-      return neodeInstance.create('Report', args)
+    factory: async ({ args }) => {
+      return Factory.build('report', args)
     },
   }
 }
diff --git a/backend/src/factories/socialMedia.js b/backend/src/factories/socialMedia.js
index 49a237cef..164a49529 100644
--- a/backend/src/factories/socialMedia.js
+++ b/backend/src/factories/socialMedia.js
@@ -1,14 +1,20 @@
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('socialMedia')
+  .attrs({
+    url: 'https://mastodon.social/@Gargron',
+  })
+  .after((buildObject, options) => {
+    return neode.create('SocialMedia', buildObject)
+  })
+
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      const defaults = {
-        url: 'https://mastodon.social/@Gargron',
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      return neodeInstance.create('SocialMedia', args)
+      return Factory.build('socialMedia', args)
     },
   }
 }
diff --git a/backend/src/factories/tags.js b/backend/src/factories/tags.js
index 9005d1406..cf7ca1729 100644
--- a/backend/src/factories/tags.js
+++ b/backend/src/factories/tags.js
@@ -1,12 +1,20 @@
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('tag')
+  .attrs({
+    name: '#human-connection',
+  })
+  .after((buildObject, options) => {
+    return neode.create('Tag', buildObject)
+  })
+
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      const defaults = { name: '#human-connection' }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      return neodeInstance.create('Tag', args)
+      return Factory.build('tag', args)
     },
   }
 }
diff --git a/backend/src/factories/unverifiedEmailAddresses.js b/backend/src/factories/unverifiedEmailAddresses.js
index 94e32af6e..2d6bd9f57 100644
--- a/backend/src/factories/unverifiedEmailAddresses.js
+++ b/backend/src/factories/unverifiedEmailAddresses.js
@@ -1,10 +1,19 @@
 import { defaults } from './emailAddresses.js'
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('unverifiedEmailAddress')
+  .attr(defaults)
+  .after((buildObject, options) => {
+    return neode.create('UnverifiedEmailAddress', buildObject)
+  })
 
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      args = defaults({ args })
-      return neodeInstance.create('UnverifiedEmailAddress', args)
+      return Factory.build('unverifiedEmailAddress', args)
     },
   }
 }

From 2a79c53765b73f9b91691eb75f55cf8c9e48306e Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 01:52:20 +0100
Subject: [PATCH 035/171] Refactor user factory

---
 backend/src/db/seed.js                        | 133 +++++++++++-------
 backend/src/factories/index.js                |   3 +-
 backend/src/factories/socialMedia.js          |   2 +-
 backend/src/factories/users.js                |  80 ++++++-----
 backend/src/jwt/decode.spec.js                |  21 +--
 .../hashtags/hashtagsMiddleware.spec.js       |  19 ++-
 .../notificationsMiddleware.spec.js           | 114 +++++++++------
 .../middleware/permissionsMiddleware.spec.js  |  64 ++++++---
 .../src/middleware/slugifyMiddleware.spec.js  |  12 +-
 .../softDelete/softDeleteMiddleware.spec.js   |  15 +-
 backend/src/schema/resolvers/emails.spec.js   |   6 +-
 backend/src/schema/resolvers/follow.spec.js   |  34 +++--
 .../src/schema/resolvers/moderation.spec.js   |  36 +++--
 .../schema/resolvers/passwordReset.spec.js    |  25 ++--
 backend/src/schema/resolvers/posts.spec.js    |  34 +++--
 .../src/schema/resolvers/registration.spec.js |  23 +--
 backend/src/schema/resolvers/reports.spec.js  | 102 +++++++++-----
 backend/src/schema/resolvers/rewards.spec.js  |  60 +++++---
 backend/src/schema/resolvers/shout.spec.js    |  34 +++--
 .../src/schema/resolvers/socialMedia.spec.js  |  40 +++---
 .../schema/resolvers/user_management.spec.js  |  34 +++--
 backend/src/schema/resolvers/users.spec.js    |  72 ++++++----
 .../schema/resolvers/users/location.spec.js   |   7 +-
 backend/test/features/support/steps.js        |   3 +-
 24 files changed, 611 insertions(+), 362 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index ba7ace90b..75671d098 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -147,55 +147,90 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       louie,
       dagobert,
     ] = await Promise.all([
-      factory.create('User', {
-        id: 'u1',
-        name: 'Peter Lustig',
-        slug: 'peter-lustig',
-        role: 'admin',
-        email: 'admin@example.org',
-      }),
-      factory.create('User', {
-        id: 'u2',
-        name: 'Bob der Baumeister',
-        slug: 'bob-der-baumeister',
-        role: 'moderator',
-        email: 'moderator@example.org',
-      }),
-      factory.create('User', {
-        id: 'u3',
-        name: 'Jenny Rostock',
-        slug: 'jenny-rostock',
-        role: 'user',
-        email: 'user@example.org',
-      }),
-      factory.create('User', {
-        id: 'u4',
-        name: 'Huey',
-        slug: 'huey',
-        role: 'user',
-        email: 'huey@example.org',
-      }),
-      factory.create('User', {
-        id: 'u5',
-        name: 'Dewey',
-        slug: 'dewey',
-        role: 'user',
-        email: 'dewey@example.org',
-      }),
-      factory.create('User', {
-        id: 'u6',
-        name: 'Louie',
-        slug: 'louie',
-        role: 'user',
-        email: 'louie@example.org',
-      }),
-      factory.create('User', {
-        id: 'u7',
-        name: 'Dagobert',
-        slug: 'dagobert',
-        role: 'user',
-        email: 'dagobert@example.org',
-      }),
+      factory.create(
+        'User',
+        {
+          id: 'u1',
+          name: 'Peter Lustig',
+          slug: 'peter-lustig',
+          role: 'admin',
+        },
+        {
+          email: 'admin@example.org',
+        },
+      ),
+      factory.create(
+        'User',
+        {
+          id: 'u2',
+          name: 'Bob der Baumeister',
+          slug: 'bob-der-baumeister',
+          role: 'moderator',
+        },
+        {
+          email: 'moderator@example.org',
+        },
+      ),
+      factory.create(
+        'User',
+        {
+          id: 'u3',
+          name: 'Jenny Rostock',
+          slug: 'jenny-rostock',
+          role: 'user',
+        },
+        {
+          email: 'user@example.org',
+        },
+      ),
+      factory.create(
+        'User',
+        {
+          id: 'u4',
+          name: 'Huey',
+          slug: 'huey',
+          role: 'user',
+        },
+        {
+          email: 'huey@example.org',
+        },
+      ),
+      factory.create(
+        'User',
+        {
+          id: 'u5',
+          name: 'Dewey',
+          slug: 'dewey',
+          role: 'user',
+        },
+        {
+          email: 'dewey@example.org',
+        },
+      ),
+      factory.create(
+        'User',
+        {
+          id: 'u6',
+          name: 'Louie',
+          slug: 'louie',
+          role: 'user',
+        },
+        {
+          email: 'louie@example.org',
+        },
+      ),
+      factory.create(
+        'User',
+        {
+          id: 'u7',
+          name: 'Dagobert',
+          slug: 'dagobert',
+          role: 'user',
+        },
+        {
+          email: 'dagobert@example.org',
+        },
+      ),
     ])
 
     await Promise.all([
diff --git a/backend/src/factories/index.js b/backend/src/factories/index.js
index c3ab14f64..983aaae26 100644
--- a/backend/src/factories/index.js
+++ b/backend/src/factories/index.js
@@ -40,10 +40,11 @@ export default function Factory(options = {}) {
     factories,
     lastResponse: null,
     neodeInstance,
-    async create(node, args = {}) {
+    async create(node, args = {}, options = {}) {
       const { factory } = this.factories[node](args)
       this.lastResponse = await factory({
         args,
+        options,
         neodeInstance,
         factoryInstance: this,
       })
diff --git a/backend/src/factories/socialMedia.js b/backend/src/factories/socialMedia.js
index 164a49529..2baf058a0 100644
--- a/backend/src/factories/socialMedia.js
+++ b/backend/src/factories/socialMedia.js
@@ -13,7 +13,7 @@ Factory.define('socialMedia')
 
 export default function create() {
   return {
-    factory: async ({ args, neodeInstance }) => {
+    factory: async ({ args }) => {
       return Factory.build('socialMedia', args)
     },
   }
diff --git a/backend/src/factories/users.js b/backend/src/factories/users.js
index 57f69b76b..9ed701441 100644
--- a/backend/src/factories/users.js
+++ b/backend/src/factories/users.js
@@ -1,44 +1,54 @@
 import faker from 'faker'
 import uuid from 'uuid/v4'
-import encryptPassword from '../helpers/encryptPassword'
 import slugify from 'slug'
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+import { hashSync } from 'bcryptjs'
+
+const neode = getNeode()
+
+Factory.define('userWithoutEmailAddress')
+  .option('password', '1234')
+  .attrs({
+    id: uuid,
+    name: faker.name.findName,
+    email: faker.internet.email,
+    password: '1234',
+    role: 'user',
+    avatar: faker.internet.avatar,
+    about: faker.lorem.paragraph,
+    termsAndConditionsAgreedVersion: '0.0.1',
+    termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
+    allowEmbedIframes: false,
+    showShoutsPublicly: false,
+    locale: 'en',
+  })
+  .attr('slug', ['slug', 'name'], (slug, name) => {
+    return slug || slugify(name, { lower: true })
+  })
+  .attr('encryptedPassword', ['password'], password => {
+    return hashSync(password, 10)
+  })
+  .after(async (buildObject, options) => {
+    return neode.create('User', buildObject)
+  })
+
+Factory.define('user')
+  .option('email', faker.internet.exampleEmail)
+  .extend('userWithoutEmailAddress')
+  .after(async (buildObject, options) => {
+    const [user, email] = await Promise.all([
+      buildObject,
+      neode.create('EmailAddress', { email: options.email }),
+    ])
+    await Promise.all([user.relateTo(email, 'primaryEmail'), email.relateTo(user, 'belongsTo')])
+    return user
+  })
 
 export default function create() {
   return {
-    factory: async ({ args, neodeInstance, factoryInstance }) => {
-      const defaults = {
-        id: uuid(),
-        name: faker.name.findName(),
-        email: faker.internet.email(),
-        password: '1234',
-        role: 'user',
-        avatar: faker.internet.avatar(),
-        about: faker.lorem.paragraph(),
-        termsAndConditionsAgreedVersion: '0.0.1',
-        termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
-        allowEmbedIframes: false,
-        showShoutsPublicly: false,
-        locale: 'en',
-      }
-      defaults.slug = slugify(defaults.name, { lower: true })
-      args = {
-        ...defaults,
-        ...args,
-      }
-      args = await encryptPassword(args)
-      const user = await neodeInstance.create('User', args)
-
-      let email
-      if (typeof args.email === 'object') {
-        // probably a neode node
-        email = args.email
-      } else {
-        email = await factoryInstance.create('EmailAddress', { email: args.email })
-      }
-
-      await user.relateTo(email, 'primaryEmail')
-      await email.relateTo(user, 'belongsTo')
-      return user
+    factory: async ({ args, options }) => {
+      return Factory.build('user', args, options)
     },
   }
 }
diff --git a/backend/src/jwt/decode.spec.js b/backend/src/jwt/decode.spec.js
index 71444a3e5..d0bf2005d 100644
--- a/backend/src/jwt/decode.spec.js
+++ b/backend/src/jwt/decode.spec.js
@@ -65,14 +65,19 @@ describe('decode', () => {
     describe('and corresponding user in the database', () => {
       let user
       beforeEach(async () => {
-        user = await factory.create('User', {
-          role: 'user',
-          name: 'Jenny Rostock',
-          avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/sasha_shestakov/128.jpg',
-          id: 'u3',
-          email: 'user@example.org',
-          slug: 'jenny-rostock',
-        })
+        user = await factory.create(
+          'User',
+          {
+            role: 'user',
+            name: 'Jenny Rostock',
+            avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/sasha_shestakov/128.jpg',
+            id: 'u3',
+            slug: 'jenny-rostock',
+          },
+          {
+            email: 'user@example.org',
+          },
+        )
       })
 
       it('returns user object except email', async () => {
diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
index 2247e692d..4967978a5 100644
--- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
+++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
@@ -48,13 +48,18 @@ beforeAll(() => {
 })
 
 beforeEach(async () => {
-  hashtagingUser = await neode.create('User', {
-    id: 'you',
-    name: 'Al Capone',
-    slug: 'al-capone',
-    email: 'test@example.org',
-    password: '1234',
-  })
+  hashtagingUser = await neode.create(
+    'User',
+    {
+      id: 'you',
+      name: 'Al Capone',
+      slug: 'al-capone',
+    },
+    {
+      password: '1234',
+      email: 'test@example.org',
+    },
+  )
   await neode.create('Category', {
     id: 'cat9',
     name: 'Democracy & Politics',
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 136388b88..0d0714289 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -53,13 +53,18 @@ beforeAll(async () => {
 })
 
 beforeEach(async () => {
-  notifiedUser = await neode.create('User', {
-    id: 'you',
-    name: 'Al Capone',
-    slug: 'al-capone',
-    email: 'test@example.org',
-    password: '1234',
-  })
+  notifiedUser = await neode.create(
+    'User',
+    {
+      id: 'you',
+      name: 'Al Capone',
+      slug: 'al-capone',
+    },
+    {
+      email: 'test@example.org',
+      password: '1234',
+    },
+  )
   await neode.create('Category', {
     id: 'cat9',
     name: 'Democracy & Politics',
@@ -143,13 +148,18 @@ describe('notifications', () => {
         describe('commenter is not me', () => {
           beforeEach(async () => {
             commentContent = 'Commenters comment.'
-            commentAuthor = await neode.create('User', {
-              id: 'commentAuthor',
-              name: 'Mrs Comment',
-              slug: 'mrs-comment',
-              email: 'commentauthor@example.org',
-              password: '1234',
-            })
+            commentAuthor = await neode.create(
+              'User',
+              {
+                id: 'commentAuthor',
+                name: 'Mrs Comment',
+                slug: 'mrs-comment',
+              },
+              {
+                email: 'commentauthor@example.org',
+                password: '1234',
+              },
+            )
           })
 
           it('sends me a notification', async () => {
@@ -224,13 +234,18 @@ describe('notifications', () => {
       })
 
       beforeEach(async () => {
-        postAuthor = await neode.create('User', {
-          id: 'postAuthor',
-          name: 'Mrs Post',
-          slug: 'mrs-post',
-          email: 'post-author@example.org',
-          password: '1234',
-        })
+        postAuthor = await neode.create(
+          'User',
+          {
+            id: 'postAuthor',
+            name: 'Mrs Post',
+            slug: 'mrs-post',
+          },
+          {
+            email: 'post-author@example.org',
+            password: '1234',
+          },
+        )
       })
 
       describe('mentions me in a post', () => {
@@ -428,23 +443,33 @@ describe('notifications', () => {
           beforeEach(async () => {
             commentContent =
               'One mention about me with <a data-mention-id="you" class="mention" href="/profile/you" target="_blank">@al-capone</a>.'
-            commentAuthor = await neode.create('User', {
-              id: 'commentAuthor',
-              name: 'Mrs Comment',
-              slug: 'mrs-comment',
-              email: 'comment-author@example.org',
-              password: '1234',
-            })
+            commentAuthor = await neode.create(
+              'User',
+              {
+                id: 'commentAuthor',
+                name: 'Mrs Comment',
+                slug: 'mrs-comment',
+              },
+              {
+                email: 'comment-author@example.org',
+                password: '1234',
+              },
+            )
           })
 
           it('sends only one notification with reason mentioned_in_comment', async () => {
-            postAuthor = await neode.create('User', {
-              id: 'MrPostAuthor',
-              name: 'Mr Author',
-              slug: 'mr-author',
-              email: 'post-author@example.org',
-              password: '1234',
-            })
+            postAuthor = await neode.create(
+              'User',
+              {
+                id: 'MrPostAuthor',
+                name: 'Mr Author',
+                slug: 'mr-author',
+              },
+              {
+                email: 'post-author@example.org',
+                password: '1234',
+              },
+            )
 
             await createCommentOnPostAction()
             const expected = expect.objectContaining({
@@ -514,13 +539,18 @@ describe('notifications', () => {
             await postAuthor.relateTo(notifiedUser, 'blocked')
             commentContent =
               'One mention about me with <a data-mention-id="you" class="mention" href="/profile/you" target="_blank">@al-capone</a>.'
-            commentAuthor = await neode.create('User', {
-              id: 'commentAuthor',
-              name: 'Mrs Comment',
-              slug: 'mrs-comment',
-              email: 'comment-author@example.org',
-              password: '1234',
-            })
+            commentAuthor = await neode.create(
+              'User',
+              {
+                id: 'commentAuthor',
+                name: 'Mrs Comment',
+                slug: 'mrs-comment',
+              },
+              {
+                email: 'comment-author@example.org',
+                password: '1234',
+              },
+            )
           })
 
           it('sends no notification', async () => {
diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js
index a4f13ea0c..7c62cfcc0 100644
--- a/backend/src/middleware/permissionsMiddleware.spec.js
+++ b/backend/src/middleware/permissionsMiddleware.spec.js
@@ -34,28 +34,48 @@ describe('authorization', () => {
   describe('given two existing users', () => {
     beforeEach(async () => {
       ;[owner, anotherRegularUser, administrator, moderator] = await Promise.all([
-        factory.create('User', {
-          email: 'owner@example.org',
-          name: 'Owner',
-          password: 'iamtheowner',
-        }),
-        factory.create('User', {
-          email: 'another.regular.user@example.org',
-          name: 'Another Regular User',
-          password: 'else',
-        }),
-        factory.create('User', {
-          email: 'admin@example.org',
-          name: 'Admin',
-          password: 'admin',
-          role: 'admin',
-        }),
-        factory.create('User', {
-          email: 'moderator@example.org',
-          name: 'Moderator',
-          password: 'moderator',
-          role: 'moderator',
-        }),
+        factory.create(
+          'User',
+          {
+            name: 'Owner',
+          },
+          {
+            email: 'owner@example.org',
+            password: 'iamtheowner',
+          },
+        ),
+        factory.create(
+          'User',
+          {
+            name: 'Another Regular User',
+          },
+          {
+            email: 'another.regular.user@example.org',
+            password: 'else',
+          },
+        ),
+        factory.create(
+          'User',
+          {
+            name: 'Admin',
+            role: 'admin',
+          },
+          {
+            email: 'admin@example.org',
+            password: 'admin',
+          },
+        ),
+        factory.create(
+          'User',
+          {
+            name: 'Moderator',
+            role: 'moderator',
+          },
+          {
+            email: 'moderator@example.org',
+            password: 'moderator',
+          },
+        ),
       ])
       variables = {}
     })
diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index cf9f0941c..5400d2c92 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -31,10 +31,14 @@ beforeEach(async () => {
   const admin = await factory.create('User', {
     role: 'admin',
   })
-  await factory.create('User', {
-    email: 'someone@example.org',
-    password: '1234',
-  })
+  await factory.create(
+    'User',
+    {},
+    {
+      email: 'someone@example.org',
+      password: '1234',
+    },
+  )
   await factory.create('Category', {
     id: 'cat9',
     name: 'Democracy & Politics',
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 6e1735af2..334564582 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -19,11 +19,16 @@ beforeAll(async () => {
   // For performance reasons we do this only once
   const users = await Promise.all([
     factory.create('User', { id: 'u1', role: 'user' }),
-    factory.create('User', {
-      id: 'm1',
-      role: 'moderator',
-      password: '1234',
-    }),
+    factory.create(
+      'User',
+      {
+        id: 'm1',
+        role: 'moderator',
+      },
+      {
+        password: '1234',
+      },
+    ),
     factory.create('User', {
       id: 'u2',
       role: 'user',
diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js
index 97a1f0c29..470eb7635 100644
--- a/backend/src/schema/resolvers/emails.spec.js
+++ b/backend/src/schema/resolvers/emails.spec.js
@@ -63,7 +63,7 @@ describe('AddEmailAddress', () => {
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      user = await factory.create('User', { id: '567', email: 'user@example.org' })
+      user = await factory.create('User', { id: '567' }, { email: 'user@example.org' })
       authenticatedUser = await user.toJson()
     })
 
@@ -128,7 +128,7 @@ describe('AddEmailAddress', () => {
 
       describe('but if another user owns an `EmailAddress` already with that email', () => {
         it('throws UserInputError because of unique constraints', async () => {
-          await factory.create('User', { email: 'new-email@example.org' })
+          await factory.create('User', {}, { email: 'new-email@example.org' })
           await expect(mutate({ mutation, variables })).resolves.toMatchObject({
             data: { AddEmailAddress: null },
             errors: [{ message: 'A user account with this email already exists.' }],
@@ -169,7 +169,7 @@ describe('VerifyEmailAddress', () => {
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      user = await factory.create('User', { id: '567', email: 'user@example.org' })
+      user = await factory.create('User', { id: '567' }, { email: 'user@example.org' })
       authenticatedUser = await user.toJson()
     })
 
diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js
index ad836a461..d7f5e3113 100644
--- a/backend/src/schema/resolvers/follow.spec.js
+++ b/backend/src/schema/resolvers/follow.spec.js
@@ -73,20 +73,30 @@ beforeAll(async () => {
 
 beforeEach(async () => {
   user1 = await factory
-    .create('User', {
-      id: 'u1',
-      name: 'user1',
-      email: 'test@example.org',
-      password: '1234',
-    })
+    .create(
+      'User',
+      {
+        id: 'u1',
+        name: 'user1',
+      },
+      {
+        email: 'test@example.org',
+        password: '1234',
+      },
+    )
     .then(user => user.toJson())
   user2 = await factory
-    .create('User', {
-      id: 'u2',
-      name: 'user2',
-      email: 'test2@example.org',
-      password: '1234',
-    })
+    .create(
+      'User',
+      {
+        id: 'u2',
+        name: 'user2',
+      },
+      {
+        email: 'test2@example.org',
+        password: '1234',
+      },
+    )
     .then(user => user.toJson())
 
   authenticatedUser = user1
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index cd502be75..856f094d1 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -80,19 +80,29 @@ describe('moderate resources', () => {
       closed: false,
     }
     authenticatedUser = null
-    moderator = await factory.create('User', {
-      id: 'moderator-id',
-      name: 'Moderator',
-      email: 'moderator@example.org',
-      password: '1234',
-      role: 'moderator',
-    })
-    nonModerator = await factory.create('User', {
-      id: 'non-moderator',
-      name: 'Non Moderator',
-      email: 'non.moderator@example.org',
-      password: '1234',
-    })
+    moderator = await factory.create(
+      'User',
+      {
+        id: 'moderator-id',
+        name: 'Moderator',
+        role: 'moderator',
+      },
+      {
+        email: 'moderator@example.org',
+        password: '1234',
+      },
+    )
+    nonModerator = await factory.create(
+      'User',
+      {
+        id: 'non-moderator',
+        name: 'Non Moderator',
+      },
+      {
+        email: 'non.moderator@example.org',
+        password: '1234',
+      },
+    )
   })
 
   afterEach(async () => {
diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js
index d7b3a0157..97fba47f4 100644
--- a/backend/src/schema/resolvers/passwordReset.spec.js
+++ b/backend/src/schema/resolvers/passwordReset.spec.js
@@ -45,9 +45,13 @@ afterEach(async () => {
 describe('passwordReset', () => {
   describe('given a user', () => {
     beforeEach(async () => {
-      await factory.create('User', {
-        email: 'user@example.org',
-      })
+      await factory.create(
+        'User',
+        {},
+        {
+          email: 'user@example.org',
+        },
+      )
     })
 
     describe('requestPasswordReset', () => {
@@ -123,11 +127,16 @@ describe('resetPassword', () => {
 
   describe('given a user', () => {
     beforeEach(async () => {
-      await factory.create('User', {
-        email: 'user@example.org',
-        role: 'user',
-        password: '1234',
-      })
+      await factory.create(
+        'User',
+        {
+          role: 'user',
+        },
+        {
+          email: 'user@example.org',
+          password: '1234',
+        },
+      )
     })
 
     describe('invalid email', () => {
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index 56a47afa7..d7195be97 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -56,12 +56,17 @@ beforeAll(async () => {
 
 beforeEach(async () => {
   variables = {}
-  user = await factory.create('User', {
-    id: 'current-user',
-    name: 'TestUser',
-    email: 'test@example.org',
-    password: '1234',
-  })
+  user = await factory.create(
+    'User',
+    {
+      id: 'current-user',
+      name: 'TestUser',
+    },
+    {
+      email: 'test@example.org',
+      password: '1234',
+    },
+  )
   await Promise.all([
     neode.create('Category', {
       id: 'cat9',
@@ -96,12 +101,17 @@ describe('Post', () => {
     let followedUser, happyPost, cryPost
     beforeEach(async () => {
       ;[followedUser] = await Promise.all([
-        factory.create('User', {
-          id: 'followed-by-me',
-          email: 'followed@example.org',
-          name: 'Followed User',
-          password: '1234',
-        }),
+        factory.create(
+          'User',
+          {
+            id: 'followed-by-me',
+            name: 'Followed User',
+          },
+          {
+            email: 'followed@example.org',
+            password: '1234',
+          },
+        ),
       ])
       ;[happyPost, cryPost] = await Promise.all([
         factory.create('Post', { id: 'happy-post', categoryIds: ['cat4'] }),
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
index 23b1f9d2a..36514bf4d 100644
--- a/backend/src/schema/resolvers/registration.spec.js
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -1,4 +1,5 @@
 import Factory from '../../factories'
+import { Factory as RosieFactory } from 'rosie'
 import { gql } from '../../helpers/jest'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
@@ -58,11 +59,16 @@ describe('Signup', () => {
 
     describe('as admin', () => {
       beforeEach(async () => {
-        const admin = await factory.create('User', {
-          role: 'admin',
-          email: 'admin@example.org',
-          password: '1234',
-        })
+        const admin = await factory.create(
+          'User',
+          {
+            role: 'admin',
+          },
+          {
+            email: 'admin@example.org',
+            password: '1234',
+          },
+        )
         authenticatedUser = await admin.toJson()
       })
 
@@ -90,9 +96,9 @@ describe('Signup', () => {
         })
 
         describe('if the email already exists', () => {
-          let email
+          let emailAddress
           beforeEach(async () => {
-            email = await factory.create('EmailAddress', {
+            emailAddress = await factory.create('EmailAddress', {
               email: 'someuser@example.org',
               verifiedAt: null,
             })
@@ -100,7 +106,8 @@ describe('Signup', () => {
 
           describe('and the user has registered already', () => {
             beforeEach(async () => {
-              await factory.create('User', { email })
+              const user = await RosieFactory.build('userWithoutEmailAddress')
+              await emailAddress.relateTo(user, 'belongsTo')
             })
 
             it('throws UserInputError error because of unique constraint violation', async () => {
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 7f827b111..9992da200 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -84,24 +84,39 @@ describe('file a report on a resource', () => {
 
     describe('authenticated', () => {
       beforeEach(async () => {
-        currentUser = await factory.create('User', {
-          id: 'current-user-id',
-          role: 'user',
-          email: 'test@example.org',
-          password: '1234',
-        })
-        otherReportingUser = await factory.create('User', {
-          id: 'other-reporting-user-id',
-          role: 'user',
-          email: 'reporting@example.org',
-          password: '1234',
-        })
-        await factory.create('User', {
-          id: 'abusive-user-id',
-          role: 'user',
-          name: 'abusive-user',
-          email: 'abusive-user@example.org',
-        })
+        currentUser = await factory.create(
+          'User',
+          {
+            id: 'current-user-id',
+            role: 'user',
+          },
+          {
+            email: 'test@example.org',
+            password: '1234',
+          },
+        )
+        otherReportingUser = await factory.create(
+          'User',
+          {
+            id: 'other-reporting-user-id',
+            role: 'user',
+          },
+          {
+            email: 'reporting@example.org',
+            password: '1234',
+          },
+        )
+        await factory.create(
+          'User',
+          {
+            id: 'abusive-user-id',
+            role: 'user',
+            name: 'abusive-user',
+          },
+          {
+            email: 'abusive-user@example.org',
+          },
+        )
         await instance.create('Category', {
           id: 'cat9',
           name: 'Democracy & Politics',
@@ -515,24 +530,39 @@ describe('file a report on a resource', () => {
 
     beforeEach(async () => {
       authenticatedUser = null
-      moderator = await factory.create('User', {
-        id: 'moderator-1',
-        role: 'moderator',
-        email: 'moderator@example.org',
-        password: '1234',
-      })
-      currentUser = await factory.create('User', {
-        id: 'current-user-id',
-        role: 'user',
-        email: 'current.user@example.org',
-        password: '1234',
-      })
-      abusiveUser = await factory.create('User', {
-        id: 'abusive-user-1',
-        role: 'user',
-        name: 'abusive-user',
-        email: 'abusive-user@example.org',
-      })
+      moderator = await factory.create(
+        'User',
+        {
+          id: 'moderator-1',
+          role: 'moderator',
+        },
+        {
+          email: 'moderator@example.org',
+          password: '1234',
+        },
+      )
+      currentUser = await factory.create(
+        'User',
+        {
+          id: 'current-user-id',
+          role: 'user',
+        },
+        {
+          email: 'current.user@example.org',
+          password: '1234',
+        },
+      )
+      abusiveUser = await factory.create(
+        'User',
+        {
+          id: 'abusive-user-1',
+          role: 'user',
+          name: 'abusive-user',
+        },
+        {
+          email: 'abusive-user@example.org',
+        },
+      )
       await instance.create('Category', {
         id: 'cat9',
         name: 'Democracy & Politics',
diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index fe2807f25..ba5c2dc42 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -31,22 +31,37 @@ describe('rewards', () => {
   })
 
   beforeEach(async () => {
-    regularUser = await factory.create('User', {
-      id: 'regular-user-id',
-      role: 'user',
-      email: 'user@example.org',
-      password: '1234',
-    })
-    moderator = await factory.create('User', {
-      id: 'moderator-id',
-      role: 'moderator',
-      email: 'moderator@example.org',
-    })
-    administrator = await factory.create('User', {
-      id: 'admin-id',
-      role: 'admin',
-      email: 'admin@example.org',
-    })
+    regularUser = await factory.create(
+      'User',
+      {
+        id: 'regular-user-id',
+        role: 'user',
+      },
+      {
+        email: 'user@example.org',
+        password: '1234',
+      },
+    )
+    moderator = await factory.create(
+      'User',
+      {
+        id: 'moderator-id',
+        role: 'moderator',
+      },
+      {
+        email: 'moderator@example.org',
+      },
+    )
+    administrator = await factory.create(
+      'User',
+      {
+        id: 'admin-id',
+        role: 'admin',
+      },
+      {
+        email: 'admin@example.org',
+      },
+    )
     badge = await factory.create('Badge', {
       id: 'indiegogo_en_rhino',
       type: 'crowdfunding',
@@ -172,10 +187,15 @@ describe('rewards', () => {
           },
           errors: undefined,
         }
-        await factory.create('User', {
-          id: 'regular-user-2-id',
-          email: 'regular2@email.com',
-        })
+        await factory.create(
+          'User',
+          {
+            id: 'regular-user-2-id',
+          },
+          {
+            email: 'regular2@email.com',
+          },
+        )
         await mutate({
           mutation: rewardMutation,
           variables,
diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
index 104a28399..50ff23687 100644
--- a/backend/src/schema/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -47,19 +47,29 @@ describe('shout and unshout posts', () => {
     query = createTestClient(server).query
   })
   beforeEach(async () => {
-    currentUser = await factory.create('User', {
-      id: 'current-user-id',
-      name: 'Current User',
-      email: 'current.user@example.org',
-      password: '1234',
-    })
+    currentUser = await factory.create(
+      'User',
+      {
+        id: 'current-user-id',
+        name: 'Current User',
+      },
+      {
+        email: 'current.user@example.org',
+        password: '1234',
+      },
+    )
 
-    postAuthor = await factory.create('User', {
-      id: 'id-of-another-user',
-      name: 'Another User',
-      email: 'another.user@example.org',
-      password: '1234',
-    })
+    postAuthor = await factory.create(
+      'User',
+      {
+        id: 'id-of-another-user',
+        name: 'Another User',
+      },
+      {
+        email: 'another.user@example.org',
+        password: '1234',
+      },
+    )
   })
   afterEach(async () => {
     await factory.cleanDatabase()
diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js
index f292b58a0..05bb13eb4 100644
--- a/backend/src/schema/resolvers/socialMedia.spec.js
+++ b/backend/src/schema/resolvers/socialMedia.spec.js
@@ -2,40 +2,46 @@ import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../db/neo4j'
+import { getDriver } from '../../db/neo4j'
 
 const driver = getDriver()
 const factory = Factory()
-const neode = getNeode()
 
 describe('SocialMedia', () => {
   let socialMediaAction, someUser, ownerNode, owner
 
-  const ownerParams = {
-    email: 'pippi@example.com',
-    password: '1234',
-    name: 'Pippi Langstrumpf',
-  }
-
-  const userParams = {
-    email: 'kalle@example.com',
-    password: 'abcd',
-    name: 'Kalle Blomqvist',
-  }
-
   const url = 'https://twitter.com/pippi-langstrumpf'
   const newUrl = 'https://twitter.com/bullerby'
 
   const setUpSocialMedia = async () => {
-    const socialMediaNode = await neode.create('SocialMedia', { url })
+    const socialMediaNode = await factory.create('SocialMedia', { url })
     await socialMediaNode.relateTo(ownerNode, 'ownedBy')
     return socialMediaNode.toJson()
   }
 
   beforeEach(async () => {
-    const someUserNode = await neode.create('User', userParams)
+    const someUserNode = await factory.create(
+      'User',
+      {
+        name: 'Kalle Blomqvist',
+      },
+      {
+        email: 'kalle@example.com',
+        password: 'abcd',
+      },
+    )
+
     someUser = await someUserNode.toJson()
-    ownerNode = await neode.create('User', ownerParams)
+    ownerNode = await factory.create(
+      'User',
+      {
+        name: 'Pippi Langstrumpf',
+      },
+      {
+        email: 'pippi@example.com',
+        password: '1234',
+      },
+    )
     owner = await ownerNode.toJson()
 
     socialMediaAction = async (user, mutation, variables) => {
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 5e7043e74..27bc84b10 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -127,15 +127,20 @@ describe('currentUser', () => {
   describe('authenticated', () => {
     describe('and corresponding user in the database', () => {
       beforeEach(async () => {
-        await factory.create('User', {
-          id: 'u3',
-          // the `id` is the only thing that has to match the decoded JWT bearer token
-          avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
-          email: 'test@example.org',
-          name: 'Matilde Hermiston',
-          slug: 'matilde-hermiston',
-          role: 'user',
-        })
+        await factory.create(
+          'User',
+          {
+            id: 'u3',
+            // the `id` is the only thing that has to match the decoded JWT bearer token
+            avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+            name: 'Matilde Hermiston',
+            slug: 'matilde-hermiston',
+            role: 'user',
+          },
+          {
+            email: 'test@example.org',
+          },
+        )
         const userBearerToken = encode({ id: 'u3' })
         req = { headers: { authorization: `Bearer ${userBearerToken}` } }
       })
@@ -172,10 +177,13 @@ describe('login', () => {
 
   beforeEach(async () => {
     variables = { email: 'test@example.org', password: '1234' }
-    user = await factory.create('User', {
-      ...variables,
-      id: 'acb2d923-f3af-479e-9f00-61b12e864666',
-    })
+    user = await factory.create(
+      'User',
+      {
+        id: 'acb2d923-f3af-479e-9f00-61b12e864666',
+      },
+      variables,
+    )
   })
 
   describe('ask for a `token`', () => {
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index cfd84fcf7..9ead48a2b 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -37,7 +37,7 @@ afterEach(async () => {
 describe('User', () => {
   describe('query by email address', () => {
     beforeEach(async () => {
-      await factory.create('User', { name: 'Johnny', email: 'any-email-address@example.org' })
+      await factory.create('User', { name: 'Johnny' }, { email: 'any-email-address@example.org' })
     })
 
     const userQuery = gql`
@@ -57,11 +57,16 @@ describe('User', () => {
 
     describe('as admin', () => {
       beforeEach(async () => {
-        const admin = await factory.create('User', {
-          role: 'admin',
-          email: 'admin@example.org',
-          password: '1234',
-        })
+        const admin = await factory.create(
+          'User',
+          {
+            role: 'admin',
+          },
+          {
+            email: 'admin@example.org',
+            password: '1234',
+          },
+        )
         authenticatedUser = await admin.toJson()
       })
 
@@ -91,19 +96,9 @@ describe('User', () => {
 })
 
 describe('UpdateUser', () => {
-  let userParams, variables
+  let variables
 
   beforeEach(async () => {
-    userParams = {
-      email: 'user@example.org',
-      password: '1234',
-      id: 'u47',
-      name: 'John Doe',
-      termsAndConditionsAgreedVersion: null,
-      termsAndConditionsAgreedAt: null,
-      allowEmbedIframes: false,
-    }
-
     variables = {
       id: 'u47',
       name: 'John Doughnut',
@@ -133,18 +128,33 @@ describe('UpdateUser', () => {
   `
 
   beforeEach(async () => {
-    user = await factory.create('User', userParams)
+    user = await factory.create(
+      'User',
+      {
+        id: 'u47',
+        name: 'John Doe',
+        termsAndConditionsAgreedVersion: null,
+        termsAndConditionsAgreedAt: null,
+        allowEmbedIframes: false,
+      },
+      {
+        email: 'user@example.org',
+      },
+    )
   })
 
   describe('as another user', () => {
     beforeEach(async () => {
-      const someoneElseParams = {
-        email: 'someone-else@example.org',
-        password: '1234',
-        name: 'James Doe',
-      }
+      const someoneElse = await factory.create(
+        'User',
+        {
+          name: 'James Doe',
+        },
+        {
+          email: 'someone-else@example.org',
+        },
+      )
 
-      const someoneElse = await factory.create('User', someoneElseParams)
       authenticatedUser = await someoneElse.toJson()
     })
 
@@ -272,11 +282,15 @@ describe('DeleteUser', () => {
       about: 'along with my about',
       id: 'u343',
     })
-    await factory.create('User', {
-      email: 'friends-account@example.org',
-      password: '1234',
-      id: 'not-my-account',
-    })
+    await factory.create(
+      'User',
+      {
+        id: 'not-my-account',
+      },
+      {
+        email: 'friends-account@example.org',
+      },
+    )
   })
 
   describe('unauthenticated', () => {
diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index f7315174c..85c0f091f 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -146,7 +146,7 @@ describe('userMiddleware', () => {
   })
 
   describe('UpdateUser', () => {
-    let user, userParams
+    let user
     beforeEach(async () => {
       newlyCreatedNodesWithLocales = [
         {
@@ -182,10 +182,9 @@ describe('userMiddleware', () => {
           },
         },
       ]
-      userParams = {
+      user = await factory.create('User', {
         id: 'updating-user',
-      }
-      user = await factory.create('User', userParams)
+      })
       authenticatedUser = await user.toJson()
     })
 
diff --git a/backend/test/features/support/steps.js b/backend/test/features/support/steps.js
index 70802f4e2..ff9d45b27 100644
--- a/backend/test/features/support/steps.js
+++ b/backend/test/features/support/steps.js
@@ -13,8 +13,9 @@ function createUser (slug) {
   debug(`creating user ${slug}`)
   return factory.create('User', {
     name: slug,
-    email: 'example@test.org',
+  }, {
     password: '1234'
+    email: 'example@test.org',
   })
   // await login({ email: 'example@test.org', password: '1234' })
 }

From 094fa196e6605ebce26f828554f88ac535a029cd Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 02:23:00 +0100
Subject: [PATCH 036/171] Fix factories for cypress tests

---
 backend/src/config/index.js          |  5 ++++-
 backend/src/factories/users.js       |  4 ++--
 cypress/integration/common/report.js |  7 ++++---
 cypress/integration/common/steps.js  |  5 -----
 cypress/support/factories.js         | 12 ++----------
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 2f8d0ed22..058dc00ab 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -4,6 +4,9 @@ if (require.resolve) {
   dotenv.config({ path: require.resolve('../../.env') })
 }
 
+// eslint-disable-next-line no-undef
+const env = typeof Cypress !== 'undefined' ? Cypress.env() : process.env
+
 const {
   MAPBOX_TOKEN,
   JWT_SECRET,
@@ -20,7 +23,7 @@ const {
   NEO4J_PASSWORD = 'neo4j',
   CLIENT_URI = 'http://localhost:3000',
   GRAPHQL_URI = 'http://localhost:4000',
-} = process.env
+} = env
 
 export const requiredConfigs = {
   MAPBOX_TOKEN,
diff --git a/backend/src/factories/users.js b/backend/src/factories/users.js
index 9ed701441..91b9e9a8b 100644
--- a/backend/src/factories/users.js
+++ b/backend/src/factories/users.js
@@ -34,8 +34,8 @@ Factory.define('userWithoutEmailAddress')
   })
 
 Factory.define('user')
-  .option('email', faker.internet.exampleEmail)
   .extend('userWithoutEmailAddress')
+  .option('email', faker.internet.exampleEmail)
   .after(async (buildObject, options) => {
     const [user, email] = await Promise.all([
       buildObject,
@@ -47,7 +47,7 @@ Factory.define('user')
 
 export default function create() {
   return {
-    factory: async ({ args, options }) => {
+    factory: ({ args, options }) => {
       return Factory.build('user', args, options)
     },
   }
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 710928ff2..6b808c75f 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -31,10 +31,11 @@ Given("I see David Irving's post on the post page", page => {
 
 Given('I am logged in with a {string} role', role => {
   cy.factory().create('User', {
-    email: `${role}@example.org`,
-    password: '1234',
     termsAndConditionsAgreedVersion: VERSION,
     role
+  }, {
+    email: `${role}@example.org`,
+    password: '1234',
   })
   cy.login({
     email: `${role}@example.org`,
@@ -127,7 +128,7 @@ Given('somebody reported the following posts:', table => {
       password: '1234'
     }
     cy.factory()
-      .create('User', submitter)
+      .create('User', {}, submitter)
       .authenticateAs(submitter)
       .mutate(gql`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 9a5c02d08..3867b3513 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -192,11 +192,6 @@ When("I press {string}", label => {
   cy.contains(label).click();
 });
 
-Given("we have this user in our database:", table => {
-  const [firstRow] = table.hashes()
-  cy.factory().create('User', firstRow)
-})
-
 Given("we have the following posts in our database:", table => {
   cy.factory().create('Category', {
     id: `cat-456`,
diff --git a/cypress/support/factories.js b/cypress/support/factories.js
index 1b76a1a01..d5d4ee768 100644
--- a/cypress/support/factories.js
+++ b/cypress/support/factories.js
@@ -40,17 +40,9 @@ Cypress.Commands.add('factory', () => {
 Cypress.Commands.add(
   'create',
   { prevSubject: true },
-  async (factory, node, properties) => {
-    await factory.create(node, properties)
+  async (factory, node, properties, options) => {
+    await factory.create(node, properties, options)
     return factory
   }
 )
 
-Cypress.Commands.add(
-  'relate',
-  { prevSubject: true },
-  async (factory, node, relationship, properties) => {
-    await factory.relate(node, relationship, properties)
-    return factory
-  }
-)

From 3d1a964120b922bcd29e42dd27db64a24f6bc9b6 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 10:03:13 +0100
Subject: [PATCH 037/171] Add missing dependency rosie for cypress tests

---
 package.json | 1 +
 yarn.lock    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd8f9312f..3e868b075 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "neo4j-driver": "^4.0.1",
     "neode": "^0.3.7",
     "npm-run-all": "^4.1.5",
+    "rosie": "^2.0.1",
     "slug": "^2.1.1",
     "standard-version": "^7.1.0"
   },
diff --git a/yarn.lock b/yarn.lock
index e4aefda5b..95fcfd483 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3219,7 +3219,6 @@ extsprintf@^1.2.0:
 
 faker@Marak/faker.js#master:
   version "4.1.0"
-  uid "3b2fa4aebccee52ae1bafc15d575061fb30c3cf1"
   resolved "https://codeload.github.com/Marak/faker.js/tar.gz/3b2fa4aebccee52ae1bafc15d575061fb30c3cf1"
 
 fast-deep-equal@^2.0.1:
@@ -5885,6 +5884,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+rosie@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rosie/-/rosie-2.0.1.tgz#c250c4787ce450b72aa9eff26509f68589814fa2"
+  integrity sha1-wlDEeHzkULcqqe/yZQn2hYmBT6I=
+
 rsvp@^4.8.4:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"

From 95bfb090fde6280ef26170de52a9e66ceba83ab9 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 13:42:29 +0100
Subject: [PATCH 038/171] Refactor factory for posts

---
 backend/src/db/seed.js                        |  69 ++++++----
 backend/src/factories/posts.js                | 130 +++++++++---------
 .../src/middleware/slugifyMiddleware.spec.js  |   1 +
 .../softDelete/softDeleteMiddleware.spec.js   |   9 +-
 .../validation/validationMiddleware.spec.js   |   2 +
 backend/src/models/Post.js                    |   1 -
 backend/src/schema/resolvers/comments.spec.js |   3 +-
 .../schema/resolvers/notifications.spec.js    |  12 +-
 backend/src/schema/resolvers/posts.spec.js    |  17 ++-
 backend/src/schema/resolvers/reports.spec.js  |  26 ++--
 backend/src/schema/resolvers/shout.spec.js    |   3 +
 backend/src/schema/resolvers/users.spec.js    |   3 +-
 12 files changed, 156 insertions(+), 120 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index 75671d098..82d6239c2 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -386,86 +386,98 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     const [p0, p1, p3, p4, p5, p6, p9, p10, p11, p13, p14, p15] = await Promise.all([
       factory.create('Post', {
-        author: peterLustig,
         id: 'p0',
         language: sample(languages),
         image: faker.image.unsplash.food(300, 169),
-        categoryIds: ['cat16'],
         imageBlurred: true,
         imageAspectRatio: 300 / 169,
+      }, {
+        categoryIds: ['cat16'],
+        author: peterLustig,
       }),
       factory.create('Post', {
-        author: bobDerBaumeister,
         id: 'p1',
         language: sample(languages),
         image: faker.image.unsplash.technology(300, 1500),
-        categoryIds: ['cat1'],
         imageAspectRatio: 300 / 1500,
+      }, {
+        categoryIds: ['cat1'],
+        author: bobDerBaumeister,
       }),
       factory.create('Post', {
-        author: huey,
         id: 'p3',
         language: sample(languages),
+      }, {
         categoryIds: ['cat3'],
+        author: huey,
       }),
       factory.create('Post', {
-        author: dewey,
         id: 'p4',
         language: sample(languages),
+      }, {
         categoryIds: ['cat4'],
+        author: dewey,
       }),
       factory.create('Post', {
-        author: louie,
         id: 'p5',
         language: sample(languages),
+      }, {
         categoryIds: ['cat5'],
+        author: louie,
       }),
       factory.create('Post', {
-        authorId: 'u1',
         id: 'p6',
         language: sample(languages),
         image: faker.image.unsplash.buildings(300, 857),
-        categoryIds: ['cat6'],
         imageAspectRatio: 300 / 857,
+      }, {
+        categoryIds: ['cat6'],
+        author: peterLustig,
       }),
       factory.create('Post', {
-        author: huey,
         id: 'p9',
         language: sample(languages),
+      }, {
         categoryIds: ['cat9'],
+        author: huey,
       }),
       factory.create('Post', {
-        author: dewey,
         id: 'p10',
-        categoryIds: ['cat10'],
         imageBlurred: true,
+      }, {
+        author: dewey,
+        categoryIds: ['cat10'],
       }),
       factory.create('Post', {
-        author: louie,
         id: 'p11',
         language: sample(languages),
         image: faker.image.unsplash.people(300, 901),
-        categoryIds: ['cat11'],
         imageAspectRatio: 300 / 901,
+      }, {
+        categoryIds: ['cat11'],
+        author: louie,
       }),
       factory.create('Post', {
-        author: bobDerBaumeister,
         id: 'p13',
         language: sample(languages),
+      }, {
+        author: bobDerBaumeister,
         categoryIds: ['cat13'],
       }),
       factory.create('Post', {
-        author: jennyRostock,
         id: 'p14',
         language: sample(languages),
         image: faker.image.unsplash.objects(300, 200),
-        categoryIds: ['cat14'],
         imageAspectRatio: 300 / 450,
+      }, {
+        author: jennyRostock,
+        categoryIds: ['cat14'],
       }),
       factory.create('Post', {
-        author: huey,
         id: 'p15',
         language: sample(languages),
+      }, {
+        author: huey,
         categoryIds: ['cat15'],
       }),
     ])
@@ -828,8 +840,10 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(30).keys()].map(() => {
         return factory.create('Post', {
-          author: jennyRostock,
           image: faker.image.unsplash.objects(),
+        }, {
+          categoryIds: ['cat1'],
+          author: jennyRostock,
         })
       }),
     )
@@ -864,8 +878,9 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(21).keys()].map(() => {
         return factory.create('Post', {
-          author: peterLustig,
           image: faker.image.unsplash.buildings(),
+        }, {
+          author: peterLustig,
         })
       }),
     )
@@ -900,8 +915,9 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(11).keys()].map(() => {
         return factory.create('Post', {
-          author: dewey,
           image: faker.image.unsplash.food(),
+        }, {
+          author: dewey,
         })
       }),
     )
@@ -936,8 +952,9 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(16).keys()].map(() => {
         return factory.create('Post', {
-          author: louie,
           image: faker.image.unsplash.technology(),
+        }, {
+          author: louie,
         })
       }),
     )
@@ -945,8 +962,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(4).keys()].map(() => {
         return factory.create('Comment', {
-          author: louie,
           postId: 'p1',
+          author: louie,
         })
       }),
     )
@@ -972,8 +989,9 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(45).keys()].map(() => {
         return factory.create('Post', {
-          author: bobDerBaumeister,
           image: faker.image.unsplash.people(),
+        }, {
+          author: bobDerBaumeister,
         })
       }),
     )
@@ -1008,8 +1026,9 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await Promise.all(
       [...Array(8).keys()].map(() => {
         return factory.create('Post', {
-          author: huey,
           image: faker.image.unsplash.nature(),
+        }, {
+          author: huey,
         })
       }),
     )
diff --git a/backend/src/factories/posts.js b/backend/src/factories/posts.js
index 3295665b7..2731cb60d 100644
--- a/backend/src/factories/posts.js
+++ b/backend/src/factories/posts.js
@@ -1,77 +1,71 @@
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
 import faker from 'faker'
 import slugify from 'slug'
 import uuid from 'uuid/v4'
 
+const neode = getNeode()
+
+Factory.define('post')
+  .option('categoryIds', [])
+  .option('categories', ['categoryIds'], (categoryIds) => {
+    if (categoryIds.length) return Promise.all(categoryIds.map(id => neode.find('Category', id)))
+    // there must be at least one category
+    return Promise.all([Factory.build('category')])
+  })
+  .option('tagIds', [])
+  .option('tags', ['tagIds'], (tagIds) => {
+    return Promise.all(tagIds.map(id => neode.find('Tag', id)))
+  })
+  .option('authorId', null)
+  .option('author', ['authorId'], (authorId) => {
+    if (authorId) return neode.find('User', authorId)
+    return Factory.build('user')
+  })
+  .option('pinnedBy', null)
+  .attrs({
+    id: uuid,
+    title: faker.lorem.sentence,
+    content: faker.lorem.paragraphs,
+    image: faker.image.unsplash.imageUrl,
+    visibility: 'public',
+    deleted: false,
+    imageBlurred: false,
+    imageAspectRatio: 1.333,
+  })
+  .attr('pinned', ['pinned'], (pinned) => {
+    // Convert false to null
+    return pinned || null
+  })
+  .attr('contentExcerpt', ['contentExcerpt', 'content'], (contentExcerpt, content) => {
+    return contentExcerpt || content
+  })
+  .attr('slug', ['slug', 'title'], (slug, title) => {
+    return slug || slugify(title, { lower: true })
+  })
+  .after(async (buildObject, options) => {
+    const [post, author, categories, tags] = await Promise.all([
+      neode.create('Post', buildObject),
+      options.author,
+      options.categories,
+      options.tags,
+    ])
+    await Promise.all([
+      post.relateTo(author, 'author'),
+      Promise.all(categories.map(c => c.relateTo(post, 'post'))),
+      Promise.all(tags.map(t => t.relateTo(post, 'post'))),
+    ])
+    if (buildObject.pinned) {
+      const pinnedBy = await (options.pinnedBy || Factory.build('user', { role: 'admin' }))
+      await pinnedBy.relateTo(post, 'pinned')
+    }
+    return post
+  })
+
 export default function create() {
   return {
-    factory: async ({ args, neodeInstance, factoryInstance }) => {
-      const defaults = {
-        id: uuid(),
-        title: faker.lorem.sentence(),
-        content: [
-          faker.lorem.sentence(),
-          faker.lorem.sentence(),
-          faker.lorem.sentence(),
-          faker.lorem.sentence(),
-          faker.lorem.sentence(),
-        ].join('. '),
-        image: faker.image.unsplash.imageUrl(),
-        visibility: 'public',
-        deleted: false,
-        categoryIds: [],
-        imageBlurred: false,
-        imageAspectRatio: 1.333,
-        pinned: null,
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      // Convert false to null
-      args.pinned = args.pinned || null
-
-      args.slug = args.slug || slugify(args.title, { lower: true })
-      args.contentExcerpt = args.contentExcerpt || args.content
-
-      let { categories, categoryIds } = args
-      delete args.categories
-      delete args.categoryIds
-      if (categories && categoryIds) throw new Error('You provided both categories and categoryIds')
-      if (categoryIds)
-        categories = await Promise.all(categoryIds.map(id => neodeInstance.find('Category', id)))
-      categories = categories || (await Promise.all([factoryInstance.create('Category')]))
-      const { tagIds = [] } = args
-      delete args.tags
-      const tags = await Promise.all(
-        tagIds.map(t => {
-          return neodeInstance.find('Tag', t)
-        }),
-      )
-
-      let { author, authorId } = args
-      delete args.author
-      delete args.authorId
-      if (author && authorId) throw new Error('You provided both author and authorId')
-      if (authorId) author = await neodeInstance.find('User', authorId)
-      author = author || (await factoryInstance.create('User'))
-      const post = await neodeInstance.create('Post', args)
-      await post.relateTo(author, 'author')
-
-      if (args.pinned) {
-        args.pinnedAt = args.pinnedAt || new Date().toISOString()
-        if (!args.pinnedBy) {
-          const admin = await factoryInstance.create('User', {
-            role: 'admin',
-            updatedAt: new Date().toISOString(),
-          })
-          await admin.relateTo(post, 'pinned')
-          args.pinnedBy = admin
-        }
-      }
-
-      await Promise.all(categories.map(c => c.relateTo(post, 'post')))
-      await Promise.all(tags.map(t => t.relateTo(post, 'post')))
-      return post
+    factory: async ({ args, options, neodeInstance, factoryInstance }) => {
+      return Factory.build('post', args, options)
     },
   }
 }
diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index 5400d2c92..8f05fd6cd 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -92,6 +92,7 @@ describe('slugifyMiddleware', () => {
           title: 'Pre-existing post',
           slug: 'pre-existing-post',
           content: 'as Someone else content',
+        }, {
           categoryIds,
         })
       })
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 334564582..cd6e2f726 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -51,19 +51,21 @@ beforeAll(async () => {
   await Promise.all([
     user.relateTo(troll, 'following'),
     factory.create('Post', {
-      author: user,
       id: 'p1',
       title: 'Deleted post',
       slug: 'deleted-post',
       deleted: true,
+    }, {
+      author: user,
       categoryIds,
     }),
     factory.create('Post', {
-      author: user,
       id: 'p3',
       title: 'Publicly visible post',
       slug: 'publicly-visible-post',
       deleted: false,
+    }, {
+      author: user,
       categoryIds,
     }),
   ])
@@ -77,12 +79,13 @@ beforeAll(async () => {
     }),
     factory.create('Post', {
       id: 'p2',
-      author: troll,
       title: 'Disabled post',
       content: 'This is an offensive post content',
       contentExcerpt: 'This is an offensive post content',
       image: '/some/offensive/image.jpg',
       deleted: false,
+    }, {
+      author: troll,
       categoryIds,
     }),
     factory.create('Comment', {
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
index 38cd010b4..a419c2428 100644
--- a/backend/src/middleware/validation/validationMiddleware.spec.js
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -121,10 +121,12 @@ beforeEach(async () => {
   const posts = await Promise.all([
     factory.create('Post', {
       id: 'offensive-post',
+    }, {
       authorId: 'moderating-user',
     }),
     factory.create('Post', {
       id: 'post-4-commenting',
+    }, {
       authorId: 'commenting-user',
     }),
   ])
diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js
index 2b553232e..cbc29d814 100644
--- a/backend/src/models/Post.js
+++ b/backend/src/models/Post.js
@@ -42,5 +42,4 @@ export default {
   imageBlurred: { type: 'boolean', default: false },
   imageAspectRatio: { type: 'float', default: 1.0 },
   pinned: { type: 'boolean', default: null, valid: [null, true] },
-  pinnedAt: { type: 'string', isoDate: true },
 }
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 9877161db..355074804 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -52,6 +52,7 @@ const setupPostAndComment = async () => {
   await factory.create('Post', {
     id: 'p1',
     content: 'Post to be commented',
+  }, {
     categoryIds: ['cat9'],
   })
   newlyCreatedComment = await factory.create('Comment', {
@@ -88,7 +89,7 @@ describe('CreateComment', () => {
 
     describe('given a post', () => {
       beforeEach(async () => {
-        await factory.create('Post', { categoryIds: ['cat9'], id: 'p1' })
+        await factory.create('Post', { id: 'p1' }, { categoryIds: ['cat9'] } )
         variables = {
           ...variables,
           postId: 'p1',
diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index a5c46e930..27b8489e2 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -45,18 +45,20 @@ describe('given some notifications', () => {
       factory.create('Category', { id: 'cat1' }),
     ])
     const [post1, post2, post3] = await Promise.all([
-      factory.create('Post', { author, id: 'p1', categoryIds, content: 'Not for you' }),
+      factory.create('Post', { id: 'p1', content: 'Not for you' }, { author, categoryIds }),
       factory.create('Post', {
-        author,
         id: 'p2',
-        categoryIds,
         content: 'Already seen post mention',
+      }, {
+        author,
+        categoryIds,
       }),
       factory.create('Post', {
-        author,
         id: 'p3',
-        categoryIds,
         content: 'You have been mentioned in a post',
+      }, {
+        author,
+        categoryIds,
       }),
     ])
     const [comment1, comment2, comment3] = await Promise.all([
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index d7195be97..83dc53eea 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -114,10 +114,11 @@ describe('Post', () => {
         ),
       ])
       ;[happyPost, cryPost] = await Promise.all([
-        factory.create('Post', { id: 'happy-post', categoryIds: ['cat4'] }),
-        factory.create('Post', { id: 'cry-post', categoryIds: ['cat15'] }),
+        factory.create('Post', { id: 'happy-post' }, { categoryIds: ['cat4'] }),
+        factory.create('Post', { id: 'cry-post'} , { categoryIds: ['cat15'] }),
         factory.create('Post', {
           id: 'post-by-followed-user',
+        }, {
           categoryIds: ['cat9'],
           author: followedUser,
         }),
@@ -352,10 +353,11 @@ describe('UpdatePost', () => {
   beforeEach(async () => {
     author = await factory.create('User', { slug: 'the-author' })
     newlyCreatedPost = await factory.create('Post', {
-      author,
       id: 'p9876',
       title: 'Old title',
       content: 'Old content',
+    }, {
+      author,
       categoryIds,
     })
 
@@ -541,6 +543,7 @@ describe('UpdatePost', () => {
         beforeEach(async () => {
           await factory.create('Post', {
             id: 'created-and-pinned-by-same-admin',
+          }, {
             author: admin,
           })
           variables = { ...variables, id: 'created-and-pinned-by-same-admin' }
@@ -606,6 +609,7 @@ describe('UpdatePost', () => {
           authenticatedUser = await otherAdmin.toJson()
           await factory.create('Post', {
             id: 'created-by-one-admin-pinned-by-different-one',
+          }, {
             author: otherAdmin,
           })
         })
@@ -666,6 +670,7 @@ describe('UpdatePost', () => {
         beforeEach(async () => {
           await factory.create('Post', {
             id: 'only-pinned-post',
+          }, {
             author: admin,
           })
           await mutate({ mutation: pinPostMutation, variables })
@@ -887,10 +892,11 @@ describe('DeletePost', () => {
     author = await factory.create('User')
     await factory.create('Post', {
       id: 'p4711',
-      author,
       title: 'I will be deleted',
       content: 'To be deleted',
       image: 'path/to/some/image',
+    }, {
+      author,
       categoryIds,
     })
     variables = { ...variables, id: 'p4711' }
@@ -999,8 +1005,9 @@ describe('emotions', () => {
   beforeEach(async () => {
     author = await neode.create('User', { id: 'u257' })
     postToEmote = await factory.create('Post', {
-      author,
       id: 'p1376',
+    }, {
+      author,
       categoryIds,
     })
 
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 9992da200..cc5c6dd26 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -357,9 +357,10 @@ describe('file a report on a resource', () => {
         describe('reported resource is a post', () => {
           beforeEach(async () => {
             await factory.create('Post', {
-              author: currentUser,
               id: 'post-to-report-id',
               title: 'This is a post that is going to be reported',
+            }, {
+              author: currentUser,
               categoryIds,
             })
           })
@@ -409,15 +410,15 @@ describe('file a report on a resource', () => {
         })
 
         describe('reported resource is a comment', () => {
-          let createPostVariables
           beforeEach(async () => {
-            createPostVariables = {
+            await factory.create('Post', {
               id: 'p1',
               title: 'post to comment on',
               content: 'please comment on me',
+            }, {
               categoryIds,
-            }
-            await factory.create('Post', { ...createPostVariables, author: currentUser })
+              author: currentUser
+            })
             await factory.create('Comment', {
               author: currentUser,
               postId: 'p1',
@@ -571,22 +572,25 @@ describe('file a report on a resource', () => {
 
       await Promise.all([
         factory.create('Post', {
-          author: abusiveUser,
           id: 'abusive-post-1',
-          categoryIds,
           content: 'Interesting Knowledge',
+        }, {
+          categoryIds,
+          author: abusiveUser,
         }),
         factory.create('Post', {
-          author: moderator,
           id: 'post-2',
-          categoryIds,
           content: 'More things to do …',
+        }, {
+          author: moderator,
+          categoryIds,
         }),
         factory.create('Post', {
-          author: currentUser,
           id: 'post-3',
-          categoryIds,
           content: 'I am at school …',
+        }, {
+          categoryIds,
+          author: currentUser,
         }),
       ])
       await Promise.all([
diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
index 50ff23687..4fb467252 100644
--- a/backend/src/schema/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -91,11 +91,13 @@ describe('shout and unshout posts', () => {
         await factory.create('Post', {
           name: 'Other user post',
           id: 'another-user-post-id',
+        }, {
           author: postAuthor,
         })
         await factory.create('Post', {
           name: 'current user post',
           id: 'current-user-post-id',
+        }, {
           author: currentUser,
         })
         variables = {}
@@ -157,6 +159,7 @@ describe('shout and unshout posts', () => {
         await factory.create('Post', {
           name: 'Posted By Another User',
           id: 'posted-by-another-user',
+        }, {
           author: postAuthor,
         })
         await mutate({
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 9ead48a2b..20508774e 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -329,9 +329,10 @@ describe('DeleteUser', () => {
             icon: 'university',
           })
           await factory.create('Post', {
-            author: user,
             id: 'p139',
             content: 'Post by user u343',
+          }, {
+            author: user,
             categoryIds,
           })
           await factory.create('Comment', {

From 2fc71d75a5d5eab9c3467e94e00257ef6dd7d8a0 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 19:56:57 +0100
Subject: [PATCH 039/171] Refactor factory for comments

---
 backend/src/db/seed.js                        | 705 +++++++++++-------
 backend/src/factories/comments.js             |  64 +-
 backend/src/factories/posts.js                |   8 +-
 .../src/middleware/slugifyMiddleware.spec.js  |  18 +-
 .../softDelete/softDeleteMiddleware.spec.js   | 106 +--
 .../validation/validationMiddleware.spec.js   |  41 +-
 backend/src/schema/resolvers/comments.spec.js |  35 +-
 .../schema/resolvers/notifications.spec.js    |  87 ++-
 backend/src/schema/resolvers/posts.spec.js    | 133 ++--
 backend/src/schema/resolvers/reports.spec.js  | 124 +--
 backend/src/schema/resolvers/shout.spec.js    |  48 +-
 backend/src/schema/resolvers/users.spec.js    |  48 +-
 12 files changed, 890 insertions(+), 527 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index 82d6239c2..fa426fb55 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -385,101 +385,149 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
 
     const [p0, p1, p3, p4, p5, p6, p9, p10, p11, p13, p14, p15] = await Promise.all([
-      factory.create('Post', {
-        id: 'p0',
-        language: sample(languages),
-        image: faker.image.unsplash.food(300, 169),
-        imageBlurred: true,
-        imageAspectRatio: 300 / 169,
-      }, {
-        categoryIds: ['cat16'],
-        author: peterLustig,
-      }),
-      factory.create('Post', {
-        id: 'p1',
-        language: sample(languages),
-        image: faker.image.unsplash.technology(300, 1500),
-        imageAspectRatio: 300 / 1500,
-      }, {
-        categoryIds: ['cat1'],
-        author: bobDerBaumeister,
-      }),
-      factory.create('Post', {
-        id: 'p3',
-        language: sample(languages),
-      }, {
-        categoryIds: ['cat3'],
-        author: huey,
-      }),
-      factory.create('Post', {
-        id: 'p4',
-        language: sample(languages),
-      }, {
-        categoryIds: ['cat4'],
-        author: dewey,
-      }),
-      factory.create('Post', {
-        id: 'p5',
-        language: sample(languages),
-      }, {
-        categoryIds: ['cat5'],
-        author: louie,
-      }),
-      factory.create('Post', {
-        id: 'p6',
-        language: sample(languages),
-        image: faker.image.unsplash.buildings(300, 857),
-        imageAspectRatio: 300 / 857,
-      }, {
-        categoryIds: ['cat6'],
-        author: peterLustig,
-      }),
-      factory.create('Post', {
-        id: 'p9',
-        language: sample(languages),
-      }, {
-        categoryIds: ['cat9'],
-        author: huey,
-      }),
-      factory.create('Post', {
-        id: 'p10',
-        imageBlurred: true,
-      }, {
-        author: dewey,
-        categoryIds: ['cat10'],
-      }),
-      factory.create('Post', {
-        id: 'p11',
-        language: sample(languages),
-        image: faker.image.unsplash.people(300, 901),
-        imageAspectRatio: 300 / 901,
-      }, {
-        categoryIds: ['cat11'],
-        author: louie,
-      }),
-      factory.create('Post', {
-        id: 'p13',
-        language: sample(languages),
-      }, {
-        author: bobDerBaumeister,
-        categoryIds: ['cat13'],
-      }),
-      factory.create('Post', {
-        id: 'p14',
-        language: sample(languages),
-        image: faker.image.unsplash.objects(300, 200),
-        imageAspectRatio: 300 / 450,
-      }, {
-        author: jennyRostock,
-        categoryIds: ['cat14'],
-      }),
-      factory.create('Post', {
-        id: 'p15',
-        language: sample(languages),
-      }, {
-        author: huey,
-        categoryIds: ['cat15'],
-      }),
+      factory.create(
+        'Post',
+        {
+          id: 'p0',
+          language: sample(languages),
+          image: faker.image.unsplash.food(300, 169),
+          imageBlurred: true,
+          imageAspectRatio: 300 / 169,
+        },
+        {
+          categoryIds: ['cat16'],
+          author: peterLustig,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p1',
+          language: sample(languages),
+          image: faker.image.unsplash.technology(300, 1500),
+          imageAspectRatio: 300 / 1500,
+        },
+        {
+          categoryIds: ['cat1'],
+          author: bobDerBaumeister,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p3',
+          language: sample(languages),
+        },
+        {
+          categoryIds: ['cat3'],
+          author: huey,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p4',
+          language: sample(languages),
+        },
+        {
+          categoryIds: ['cat4'],
+          author: dewey,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p5',
+          language: sample(languages),
+        },
+        {
+          categoryIds: ['cat5'],
+          author: louie,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p6',
+          language: sample(languages),
+          image: faker.image.unsplash.buildings(300, 857),
+          imageAspectRatio: 300 / 857,
+        },
+        {
+          categoryIds: ['cat6'],
+          author: peterLustig,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p9',
+          language: sample(languages),
+        },
+        {
+          categoryIds: ['cat9'],
+          author: huey,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p10',
+          imageBlurred: true,
+        },
+        {
+          author: dewey,
+          categoryIds: ['cat10'],
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p11',
+          language: sample(languages),
+          image: faker.image.unsplash.people(300, 901),
+          imageAspectRatio: 300 / 901,
+        },
+        {
+          categoryIds: ['cat11'],
+          author: louie,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p13',
+          language: sample(languages),
+        },
+        {
+          author: bobDerBaumeister,
+          categoryIds: ['cat13'],
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p14',
+          language: sample(languages),
+          image: faker.image.unsplash.objects(300, 200),
+          imageAspectRatio: 300 / 450,
+        },
+        {
+          author: jennyRostock,
+          categoryIds: ['cat14'],
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p15',
+          language: sample(languages),
+        },
+        {
+          author: huey,
+          categoryIds: ['cat15'],
+        },
+      ),
     ])
 
     authenticatedUser = await louie.toJson()
@@ -601,61 +649,116 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     authenticatedUser = null
 
     const comments = await Promise.all([
-      factory.create('Comment', {
-        author: jennyRostock,
-        id: 'c1',
-        postId: 'p1',
-      }),
-      factory.create('Comment', {
-        author: huey,
-        id: 'c2',
-        postId: 'p1',
-      }),
-      factory.create('Comment', {
-        author: louie,
-        id: 'c3',
-        postId: 'p3',
-      }),
-      factory.create('Comment', {
-        author: jennyRostock,
-        id: 'c5',
-        postId: 'p3',
-      }),
-      factory.create('Comment', {
-        author: peterLustig,
-        id: 'c6',
-        postId: 'p4',
-      }),
-      factory.create('Comment', {
-        author: jennyRostock,
-        id: 'c7',
-        postId: 'p2',
-      }),
-      factory.create('Comment', {
-        author: huey,
-        id: 'c8',
-        postId: 'p15',
-      }),
-      factory.create('Comment', {
-        author: dewey,
-        id: 'c9',
-        postId: 'p15',
-      }),
-      factory.create('Comment', {
-        author: louie,
-        id: 'c10',
-        postId: 'p15',
-      }),
-      factory.create('Comment', {
-        author: jennyRostock,
-        id: 'c11',
-        postId: 'p15',
-      }),
-      factory.create('Comment', {
-        author: jennyRostock,
-        id: 'c12',
-        postId: 'p15',
-      }),
+      factory.create(
+        'Comment',
+        {
+          id: 'c1',
+        },
+        {
+          author: jennyRostock,
+          postId: 'p1',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c2',
+        },
+        {
+          author: huey,
+          postId: 'p1',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c3',
+        },
+        {
+          author: louie,
+          postId: 'p3',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c5',
+        },
+        {
+          author: jennyRostock,
+          postId: 'p3',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c6',
+        },
+        {
+          author: peterLustig,
+          postId: 'p4',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c7',
+        },
+        {
+          author: jennyRostock,
+          postId: 'p2',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c8',
+        },
+        {
+          author: huey,
+          postId: 'p15',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c9',
+        },
+        {
+          author: dewey,
+          postId: 'p15',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c10',
+        },
+        {
+          author: louie,
+          postId: 'p15',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c11',
+        },
+        {
+          author: jennyRostock,
+          postId: 'p15',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c12',
+        },
+        {
+          author: jennyRostock,
+          postId: 'p15',
+        },
+      ),
     ])
     const trollingComment = comments[0]
 
@@ -839,224 +942,320 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(30).keys()].map(() => {
-        return factory.create('Post', {
-          image: faker.image.unsplash.objects(),
-        }, {
-          categoryIds: ['cat1'],
-          author: jennyRostock,
-        })
+        return factory.create(
+          'Post',
+          {
+            image: faker.image.unsplash.objects(),
+          },
+          {
+            categoryIds: ['cat1'],
+            author: jennyRostock,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(6).keys()].map(() => {
-        return factory.create('Comment', {
-          author: jennyRostock,
-          postId: 'p2',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: jennyRostock,
+            postId: 'p2',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(4).keys()].map(() => {
-        return factory.create('Comment', {
-          author: jennyRostock,
-          postId: 'p15',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: jennyRostock,
+            postId: 'p15',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(2).keys()].map(() => {
-        return factory.create('Comment', {
-          author: jennyRostock,
-          postId: 'p4',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: jennyRostock,
+            postId: 'p4',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(21).keys()].map(() => {
-        return factory.create('Post', {
-          image: faker.image.unsplash.buildings(),
-        }, {
-          author: peterLustig,
-        })
+        return factory.create(
+          'Post',
+          {
+            image: faker.image.unsplash.buildings(),
+          },
+          {
+            author: peterLustig,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(3).keys()].map(() => {
-        return factory.create('Comment', {
-          author: peterLustig,
-          postId: 'p4',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: peterLustig,
+            postId: 'p4',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(5).keys()].map(() => {
-        return factory.create('Comment', {
-          author: peterLustig,
-          postId: 'p14',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: peterLustig,
+            postId: 'p14',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(6).keys()].map(() => {
-        return factory.create('Comment', {
-          author: peterLustig,
-          postId: 'p0',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: peterLustig,
+            postId: 'p0',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(11).keys()].map(() => {
-        return factory.create('Post', {
-          image: faker.image.unsplash.food(),
-        }, {
-          author: dewey,
-        })
+        return factory.create(
+          'Post',
+          {
+            image: faker.image.unsplash.food(),
+          },
+          {
+            author: dewey,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(7).keys()].map(() => {
-        return factory.create('Comment', {
-          author: dewey,
-          postId: 'p2',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: dewey,
+            postId: 'p2',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(5).keys()].map(() => {
-        return factory.create('Comment', {
-          author: dewey,
-          postId: 'p6',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: dewey,
+            postId: 'p6',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(2).keys()].map(() => {
-        return factory.create('Comment', {
-          author: dewey,
-          postId: 'p9',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: dewey,
+            postId: 'p9',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(16).keys()].map(() => {
-        return factory.create('Post', {
-          image: faker.image.unsplash.technology(),
-        }, {
-          author: louie,
-        })
+        return factory.create(
+          'Post',
+          {
+            image: faker.image.unsplash.technology(),
+          },
+          {
+            author: louie,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(4).keys()].map(() => {
-        return factory.create('Comment', {
-          postId: 'p1',
-          author: louie,
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            postId: 'p1',
+            author: louie,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(8).keys()].map(() => {
-        return factory.create('Comment', {
-          author: louie,
-          postId: 'p10',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: louie,
+            postId: 'p10',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(5).keys()].map(() => {
-        return factory.create('Comment', {
-          author: louie,
-          postId: 'p13',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: louie,
+            postId: 'p13',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(45).keys()].map(() => {
-        return factory.create('Post', {
-          image: faker.image.unsplash.people(),
-        }, {
-          author: bobDerBaumeister,
-        })
+        return factory.create(
+          'Post',
+          {
+            image: faker.image.unsplash.people(),
+          },
+          {
+            author: bobDerBaumeister,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(2).keys()].map(() => {
-        return factory.create('Comment', {
-          author: bobDerBaumeister,
-          postId: 'p2',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: bobDerBaumeister,
+            postId: 'p2',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(3).keys()].map(() => {
-        return factory.create('Comment', {
-          author: bobDerBaumeister,
-          postId: 'p12',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: bobDerBaumeister,
+            postId: 'p12',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(7).keys()].map(() => {
-        return factory.create('Comment', {
-          author: bobDerBaumeister,
-          postId: 'p13',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: bobDerBaumeister,
+            postId: 'p13',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(8).keys()].map(() => {
-        return factory.create('Post', {
-          image: faker.image.unsplash.nature(),
-        }, {
-          author: huey,
-        })
+        return factory.create(
+          'Post',
+          {
+            image: faker.image.unsplash.nature(),
+          },
+          {
+            author: huey,
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(6).keys()].map(() => {
-        return factory.create('Comment', {
-          author: huey,
-          postId: 'p0',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: huey,
+            postId: 'p0',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(8).keys()].map(() => {
-        return factory.create('Comment', {
-          author: huey,
-          postId: 'p13',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: huey,
+            postId: 'p13',
+          },
+        )
       }),
     )
 
     await Promise.all(
       [...Array(9).keys()].map(() => {
-        return factory.create('Comment', {
-          author: huey,
-          postId: 'p15',
-        })
+        return factory.create(
+          'Comment',
+          {},
+          {
+            author: huey,
+            postId: 'p15',
+          },
+        )
       }),
     )
 
diff --git a/backend/src/factories/comments.js b/backend/src/factories/comments.js
index de3390e1a..0ecbb03ec 100644
--- a/backend/src/factories/comments.js
+++ b/backend/src/factories/comments.js
@@ -1,38 +1,42 @@
 import faker from 'faker'
 import uuid from 'uuid/v4'
+import { Factory } from 'rosie'
+import { getNeode } from '../db/neo4j'
+
+const neode = getNeode()
+
+Factory.define('comment')
+  .option('postId', null)
+  .option('post', ['postId'], postId => {
+    if (postId) return neode.find('Post', postId)
+    return Factory.build('post')
+  })
+  .option('authorId', null)
+  .option('author', ['authorId'], authorId => {
+    if (authorId) return neode.find('User', authorId)
+    return Factory.build('user')
+  })
+  .attrs({
+    id: uuid,
+    content: faker.lorem.sentence,
+  })
+  .attr('contentExcerpt', ['contentExcerpt', 'content'], (contentExcerpt, content) => {
+    return contentExcerpt || content
+  })
+  .after(async (buildObject, options) => {
+    const [comment, author, post] = await Promise.all([
+      neode.create('Comment', buildObject),
+      options.author,
+      options.post,
+    ])
+    await Promise.all([comment.relateTo(author, 'author'), comment.relateTo(post, 'post')])
+    return comment
+  })
 
 export default function create() {
   return {
-    factory: async ({ args, neodeInstance, factoryInstance }) => {
-      const defaults = {
-        id: uuid(),
-        content: [faker.lorem.sentence(), faker.lorem.sentence()].join('. '),
-      }
-      args = {
-        ...defaults,
-        ...args,
-      }
-      args.contentExcerpt = args.contentExcerpt || args.content
-
-      let { post, postId } = args
-      delete args.post
-      delete args.postId
-      if (post && postId) throw new Error('You provided both post and postId')
-      if (postId) post = await neodeInstance.find('Post', postId)
-      post = post || (await factoryInstance.create('Post'))
-
-      let { author, authorId } = args
-      delete args.author
-      delete args.authorId
-      if (author && authorId) throw new Error('You provided both author and authorId')
-      if (authorId) author = await neodeInstance.find('User', authorId)
-      author = author || (await factoryInstance.create('User'))
-
-      delete args.author
-      const comment = await neodeInstance.create('Comment', args)
-      await comment.relateTo(post, 'post')
-      await comment.relateTo(author, 'author')
-      return comment
+    factory: async ({ args, options, neodeInstance, factoryInstance }) => {
+      return Factory.build('comment', args, options)
     },
   }
 }
diff --git a/backend/src/factories/posts.js b/backend/src/factories/posts.js
index 2731cb60d..b6c7f1424 100644
--- a/backend/src/factories/posts.js
+++ b/backend/src/factories/posts.js
@@ -8,17 +8,17 @@ const neode = getNeode()
 
 Factory.define('post')
   .option('categoryIds', [])
-  .option('categories', ['categoryIds'], (categoryIds) => {
+  .option('categories', ['categoryIds'], categoryIds => {
     if (categoryIds.length) return Promise.all(categoryIds.map(id => neode.find('Category', id)))
     // there must be at least one category
     return Promise.all([Factory.build('category')])
   })
   .option('tagIds', [])
-  .option('tags', ['tagIds'], (tagIds) => {
+  .option('tags', ['tagIds'], tagIds => {
     return Promise.all(tagIds.map(id => neode.find('Tag', id)))
   })
   .option('authorId', null)
-  .option('author', ['authorId'], (authorId) => {
+  .option('author', ['authorId'], authorId => {
     if (authorId) return neode.find('User', authorId)
     return Factory.build('user')
   })
@@ -33,7 +33,7 @@ Factory.define('post')
     imageBlurred: false,
     imageAspectRatio: 1.333,
   })
-  .attr('pinned', ['pinned'], (pinned) => {
+  .attr('pinned', ['pinned'], pinned => {
     // Convert false to null
     return pinned || null
   })
diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index 8f05fd6cd..c3c7384dd 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -88,13 +88,17 @@ describe('slugifyMiddleware', () => {
 
     describe('if slug exists', () => {
       beforeEach(async () => {
-        await factory.create('Post', {
-          title: 'Pre-existing post',
-          slug: 'pre-existing-post',
-          content: 'as Someone else content',
-        }, {
-          categoryIds,
-        })
+        await factory.create(
+          'Post',
+          {
+            title: 'Pre-existing post',
+            slug: 'pre-existing-post',
+            content: 'as Someone else content',
+          },
+          {
+            categoryIds,
+          },
+        )
       })
 
       it('chooses another slug', async () => {
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index cd6e2f726..713020d4f 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -50,51 +50,73 @@ beforeAll(async () => {
 
   await Promise.all([
     user.relateTo(troll, 'following'),
-    factory.create('Post', {
-      id: 'p1',
-      title: 'Deleted post',
-      slug: 'deleted-post',
-      deleted: true,
-    }, {
-      author: user,
-      categoryIds,
-    }),
-    factory.create('Post', {
-      id: 'p3',
-      title: 'Publicly visible post',
-      slug: 'publicly-visible-post',
-      deleted: false,
-    }, {
-      author: user,
-      categoryIds,
-    }),
+    factory.create(
+      'Post',
+      {
+        id: 'p1',
+        title: 'Deleted post',
+        slug: 'deleted-post',
+        deleted: true,
+      },
+      {
+        author: user,
+        categoryIds,
+      },
+    ),
+    factory.create(
+      'Post',
+      {
+        id: 'p3',
+        title: 'Publicly visible post',
+        slug: 'publicly-visible-post',
+        deleted: false,
+      },
+      {
+        author: user,
+        categoryIds,
+      },
+    ),
   ])
 
   const resources = await Promise.all([
-    factory.create('Comment', {
-      author: user,
-      id: 'c2',
-      postId: 'p3',
-      content: 'Enabled comment on public post',
-    }),
-    factory.create('Post', {
-      id: 'p2',
-      title: 'Disabled post',
-      content: 'This is an offensive post content',
-      contentExcerpt: 'This is an offensive post content',
-      image: '/some/offensive/image.jpg',
-      deleted: false,
-    }, {
-      author: troll,
-      categoryIds,
-    }),
-    factory.create('Comment', {
-      id: 'c1',
-      author: troll,
-      postId: 'p3',
-      content: 'Disabled comment',
-      contentExcerpt: 'Disabled comment',
-    }),
+    factory.create(
+      'Comment',
+      {
+        id: 'c2',
+        content: 'Enabled comment on public post',
+      },
+      {
+        author: user,
+        postId: 'p3',
+      },
+    ),
+    factory.create(
+      'Post',
+      {
+        id: 'p2',
+        title: 'Disabled post',
+        content: 'This is an offensive post content',
+        contentExcerpt: 'This is an offensive post content',
+        image: '/some/offensive/image.jpg',
+        deleted: false,
+      },
+      {
+        author: troll,
+        categoryIds,
+      },
+    ),
+    factory.create(
+      'Comment',
+      {
+        id: 'c1',
+        content: 'Disabled comment',
+        contentExcerpt: 'Disabled comment',
+      },
+      {
+        author: troll,
+        postId: 'p3',
+      },
+    ),
   ])
 
   const { server } = createServer({
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
index a419c2428..4b9874d7b 100644
--- a/backend/src/middleware/validation/validationMiddleware.spec.js
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -119,16 +119,24 @@ beforeEach(async () => {
   moderatingUser = users[1]
   commentingUser = users[2]
   const posts = await Promise.all([
-    factory.create('Post', {
-      id: 'offensive-post',
-    }, {
-      authorId: 'moderating-user',
-    }),
-    factory.create('Post', {
-      id: 'post-4-commenting',
-    }, {
-      authorId: 'commenting-user',
-    }),
+    factory.create(
+      'Post',
+      {
+        id: 'offensive-post',
+      },
+      {
+        authorId: 'moderating-user',
+      },
+    ),
+    factory.create(
+      'Post',
+      {
+        id: 'post-4-commenting',
+      },
+      {
+        authorId: 'commenting-user',
+      },
+    ),
   ])
   offensivePost = posts[0]
 })
@@ -184,10 +192,15 @@ describe('validateCreateComment', () => {
   describe('validateUpdateComment', () => {
     let updateCommentVariables
     beforeEach(async () => {
-      await factory.create('Comment', {
-        id: 'comment-id',
-        authorId: 'commenting-user',
-      })
+      await factory.create(
+        'Comment',
+        {
+          id: 'comment-id',
+        },
+        {
+          authorId: 'commenting-user',
+        },
+      )
       updateCommentVariables = {
         id: 'whatever',
         content: '',
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 355074804..bcc3c542f 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -49,18 +49,27 @@ const createCommentMutation = gql`
 `
 const setupPostAndComment = async () => {
   commentAuthor = await factory.create('User')
-  await factory.create('Post', {
-    id: 'p1',
-    content: 'Post to be commented',
-  }, {
-    categoryIds: ['cat9'],
-  })
-  newlyCreatedComment = await factory.create('Comment', {
-    id: 'c456',
-    postId: 'p1',
-    author: commentAuthor,
-    content: 'Comment to be deleted',
-  })
+  await factory.create(
+    'Post',
+    {
+      id: 'p1',
+      content: 'Post to be commented',
+    },
+    {
+      categoryIds: ['cat9'],
+    },
+  )
+  newlyCreatedComment = await factory.create(
+    'Comment',
+    {
+      id: 'c456',
+      content: 'Comment to be deleted',
+    },
+    {
+      postId: 'p1',
+      author: commentAuthor,
+    },
+  )
   variables = {
     ...variables,
     id: 'c456',
@@ -89,7 +98,7 @@ describe('CreateComment', () => {
 
     describe('given a post', () => {
       beforeEach(async () => {
-        await factory.create('Post', { id: 'p1' }, { categoryIds: ['cat9'] } )
+        await factory.create('Post', { id: 'p1' }, { categoryIds: ['cat9'] })
         variables = {
           ...variables,
           postId: 'p1',
diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index 27b8489e2..1ce95ddd4 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -46,40 +46,63 @@ describe('given some notifications', () => {
     ])
     const [post1, post2, post3] = await Promise.all([
       factory.create('Post', { id: 'p1', content: 'Not for you' }, { author, categoryIds }),
-      factory.create('Post', {
-        id: 'p2',
-        content: 'Already seen post mention',
-      }, {
-        author,
-        categoryIds,
-      }),
-      factory.create('Post', {
-        id: 'p3',
-        content: 'You have been mentioned in a post',
-      }, {
-        author,
-        categoryIds,
-      }),
+      factory.create(
+        'Post',
+        {
+          id: 'p2',
+          content: 'Already seen post mention',
+        },
+        {
+          author,
+          categoryIds,
+        },
+      ),
+      factory.create(
+        'Post',
+        {
+          id: 'p3',
+          content: 'You have been mentioned in a post',
+        },
+        {
+          author,
+          categoryIds,
+        },
+      ),
     ])
     const [comment1, comment2, comment3] = await Promise.all([
-      factory.create('Comment', {
-        author,
-        postId: 'p3',
-        id: 'c1',
-        content: 'You have seen this comment mentioning already',
-      }),
-      factory.create('Comment', {
-        author,
-        postId: 'p3',
-        id: 'c2',
-        content: 'You have been mentioned in a comment',
-      }),
-      factory.create('Comment', {
-        author,
-        postId: 'p3',
-        id: 'c3',
-        content: 'Somebody else was mentioned in a comment',
-      }),
+      factory.create(
+        'Comment',
+        {
+          id: 'c1',
+          content: 'You have seen this comment mentioning already',
+        },
+        {
+          author,
+          postId: 'p3',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c2',
+          content: 'You have been mentioned in a comment',
+        },
+        {
+          author,
+          postId: 'p3',
+        },
+      ),
+      factory.create(
+        'Comment',
+        {
+          id: 'c3',
+          content: 'Somebody else was mentioned in a comment',
+        },
+        {
+          author,
+          postId: 'p3',
+        },
+      ),
     ])
     await Promise.all([
       post1.relateTo(neighbor, 'notified', {
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index 83dc53eea..b8fe25ec3 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -115,13 +115,17 @@ describe('Post', () => {
       ])
       ;[happyPost, cryPost] = await Promise.all([
         factory.create('Post', { id: 'happy-post' }, { categoryIds: ['cat4'] }),
-        factory.create('Post', { id: 'cry-post'} , { categoryIds: ['cat15'] }),
-        factory.create('Post', {
-          id: 'post-by-followed-user',
-        }, {
-          categoryIds: ['cat9'],
-          author: followedUser,
-        }),
+        factory.create('Post', { id: 'cry-post' }, { categoryIds: ['cat15'] }),
+        factory.create(
+          'Post',
+          {
+            id: 'post-by-followed-user',
+          },
+          {
+            categoryIds: ['cat9'],
+            author: followedUser,
+          },
+        ),
       ])
     })
 
@@ -352,14 +356,18 @@ describe('UpdatePost', () => {
   `
   beforeEach(async () => {
     author = await factory.create('User', { slug: 'the-author' })
-    newlyCreatedPost = await factory.create('Post', {
-      id: 'p9876',
-      title: 'Old title',
-      content: 'Old content',
-    }, {
-      author,
-      categoryIds,
-    })
+    newlyCreatedPost = await factory.create(
+      'Post',
+      {
+        id: 'p9876',
+        title: 'Old title',
+        content: 'Old content',
+      },
+      {
+        author,
+        categoryIds,
+      },
+    )
 
     variables = {
       id: 'p9876',
@@ -541,11 +549,15 @@ describe('UpdatePost', () => {
 
       describe('are allowed to pin posts', () => {
         beforeEach(async () => {
-          await factory.create('Post', {
-            id: 'created-and-pinned-by-same-admin',
-          }, {
-            author: admin,
-          })
+          await factory.create(
+            'Post',
+            {
+              id: 'created-and-pinned-by-same-admin',
+            },
+            {
+              author: admin,
+            },
+          )
           variables = { ...variables, id: 'created-and-pinned-by-same-admin' }
         })
 
@@ -607,11 +619,15 @@ describe('UpdatePost', () => {
             name: 'otherAdmin',
           })
           authenticatedUser = await otherAdmin.toJson()
-          await factory.create('Post', {
-            id: 'created-by-one-admin-pinned-by-different-one',
-          }, {
-            author: otherAdmin,
-          })
+          await factory.create(
+            'Post',
+            {
+              id: 'created-by-one-admin-pinned-by-different-one',
+            },
+            {
+              author: otherAdmin,
+            },
+          )
         })
 
         it('responds with the updated Post', async () => {
@@ -668,11 +684,15 @@ describe('UpdatePost', () => {
       describe('pinned post already exists', () => {
         let pinnedPost
         beforeEach(async () => {
-          await factory.create('Post', {
-            id: 'only-pinned-post',
-          }, {
-            author: admin,
-          })
+          await factory.create(
+            'Post',
+            {
+              id: 'only-pinned-post',
+            },
+            {
+              author: admin,
+            },
+          )
           await mutate({ mutation: pinPostMutation, variables })
         })
 
@@ -890,15 +910,19 @@ describe('DeletePost', () => {
 
   beforeEach(async () => {
     author = await factory.create('User')
-    await factory.create('Post', {
-      id: 'p4711',
-      title: 'I will be deleted',
-      content: 'To be deleted',
-      image: 'path/to/some/image',
-    }, {
-      author,
-      categoryIds,
-    })
+    await factory.create(
+      'Post',
+      {
+        id: 'p4711',
+        title: 'I will be deleted',
+        content: 'To be deleted',
+        image: 'path/to/some/image',
+      },
+      {
+        author,
+        categoryIds,
+      },
+    )
     variables = { ...variables, id: 'p4711' }
   })
 
@@ -945,11 +969,16 @@ describe('DeletePost', () => {
 
     describe('if there are comments on the post', () => {
       beforeEach(async () => {
-        await factory.create('Comment', {
-          postId: 'p4711',
-          content: 'to be deleted comment content',
-          contentExcerpt: 'to be deleted comment content',
-        })
+        await factory.create(
+          'Comment',
+          {
+            content: 'to be deleted comment content',
+            contentExcerpt: 'to be deleted comment content',
+          },
+          {
+            postId: 'p4711',
+          },
+        )
       })
 
       it('marks the comments as deleted', async () => {
@@ -1004,12 +1033,16 @@ describe('emotions', () => {
 
   beforeEach(async () => {
     author = await neode.create('User', { id: 'u257' })
-    postToEmote = await factory.create('Post', {
-      id: 'p1376',
-    }, {
-      author,
-      categoryIds,
-    })
+    postToEmote = await factory.create(
+      'Post',
+      {
+        id: 'p1376',
+      },
+      {
+        author,
+        categoryIds,
+      },
+    )
 
     variables = {
       ...variables,
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index cc5c6dd26..9cd4c1279 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -356,13 +356,17 @@ describe('file a report on a resource', () => {
 
         describe('reported resource is a post', () => {
           beforeEach(async () => {
-            await factory.create('Post', {
-              id: 'post-to-report-id',
-              title: 'This is a post that is going to be reported',
-            }, {
-              author: currentUser,
-              categoryIds,
-            })
+            await factory.create(
+              'Post',
+              {
+                id: 'post-to-report-id',
+                title: 'This is a post that is going to be reported',
+              },
+              {
+                author: currentUser,
+                categoryIds,
+              },
+            )
           })
 
           it('returns type "Post"', async () => {
@@ -411,20 +415,29 @@ describe('file a report on a resource', () => {
 
         describe('reported resource is a comment', () => {
           beforeEach(async () => {
-            await factory.create('Post', {
-              id: 'p1',
-              title: 'post to comment on',
-              content: 'please comment on me',
-            }, {
-              categoryIds,
-              author: currentUser
-            })
-            await factory.create('Comment', {
-              author: currentUser,
-              postId: 'p1',
-              id: 'comment-to-report-id',
-              content: 'Post comment to be reported.',
-            })
+            await factory.create(
+              'Post',
+              {
+                id: 'p1',
+                title: 'post to comment on',
+                content: 'please comment on me',
+              },
+              {
+                categoryIds,
+                author: currentUser,
+              },
+            )
+            await factory.create(
+              'Comment',
+              {
+                id: 'comment-to-report-id',
+                content: 'Post comment to be reported.',
+              },
+              {
+                author: currentUser,
+                postId: 'p1',
+              },
+            )
           })
 
           it('returns type "Comment"', async () => {
@@ -571,34 +584,51 @@ describe('file a report on a resource', () => {
       })
 
       await Promise.all([
-        factory.create('Post', {
-          id: 'abusive-post-1',
-          content: 'Interesting Knowledge',
-        }, {
-          categoryIds,
-          author: abusiveUser,
-        }),
-        factory.create('Post', {
-          id: 'post-2',
-          content: 'More things to do …',
-        }, {
-          author: moderator,
-          categoryIds,
-        }),
-        factory.create('Post', {
-          id: 'post-3',
-          content: 'I am at school …',
-        }, {
-          categoryIds,
-          author: currentUser,
-        }),
+        factory.create(
+          'Post',
+          {
+            id: 'abusive-post-1',
+            content: 'Interesting Knowledge',
+          },
+          {
+            categoryIds,
+            author: abusiveUser,
+          },
+        ),
+        factory.create(
+          'Post',
+          {
+            id: 'post-2',
+            content: 'More things to do …',
+          },
+          {
+            author: moderator,
+            categoryIds,
+          },
+        ),
+        factory.create(
+          'Post',
+          {
+            id: 'post-3',
+            content: 'I am at school …',
+          },
+          {
+            categoryIds,
+            author: currentUser,
+          },
+        ),
       ])
       await Promise.all([
-        factory.create('Comment', {
-          author: currentUser,
-          id: 'abusive-comment-1',
-          postId: 'post-1',
-        }),
+        factory.create(
+          'Comment',
+          {
+            id: 'abusive-comment-1',
+          },
+          {
+            postId: 'post-2',
+            author: currentUser,
+          },
+        ),
       ])
       authenticatedUser = await currentUser.toJson()
       await Promise.all([
diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
index 4fb467252..dfe14f875 100644
--- a/backend/src/schema/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -88,18 +88,26 @@ describe('shout and unshout posts', () => {
     describe('authenticated', () => {
       beforeEach(async () => {
         authenticatedUser = await currentUser.toJson()
-        await factory.create('Post', {
-          name: 'Other user post',
-          id: 'another-user-post-id',
-        }, {
-          author: postAuthor,
-        })
-        await factory.create('Post', {
-          name: 'current user post',
-          id: 'current-user-post-id',
-        }, {
-          author: currentUser,
-        })
+        await factory.create(
+          'Post',
+          {
+            name: 'Other user post',
+            id: 'another-user-post-id',
+          },
+          {
+            author: postAuthor,
+          },
+        )
+        await factory.create(
+          'Post',
+          {
+            name: 'current user post',
+            id: 'current-user-post-id',
+          },
+          {
+            author: currentUser,
+          },
+        )
         variables = {}
       })
 
@@ -156,12 +164,16 @@ describe('shout and unshout posts', () => {
     describe('authenticated', () => {
       beforeEach(async () => {
         authenticatedUser = await currentUser.toJson()
-        await factory.create('Post', {
-          name: 'Posted By Another User',
-          id: 'posted-by-another-user',
-        }, {
-          author: postAuthor,
-        })
+        await factory.create(
+          'Post',
+          {
+            name: 'Posted By Another User',
+            id: 'posted-by-another-user',
+          },
+          {
+            author: postAuthor,
+          },
+        )
         await mutate({
           mutation: mutationShoutPost,
           variables: { id: 'posted-by-another-user' },
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 20508774e..3806319f3 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -328,23 +328,37 @@ describe('DeleteUser', () => {
             name: 'Democracy & Politics',
             icon: 'university',
           })
-          await factory.create('Post', {
-            id: 'p139',
-            content: 'Post by user u343',
-          }, {
-            author: user,
-            categoryIds,
-          })
-          await factory.create('Comment', {
-            author: user,
-            id: 'c155',
-            content: 'Comment by user u343',
-          })
-          await factory.create('Comment', {
-            postId: 'p139',
-            id: 'c156',
-            content: "A comment by someone else on user u343's post",
-          })
+          await factory.create(
+            'Post',
+            {
+              id: 'p139',
+              content: 'Post by user u343',
+            },
+            {
+              author: user,
+              categoryIds,
+            },
+          )
+          await factory.create(
+            'Comment',
+            {
+              id: 'c155',
+              content: 'Comment by user u343',
+            },
+            {
+              author: user,
+            },
+          )
+          await factory.create(
+            'Comment',
+            {
+              id: 'c156',
+              content: "A comment by someone else on user u343's post",
+            },
+            {
+              postId: 'p139',
+            },
+          )
         })
 
         it("deletes my account, but doesn't delete posts or comments by default", async () => {

From fc367297e3e054f09b7f8f31788ab68d87f6babf Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 20:32:20 +0100
Subject: [PATCH 040/171] Get rid of different factory files

..and fix some cypress tests
---
 .../src/activitypub/routes/webfinger.spec.js  |   7 +-
 backend/src/db/seed.js                        | 291 +++++++++---------
 backend/src/factories.js                      | 227 ++++++++++++++
 backend/src/factories/badges.js               |  19 --
 backend/src/factories/categories.js           |  21 --
 backend/src/factories/comments.js             |  42 ---
 backend/src/factories/donations.js            |  21 --
 backend/src/factories/emailAddresses.js       |  24 --
 backend/src/factories/index.js                |  64 ----
 backend/src/factories/locations.js            |  30 --
 backend/src/factories/posts.js                |  71 -----
 backend/src/factories/reports.js              |  16 -
 backend/src/factories/socialMedia.js          |  20 --
 backend/src/factories/tags.js                 |  20 --
 .../src/factories/unverifiedEmailAddresses.js |  19 --
 backend/src/factories/users.js                |  54 ----
 backend/src/jwt/decode.spec.js                |   9 +-
 .../hashtags/hashtagsMiddleware.spec.js       |   5 +-
 .../notificationsMiddleware.spec.js           |   7 +-
 .../src/middleware/orderByMiddleware.spec.js  |   5 +-
 .../middleware/permissionsMiddleware.spec.js  |  23 +-
 .../src/middleware/slugifyMiddleware.spec.js  |  22 +-
 .../softDelete/softDeleteMiddleware.spec.js   |  39 ++-
 .../validation/validationMiddleware.spec.js   |  31 +-
 backend/src/models/User.spec.js               |   5 +-
 backend/src/schema/resolvers/comments.spec.js |  23 +-
 .../src/schema/resolvers/donations.spec.js    |  17 +-
 backend/src/schema/resolvers/emails.spec.js   |  17 +-
 backend/src/schema/resolvers/follow.spec.js   |  55 ++--
 .../src/schema/resolvers/locations.spec.js    |  10 +-
 .../src/schema/resolvers/moderation.spec.js   |  43 ++-
 .../schema/resolvers/notifications.spec.js    |  35 +--
 .../schema/resolvers/passwordReset.spec.js    |  13 +-
 backend/src/schema/resolvers/posts.spec.js    |  63 ++--
 .../src/schema/resolvers/registration.spec.js |  14 +-
 backend/src/schema/resolvers/reports.spec.js  |  61 ++--
 backend/src/schema/resolvers/rewards.spec.js  |  25 +-
 backend/src/schema/resolvers/shout.spec.js    |  25 +-
 .../src/schema/resolvers/socialMedia.spec.js  |  15 +-
 .../src/schema/resolvers/statistics.spec.js   |  17 +-
 .../schema/resolvers/user_management.spec.js  |  21 +-
 backend/src/schema/resolvers/users.spec.js    |  41 ++-
 .../schema/resolvers/users/location.spec.js   |   7 +-
 .../schema/resolvers/users/mutedUsers.spec.js |   5 +-
 backend/test/features/support/steps.js        |   3 +-
 cypress/integration/common/report.js          |   9 +-
 cypress/integration/common/steps.js           |  58 ++--
 cypress/support/commands.js                   |   8 +-
 cypress/support/factories.js                  |   8 +-
 features/support/steps.js                     |   8 +-
 50 files changed, 728 insertions(+), 965 deletions(-)
 create mode 100644 backend/src/factories.js
 delete mode 100644 backend/src/factories/badges.js
 delete mode 100644 backend/src/factories/categories.js
 delete mode 100644 backend/src/factories/comments.js
 delete mode 100644 backend/src/factories/donations.js
 delete mode 100644 backend/src/factories/emailAddresses.js
 delete mode 100644 backend/src/factories/index.js
 delete mode 100644 backend/src/factories/locations.js
 delete mode 100644 backend/src/factories/posts.js
 delete mode 100644 backend/src/factories/reports.js
 delete mode 100644 backend/src/factories/socialMedia.js
 delete mode 100644 backend/src/factories/tags.js
 delete mode 100644 backend/src/factories/unverifiedEmailAddresses.js
 delete mode 100644 backend/src/factories/users.js

diff --git a/backend/src/activitypub/routes/webfinger.spec.js b/backend/src/activitypub/routes/webfinger.spec.js
index 06ca4577d..1a81c219b 100644
--- a/backend/src/activitypub/routes/webfinger.spec.js
+++ b/backend/src/activitypub/routes/webfinger.spec.js
@@ -1,10 +1,9 @@
 import { handler } from './webfinger'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { getDriver } from '../../db/neo4j'
 
 let resource, res, json, status, contentType
 
-const factory = Factory()
 const driver = getDriver()
 
 const request = () => {
@@ -28,7 +27,7 @@ const request = () => {
 }
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('webfinger', () => {
@@ -90,7 +89,7 @@ describe('webfinger', () => {
 
       describe('given a user for acct', () => {
         beforeEach(async () => {
-          await factory.create('User', { slug: 'some-user' })
+          await Factory.build('user', { slug: 'some-user' })
         })
 
         it('returns user object', async () => {
diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index fa426fb55..f2ec31876 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -12,7 +12,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 ;(async function() {
   let authenticatedUser = null
   const driver = getDriver()
-  const factory = Factory()
   const neode = getNeode()
 
   try {
@@ -28,7 +27,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     const { mutate } = createTestClient(server)
 
     const [Hamburg, Berlin, Germany, Paris, France] = await Promise.all([
-      factory.create('Location', {
+      Factory.build('location', {
         id: 'region.5127278006398860',
         name: 'Hamburg',
         type: 'region',
@@ -44,7 +43,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         namePL: 'Hamburg',
         nameRU: 'Гамбург',
       }),
-      factory.create('Location', {
+      Factory.build('location', {
         id: 'region.14880313158564380',
         type: 'region',
         name: 'Berlin',
@@ -60,7 +59,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         namePL: 'Berlin',
         nameRU: 'Берлин',
       }),
-      factory.create('Location', {
+      Factory.build('location', {
         id: 'country.10743216036480410',
         name: 'Germany',
         type: 'country',
@@ -74,7 +73,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         nameEN: 'Germany',
         nameRU: 'Германия',
       }),
-      factory.create('Location', {
+      Factory.build('location', {
         id: 'region.9397217726497330',
         name: 'Paris',
         type: 'region',
@@ -90,7 +89,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         namePL: 'Paryż',
         nameRU: 'Париж',
       }),
-      factory.create('Location', {
+      Factory.build('location', {
         id: 'country.9759535382641660',
         name: 'France',
         type: 'country',
@@ -112,27 +111,27 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
 
     const [racoon, rabbit, wolf, bear, turtle, rhino] = await Promise.all([
-      factory.create('Badge', {
+      Factory.build('badge', {
         id: 'indiegogo_en_racoon',
         icon: '/img/badges/indiegogo_en_racoon.svg',
       }),
-      factory.create('Badge', {
+      Factory.build('badge', {
         id: 'indiegogo_en_rabbit',
         icon: '/img/badges/indiegogo_en_rabbit.svg',
       }),
-      factory.create('Badge', {
+      Factory.build('badge', {
         id: 'indiegogo_en_wolf',
         icon: '/img/badges/indiegogo_en_wolf.svg',
       }),
-      factory.create('Badge', {
+      Factory.build('badge', {
         id: 'indiegogo_en_bear',
         icon: '/img/badges/indiegogo_en_bear.svg',
       }),
-      factory.create('Badge', {
+      Factory.build('badge', {
         id: 'indiegogo_en_turtle',
         icon: '/img/badges/indiegogo_en_turtle.svg',
       }),
-      factory.create('Badge', {
+      Factory.build('badge', {
         id: 'indiegogo_en_rhino',
         icon: '/img/badges/indiegogo_en_rhino.svg',
       }),
@@ -147,8 +146,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       louie,
       dagobert,
     ] = await Promise.all([
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u1',
           name: 'Peter Lustig',
@@ -159,8 +158,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           email: 'admin@example.org',
         },
       ),
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u2',
           name: 'Bob der Baumeister',
@@ -171,8 +170,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           email: 'moderator@example.org',
         },
       ),
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u3',
           name: 'Jenny Rostock',
@@ -183,8 +182,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           email: 'user@example.org',
         },
       ),
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u4',
           name: 'Huey',
@@ -195,8 +194,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           email: 'huey@example.org',
         },
       ),
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u5',
           name: 'Dewey',
@@ -207,8 +206,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           email: 'dewey@example.org',
         },
       ),
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u6',
           name: 'Louie',
@@ -219,8 +218,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           email: 'louie@example.org',
         },
       ),
-      factory.create(
-        'User',
+      Factory.build(
+        'user',
         {
           id: 'u7',
           name: 'Dagobert',
@@ -271,97 +270,97 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
 
     await Promise.all([
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat1',
         name: 'Just For Fun',
         slug: 'just-for-fun',
         icon: 'smile',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat2',
         name: 'Happiness & Values',
         slug: 'happiness-values',
         icon: 'heart-o',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat3',
         name: 'Health & Wellbeing',
         slug: 'health-wellbeing',
         icon: 'medkit',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat4',
         name: 'Environment & Nature',
         slug: 'environment-nature',
         icon: 'tree',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat5',
         name: 'Animal Protection',
         slug: 'animal-protection',
         icon: 'paw',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat6',
         name: 'Human Rights & Justice',
         slug: 'human-rights-justice',
         icon: 'balance-scale',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat7',
         name: 'Education & Sciences',
         slug: 'education-sciences',
         icon: 'graduation-cap',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat8',
         name: 'Cooperation & Development',
         slug: 'cooperation-development',
         icon: 'users',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat9',
         name: 'Democracy & Politics',
         slug: 'democracy-politics',
         icon: 'university',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat10',
         name: 'Economy & Finances',
         slug: 'economy-finances',
         icon: 'money',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat11',
         name: 'Energy & Technology',
         slug: 'energy-technology',
         icon: 'flash',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat12',
         name: 'IT, Internet & Data Privacy',
         slug: 'it-internet-data-privacy',
         icon: 'mouse-pointer',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat13',
         name: 'Art, Culture & Sport',
         slug: 'art-culture-sport',
         icon: 'paint-brush',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat14',
         name: 'Freedom of Speech',
         slug: 'freedom-of-speech',
         icon: 'bullhorn',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat15',
         name: 'Consumption & Sustainability',
         slug: 'consumption-sustainability',
         icon: 'shopping-cart',
       }),
-      factory.create('Category', {
+      Factory.build('category', {
         id: 'cat16',
         name: 'Global Peace & Nonviolence',
         slug: 'global-peace-nonviolence',
@@ -370,23 +369,23 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
 
     const [environment, nature, democracy, freedom] = await Promise.all([
-      factory.create('Tag', {
+      Factory.build('tag', {
         id: 'Environment',
       }),
-      factory.create('Tag', {
+      Factory.build('tag', {
         id: 'Nature',
       }),
-      factory.create('Tag', {
+      Factory.build('tag', {
         id: 'Democracy',
       }),
-      factory.create('Tag', {
+      Factory.build('tag', {
         id: 'Freedom',
       }),
     ])
 
     const [p0, p1, p3, p4, p5, p6, p9, p10, p11, p13, p14, p15] = await Promise.all([
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p0',
           language: sample(languages),
@@ -399,8 +398,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: peterLustig,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p1',
           language: sample(languages),
@@ -412,8 +411,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: bobDerBaumeister,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p3',
           language: sample(languages),
@@ -423,8 +422,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: huey,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p4',
           language: sample(languages),
@@ -434,8 +433,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: dewey,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p5',
           language: sample(languages),
@@ -445,8 +444,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: louie,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p6',
           language: sample(languages),
@@ -458,8 +457,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: peterLustig,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p9',
           language: sample(languages),
@@ -469,8 +468,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: huey,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p10',
           imageBlurred: true,
@@ -480,8 +479,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           categoryIds: ['cat10'],
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p11',
           language: sample(languages),
@@ -493,8 +492,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           author: louie,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p13',
           language: sample(languages),
@@ -504,8 +503,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           categoryIds: ['cat13'],
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p14',
           language: sample(languages),
@@ -517,8 +516,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           categoryIds: ['cat14'],
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p15',
           language: sample(languages),
@@ -649,8 +648,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     authenticatedUser = null
 
     const comments = await Promise.all([
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c1',
         },
@@ -659,8 +658,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p1',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c2',
         },
@@ -669,8 +668,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p1',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c3',
         },
@@ -679,8 +678,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p3',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c5',
         },
@@ -689,8 +688,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p3',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c6',
         },
@@ -699,8 +698,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p4',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c7',
         },
@@ -709,8 +708,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p2',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c8',
         },
@@ -719,8 +718,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p15',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c9',
         },
@@ -729,8 +728,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p15',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c10',
         },
@@ -739,8 +738,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p15',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c11',
         },
@@ -749,8 +748,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           postId: 'p15',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c12',
         },
@@ -825,10 +824,10 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
 
     const reports = await Promise.all([
-      factory.create('Report'),
-      factory.create('Report'),
-      factory.create('Report'),
-      factory.create('Report'),
+      Factory.build('report'),
+      Factory.build('report'),
+      Factory.build('report'),
+      Factory.build('report'),
     ])
     const reportAgainstDagobert = reports[0]
     const reportAgainstTrollingPost = reports[1]
@@ -936,14 +935,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(30).keys()].map(i => {
-        return factory.create('User')
+        return Factory.build('user')
       }),
     )
 
     await Promise.all(
       [...Array(30).keys()].map(() => {
-        return factory.create(
-          'Post',
+        return Factory.build(
+          'post',
           {
             image: faker.image.unsplash.objects(),
           },
@@ -957,8 +956,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(6).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: jennyRostock,
@@ -970,8 +969,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(4).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: jennyRostock,
@@ -983,8 +982,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(2).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: jennyRostock,
@@ -996,8 +995,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(21).keys()].map(() => {
-        return factory.create(
-          'Post',
+        return Factory.build(
+          'post',
           {
             image: faker.image.unsplash.buildings(),
           },
@@ -1010,8 +1009,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(3).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: peterLustig,
@@ -1023,8 +1022,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(5).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: peterLustig,
@@ -1036,8 +1035,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(6).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: peterLustig,
@@ -1049,8 +1048,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(11).keys()].map(() => {
-        return factory.create(
-          'Post',
+        return Factory.build(
+          'post',
           {
             image: faker.image.unsplash.food(),
           },
@@ -1063,8 +1062,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(7).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: dewey,
@@ -1076,8 +1075,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(5).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: dewey,
@@ -1089,8 +1088,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(2).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: dewey,
@@ -1102,8 +1101,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(16).keys()].map(() => {
-        return factory.create(
-          'Post',
+        return Factory.build(
+          'post',
           {
             image: faker.image.unsplash.technology(),
           },
@@ -1116,8 +1115,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(4).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             postId: 'p1',
@@ -1129,8 +1128,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(8).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: louie,
@@ -1142,8 +1141,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(5).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: louie,
@@ -1155,8 +1154,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(45).keys()].map(() => {
-        return factory.create(
-          'Post',
+        return Factory.build(
+          'post',
           {
             image: faker.image.unsplash.people(),
           },
@@ -1169,8 +1168,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(2).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: bobDerBaumeister,
@@ -1182,8 +1181,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(3).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: bobDerBaumeister,
@@ -1195,8 +1194,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(7).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: bobDerBaumeister,
@@ -1208,8 +1207,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(8).keys()].map(() => {
-        return factory.create(
-          'Post',
+        return Factory.build(
+          'post',
           {
             image: faker.image.unsplash.nature(),
           },
@@ -1222,8 +1221,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(6).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: huey,
@@ -1235,8 +1234,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(8).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: huey,
@@ -1248,8 +1247,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Promise.all(
       [...Array(9).keys()].map(() => {
-        return factory.create(
-          'Comment',
+        return Factory.build(
+          'comment',
           {},
           {
             author: huey,
@@ -1259,7 +1258,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       }),
     )
 
-    await factory.create('Donations')
+    await Factory.build('donations')
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     process.exit(0)
diff --git a/backend/src/factories.js b/backend/src/factories.js
new file mode 100644
index 000000000..b1ee08fe5
--- /dev/null
+++ b/backend/src/factories.js
@@ -0,0 +1,227 @@
+import uuid from 'uuid/v4'
+import faker from 'faker'
+import slugify from 'slug'
+import { hashSync } from 'bcryptjs'
+import { Factory } from 'rosie'
+import { getDriver, getNeode } from './db/neo4j'
+
+const neode = getNeode()
+
+export const cleanDatabase = async (options = {}) => {
+  const { driver = getDriver() } = options
+  const session = driver.session()
+  try {
+    await session.writeTransaction(transaction => {
+      return transaction.run(
+        `
+          MATCH (everything)
+          DETACH DELETE everything
+        `,
+      )
+    })
+  } finally {
+    session.close()
+  }
+}
+
+Factory.define('category')
+  .attr('id', uuid)
+  .attr('icon', 'img/badges/fundraisingbox_de_airship.svg')
+  .attr('name', 'Some category name')
+  .after((buildObject, options) => {
+    return neode.create('Category', buildObject)
+  })
+
+Factory.define('badge')
+  .attr('type', 'crowdfunding')
+  .attr('status', 'permanent')
+  .after((buildObject, options) => {
+    return neode.create('Badge', buildObject)
+  })
+
+Factory.define('userWithoutEmailAddress')
+  .option('password', '1234')
+  .attrs({
+    id: uuid,
+    name: faker.name.findName,
+    email: faker.internet.email,
+    password: '1234',
+    role: 'user',
+    avatar: faker.internet.avatar,
+    about: faker.lorem.paragraph,
+    termsAndConditionsAgreedVersion: '0.0.1',
+    termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
+    allowEmbedIframes: false,
+    showShoutsPublicly: false,
+    locale: 'en',
+  })
+  .attr('slug', ['slug', 'name'], (slug, name) => {
+    return slug || slugify(name, { lower: true })
+  })
+  .attr('encryptedPassword', ['password'], password => {
+    return hashSync(password, 10)
+  })
+  .after(async (buildObject, options) => {
+    return neode.create('User', buildObject)
+  })
+
+Factory.define('user')
+  .extend('userWithoutEmailAddress')
+  .option('email', faker.internet.exampleEmail)
+  .after(async (buildObject, options) => {
+    const [user, email] = await Promise.all([
+      buildObject,
+      neode.create('EmailAddress', { email: options.email }),
+    ])
+    await Promise.all([user.relateTo(email, 'primaryEmail'), email.relateTo(user, 'belongsTo')])
+    return user
+  })
+
+Factory.define('post')
+  .option('categoryIds', [])
+  .option('categories', ['categoryIds'], categoryIds => {
+    if (categoryIds.length) return Promise.all(categoryIds.map(id => neode.find('Category', id)))
+    // there must be at least one category
+    return Promise.all([Factory.build('category')])
+  })
+  .option('tagIds', [])
+  .option('tags', ['tagIds'], tagIds => {
+    return Promise.all(tagIds.map(id => neode.find('Tag', id)))
+  })
+  .option('authorId', null)
+  .option('author', ['authorId'], authorId => {
+    if (authorId) return neode.find('User', authorId)
+    return Factory.build('user')
+  })
+  .option('pinnedBy', null)
+  .attrs({
+    id: uuid,
+    title: faker.lorem.sentence,
+    content: faker.lorem.paragraphs,
+    image: faker.image.unsplash.imageUrl,
+    visibility: 'public',
+    deleted: false,
+    imageBlurred: false,
+    imageAspectRatio: 1.333,
+  })
+  .attr('pinned', ['pinned'], pinned => {
+    // Convert false to null
+    return pinned || null
+  })
+  .attr('contentExcerpt', ['contentExcerpt', 'content'], (contentExcerpt, content) => {
+    return contentExcerpt || content
+  })
+  .attr('slug', ['slug', 'title'], (slug, title) => {
+    return slug || slugify(title, { lower: true })
+  })
+  .after(async (buildObject, options) => {
+    const [post, author, categories, tags] = await Promise.all([
+      neode.create('Post', buildObject),
+      options.author,
+      options.categories,
+      options.tags,
+    ])
+    await Promise.all([
+      post.relateTo(author, 'author'),
+      Promise.all(categories.map(c => c.relateTo(post, 'post'))),
+      Promise.all(tags.map(t => t.relateTo(post, 'post'))),
+    ])
+    if (buildObject.pinned) {
+      const pinnedBy = await (options.pinnedBy || Factory.build('user', { role: 'admin' }))
+      await pinnedBy.relateTo(post, 'pinned')
+    }
+    return post
+  })
+
+Factory.define('comment')
+  .option('postId', null)
+  .option('post', ['postId'], postId => {
+    if (postId) return neode.find('Post', postId)
+    return Factory.build('post')
+  })
+  .option('authorId', null)
+  .option('author', ['authorId'], authorId => {
+    if (authorId) return neode.find('User', authorId)
+    return Factory.build('user')
+  })
+  .attrs({
+    id: uuid,
+    content: faker.lorem.sentence,
+  })
+  .attr('contentExcerpt', ['contentExcerpt', 'content'], (contentExcerpt, content) => {
+    return contentExcerpt || content
+  })
+  .after(async (buildObject, options) => {
+    const [comment, author, post] = await Promise.all([
+      neode.create('Comment', buildObject),
+      options.author,
+      options.post,
+    ])
+    await Promise.all([comment.relateTo(author, 'author'), comment.relateTo(post, 'post')])
+    return comment
+  })
+
+Factory.define('donations')
+  .attr('id', uuid)
+  .attr('goal', 15000)
+  .attr('progress', 0)
+  .after((buildObject, options) => {
+    return neode.create('Donations', buildObject)
+  })
+
+const emailDefaults = {
+  email: faker.internet.email,
+  verifiedAt: () => new Date().toISOString(),
+}
+
+Factory.define('emailAddress')
+  .attr(emailDefaults)
+  .after((buildObject, options) => {
+    return neode.create('EmailAddress', buildObject)
+  })
+
+Factory.define('unverifiedEmailAddress')
+  .attr(emailDefaults)
+  .after((buildObject, options) => {
+    return neode.create('UnverifiedEmailAddress', buildObject)
+  })
+
+Factory.define('location')
+  .attrs({
+    name: 'Germany',
+    namePT: 'Alemanha',
+    nameDE: 'Deutschland',
+    nameES: 'Alemania',
+    nameNL: 'Duitsland',
+    namePL: 'Niemcy',
+    nameFR: 'Allemagne',
+    nameIT: 'Germania',
+    nameEN: 'Germany',
+    id: 'country.10743216036480410',
+    type: 'country',
+  })
+  .after((buildObject, options) => {
+    return neode.create('Location', buildObject)
+  })
+
+Factory.define('report').after((buildObject, options) => {
+  return neode.create('Report', buildObject)
+})
+
+Factory.define('tag')
+  .attrs({
+    name: '#human-connection',
+  })
+  .after((buildObject, options) => {
+    return neode.create('Tag', buildObject)
+  })
+
+Factory.define('socialMedia')
+  .attrs({
+    url: 'https://mastodon.social/@Gargron',
+  })
+  .after((buildObject, options) => {
+    return neode.create('SocialMedia', buildObject)
+  })
+
+export default Factory
diff --git a/backend/src/factories/badges.js b/backend/src/factories/badges.js
deleted file mode 100644
index 3c981ae8a..000000000
--- a/backend/src/factories/badges.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('badge')
-  .attr('type', 'crowdfunding')
-  .attr('status', 'permanent')
-  .after((buildObject, options) => {
-    return neode.create('Badge', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: ({ args, neodeInstance }) => {
-      return Factory.build('badge', args)
-    },
-  }
-}
diff --git a/backend/src/factories/categories.js b/backend/src/factories/categories.js
deleted file mode 100644
index 5dd89efbe..000000000
--- a/backend/src/factories/categories.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import uuid from 'uuid/v4'
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('category')
-  .attr('id', uuid)
-  .attr('icon', 'img/badges/fundraisingbox_de_airship.svg')
-  .attr('name', 'Some category name')
-  .after((buildObject, options) => {
-    return neode.create('Category', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, neodeInstance }) => {
-      return Factory.build('category', args)
-    },
-  }
-}
diff --git a/backend/src/factories/comments.js b/backend/src/factories/comments.js
deleted file mode 100644
index 0ecbb03ec..000000000
--- a/backend/src/factories/comments.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import faker from 'faker'
-import uuid from 'uuid/v4'
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('comment')
-  .option('postId', null)
-  .option('post', ['postId'], postId => {
-    if (postId) return neode.find('Post', postId)
-    return Factory.build('post')
-  })
-  .option('authorId', null)
-  .option('author', ['authorId'], authorId => {
-    if (authorId) return neode.find('User', authorId)
-    return Factory.build('user')
-  })
-  .attrs({
-    id: uuid,
-    content: faker.lorem.sentence,
-  })
-  .attr('contentExcerpt', ['contentExcerpt', 'content'], (contentExcerpt, content) => {
-    return contentExcerpt || content
-  })
-  .after(async (buildObject, options) => {
-    const [comment, author, post] = await Promise.all([
-      neode.create('Comment', buildObject),
-      options.author,
-      options.post,
-    ])
-    await Promise.all([comment.relateTo(author, 'author'), comment.relateTo(post, 'post')])
-    return comment
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, options, neodeInstance, factoryInstance }) => {
-      return Factory.build('comment', args, options)
-    },
-  }
-}
diff --git a/backend/src/factories/donations.js b/backend/src/factories/donations.js
deleted file mode 100644
index a17c2511a..000000000
--- a/backend/src/factories/donations.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import uuid from 'uuid/v4'
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('donations')
-  .attr('id', uuid)
-  .attr('goal', 15000)
-  .attr('progress', 0)
-  .after((buildObject, options) => {
-    return neode.create('Donations', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, neodeInstance }) => {
-      return Factory.build('donations', args)
-    },
-  }
-}
diff --git a/backend/src/factories/emailAddresses.js b/backend/src/factories/emailAddresses.js
deleted file mode 100644
index 8be427058..000000000
--- a/backend/src/factories/emailAddresses.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import faker from 'faker'
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-export const defaults = {
-  email: faker.internet.email,
-  verifiedAt: () => new Date().toISOString(),
-}
-
-const neode = getNeode()
-
-Factory.define('emailAddress')
-  .attr(defaults)
-  .after((buildObject, options) => {
-    return neode.create('EmailAddress', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, neodeInstance }) => {
-      return Factory.build('emailAddress', args)
-    },
-  }
-}
diff --git a/backend/src/factories/index.js b/backend/src/factories/index.js
deleted file mode 100644
index 983aaae26..000000000
--- a/backend/src/factories/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { getDriver, getNeode } from '../db/neo4j'
-
-const factories = {
-  Badge: require('./badges.js').default,
-  User: require('./users.js').default,
-  Post: require('./posts.js').default,
-  Comment: require('./comments.js').default,
-  Category: require('./categories.js').default,
-  Tag: require('./tags.js').default,
-  SocialMedia: require('./socialMedia.js').default,
-  Location: require('./locations.js').default,
-  EmailAddress: require('./emailAddresses.js').default,
-  UnverifiedEmailAddress: require('./unverifiedEmailAddresses.js').default,
-  Donations: require('./donations.js').default,
-  Report: require('./reports.js').default,
-}
-
-export const cleanDatabase = async (options = {}) => {
-  const { driver = getDriver() } = options
-  const session = driver.session()
-  try {
-    await session.writeTransaction(transaction => {
-      return transaction.run(
-        `
-          MATCH (everything)
-          DETACH DELETE everything
-        `,
-      )
-    })
-  } finally {
-    session.close()
-  }
-}
-
-export default function Factory(options = {}) {
-  const { neo4jDriver = getDriver(), neodeInstance = getNeode() } = options
-
-  const result = {
-    neo4jDriver,
-    factories,
-    lastResponse: null,
-    neodeInstance,
-    async create(node, args = {}, options = {}) {
-      const { factory } = this.factories[node](args)
-      this.lastResponse = await factory({
-        args,
-        options,
-        neodeInstance,
-        factoryInstance: this,
-      })
-      return this.lastResponse
-    },
-
-    async cleanDatabase() {
-      this.lastResponse = await cleanDatabase({
-        driver: this.neo4jDriver,
-      })
-      return this
-    },
-  }
-  result.create.bind(result)
-  result.cleanDatabase.bind(result)
-  return result
-}
diff --git a/backend/src/factories/locations.js b/backend/src/factories/locations.js
deleted file mode 100644
index 29b6c3098..000000000
--- a/backend/src/factories/locations.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('location')
-  .attrs({
-    name: 'Germany',
-    namePT: 'Alemanha',
-    nameDE: 'Deutschland',
-    nameES: 'Alemania',
-    nameNL: 'Duitsland',
-    namePL: 'Niemcy',
-    nameFR: 'Allemagne',
-    nameIT: 'Germania',
-    nameEN: 'Germany',
-    id: 'country.10743216036480410',
-    type: 'country',
-  })
-  .after((buildObject, options) => {
-    return neode.create('Location', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, neodeInstance }) => {
-      return Factory.build('location', args)
-    },
-  }
-}
diff --git a/backend/src/factories/posts.js b/backend/src/factories/posts.js
deleted file mode 100644
index b6c7f1424..000000000
--- a/backend/src/factories/posts.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-import faker from 'faker'
-import slugify from 'slug'
-import uuid from 'uuid/v4'
-
-const neode = getNeode()
-
-Factory.define('post')
-  .option('categoryIds', [])
-  .option('categories', ['categoryIds'], categoryIds => {
-    if (categoryIds.length) return Promise.all(categoryIds.map(id => neode.find('Category', id)))
-    // there must be at least one category
-    return Promise.all([Factory.build('category')])
-  })
-  .option('tagIds', [])
-  .option('tags', ['tagIds'], tagIds => {
-    return Promise.all(tagIds.map(id => neode.find('Tag', id)))
-  })
-  .option('authorId', null)
-  .option('author', ['authorId'], authorId => {
-    if (authorId) return neode.find('User', authorId)
-    return Factory.build('user')
-  })
-  .option('pinnedBy', null)
-  .attrs({
-    id: uuid,
-    title: faker.lorem.sentence,
-    content: faker.lorem.paragraphs,
-    image: faker.image.unsplash.imageUrl,
-    visibility: 'public',
-    deleted: false,
-    imageBlurred: false,
-    imageAspectRatio: 1.333,
-  })
-  .attr('pinned', ['pinned'], pinned => {
-    // Convert false to null
-    return pinned || null
-  })
-  .attr('contentExcerpt', ['contentExcerpt', 'content'], (contentExcerpt, content) => {
-    return contentExcerpt || content
-  })
-  .attr('slug', ['slug', 'title'], (slug, title) => {
-    return slug || slugify(title, { lower: true })
-  })
-  .after(async (buildObject, options) => {
-    const [post, author, categories, tags] = await Promise.all([
-      neode.create('Post', buildObject),
-      options.author,
-      options.categories,
-      options.tags,
-    ])
-    await Promise.all([
-      post.relateTo(author, 'author'),
-      Promise.all(categories.map(c => c.relateTo(post, 'post'))),
-      Promise.all(tags.map(t => t.relateTo(post, 'post'))),
-    ])
-    if (buildObject.pinned) {
-      const pinnedBy = await (options.pinnedBy || Factory.build('user', { role: 'admin' }))
-      await pinnedBy.relateTo(post, 'pinned')
-    }
-    return post
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, options, neodeInstance, factoryInstance }) => {
-      return Factory.build('post', args, options)
-    },
-  }
-}
diff --git a/backend/src/factories/reports.js b/backend/src/factories/reports.js
deleted file mode 100644
index 9e3024e35..000000000
--- a/backend/src/factories/reports.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('report').after((buildObject, options) => {
-  return neode.create('Report', buildObject)
-})
-
-export default function create() {
-  return {
-    factory: async ({ args }) => {
-      return Factory.build('report', args)
-    },
-  }
-}
diff --git a/backend/src/factories/socialMedia.js b/backend/src/factories/socialMedia.js
deleted file mode 100644
index 2baf058a0..000000000
--- a/backend/src/factories/socialMedia.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('socialMedia')
-  .attrs({
-    url: 'https://mastodon.social/@Gargron',
-  })
-  .after((buildObject, options) => {
-    return neode.create('SocialMedia', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args }) => {
-      return Factory.build('socialMedia', args)
-    },
-  }
-}
diff --git a/backend/src/factories/tags.js b/backend/src/factories/tags.js
deleted file mode 100644
index cf7ca1729..000000000
--- a/backend/src/factories/tags.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('tag')
-  .attrs({
-    name: '#human-connection',
-  })
-  .after((buildObject, options) => {
-    return neode.create('Tag', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, neodeInstance }) => {
-      return Factory.build('tag', args)
-    },
-  }
-}
diff --git a/backend/src/factories/unverifiedEmailAddresses.js b/backend/src/factories/unverifiedEmailAddresses.js
deleted file mode 100644
index 2d6bd9f57..000000000
--- a/backend/src/factories/unverifiedEmailAddresses.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { defaults } from './emailAddresses.js'
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-
-const neode = getNeode()
-
-Factory.define('unverifiedEmailAddress')
-  .attr(defaults)
-  .after((buildObject, options) => {
-    return neode.create('UnverifiedEmailAddress', buildObject)
-  })
-
-export default function create() {
-  return {
-    factory: async ({ args, neodeInstance }) => {
-      return Factory.build('unverifiedEmailAddress', args)
-    },
-  }
-}
diff --git a/backend/src/factories/users.js b/backend/src/factories/users.js
deleted file mode 100644
index 91b9e9a8b..000000000
--- a/backend/src/factories/users.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import faker from 'faker'
-import uuid from 'uuid/v4'
-import slugify from 'slug'
-import { Factory } from 'rosie'
-import { getNeode } from '../db/neo4j'
-import { hashSync } from 'bcryptjs'
-
-const neode = getNeode()
-
-Factory.define('userWithoutEmailAddress')
-  .option('password', '1234')
-  .attrs({
-    id: uuid,
-    name: faker.name.findName,
-    email: faker.internet.email,
-    password: '1234',
-    role: 'user',
-    avatar: faker.internet.avatar,
-    about: faker.lorem.paragraph,
-    termsAndConditionsAgreedVersion: '0.0.1',
-    termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
-    allowEmbedIframes: false,
-    showShoutsPublicly: false,
-    locale: 'en',
-  })
-  .attr('slug', ['slug', 'name'], (slug, name) => {
-    return slug || slugify(name, { lower: true })
-  })
-  .attr('encryptedPassword', ['password'], password => {
-    return hashSync(password, 10)
-  })
-  .after(async (buildObject, options) => {
-    return neode.create('User', buildObject)
-  })
-
-Factory.define('user')
-  .extend('userWithoutEmailAddress')
-  .option('email', faker.internet.exampleEmail)
-  .after(async (buildObject, options) => {
-    const [user, email] = await Promise.all([
-      buildObject,
-      neode.create('EmailAddress', { email: options.email }),
-    ])
-    await Promise.all([user.relateTo(email, 'primaryEmail'), email.relateTo(user, 'belongsTo')])
-    return user
-  })
-
-export default function create() {
-  return {
-    factory: ({ args, options }) => {
-      return Factory.build('user', args, options)
-    },
-  }
-}
diff --git a/backend/src/jwt/decode.spec.js b/backend/src/jwt/decode.spec.js
index d0bf2005d..1163f71a8 100644
--- a/backend/src/jwt/decode.spec.js
+++ b/backend/src/jwt/decode.spec.js
@@ -1,8 +1,7 @@
-import Factory from '../factories/index'
+import Factory, { cleanDatabase } from '../factories'
 import { getDriver, getNeode } from '../db/neo4j'
 import decode from './decode'
 
-const factory = Factory()
 const driver = getDriver()
 const neode = getNeode()
 
@@ -26,7 +25,7 @@ export const validAuthorizationHeader =
   'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoidXNlciIsImxvY2F0aW9uTmFtZSI6bnVsbCwibmFtZSI6Ikplbm55IFJvc3RvY2siLCJhYm91dCI6bnVsbCwiYXZhdGFyIjoiaHR0cHM6Ly9zMy5hbWF6b25hd3MuY29tL3VpZmFjZXMvZmFjZXMvdHdpdHRlci9zYXNoYV9zaGVzdGFrb3YvMTI4LmpwZyIsImlkIjoidTMiLCJlbWFpbCI6InVzZXJAZXhhbXBsZS5vcmciLCJzbHVnIjoiamVubnktcm9zdG9jayIsImlhdCI6MTU1MDg0NjY4MCwiZXhwIjoxNjM3MjQ2NjgwLCJhdWQiOiJodHRwOi8vbG9jYWxob3N0OjMwMDAiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjQwMDAiLCJzdWIiOiJ1MyJ9.eZ_mVKas4Wzoc_JrQTEWXyRn7eY64cdIg4vqQ-F_7Jc'
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('decode', () => {
@@ -65,8 +64,8 @@ describe('decode', () => {
     describe('and corresponding user in the database', () => {
       let user
       beforeEach(async () => {
-        user = await factory.create(
-          'User',
+        user = await Factory.build(
+          'user',
           {
             role: 'user',
             name: 'Jenny Rostock',
diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
index 4967978a5..8560c97d4 100644
--- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
+++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
@@ -1,5 +1,5 @@
 import { gql } from '../../helpers/jest'
-import Factory from '../../factories'
+import { cleanDatabase } from '../../factories'
 import { createTestClient } from 'apollo-server-testing'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
@@ -9,7 +9,6 @@ let query
 let mutate
 let hashtagingUser
 let authenticatedUser
-const factory = Factory()
 const driver = getDriver()
 const neode = getNeode()
 const categoryIds = ['cat9']
@@ -68,7 +67,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('hashtags', () => {
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 0d0714289..fdc4d2a48 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -1,11 +1,10 @@
 import { gql } from '../../helpers/jest'
-import Factory from '../../factories'
+import { cleanDatabase } from '../../factories'
 import { createTestClient } from 'apollo-server-testing'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let server, query, mutate, notifiedUser, authenticatedUser
-const factory = Factory()
 const driver = getDriver()
 const neode = getNeode()
 const categoryIds = ['cat9']
@@ -36,7 +35,7 @@ const createCommentMutation = gql`
 `
 
 beforeAll(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
   const createServerResult = createServer({
     context: () => {
       return {
@@ -73,7 +72,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('notifications', () => {
diff --git a/backend/src/middleware/orderByMiddleware.spec.js b/backend/src/middleware/orderByMiddleware.spec.js
index 8d92a5b5d..2bca36364 100644
--- a/backend/src/middleware/orderByMiddleware.spec.js
+++ b/backend/src/middleware/orderByMiddleware.spec.js
@@ -1,10 +1,9 @@
 import { gql } from '../helpers/jest'
-import Factory from '../factories'
+import { cleanDatabase } from '../factories'
 import { getNeode, getDriver } from '../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
 
-const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 
@@ -27,7 +26,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('Query', () => {
diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js
index 7c62cfcc0..5b24b3e74 100644
--- a/backend/src/middleware/permissionsMiddleware.spec.js
+++ b/backend/src/middleware/permissionsMiddleware.spec.js
@@ -1,10 +1,9 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
-import Factory from '../factories'
+import Factory, { cleanDatabase } from '../factories'
 import { gql } from '../helpers/jest'
 import { getDriver, getNeode } from '../db/neo4j'
 
-const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
@@ -20,7 +19,7 @@ const userQuery = gql`
 
 describe('authorization', () => {
   beforeAll(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
     const { server } = createServer({
       context: () => ({
         driver,
@@ -34,8 +33,8 @@ describe('authorization', () => {
   describe('given two existing users', () => {
     beforeEach(async () => {
       ;[owner, anotherRegularUser, administrator, moderator] = await Promise.all([
-        factory.create(
-          'User',
+        Factory.build(
+          'user',
           {
             name: 'Owner',
           },
@@ -44,8 +43,8 @@ describe('authorization', () => {
             password: 'iamtheowner',
           },
         ),
-        factory.create(
-          'User',
+        Factory.build(
+          'user',
           {
             name: 'Another Regular User',
           },
@@ -54,8 +53,8 @@ describe('authorization', () => {
             password: 'else',
           },
         ),
-        factory.create(
-          'User',
+        Factory.build(
+          'user',
           {
             name: 'Admin',
             role: 'admin',
@@ -65,8 +64,8 @@ describe('authorization', () => {
             password: 'admin',
           },
         ),
-        factory.create(
-          'User',
+        Factory.build(
+          'user',
           {
             name: 'Moderator',
             role: 'moderator',
@@ -81,7 +80,7 @@ describe('authorization', () => {
     })
 
     afterEach(async () => {
-      await factory.cleanDatabase()
+      await cleanDatabase()
     })
 
     describe('access email address', () => {
diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index c3c7384dd..e13d66407 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -1,11 +1,9 @@
-import Factory from '../factories'
+import Factory, { cleanDatabase } from '../factories'
 import { gql } from '../helpers/jest'
 import { getNeode, getDriver } from '../db/neo4j'
 import createServer from '../server'
 import { createTestClient } from 'apollo-server-testing'
 
-const factory = Factory()
-
 let mutate
 let authenticatedUser
 let variables
@@ -28,18 +26,18 @@ beforeAll(() => {
 
 beforeEach(async () => {
   variables = {}
-  const admin = await factory.create('User', {
+  const admin = await Factory.build('user', {
     role: 'admin',
   })
-  await factory.create(
-    'User',
+  await Factory.build(
+    'user',
     {},
     {
       email: 'someone@example.org',
       password: '1234',
     },
   )
-  await factory.create('Category', {
+  await Factory.build('category', {
     id: 'cat9',
     name: 'Democracy & Politics',
     icon: 'university',
@@ -48,7 +46,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('slugifyMiddleware', () => {
@@ -88,8 +86,8 @@ describe('slugifyMiddleware', () => {
 
     describe('if slug exists', () => {
       beforeEach(async () => {
-        await factory.create(
-          'Post',
+        await Factory.build(
+          'post',
           {
             title: 'Pre-existing post',
             slug: 'pre-existing-post',
@@ -199,7 +197,7 @@ describe('slugifyMiddleware', () => {
 
     describe('given a user has signed up with their email address', () => {
       beforeEach(async () => {
-        await factory.create('EmailAddress', {
+        await Factory.build('emailAddress', {
           email: '123@example.org',
           nonce: '123456',
           verifiedAt: null,
@@ -223,7 +221,7 @@ describe('slugifyMiddleware', () => {
 
       describe('if slug exists', () => {
         beforeEach(async () => {
-          await factory.create('User', {
+          await Factory.build('user', {
             name: 'I am a user',
             slug: 'i-am-a-user',
           })
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 713020d4f..8d8adb56b 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -1,10 +1,9 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 
-const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 
@@ -18,9 +17,9 @@ const action = () => {
 beforeAll(async () => {
   // For performance reasons we do this only once
   const users = await Promise.all([
-    factory.create('User', { id: 'u1', role: 'user' }),
-    factory.create(
-      'User',
+    Factory.build('user', { id: 'u1', role: 'user' }),
+    Factory.build(
+      'user',
       {
         id: 'm1',
         role: 'moderator',
@@ -29,7 +28,7 @@ beforeAll(async () => {
         password: '1234',
       },
     ),
-    factory.create('User', {
+    Factory.build('user', {
       id: 'u2',
       role: 'user',
       name: 'Offensive Name',
@@ -50,8 +49,8 @@ beforeAll(async () => {
 
   await Promise.all([
     user.relateTo(troll, 'following'),
-    factory.create(
-      'Post',
+    Factory.build(
+      'post',
       {
         id: 'p1',
         title: 'Deleted post',
@@ -63,8 +62,8 @@ beforeAll(async () => {
         categoryIds,
       },
     ),
-    factory.create(
-      'Post',
+    Factory.build(
+      'post',
       {
         id: 'p3',
         title: 'Publicly visible post',
@@ -79,8 +78,8 @@ beforeAll(async () => {
   ])
 
   const resources = await Promise.all([
-    factory.create(
-      'Comment',
+    Factory.build(
+      'comment',
       {
         id: 'c2',
         content: 'Enabled comment on public post',
@@ -90,8 +89,8 @@ beforeAll(async () => {
         postId: 'p3',
       },
     ),
-    factory.create(
-      'Post',
+    Factory.build(
+      'post',
       {
         id: 'p2',
         title: 'Disabled post',
@@ -105,8 +104,8 @@ beforeAll(async () => {
         categoryIds,
       },
     ),
-    factory.create(
-      'Comment',
+    Factory.build(
+      'comment',
       {
         id: 'c1',
         content: 'Disabled comment',
@@ -135,9 +134,9 @@ beforeAll(async () => {
   const trollingComment = resources[2]
 
   const reports = await Promise.all([
-    factory.create('Report'),
-    factory.create('Report'),
-    factory.create('Report'),
+    Factory.build('report'),
+    Factory.build('report'),
+    Factory.build('report'),
   ])
   const reportAgainstTroll = reports[0]
   const reportAgainstTrollingPost = reports[1]
@@ -184,7 +183,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('softDeleteMiddleware', () => {
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
index 4b9874d7b..25524c973 100644
--- a/backend/src/middleware/validation/validationMiddleware.spec.js
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -1,10 +1,9 @@
 import { gql } from '../../helpers/jest'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { getNeode, getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 
-const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 let authenticatedUser,
@@ -94,14 +93,14 @@ beforeAll(() => {
 
 beforeEach(async () => {
   users = await Promise.all([
-    factory.create('User', {
+    Factory.build('user', {
       id: 'reporting-user',
     }),
-    factory.create('User', {
+    Factory.build('user', {
       id: 'moderating-user',
       role: 'moderator',
     }),
-    factory.create('User', {
+    Factory.build('user', {
       id: 'commenting-user',
     }),
   ])
@@ -119,8 +118,8 @@ beforeEach(async () => {
   moderatingUser = users[1]
   commentingUser = users[2]
   const posts = await Promise.all([
-    factory.create(
-      'Post',
+    Factory.build(
+      'post',
       {
         id: 'offensive-post',
       },
@@ -128,8 +127,8 @@ beforeEach(async () => {
         authorId: 'moderating-user',
       },
     ),
-    factory.create(
-      'Post',
+    Factory.build(
+      'post',
       {
         id: 'post-4-commenting',
       },
@@ -142,7 +141,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('validateCreateComment', () => {
@@ -192,8 +191,8 @@ describe('validateCreateComment', () => {
   describe('validateUpdateComment', () => {
     let updateCommentVariables
     beforeEach(async () => {
-      await factory.create(
-        'Comment',
+      await Factory.build(
+        'comment',
         {
           id: 'comment-id',
         },
@@ -343,7 +342,7 @@ describe('validateReport', () => {
 
 describe('validateReview', () => {
   beforeEach(async () => {
-    const reportAgainstModerator = await factory.create('Report')
+    const reportAgainstModerator = await Factory.build('report')
     await Promise.all([
       reportAgainstModerator.relateTo(reportingUser, 'filed', {
         ...reportVariables,
@@ -385,7 +384,7 @@ describe('validateReview', () => {
   })
 
   it('throws an error if a moderator tries to review their own resource(Post|Comment)', async () => {
-    const reportAgainstOffensivePost = await factory.create('Report')
+    const reportAgainstOffensivePost = await Factory.build('report')
     await Promise.all([
       reportAgainstOffensivePost.relateTo(reportingUser, 'filed', {
         ...reportVariables,
@@ -404,7 +403,7 @@ describe('validateReview', () => {
 
   describe('moderate a resource that is not a (Comment|Post|User) ', () => {
     beforeEach(async () => {
-      await Promise.all([factory.create('Tag', { id: 'tag-id' })])
+      await Promise.all([Factory.build('tag', { id: 'tag-id' })])
     })
 
     it('returns null', async () => {
@@ -434,7 +433,7 @@ describe('validateReview', () => {
         id: 'updating-user',
         name: 'John Doughnut',
       }
-      updatingUser = await factory.create('User', userParams)
+      updatingUser = await Factory.build('user', userParams)
       authenticatedUser = await updatingUser.toJson()
     })
 
diff --git a/backend/src/models/User.spec.js b/backend/src/models/User.spec.js
index 7bdde7014..d112cde9a 100644
--- a/backend/src/models/User.spec.js
+++ b/backend/src/models/User.spec.js
@@ -1,11 +1,10 @@
-import Factory from '../factories'
+import { cleanDatabase } from '../factories'
 import { getNeode } from '../db/neo4j'
 
-const factory = Factory()
 const neode = getNeode()
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('role', () => {
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index bcc3c542f..80b9df814 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -1,4 +1,4 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
@@ -6,12 +6,11 @@ import { getNeode, getDriver } from '../../db/neo4j'
 
 const driver = getDriver()
 const neode = getNeode()
-const factory = Factory()
 
 let variables, mutate, authenticatedUser, commentAuthor, newlyCreatedComment
 
 beforeAll(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
   const { server } = createServer({
     context: () => {
       return {
@@ -33,7 +32,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 const createCommentMutation = gql`
@@ -48,9 +47,9 @@ const createCommentMutation = gql`
   }
 `
 const setupPostAndComment = async () => {
-  commentAuthor = await factory.create('User')
-  await factory.create(
-    'Post',
+  commentAuthor = await Factory.build('user')
+  await Factory.build(
+    'post',
     {
       id: 'p1',
       content: 'Post to be commented',
@@ -59,8 +58,8 @@ const setupPostAndComment = async () => {
       categoryIds: ['cat9'],
     },
   )
-  newlyCreatedComment = await factory.create(
-    'Comment',
+  newlyCreatedComment = await Factory.build(
+    'comment',
     {
       id: 'c456',
       content: 'Comment to be deleted',
@@ -98,7 +97,7 @@ describe('CreateComment', () => {
 
     describe('given a post', () => {
       beforeEach(async () => {
-        await factory.create('Post', { id: 'p1' }, { categoryIds: ['cat9'] })
+        await Factory.build('post', { id: 'p1' }, { categoryIds: ['cat9'] })
         variables = {
           ...variables,
           postId: 'p1',
@@ -151,7 +150,7 @@ describe('UpdateComment', () => {
 
     describe('authenticated but not the author', () => {
       beforeEach(async () => {
-        const randomGuy = await factory.create('User')
+        const randomGuy = await Factory.build('user')
         authenticatedUser = await randomGuy.toJson()
       })
 
@@ -243,7 +242,7 @@ describe('DeleteComment', () => {
 
     describe('authenticated but not the author', () => {
       beforeEach(async () => {
-        const randomGuy = await factory.create('User')
+        const randomGuy = await Factory.build('user')
         authenticatedUser = await randomGuy.toJson()
       })
 
diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js
index c382eb475..2888651b5 100644
--- a/backend/src/schema/resolvers/donations.spec.js
+++ b/backend/src/schema/resolvers/donations.spec.js
@@ -1,11 +1,10 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let mutate, query, authenticatedUser, variables
-const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
@@ -33,7 +32,7 @@ const donationsQuery = gql`
 describe('donations', () => {
   let currentUser, newlyCreatedDonations
   beforeAll(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
     authenticatedUser = undefined
     const { server } = createServer({
       context: () => {
@@ -50,11 +49,11 @@ describe('donations', () => {
 
   beforeEach(async () => {
     variables = {}
-    newlyCreatedDonations = await factory.create('Donations')
+    newlyCreatedDonations = await Factory.build('donations')
   })
 
   afterEach(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
   })
 
   describe('query for donations', () => {
@@ -68,7 +67,7 @@ describe('donations', () => {
 
       describe('authenticated', () => {
         beforeEach(async () => {
-          currentUser = await factory.create('User', {
+          currentUser = await Factory.build('user', {
             id: 'normal-user',
             role: 'user',
           })
@@ -102,7 +101,7 @@ describe('donations', () => {
       describe('authenticated', () => {
         describe('as a normal user', () => {
           beforeEach(async () => {
-            currentUser = await factory.create('User', {
+            currentUser = await Factory.build('user', {
               id: 'normal-user',
               role: 'user',
             })
@@ -121,7 +120,7 @@ describe('donations', () => {
 
         describe('as a moderator', () => {
           beforeEach(async () => {
-            currentUser = await factory.create('User', {
+            currentUser = await Factory.build('user', {
               id: 'moderator',
               role: 'moderator',
             })
@@ -140,7 +139,7 @@ describe('donations', () => {
 
         describe('as an admin', () => {
           beforeEach(async () => {
-            currentUser = await factory.create('User', {
+            currentUser = await Factory.build('user', {
               id: 'admin',
               role: 'admin',
             })
diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js
index 470eb7635..7ef018739 100644
--- a/backend/src/schema/resolvers/emails.spec.js
+++ b/backend/src/schema/resolvers/emails.spec.js
@@ -1,10 +1,9 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 
-const factory = Factory()
 const neode = getNeode()
 
 let mutate
@@ -31,7 +30,7 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('AddEmailAddress', () => {
@@ -63,7 +62,7 @@ describe('AddEmailAddress', () => {
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      user = await factory.create('User', { id: '567' }, { email: 'user@example.org' })
+      user = await Factory.build('user', { id: '567' }, { email: 'user@example.org' })
       authenticatedUser = await user.toJson()
     })
 
@@ -110,7 +109,7 @@ describe('AddEmailAddress', () => {
 
       describe('if another `UnverifiedEmailAddress` node already exists with that email', () => {
         it('throws no unique constraint violation error', async () => {
-          await factory.create('UnverifiedEmailAddress', {
+          await Factory.build('unverifiedEmailAddress', {
             createdAt: '2019-09-24T14:00:01.565Z',
             email: 'new-email@example.org',
           })
@@ -128,7 +127,7 @@ describe('AddEmailAddress', () => {
 
       describe('but if another user owns an `EmailAddress` already with that email', () => {
         it('throws UserInputError because of unique constraints', async () => {
-          await factory.create('User', {}, { email: 'new-email@example.org' })
+          await Factory.build('user', {}, { email: 'new-email@example.org' })
           await expect(mutate({ mutation, variables })).resolves.toMatchObject({
             data: { AddEmailAddress: null },
             errors: [{ message: 'A user account with this email already exists.' }],
@@ -169,7 +168,7 @@ describe('VerifyEmailAddress', () => {
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      user = await factory.create('User', { id: '567' }, { email: 'user@example.org' })
+      user = await Factory.build('user', { id: '567' }, { email: 'user@example.org' })
       authenticatedUser = await user.toJson()
     })
 
@@ -185,7 +184,7 @@ describe('VerifyEmailAddress', () => {
     describe('given a `UnverifiedEmailAddress`', () => {
       let emailAddress
       beforeEach(async () => {
-        emailAddress = await factory.create('UnverifiedEmailAddress', {
+        emailAddress = await Factory.build('unverifiedEmailAddress', {
           nonce: 'abcdef',
           verifiedAt: null,
           createdAt: new Date().toISOString(),
@@ -281,7 +280,7 @@ describe('VerifyEmailAddress', () => {
 
           describe('Edge case: In the meantime someone created an `EmailAddress` node with the given email', () => {
             beforeEach(async () => {
-              await factory.create('EmailAddress', { email: 'to-be-verified@example.org' })
+              await Factory.build('emailAddress', { email: 'to-be-verified@example.org' })
             })
 
             it('throws UserInputError because of unique constraints', async () => {
diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js
index d7f5e3113..9bfdaf3a4 100644
--- a/backend/src/schema/resolvers/follow.spec.js
+++ b/backend/src/schema/resolvers/follow.spec.js
@@ -1,10 +1,9 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { gql } from '../../helpers/jest'
 
-const factory = Factory()
 const driver = getDriver()
 const neode = getNeode()
 
@@ -54,7 +53,7 @@ const userQuery = gql`
 `
 
 beforeAll(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
   const { server } = createServer({
     context: () => ({
       driver,
@@ -72,39 +71,35 @@ beforeAll(async () => {
 })
 
 beforeEach(async () => {
-  user1 = await factory
-    .create(
-      'User',
-      {
-        id: 'u1',
-        name: 'user1',
-      },
-      {
-        email: 'test@example.org',
-        password: '1234',
-      },
-    )
-    .then(user => user.toJson())
-  user2 = await factory
-    .create(
-      'User',
-      {
-        id: 'u2',
-        name: 'user2',
-      },
-      {
-        email: 'test2@example.org',
-        password: '1234',
-      },
-    )
-    .then(user => user.toJson())
+  user1 = await Factory.build(
+    'user',
+    {
+      id: 'u1',
+      name: 'user1',
+    },
+    {
+      email: 'test@example.org',
+      password: '1234',
+    },
+  ).then(user => user.toJson())
+  user2 = await Factory.build(
+    'user',
+    {
+      id: 'u2',
+      name: 'user2',
+    },
+    {
+      email: 'test2@example.org',
+      password: '1234',
+    },
+  ).then(user => user.toJson())
 
   authenticatedUser = user1
   variables = { id: user2.id }
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('follow', () => {
diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js
index aba11f9bc..6e2046132 100644
--- a/backend/src/schema/resolvers/locations.spec.js
+++ b/backend/src/schema/resolvers/locations.spec.js
@@ -1,11 +1,9 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 
-const factory = Factory()
-
 let mutate, authenticatedUser
 
 const driver = getDriver()
@@ -25,7 +23,7 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('resolvers', () => {
@@ -49,7 +47,7 @@ describe('resolvers', () => {
           id: 'u47',
           name: 'John Doughnut',
         }
-        const Paris = await factory.create('Location', {
+        const Paris = await Factory.build('location', {
           id: 'region.9397217726497330',
           name: 'Paris',
           type: 'region',
@@ -58,7 +56,7 @@ describe('resolvers', () => {
           nameEN: 'Paris',
         })
 
-        const user = await factory.create('User', {
+        const user = await Factory.build('user', {
           id: 'u47',
           name: 'John Doe',
         })
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 856f094d1..8ebce9811 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -1,10 +1,9 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
-const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 
@@ -54,7 +53,7 @@ const reviewMutation = gql`
 
 describe('moderate resources', () => {
   beforeAll(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
     authenticatedUser = undefined
     const { server } = createServer({
       context: () => {
@@ -80,8 +79,8 @@ describe('moderate resources', () => {
       closed: false,
     }
     authenticatedUser = null
-    moderator = await factory.create(
-      'User',
+    moderator = await Factory.build(
+      'user',
       {
         id: 'moderator-id',
         name: 'Moderator',
@@ -92,8 +91,8 @@ describe('moderate resources', () => {
         password: '1234',
       },
     )
-    nonModerator = await factory.create(
-      'User',
+    nonModerator = await Factory.build(
+      'user',
       {
         id: 'non-moderator',
         name: 'Non Moderator',
@@ -106,7 +105,7 @@ describe('moderate resources', () => {
   })
 
   afterEach(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
   })
 
   describe('review to close report, leaving resource enabled', () => {
@@ -137,10 +136,10 @@ describe('moderate resources', () => {
     describe('moderator', () => {
       beforeEach(async () => {
         authenticatedUser = await moderator.toJson()
-        const questionablePost = await factory.create('Post', {
+        const questionablePost = await Factory.build('post', {
           id: 'should-i-be-disabled',
         })
-        const reportAgainstQuestionablePost = await factory.create('Report')
+        const reportAgainstQuestionablePost = await Factory.build('report')
         await Promise.all([
           reportAgainstQuestionablePost.relateTo(nonModerator, 'filed', {
             resourceId: 'should-i-be-disabled',
@@ -239,10 +238,10 @@ describe('moderate resources', () => {
 
       describe('moderate a comment', () => {
         beforeEach(async () => {
-          const trollingComment = await factory.create('Comment', {
+          const trollingComment = await Factory.build('comment', {
             id: 'comment-id',
           })
-          const reportAgainstTrollingComment = await factory.create('Report')
+          const reportAgainstTrollingComment = await Factory.build('report')
           await Promise.all([
             reportAgainstTrollingComment.relateTo(nonModerator, 'filed', {
               resourceId: 'comment-id',
@@ -317,10 +316,10 @@ describe('moderate resources', () => {
 
       describe('moderate a post', () => {
         beforeEach(async () => {
-          const trollingPost = await factory.create('Post', {
+          const trollingPost = await Factory.build('post', {
             id: 'post-id',
           })
-          const reportAgainstTrollingPost = await factory.create('Report')
+          const reportAgainstTrollingPost = await Factory.build('report')
           await Promise.all([
             reportAgainstTrollingPost.relateTo(nonModerator, 'filed', {
               resourceId: 'post-id',
@@ -397,10 +396,10 @@ describe('moderate resources', () => {
 
       describe('moderate a user', () => {
         beforeEach(async () => {
-          const troll = await factory.create('User', {
+          const troll = await Factory.build('user', {
             id: 'user-id',
           })
-          const reportAgainstTroll = await factory.create('Report')
+          const reportAgainstTroll = await Factory.build('report')
           await Promise.all([
             reportAgainstTroll.relateTo(nonModerator, 'filed', {
               resourceId: 'user-id',
@@ -514,10 +513,10 @@ describe('moderate resources', () => {
 
         describe('moderate a comment', () => {
           beforeEach(async () => {
-            const trollingComment = await factory.create('Comment', {
+            const trollingComment = await Factory.build('comment', {
               id: 'comment-id',
             })
-            const reportAgainstTrollingComment = await factory.create('Report')
+            const reportAgainstTrollingComment = await Factory.build('report')
             await Promise.all([
               reportAgainstTrollingComment.relateTo(nonModerator, 'filed', {
                 resourceId: 'comment-id',
@@ -578,10 +577,10 @@ describe('moderate resources', () => {
 
         describe('moderate a post', () => {
           beforeEach(async () => {
-            const trollingPost = await factory.create('Post', {
+            const trollingPost = await Factory.build('post', {
               id: 'post-id',
             })
-            const reportAgainstTrollingPost = await factory.create('Report')
+            const reportAgainstTrollingPost = await Factory.build('report')
             await Promise.all([
               reportAgainstTrollingPost.relateTo(nonModerator, 'filed', {
                 resourceId: 'post-id',
@@ -643,10 +642,10 @@ describe('moderate resources', () => {
 
         describe('moderate a user', () => {
           beforeEach(async () => {
-            const troll = await factory.create('User', {
+            const troll = await Factory.build('user', {
               id: 'user-id',
             })
-            const reportAgainstTroll = await factory.create('Report')
+            const reportAgainstTroll = await Factory.build('report')
             await Promise.all([
               reportAgainstTroll.relateTo(nonModerator, 'filed', {
                 resourceId: 'user-id',
diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index 1ce95ddd4..d2eb9b88c 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -1,10 +1,9 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
 
-const factory = Factory()
 const driver = getDriver()
 let authenticatedUser
 let user
@@ -32,22 +31,22 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('given some notifications', () => {
   beforeEach(async () => {
     const categoryIds = ['cat1']
-    author = await factory.create('User', { id: 'author' })
-    user = await factory.create('User', { id: 'you' })
+    author = await Factory.build('user', { id: 'author' })
+    user = await Factory.build('user', { id: 'you' })
     const [neighbor] = await Promise.all([
-      factory.create('User', { id: 'neighbor' }),
-      factory.create('Category', { id: 'cat1' }),
+      Factory.build('user', { id: 'neighbor' }),
+      Factory.build('category', { id: 'cat1' }),
     ])
     const [post1, post2, post3] = await Promise.all([
-      factory.create('Post', { id: 'p1', content: 'Not for you' }, { author, categoryIds }),
-      factory.create(
-        'Post',
+      Factory.build('post', { id: 'p1', content: 'Not for you' }, { author, categoryIds }),
+      Factory.build(
+        'post',
         {
           id: 'p2',
           content: 'Already seen post mention',
@@ -57,8 +56,8 @@ describe('given some notifications', () => {
           categoryIds,
         },
       ),
-      factory.create(
-        'Post',
+      Factory.build(
+        'post',
         {
           id: 'p3',
           content: 'You have been mentioned in a post',
@@ -70,8 +69,8 @@ describe('given some notifications', () => {
       ),
     ])
     const [comment1, comment2, comment3] = await Promise.all([
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c1',
           content: 'You have seen this comment mentioning already',
@@ -81,8 +80,8 @@ describe('given some notifications', () => {
           postId: 'p3',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c2',
           content: 'You have been mentioned in a comment',
@@ -92,8 +91,8 @@ describe('given some notifications', () => {
           postId: 'p3',
         },
       ),
-      factory.create(
-        'Comment',
+      Factory.build(
+        'comment',
         {
           id: 'c3',
           content: 'Somebody else was mentioned in a comment',
diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js
index 97fba47f4..0d297a625 100644
--- a/backend/src/schema/resolvers/passwordReset.spec.js
+++ b/backend/src/schema/resolvers/passwordReset.spec.js
@@ -1,4 +1,4 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createPasswordReset from './helpers/createPasswordReset'
@@ -7,7 +7,6 @@ import { createTestClient } from 'apollo-server-testing'
 
 const neode = getNeode()
 const driver = getDriver()
-const factory = Factory()
 
 let mutate
 let authenticatedUser
@@ -39,14 +38,14 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('passwordReset', () => {
   describe('given a user', () => {
     beforeEach(async () => {
-      await factory.create(
-        'User',
+      await Factory.build(
+        'user',
         {},
         {
           email: 'user@example.org',
@@ -127,8 +126,8 @@ describe('resetPassword', () => {
 
   describe('given a user', () => {
     beforeEach(async () => {
-      await factory.create(
-        'User',
+      await Factory.build(
+        'user',
         {
           role: 'user',
         },
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index b8fe25ec3..f6471035a 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -1,11 +1,10 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 const driver = getDriver()
-const factory = Factory()
 const neode = getNeode()
 
 let query
@@ -40,7 +39,7 @@ const createPostMutation = gql`
 `
 
 beforeAll(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
   const { server } = createServer({
     context: () => {
       return {
@@ -56,8 +55,8 @@ beforeAll(async () => {
 
 beforeEach(async () => {
   variables = {}
-  user = await factory.create(
-    'User',
+  user = await Factory.build(
+    'user',
     {
       id: 'current-user',
       name: 'TestUser',
@@ -93,7 +92,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('Post', () => {
@@ -101,8 +100,8 @@ describe('Post', () => {
     let followedUser, happyPost, cryPost
     beforeEach(async () => {
       ;[followedUser] = await Promise.all([
-        factory.create(
-          'User',
+        Factory.build(
+          'user',
           {
             id: 'followed-by-me',
             name: 'Followed User',
@@ -114,10 +113,10 @@ describe('Post', () => {
         ),
       ])
       ;[happyPost, cryPost] = await Promise.all([
-        factory.create('Post', { id: 'happy-post' }, { categoryIds: ['cat4'] }),
-        factory.create('Post', { id: 'cry-post' }, { categoryIds: ['cat15'] }),
-        factory.create(
-          'Post',
+        Factory.build('post', { id: 'happy-post' }, { categoryIds: ['cat4'] }),
+        Factory.build('post', { id: 'cry-post' }, { categoryIds: ['cat15'] }),
+        Factory.build(
+          'post',
           {
             id: 'post-by-followed-user',
           },
@@ -355,9 +354,9 @@ describe('UpdatePost', () => {
     }
   `
   beforeEach(async () => {
-    author = await factory.create('User', { slug: 'the-author' })
-    newlyCreatedPost = await factory.create(
-      'Post',
+    author = await Factory.build('user', { slug: 'the-author' })
+    newlyCreatedPost = await Factory.build(
+      'post',
       {
         id: 'p9876',
         title: 'Old title',
@@ -549,8 +548,8 @@ describe('UpdatePost', () => {
 
       describe('are allowed to pin posts', () => {
         beforeEach(async () => {
-          await factory.create(
-            'Post',
+          await Factory.build(
+            'post',
             {
               id: 'created-and-pinned-by-same-admin',
             },
@@ -614,13 +613,13 @@ describe('UpdatePost', () => {
       describe('post created by another admin', () => {
         let otherAdmin
         beforeEach(async () => {
-          otherAdmin = await factory.create('User', {
+          otherAdmin = await Factory.build('user', {
             role: 'admin',
             name: 'otherAdmin',
           })
           authenticatedUser = await otherAdmin.toJson()
-          await factory.create(
-            'Post',
+          await Factory.build(
+            'post',
             {
               id: 'created-by-one-admin-pinned-by-different-one',
             },
@@ -684,8 +683,8 @@ describe('UpdatePost', () => {
       describe('pinned post already exists', () => {
         let pinnedPost
         beforeEach(async () => {
-          await factory.create(
-            'Post',
+          await Factory.build(
+            'post',
             {
               id: 'only-pinned-post',
             },
@@ -718,12 +717,12 @@ describe('UpdatePost', () => {
 
       describe('PostOrdering', () => {
         beforeEach(async () => {
-          await factory.create('Post', {
+          await Factory.build('post', {
             id: 'im-a-pinned-post',
             createdAt: '2019-11-22T17:26:29.070Z',
             pinned: true,
           })
-          await factory.create('Post', {
+          await Factory.build('post', {
             id: 'i-was-created-before-pinned-post',
             // fairly old, so this should be 3rd
             createdAt: '2019-10-22T17:26:29.070Z',
@@ -842,7 +841,7 @@ describe('UpdatePost', () => {
     describe('admin can unpin posts', () => {
       let admin, pinnedPost
       beforeEach(async () => {
-        pinnedPost = await factory.create('Post', { id: 'post-to-be-unpinned' })
+        pinnedPost = await Factory.build('post', { id: 'post-to-be-unpinned' })
         admin = await user.update({
           role: 'admin',
           name: 'Admin',
@@ -909,9 +908,9 @@ describe('DeletePost', () => {
   `
 
   beforeEach(async () => {
-    author = await factory.create('User')
-    await factory.create(
-      'Post',
+    author = await Factory.build('user')
+    await Factory.build(
+      'post',
       {
         id: 'p4711',
         title: 'I will be deleted',
@@ -969,8 +968,8 @@ describe('DeletePost', () => {
 
     describe('if there are comments on the post', () => {
       beforeEach(async () => {
-        await factory.create(
-          'Comment',
+        await Factory.build(
+          'comment',
           {
             content: 'to be deleted comment content',
             contentExcerpt: 'to be deleted comment content',
@@ -1033,8 +1032,8 @@ describe('emotions', () => {
 
   beforeEach(async () => {
     author = await neode.create('User', { id: 'u257' })
-    postToEmote = await factory.create(
-      'Post',
+    postToEmote = await Factory.build(
+      'post',
       {
         id: 'p1376',
       },
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
index 36514bf4d..5543d0770 100644
--- a/backend/src/schema/resolvers/registration.spec.js
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -1,11 +1,9 @@
-import Factory from '../../factories'
-import { Factory as RosieFactory } from 'rosie'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 
-const factory = Factory()
 const neode = getNeode()
 
 let mutate
@@ -31,7 +29,7 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('Signup', () => {
@@ -59,8 +57,8 @@ describe('Signup', () => {
 
     describe('as admin', () => {
       beforeEach(async () => {
-        const admin = await factory.create(
-          'User',
+        const admin = await Factory.build(
+          'user',
           {
             role: 'admin',
           },
@@ -98,7 +96,7 @@ describe('Signup', () => {
         describe('if the email already exists', () => {
           let emailAddress
           beforeEach(async () => {
-            emailAddress = await factory.create('EmailAddress', {
+            emailAddress = await Factory.build('emailAddress', {
               email: 'someuser@example.org',
               verifiedAt: null,
             })
@@ -106,7 +104,7 @@ describe('Signup', () => {
 
           describe('and the user has registered already', () => {
             beforeEach(async () => {
-              const user = await RosieFactory.build('userWithoutEmailAddress')
+              const user = await Factory.build('userWithoutEmailAddress')
               await emailAddress.relateTo(user, 'belongsTo')
             })
 
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 9cd4c1279..34f46c4fa 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -1,10 +1,9 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getDriver, getNeode } from '../../db/neo4j'
 
-const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
@@ -53,7 +52,7 @@ describe('file a report on a resource', () => {
   }
 
   beforeAll(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
     const { server } = createServer({
       context: () => {
         return {
@@ -68,7 +67,7 @@ describe('file a report on a resource', () => {
   })
 
   afterEach(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
   })
 
   describe('report a resource', () => {
@@ -84,8 +83,8 @@ describe('file a report on a resource', () => {
 
     describe('authenticated', () => {
       beforeEach(async () => {
-        currentUser = await factory.create(
-          'User',
+        currentUser = await Factory.build(
+          'user',
           {
             id: 'current-user-id',
             role: 'user',
@@ -95,8 +94,8 @@ describe('file a report on a resource', () => {
             password: '1234',
           },
         )
-        otherReportingUser = await factory.create(
-          'User',
+        otherReportingUser = await Factory.build(
+          'user',
           {
             id: 'other-reporting-user-id',
             role: 'user',
@@ -106,8 +105,8 @@ describe('file a report on a resource', () => {
             password: '1234',
           },
         )
-        await factory.create(
-          'User',
+        await Factory.build(
+          'user',
           {
             id: 'abusive-user-id',
             role: 'user',
@@ -356,8 +355,8 @@ describe('file a report on a resource', () => {
 
         describe('reported resource is a post', () => {
           beforeEach(async () => {
-            await factory.create(
-              'Post',
+            await Factory.build(
+              'post',
               {
                 id: 'post-to-report-id',
                 title: 'This is a post that is going to be reported',
@@ -415,8 +414,8 @@ describe('file a report on a resource', () => {
 
         describe('reported resource is a comment', () => {
           beforeEach(async () => {
-            await factory.create(
-              'Post',
+            await Factory.build(
+              'post',
               {
                 id: 'p1',
                 title: 'post to comment on',
@@ -427,8 +426,8 @@ describe('file a report on a resource', () => {
                 author: currentUser,
               },
             )
-            await factory.create(
-              'Comment',
+            await Factory.build(
+              'comment',
               {
                 id: 'comment-to-report-id',
                 content: 'Post comment to be reported.',
@@ -486,7 +485,7 @@ describe('file a report on a resource', () => {
 
         describe('reported resource is a tag', () => {
           beforeEach(async () => {
-            await factory.create('Tag', {
+            await Factory.build('tag', {
               id: 'tag-to-report-id',
             })
           })
@@ -544,8 +543,8 @@ describe('file a report on a resource', () => {
 
     beforeEach(async () => {
       authenticatedUser = null
-      moderator = await factory.create(
-        'User',
+      moderator = await Factory.build(
+        'user',
         {
           id: 'moderator-1',
           role: 'moderator',
@@ -555,8 +554,8 @@ describe('file a report on a resource', () => {
           password: '1234',
         },
       )
-      currentUser = await factory.create(
-        'User',
+      currentUser = await Factory.build(
+        'user',
         {
           id: 'current-user-id',
           role: 'user',
@@ -566,8 +565,8 @@ describe('file a report on a resource', () => {
           password: '1234',
         },
       )
-      abusiveUser = await factory.create(
-        'User',
+      abusiveUser = await Factory.build(
+        'user',
         {
           id: 'abusive-user-1',
           role: 'user',
@@ -584,8 +583,8 @@ describe('file a report on a resource', () => {
       })
 
       await Promise.all([
-        factory.create(
-          'Post',
+        Factory.build(
+          'post',
           {
             id: 'abusive-post-1',
             content: 'Interesting Knowledge',
@@ -595,8 +594,8 @@ describe('file a report on a resource', () => {
             author: abusiveUser,
           },
         ),
-        factory.create(
-          'Post',
+        Factory.build(
+          'post',
           {
             id: 'post-2',
             content: 'More things to do …',
@@ -606,8 +605,8 @@ describe('file a report on a resource', () => {
             categoryIds,
           },
         ),
-        factory.create(
-          'Post',
+        Factory.build(
+          'post',
           {
             id: 'post-3',
             content: 'I am at school …',
@@ -619,8 +618,8 @@ describe('file a report on a resource', () => {
         ),
       ])
       await Promise.all([
-        factory.create(
-          'Comment',
+        Factory.build(
+          'comment',
           {
             id: 'abusive-comment-1',
           },
diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index ba5c2dc42..df15f4682 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -1,10 +1,9 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
-const factory = Factory()
 const driver = getDriver()
 const instance = getNeode()
 
@@ -31,8 +30,8 @@ describe('rewards', () => {
   })
 
   beforeEach(async () => {
-    regularUser = await factory.create(
-      'User',
+    regularUser = await Factory.build(
+      'user',
       {
         id: 'regular-user-id',
         role: 'user',
@@ -42,8 +41,8 @@ describe('rewards', () => {
         password: '1234',
       },
     )
-    moderator = await factory.create(
-      'User',
+    moderator = await Factory.build(
+      'user',
       {
         id: 'moderator-id',
         role: 'moderator',
@@ -52,8 +51,8 @@ describe('rewards', () => {
         email: 'moderator@example.org',
       },
     )
-    administrator = await factory.create(
-      'User',
+    administrator = await Factory.build(
+      'user',
       {
         id: 'admin-id',
         role: 'admin',
@@ -62,7 +61,7 @@ describe('rewards', () => {
         email: 'admin@example.org',
       },
     )
-    badge = await factory.create('Badge', {
+    badge = await Factory.build('badge', {
       id: 'indiegogo_en_rhino',
       type: 'crowdfunding',
       status: 'permanent',
@@ -71,7 +70,7 @@ describe('rewards', () => {
   })
 
   afterEach(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
   })
 
   describe('reward', () => {
@@ -145,7 +144,7 @@ describe('rewards', () => {
       })
 
       it('rewards a second different badge to same user', async () => {
-        await factory.create('Badge', {
+        await Factory.build('badge', {
           id: 'indiegogo_en_racoon',
           icon: '/img/badges/indiegogo_en_racoon.svg',
         })
@@ -187,8 +186,8 @@ describe('rewards', () => {
           },
           errors: undefined,
         }
-        await factory.create(
-          'User',
+        await Factory.build(
+          'user',
           {
             id: 'regular-user-2-id',
           },
diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
index dfe14f875..9fa595db7 100644
--- a/backend/src/schema/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -1,11 +1,10 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let mutate, query, authenticatedUser, variables
-const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
@@ -47,8 +46,8 @@ describe('shout and unshout posts', () => {
     query = createTestClient(server).query
   })
   beforeEach(async () => {
-    currentUser = await factory.create(
-      'User',
+    currentUser = await Factory.build(
+      'user',
       {
         id: 'current-user-id',
         name: 'Current User',
@@ -59,8 +58,8 @@ describe('shout and unshout posts', () => {
       },
     )
 
-    postAuthor = await factory.create(
-      'User',
+    postAuthor = await Factory.build(
+      'user',
       {
         id: 'id-of-another-user',
         name: 'Another User',
@@ -72,7 +71,7 @@ describe('shout and unshout posts', () => {
     )
   })
   afterEach(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
   })
 
   describe('shout', () => {
@@ -88,8 +87,8 @@ describe('shout and unshout posts', () => {
     describe('authenticated', () => {
       beforeEach(async () => {
         authenticatedUser = await currentUser.toJson()
-        await factory.create(
-          'Post',
+        await Factory.build(
+          'post',
           {
             name: 'Other user post',
             id: 'another-user-post-id',
@@ -98,8 +97,8 @@ describe('shout and unshout posts', () => {
             author: postAuthor,
           },
         )
-        await factory.create(
-          'Post',
+        await Factory.build(
+          'post',
           {
             name: 'current user post',
             id: 'current-user-post-id',
@@ -164,8 +163,8 @@ describe('shout and unshout posts', () => {
     describe('authenticated', () => {
       beforeEach(async () => {
         authenticatedUser = await currentUser.toJson()
-        await factory.create(
-          'Post',
+        await Factory.build(
+          'post',
           {
             name: 'Posted By Another User',
             id: 'posted-by-another-user',
diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js
index 05bb13eb4..dd8b71580 100644
--- a/backend/src/schema/resolvers/socialMedia.spec.js
+++ b/backend/src/schema/resolvers/socialMedia.spec.js
@@ -1,11 +1,10 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getDriver } from '../../db/neo4j'
 
 const driver = getDriver()
-const factory = Factory()
 
 describe('SocialMedia', () => {
   let socialMediaAction, someUser, ownerNode, owner
@@ -14,14 +13,14 @@ describe('SocialMedia', () => {
   const newUrl = 'https://twitter.com/bullerby'
 
   const setUpSocialMedia = async () => {
-    const socialMediaNode = await factory.create('SocialMedia', { url })
+    const socialMediaNode = await Factory.build('socialMedia', { url })
     await socialMediaNode.relateTo(ownerNode, 'ownedBy')
     return socialMediaNode.toJson()
   }
 
   beforeEach(async () => {
-    const someUserNode = await factory.create(
-      'User',
+    const someUserNode = await Factory.build(
+      'user',
       {
         name: 'Kalle Blomqvist',
       },
@@ -32,8 +31,8 @@ describe('SocialMedia', () => {
     )
 
     someUser = await someUserNode.toJson()
-    ownerNode = await factory.create(
-      'User',
+    ownerNode = await Factory.build(
+      'user',
       {
         name: 'Pippi Langstrumpf',
       },
@@ -63,7 +62,7 @@ describe('SocialMedia', () => {
   })
 
   afterEach(async () => {
-    await factory.cleanDatabase()
+    await cleanDatabase()
   })
 
   describe('create social media', () => {
diff --git a/backend/src/schema/resolvers/statistics.spec.js b/backend/src/schema/resolvers/statistics.spec.js
index e2b9dafe4..2ef1780ef 100644
--- a/backend/src/schema/resolvers/statistics.spec.js
+++ b/backend/src/schema/resolvers/statistics.spec.js
@@ -1,11 +1,10 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let query, authenticatedUser
-const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
@@ -37,7 +36,7 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('statistics', () => {
@@ -45,7 +44,7 @@ describe('statistics', () => {
     beforeEach(async () => {
       await Promise.all(
         [...Array(6).keys()].map(() => {
-          return factory.create('User')
+          return Factory.build('user')
         }),
       )
     })
@@ -62,7 +61,7 @@ describe('statistics', () => {
     beforeEach(async () => {
       await Promise.all(
         [...Array(3).keys()].map(() => {
-          return factory.create('Post')
+          return Factory.build('post')
         }),
       )
     })
@@ -79,7 +78,7 @@ describe('statistics', () => {
     beforeEach(async () => {
       await Promise.all(
         [...Array(2).keys()].map(() => {
-          return factory.create('Comment')
+          return Factory.build('comment')
         }),
       )
     })
@@ -97,7 +96,7 @@ describe('statistics', () => {
     beforeEach(async () => {
       users = await Promise.all(
         [...Array(2).keys()].map(() => {
-          return factory.create('User')
+          return Factory.build('user')
         }),
       )
       await users[0].relateTo(users[1], 'following')
@@ -116,12 +115,12 @@ describe('statistics', () => {
     beforeEach(async () => {
       users = await Promise.all(
         [...Array(2).keys()].map(() => {
-          return factory.create('User')
+          return Factory.build('user')
         }),
       )
       posts = await Promise.all(
         [...Array(3).keys()].map(() => {
-          return factory.create('Post')
+          return Factory.build('post')
         }),
       )
       await Promise.all([
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 27bc84b10..dd304077b 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -1,20 +1,19 @@
 import jwt from 'jsonwebtoken'
 import CONFIG from './../../config'
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { createTestClient } from 'apollo-server-testing'
 import createServer, { context } from '../../server'
 import encode from '../../jwt/encode'
 import { getNeode } from '../../db/neo4j'
 
-const factory = Factory()
 const neode = getNeode()
 let query, mutate, variables, req, user
 
 const disable = async id => {
-  const moderator = await factory.create('User', { id: 'u2', role: 'moderator' })
+  const moderator = await Factory.build('user', { id: 'u2', role: 'moderator' })
   const user = await neode.find('User', id)
-  const reportAgainstUser = await factory.create('Report')
+  const reportAgainstUser = await Factory.build('report')
   await Promise.all([
     reportAgainstUser.relateTo(moderator, 'filed', {
       resourceId: id,
@@ -48,7 +47,7 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('isLoggedIn', () => {
@@ -69,7 +68,7 @@ describe('isLoggedIn', () => {
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      user = await factory.create('User', { id: 'u3' })
+      user = await Factory.build('user', { id: 'u3' })
       const userBearerToken = encode({ id: 'u3' })
       req = { headers: { authorization: `Bearer ${userBearerToken}` } }
     })
@@ -127,8 +126,8 @@ describe('currentUser', () => {
   describe('authenticated', () => {
     describe('and corresponding user in the database', () => {
       beforeEach(async () => {
-        await factory.create(
-          'User',
+        await Factory.build(
+          'user',
           {
             id: 'u3',
             // the `id` is the only thing that has to match the decoded JWT bearer token
@@ -177,8 +176,8 @@ describe('login', () => {
 
   beforeEach(async () => {
     variables = { email: 'test@example.org', password: '1234' }
-    user = await factory.create(
-      'User',
+    user = await Factory.build(
+      'user',
       {
         id: 'acb2d923-f3af-479e-9f00-61b12e864666',
       },
@@ -303,7 +302,7 @@ describe('change password', () => {
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      await factory.create('User', { id: 'u3' })
+      await Factory.build('user', { id: 'u3' })
       const userBearerToken = encode({ id: 'u3' })
       req = { headers: { authorization: `Bearer ${userBearerToken}` } }
     })
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 3806319f3..7d5cab853 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -1,10 +1,9 @@
-import Factory from '../../factories'
+import Factory, { cleanDatabase } from '../../factories'
 import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 
-const factory = Factory()
 const categoryIds = ['cat9']
 let user
 
@@ -31,13 +30,13 @@ beforeAll(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('User', () => {
   describe('query by email address', () => {
     beforeEach(async () => {
-      await factory.create('User', { name: 'Johnny' }, { email: 'any-email-address@example.org' })
+      await Factory.build('user', { name: 'Johnny' }, { email: 'any-email-address@example.org' })
     })
 
     const userQuery = gql`
@@ -57,8 +56,8 @@ describe('User', () => {
 
     describe('as admin', () => {
       beforeEach(async () => {
-        const admin = await factory.create(
-          'User',
+        const admin = await Factory.build(
+          'user',
           {
             role: 'admin',
           },
@@ -128,8 +127,8 @@ describe('UpdateUser', () => {
   `
 
   beforeEach(async () => {
-    user = await factory.create(
-      'User',
+    user = await Factory.build(
+      'user',
       {
         id: 'u47',
         name: 'John Doe',
@@ -145,8 +144,8 @@ describe('UpdateUser', () => {
 
   describe('as another user', () => {
     beforeEach(async () => {
-      const someoneElse = await factory.create(
-        'User',
+      const someoneElse = await Factory.build(
+        'user',
         {
           name: 'James Doe',
         },
@@ -277,13 +276,13 @@ describe('DeleteUser', () => {
   beforeEach(async () => {
     variables = { id: ' u343', resource: [] }
 
-    user = await factory.create('User', {
+    user = await Factory.build('user', {
       name: 'My name should be deleted',
       about: 'along with my about',
       id: 'u343',
     })
-    await factory.create(
-      'User',
+    await Factory.build(
+      'user',
       {
         id: 'not-my-account',
       },
@@ -323,13 +322,13 @@ describe('DeleteUser', () => {
 
       describe('given posts and comments', () => {
         beforeEach(async () => {
-          await factory.create('Category', {
+          await Factory.build('category', {
             id: 'cat9',
             name: 'Democracy & Politics',
             icon: 'university',
           })
-          await factory.create(
-            'Post',
+          await Factory.build(
+            'post',
             {
               id: 'p139',
               content: 'Post by user u343',
@@ -339,8 +338,8 @@ describe('DeleteUser', () => {
               categoryIds,
             },
           )
-          await factory.create(
-            'Comment',
+          await Factory.build(
+            'comment',
             {
               id: 'c155',
               content: 'Comment by user u343',
@@ -349,8 +348,8 @@ describe('DeleteUser', () => {
               author: user,
             },
           )
-          await factory.create(
-            'Comment',
+          await Factory.build(
+            'comment',
             {
               id: 'c156',
               content: "A comment by someone else on user u343's post",
@@ -556,7 +555,7 @@ describe('DeleteUser', () => {
 
       describe('connected `SocialMedia` nodes', () => {
         beforeEach(async () => {
-          const socialMedia = await factory.create('SocialMedia')
+          const socialMedia = await Factory.build('socialMedia')
           await socialMedia.relateTo(user, 'ownedBy')
         })
 
diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index 85c0f091f..824e03c2d 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -1,10 +1,9 @@
 import { gql } from '../../../helpers/jest'
-import Factory from '../../../factories'
+import Factory, { cleanDatabase } from '../../../factories'
 import { getNeode, getDriver } from '../../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../../server'
 
-const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 let authenticatedUser, mutate, variables
@@ -107,7 +106,7 @@ beforeEach(() => {
 })
 
 afterEach(() => {
-  factory.cleanDatabase()
+  cleanDatabase()
 })
 
 describe('userMiddleware', () => {
@@ -182,7 +181,7 @@ describe('userMiddleware', () => {
           },
         },
       ]
-      user = await factory.create('User', {
+      user = await Factory.build('user', {
         id: 'updating-user',
       })
       authenticatedUser = await user.toJson()
diff --git a/backend/src/schema/resolvers/users/mutedUsers.spec.js b/backend/src/schema/resolvers/users/mutedUsers.spec.js
index 130df08ce..68b26941d 100644
--- a/backend/src/schema/resolvers/users/mutedUsers.spec.js
+++ b/backend/src/schema/resolvers/users/mutedUsers.spec.js
@@ -1,11 +1,10 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../../server'
-import Factory from '../../../factories'
+import { cleanDatabase } from '../../../factories'
 import { gql } from '../../../helpers/jest'
 import { getNeode, getDriver } from '../../../db/neo4j'
 
 const driver = getDriver()
-const factory = Factory()
 const neode = getNeode()
 
 let currentUser
@@ -30,7 +29,7 @@ beforeEach(() => {
 })
 
 afterEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 describe('mutedUsers', () => {
diff --git a/backend/test/features/support/steps.js b/backend/test/features/support/steps.js
index ff9d45b27..4e9268818 100644
--- a/backend/test/features/support/steps.js
+++ b/backend/test/features/support/steps.js
@@ -6,12 +6,11 @@ import { GraphQLClient } from 'graphql-request'
 import Factory from '../../../src/factories'
 const debug = require('debug')('ea:test:steps')
 
-const factory = Factory()
 const client = new GraphQLClient(host)
 
 function createUser (slug) {
   debug(`creating user ${slug}`)
-  return factory.create('User', {
+  return Factory.build('user', {
     name: slug,
   }, {
     password: '1234'
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 6b808c75f..664d71d1b 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -30,7 +30,7 @@ Given("I see David Irving's post on the post page", page => {
 })
 
 Given('I am logged in with a {string} role', role => {
-  cy.factory().create('User', {
+  cy.factory().build('user', {
     termsAndConditionsAgreedVersion: VERSION,
     role
   }, {
@@ -128,7 +128,7 @@ Given('somebody reported the following posts:', table => {
       password: '1234'
     }
     cy.factory()
-      .create('User', {}, submitter)
+      .build('user', {}, submitter)
       .authenticateAs(submitter)
       .mutate(gql`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
@@ -167,8 +167,9 @@ Then('I can visit the post page', () => {
 
 When("they have a post someone has reported", () => {
   cy.factory()
-    .create("Post", {
-      authorId: 'annnoying-user',
+    .build("post", {
       title,
+    }, {
+      authorId: 'annnoying-user',
     });
 })
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 3867b3513..a0c3f30ae 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -25,14 +25,12 @@ const narratorParams = {
   name: "Peter Pan",
   slug: "peter-pan",
   avatar: "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg",
-  ...loginCredentials,
   ...termsAndConditionsAgreedVersion,
 };
 
 const annoyingParams = {
   email: "spammy-spammer@example.org",
   password: "1234",
-  ...termsAndConditionsAgreedVersion
 };
 
 Given("I am logged in", () => {
@@ -48,44 +46,44 @@ Given("we have a selection of categories", () => {
 });
 
 Given("we have a selection of tags and categories as well as posts", () => {
-  cy.createCategories("cat12")
+  cy.createCategories("cat12", "cat121", "cat122")
     .factory()
-    .create("Tag", {
+    .build("tag", {
       id: "Ecology"
     })
-    .create("Tag", {
+    .build("tag", {
       id: "Nature"
     })
-    .create("Tag", {
+    .build("tag", {
       id: "Democracy"
     });
 
   cy.factory()
-    .create("User", {
+    .build("user", {
       id: 'a1'
     })
-    .create("Post", {
+    .build("post", {}, {
       authorId: 'a1',
       tagIds: ["Ecology", "Nature", "Democracy"],
       categoryIds: ["cat12"]
     })
-    .create("Post", {
+    .build("post", {}, {
       authorId: 'a1',
       tagIds: ["Nature", "Democracy"],
       categoryIds: ["cat121"]
     });
 
   cy.factory()
-    .create("User", {
+    .build("user", {
       id: 'a2'
     })
-    .create("Post", {
+    .build("post", {}, {
       authorId: 'a2',
       tagIds: ['Nature', 'Democracy'],
       categoryIds: ["cat12"]
     });
   cy.factory()
-    .create("Post", {
+    .build("post", {}, {
       authorId: narratorParams.id,
       tagIds: ['Democracy'],
       categoryIds: ["cat122"]
@@ -94,7 +92,7 @@ Given("we have a selection of tags and categories as well as posts", () => {
 
 Given("we have the following user accounts:", table => {
   table.hashes().forEach(params => {
-    cy.factory().create("User", {
+    cy.factory().build("user", {
       ...params,
       ...termsAndConditionsAgreedVersion
     });
@@ -102,15 +100,14 @@ Given("we have the following user accounts:", table => {
 });
 
 Given("I have a user account", () => {
-  cy.factory().create("User", narratorParams);
+  cy.factory().build("user", narratorParams);
 });
 
 Given("my user account has the role {string}", role => {
-  cy.factory().create("User", {
+  cy.factory().build("user", {
     role,
-    ...loginCredentials,
     ...termsAndConditionsAgreedVersion,
-  });
+  }, loginCredentials);
 });
 
 When("I log out", cy.logout);
@@ -193,7 +190,7 @@ When("I press {string}", label => {
 });
 
 Given("we have the following posts in our database:", table => {
-  cy.factory().create('Category', {
+  cy.factory().build('category', {
     id: `cat-456`,
     name: "Just For Fun",
     slug: `just-for-fun`,
@@ -208,9 +205,8 @@ Given("we have the following posts in our database:", table => {
       deleted: Boolean(postAttributes.deleted),
       disabled: Boolean(postAttributes.disabled),
       pinned: Boolean(postAttributes.pinned),
-      categoryIds: ['cat-456']
     }
-    cy.factory().create("Post", postAttributes);
+    cy.factory().build("post", postAttributes, { categoryIds: ['cat-456'] });
   })
 });
 
@@ -234,7 +230,7 @@ Given("I previously created a post", () => {
   lastPost.title = "previously created post";
   lastPost.content = "with some content";
   cy.factory()
-    .create("Post", lastPost);
+    .build("post", lastPost);
 });
 
 When("I choose {string} as the title of the post", title => {
@@ -302,10 +298,9 @@ Then(
 Given("my user account has the following login credentials:", table => {
   loginCredentials = table.hashes()[0];
   cy.debug();
-  cy.factory().create("User", {
+  cy.factory().build("user", {
     ...termsAndConditionsAgreedVersion,
-    ...loginCredentials
-  });
+  }, loginCredentials);
 });
 
 When("I fill the password form with:", table => {
@@ -412,12 +407,11 @@ Then("there are no notifications in the top menu", () => {
 });
 
 Given("there is an annoying user called {string}", name => {
-  cy.factory().create("User", {
-    ...annoyingParams,
+  cy.factory().build("user", {
     id: "annoying-user",
     name,
     ...termsAndConditionsAgreedVersion,
-  });
+  }, annoyingParams);
 });
 
 Given("there is an annoying user who has muted me", () => {
@@ -484,9 +478,10 @@ Given("I follow the user {string}", name => {
 Given('"Spammy Spammer" wrote a post {string}', title => {
   cy.createCategories("cat21")
     .factory()
-    .create("Post", {
-      authorId: 'annoying-user',
+    .build("post", {
       title,
+    }, {
+      authorId: 'annoying-user',
       categoryIds: ["cat21"]
     });
 });
@@ -507,9 +502,10 @@ Then("nobody is following the user profile anymore", () => {
 Given("I wrote a post {string}", title => {
   cy.createCategories(`cat213`, title)
     .factory()
-    .create("Post", {
-      authorId: narratorParams.id,
+    .build("post", {
       title,
+    }, {
+      authorId: narratorParams.id,
       categoryIds: ["cat213"]
     });
 });
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index c9a2e213a..6ab0a77ce 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -76,19 +76,19 @@ Cypress.Commands.add("openPage", page => {
 });
 
 Cypress.Commands.add("createCategories", (id, slug) => {
-  cy.neode()
-    .create("Category", {
+  cy.factory()
+    .build("category", {
       id: `${id}`,
       name: "Just For Fun",
       slug: `${slug}`,
       icon: "smile"
     })
-    .create("Category", {
+    .build("category", {
       id: `${id}1`,
       name: "Happiness & Values",
       icon: "heart-o"
     })
-    .create("Category", {
+    .build("category", {
       id: `${id}2`,
       name: "Health & Wellbeing",
       icon: "medkit"
diff --git a/cypress/support/factories.js b/cypress/support/factories.js
index d5d4ee768..7103ce524 100644
--- a/cypress/support/factories.js
+++ b/cypress/support/factories.js
@@ -1,4 +1,4 @@
-import Factory from '../../backend/src/factories'
+import Factory, { cleanDatabase } from '../../backend/src/factories'
 import { getDriver, getNeode } from '../../backend/src/db/neo4j'
 
 const neo4jConfigs = {
@@ -12,7 +12,7 @@ const factoryOptions = { neo4jDriver, neodeInstance }
 const factory = Factory(factoryOptions)
 
 beforeEach(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 Cypress.Commands.add('neode', () => {
@@ -38,10 +38,10 @@ Cypress.Commands.add('factory', () => {
 })
 
 Cypress.Commands.add(
-  'create',
+  'build',
   { prevSubject: true },
   async (factory, node, properties, options) => {
-    await factory.create(node, properties, options)
+    await Factory.build(node, properties, options)
     return factory
   }
 )
diff --git a/features/support/steps.js b/features/support/steps.js
index 71f493834..13e51007e 100644
--- a/features/support/steps.js
+++ b/features/support/steps.js
@@ -1,15 +1,13 @@
 // features/support/steps.js
 import { Given, When, Then, After, AfterAll } from 'cucumber'
-import Factory from '../../backend/src/factories'
+import Factory, { cleanDatabase } from '../../backend/src/factories'
 import dotenv from 'dotenv'
 import expect from 'expect'
 
 const debug = require('debug')('ea:test:steps')
-const factory = Factory()
-
 
 After(async () => {
-  await factory.cleanDatabase()
+  await cleanDatabase()
 })
 
 Given('our CLIENT_URI is {string}', function (string) {
@@ -21,7 +19,7 @@ Given('our CLIENT_URI is {string}', function (string) {
 
 Given('we have the following users in our database:', function (dataTable) {
   return Promise.all(dataTable.hashes().map(({ slug, name }) => {
-    return factory.create('User', {
+    return Factory.build('user', {
       name,
       slug,
     })

From f9c42ab2a552d26371dd6d4608d4ceb4586a9f48 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 28 Jan 2020 23:30:09 +0100
Subject: [PATCH 041/171] refactor(seeds): Use buildList to setup lists

---
 backend/src/db/seed.js | 406 +++++++++++------------------------------
 1 file changed, 106 insertions(+), 300 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index f2ec31876..e3fbe7fc1 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -933,334 +933,140 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       trollingComment.update({ disabled: true, updatedAt: new Date().toISOString(), closed: true }),
     ])
 
-    await Promise.all(
-      [...Array(30).keys()].map(i => {
-        return Factory.build('user')
-      }),
-    )
+    await Factory.buildList('user', 30)
 
-    await Promise.all(
-      [...Array(30).keys()].map(() => {
-        return Factory.build(
-          'post',
-          {
-            image: faker.image.unsplash.objects(),
-          },
-          {
-            categoryIds: ['cat1'],
-            author: jennyRostock,
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'post', 30, {
+      image: faker.image.unsplash.objects(),
+    }, {
+      categoryIds: ['cat1'],
+      author: jennyRostock,
+    })
 
-    await Promise.all(
-      [...Array(6).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p2',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 6, {}, {
+      author: jennyRostock,
+      postId: 'p2',
+    })
 
-    await Promise.all(
-      [...Array(4).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p15',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 4, {}, {
+      author: jennyRostock,
+      postId: 'p15',
+    })
 
-    await Promise.all(
-      [...Array(2).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p4',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 2, {}, {
+      author: jennyRostock,
+      postId: 'p4',
+    })
 
-    await Promise.all(
-      [...Array(21).keys()].map(() => {
-        return Factory.build(
-          'post',
-          {
-            image: faker.image.unsplash.buildings(),
-          },
-          {
-            author: peterLustig,
-          },
-        )
-      }),
-    )
+    await Factory.buildList('post', 21, {
+      image: faker.image.unsplash.buildings(),
+    }, {
+      author: peterLustig,
+    })
 
-    await Promise.all(
-      [...Array(3).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p4',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 3, {}, {
+      author: peterLustig,
+      postId: 'p4',
+    })
 
-    await Promise.all(
-      [...Array(5).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p14',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 5, {}, {
+      author: peterLustig,
+      postId: 'p14',
+    })
 
-    await Promise.all(
-      [...Array(6).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p0',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 6, {}, {
+      author: peterLustig,
+      postId: 'p0',
+    })
 
-    await Promise.all(
-      [...Array(11).keys()].map(() => {
-        return Factory.build(
-          'post',
-          {
-            image: faker.image.unsplash.food(),
-          },
-          {
-            author: dewey,
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'post', 11, {
+      image: faker.image.unsplash.food(),
+    }, {
+      author: dewey,
+    })
 
-    await Promise.all(
-      [...Array(7).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p2',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 7, {}, {
+      author: dewey,
+      postId: 'p2',
+    })
 
-    await Promise.all(
-      [...Array(5).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p6',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 5, {}, {
+      author: dewey,
+      postId: 'p6',
+    })
 
-    await Promise.all(
-      [...Array(2).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p9',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 2, {}, {
+      author: dewey,
+      postId: 'p9',
+    })
 
-    await Promise.all(
-      [...Array(16).keys()].map(() => {
-        return Factory.build(
-          'post',
-          {
-            image: faker.image.unsplash.technology(),
-          },
-          {
-            author: louie,
-          },
-        )
-      }),
-    )
+    await Factory.buildList('post', 16, {
+      image: faker.image.unsplash.technology(),
+    }, {
+      author: louie,
+    })
 
-    await Promise.all(
-      [...Array(4).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            postId: 'p1',
-            author: louie,
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 4, {}, {
+      postId: 'p1',
+      author: louie,
+    })
 
-    await Promise.all(
-      [...Array(8).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: louie,
-            postId: 'p10',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 8, {}, {
+      author: louie,
+      postId: 'p10',
+    })
 
-    await Promise.all(
-      [...Array(5).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: louie,
-            postId: 'p13',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 5, {}, {
+      author: louie,
+      postId: 'p13',
+    })
 
-    await Promise.all(
-      [...Array(45).keys()].map(() => {
-        return Factory.build(
-          'post',
-          {
-            image: faker.image.unsplash.people(),
-          },
-          {
-            author: bobDerBaumeister,
-          },
-        )
-      }),
-    )
+    await Factory.buildList('post', 45, {
+      image: faker.image.unsplash.people(),
+    }, {
+      author: bobDerBaumeister,
+    })
 
-    await Promise.all(
-      [...Array(2).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p2',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 2, {}, {
+      author: bobDerBaumeister,
+      postId: 'p2',
+    })
 
-    await Promise.all(
-      [...Array(3).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p12',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 3, {}, {
+      author: bobDerBaumeister,
+      postId: 'p12',
+    })
 
-    await Promise.all(
-      [...Array(7).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p13',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 7, {}, {
+      author: bobDerBaumeister,
+      postId: 'p13',
+    })
 
-    await Promise.all(
-      [...Array(8).keys()].map(() => {
-        return Factory.build(
-          'post',
-          {
-            image: faker.image.unsplash.nature(),
-          },
-          {
-            author: huey,
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'post', 8, {
+      image: faker.image.unsplash.nature(),
+    }, {
+      author: huey,
+    })
 
-    await Promise.all(
-      [...Array(6).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p0',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 6, {}, {
+      author: huey,
+      postId: 'p0',
+    })
 
-    await Promise.all(
-      [...Array(8).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p13',
-          },
-        )
-      }),
-    )
+    await Factory.buildList( 'comment', 8, {}, {
+      author: huey,
+      postId: 'p13',
+    })
 
-    await Promise.all(
-      [...Array(9).keys()].map(() => {
-        return Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p15',
-          },
-        )
-      }),
-    )
+    await Factory.buildList('comment', 9, {}, {
+      author: huey,
+      postId: 'p15',
+    })
 
     await Factory.build('donations')
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
+    await driver.close()
+    await neode.close()
     process.exit(0)
   } catch (err) {
     /* eslint-disable-next-line no-console */

From 910f12208714f3c2e2ce17ce4b7aa40212873e7d Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 29 Jan 2020 00:51:04 +0100
Subject: [PATCH 042/171] Fix lint and cypress

---
 backend/src/db/seed.js              | 326 +++++++++++++++++++---------
 cypress/integration/common/steps.js |  66 ++----
 cypress/support/commands.js         |  21 --
 cypress/support/factories.js        |   4 +-
 4 files changed, 249 insertions(+), 168 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index e3fbe7fc1..b5493d81d 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -935,132 +935,252 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     await Factory.buildList('user', 30)
 
-    await Factory.buildList( 'post', 30, {
-      image: faker.image.unsplash.objects(),
-    }, {
-      categoryIds: ['cat1'],
-      author: jennyRostock,
-    })
+    await Factory.buildList(
+      'post',
+      30,
+      {
+        image: faker.image.unsplash.objects(),
+      },
+      {
+        categoryIds: ['cat1'],
+        author: jennyRostock,
+      },
+    )
 
-    await Factory.buildList('comment', 6, {}, {
-      author: jennyRostock,
-      postId: 'p2',
-    })
+    await Factory.buildList(
+      'comment',
+      6,
+      {},
+      {
+        author: jennyRostock,
+        postId: 'p2',
+      },
+    )
 
-    await Factory.buildList('comment', 4, {}, {
-      author: jennyRostock,
-      postId: 'p15',
-    })
+    await Factory.buildList(
+      'comment',
+      4,
+      {},
+      {
+        author: jennyRostock,
+        postId: 'p15',
+      },
+    )
 
-    await Factory.buildList( 'comment', 2, {}, {
-      author: jennyRostock,
-      postId: 'p4',
-    })
+    await Factory.buildList(
+      'comment',
+      2,
+      {},
+      {
+        author: jennyRostock,
+        postId: 'p4',
+      },
+    )
 
-    await Factory.buildList('post', 21, {
-      image: faker.image.unsplash.buildings(),
-    }, {
-      author: peterLustig,
-    })
+    await Factory.buildList(
+      'post',
+      21,
+      {
+        image: faker.image.unsplash.buildings(),
+      },
+      {
+        author: peterLustig,
+      },
+    )
 
-    await Factory.buildList('comment', 3, {}, {
-      author: peterLustig,
-      postId: 'p4',
-    })
+    await Factory.buildList(
+      'comment',
+      3,
+      {},
+      {
+        author: peterLustig,
+        postId: 'p4',
+      },
+    )
 
-    await Factory.buildList('comment', 5, {}, {
-      author: peterLustig,
-      postId: 'p14',
-    })
+    await Factory.buildList(
+      'comment',
+      5,
+      {},
+      {
+        author: peterLustig,
+        postId: 'p14',
+      },
+    )
 
-    await Factory.buildList('comment', 6, {}, {
-      author: peterLustig,
-      postId: 'p0',
-    })
+    await Factory.buildList(
+      'comment',
+      6,
+      {},
+      {
+        author: peterLustig,
+        postId: 'p0',
+      },
+    )
 
-    await Factory.buildList( 'post', 11, {
-      image: faker.image.unsplash.food(),
-    }, {
-      author: dewey,
-    })
+    await Factory.buildList(
+      'post',
+      11,
+      {
+        image: faker.image.unsplash.food(),
+      },
+      {
+        author: dewey,
+      },
+    )
 
-    await Factory.buildList( 'comment', 7, {}, {
-      author: dewey,
-      postId: 'p2',
-    })
+    await Factory.buildList(
+      'comment',
+      7,
+      {},
+      {
+        author: dewey,
+        postId: 'p2',
+      },
+    )
 
-    await Factory.buildList( 'comment', 5, {}, {
-      author: dewey,
-      postId: 'p6',
-    })
+    await Factory.buildList(
+      'comment',
+      5,
+      {},
+      {
+        author: dewey,
+        postId: 'p6',
+      },
+    )
 
-    await Factory.buildList( 'comment', 2, {}, {
-      author: dewey,
-      postId: 'p9',
-    })
+    await Factory.buildList(
+      'comment',
+      2,
+      {},
+      {
+        author: dewey,
+        postId: 'p9',
+      },
+    )
 
-    await Factory.buildList('post', 16, {
-      image: faker.image.unsplash.technology(),
-    }, {
-      author: louie,
-    })
+    await Factory.buildList(
+      'post',
+      16,
+      {
+        image: faker.image.unsplash.technology(),
+      },
+      {
+        author: louie,
+      },
+    )
 
-    await Factory.buildList('comment', 4, {}, {
-      postId: 'p1',
-      author: louie,
-    })
+    await Factory.buildList(
+      'comment',
+      4,
+      {},
+      {
+        postId: 'p1',
+        author: louie,
+      },
+    )
 
-    await Factory.buildList('comment', 8, {}, {
-      author: louie,
-      postId: 'p10',
-    })
+    await Factory.buildList(
+      'comment',
+      8,
+      {},
+      {
+        author: louie,
+        postId: 'p10',
+      },
+    )
 
-    await Factory.buildList('comment', 5, {}, {
-      author: louie,
-      postId: 'p13',
-    })
+    await Factory.buildList(
+      'comment',
+      5,
+      {},
+      {
+        author: louie,
+        postId: 'p13',
+      },
+    )
 
-    await Factory.buildList('post', 45, {
-      image: faker.image.unsplash.people(),
-    }, {
-      author: bobDerBaumeister,
-    })
+    await Factory.buildList(
+      'post',
+      45,
+      {
+        image: faker.image.unsplash.people(),
+      },
+      {
+        author: bobDerBaumeister,
+      },
+    )
 
-    await Factory.buildList('comment', 2, {}, {
-      author: bobDerBaumeister,
-      postId: 'p2',
-    })
+    await Factory.buildList(
+      'comment',
+      2,
+      {},
+      {
+        author: bobDerBaumeister,
+        postId: 'p2',
+      },
+    )
 
-    await Factory.buildList( 'comment', 3, {}, {
-      author: bobDerBaumeister,
-      postId: 'p12',
-    })
+    await Factory.buildList(
+      'comment',
+      3,
+      {},
+      {
+        author: bobDerBaumeister,
+        postId: 'p12',
+      },
+    )
 
-    await Factory.buildList( 'comment', 7, {}, {
-      author: bobDerBaumeister,
-      postId: 'p13',
-    })
+    await Factory.buildList(
+      'comment',
+      7,
+      {},
+      {
+        author: bobDerBaumeister,
+        postId: 'p13',
+      },
+    )
 
-    await Factory.buildList( 'post', 8, {
-      image: faker.image.unsplash.nature(),
-    }, {
-      author: huey,
-    })
+    await Factory.buildList(
+      'post',
+      8,
+      {
+        image: faker.image.unsplash.nature(),
+      },
+      {
+        author: huey,
+      },
+    )
 
-    await Factory.buildList('comment', 6, {}, {
-      author: huey,
-      postId: 'p0',
-    })
+    await Factory.buildList(
+      'comment',
+      6,
+      {},
+      {
+        author: huey,
+        postId: 'p0',
+      },
+    )
 
-    await Factory.buildList( 'comment', 8, {}, {
-      author: huey,
-      postId: 'p13',
-    })
+    await Factory.buildList(
+      'comment',
+      8,
+      {},
+      {
+        author: huey,
+        postId: 'p13',
+      },
+    )
 
-    await Factory.buildList('comment', 9, {}, {
-      author: huey,
-      postId: 'p15',
-    })
+    await Factory.buildList(
+      'comment',
+      9,
+      {},
+      {
+        author: huey,
+        postId: 'p15',
+      },
+    )
 
     await Factory.build('donations')
     /* eslint-disable-next-line no-console */
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index a0c3f30ae..a22ee8e77 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -42,26 +42,18 @@ Given("I am logged in as the muted user", () => {
 });
 
 Given("we have a selection of categories", () => {
-  cy.createCategories("cat0", "just-for-fun");
+  cy.factory().build('category', { id: "cat0", slug: "just-for-fun" });
 });
 
 Given("we have a selection of tags and categories as well as posts", () => {
-  cy.createCategories("cat12", "cat121", "cat122")
-    .factory()
-    .build("tag", {
-      id: "Ecology"
-    })
-    .build("tag", {
-      id: "Nature"
-    })
-    .build("tag", {
-      id: "Democracy"
-    });
-
   cy.factory()
-    .build("user", {
-      id: 'a1'
-    })
+    .build('category', { id: 'cat12', name: "Just For Fun", icon: "smile", })
+    .build('category', { id: 'cat121', name: "Happiness & Values", icon: "heart-o"})
+    .build('category', { id: 'cat122', name: "Health & Wellbeing", icon: "medkit"})
+    .build("tag", { id: "Ecology" })
+    .build("tag", { id: "Nature" })
+    .build("tag", { id: "Democracy" })
+    .build("user", { id: 'a1' })
     .build("post", {}, {
       authorId: 'a1',
       tagIds: ["Ecology", "Nature", "Democracy"],
@@ -71,20 +63,14 @@ Given("we have a selection of tags and categories as well as posts", () => {
       authorId: 'a1',
       tagIds: ["Nature", "Democracy"],
       categoryIds: ["cat121"]
-    });
-
-  cy.factory()
-    .build("user", {
-      id: 'a2'
     })
+    .build("user", { id: 'a2' })
     .build("post", {}, {
       authorId: 'a2',
       tagIds: ['Nature', 'Democracy'],
       categoryIds: ["cat12"]
-    });
-  cy.factory()
+    })
     .build("post", {}, {
-      authorId: narratorParams.id,
       tagIds: ['Democracy'],
       categoryIds: ["cat122"]
     })
@@ -95,12 +81,12 @@ Given("we have the following user accounts:", table => {
     cy.factory().build("user", {
       ...params,
       ...termsAndConditionsAgreedVersion
-    });
+    }, params);
   });
 });
 
 Given("I have a user account", () => {
-  cy.factory().build("user", narratorParams);
+  cy.factory().build("user", narratorParams, loginCredentials);
 });
 
 Given("my user account has the role {string}", role => {
@@ -197,16 +183,16 @@ Given("we have the following posts in our database:", table => {
     icon: "smile"
   })
 
-  table.hashes().forEach(({
-    ...postAttributes
-  }, i) => {
-    postAttributes = {
-      ...postAttributes,
-      deleted: Boolean(postAttributes.deleted),
-      disabled: Boolean(postAttributes.disabled),
-      pinned: Boolean(postAttributes.pinned),
-    }
-    cy.factory().build("post", postAttributes, { categoryIds: ['cat-456'] });
+  table.hashes().forEach((attributesOrOptions, i) => {
+    cy.factory().build("post", {
+      ...attributesOrOptions,
+      deleted: Boolean(attributesOrOptions.deleted),
+      disabled: Boolean(attributesOrOptions.disabled),
+      pinned: Boolean(attributesOrOptions.pinned),
+    }, {
+      ...attributesOrOptions,
+      categoryIds: ['cat-456']
+    });
   })
 });
 
@@ -476,13 +462,11 @@ Given("I follow the user {string}", name => {
 });
 
 Given('"Spammy Spammer" wrote a post {string}', title => {
-  cy.createCategories("cat21")
-    .factory()
+  cy.factory()
     .build("post", {
       title,
     }, {
       authorId: 'annoying-user',
-      categoryIds: ["cat21"]
     });
 });
 
@@ -500,13 +484,11 @@ Then("nobody is following the user profile anymore", () => {
 });
 
 Given("I wrote a post {string}", title => {
-  cy.createCategories(`cat213`, title)
-    .factory()
+  cy.factory()
     .build("post", {
       title,
     }, {
       authorId: narratorParams.id,
-      categoryIds: ["cat213"]
     });
 });
 
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 6ab0a77ce..8e586fde9 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -75,27 +75,6 @@ Cypress.Commands.add("openPage", page => {
   cy.visit(`/${page}`);
 });
 
-Cypress.Commands.add("createCategories", (id, slug) => {
-  cy.factory()
-    .build("category", {
-      id: `${id}`,
-      name: "Just For Fun",
-      slug: `${slug}`,
-      icon: "smile"
-    })
-    .build("category", {
-      id: `${id}1`,
-      name: "Happiness & Values",
-      icon: "heart-o"
-    })
-    .build("category", {
-      id: `${id}2`,
-      name: "Health & Wellbeing",
-      icon: "medkit"
-    });
-});
-
-
 Cypress.Commands.add(
   'authenticateAs',
   async ({email, password}) => {
diff --git a/cypress/support/factories.js b/cypress/support/factories.js
index 7103ce524..951833de1 100644
--- a/cypress/support/factories.js
+++ b/cypress/support/factories.js
@@ -40,8 +40,8 @@ Cypress.Commands.add('factory', () => {
 Cypress.Commands.add(
   'build',
   { prevSubject: true },
-  async (factory, node, properties, options) => {
-    await Factory.build(node, properties, options)
+  async (factory, name, atrributes, options) => {
+    await Factory.build(name, atrributes, options)
     return factory
   }
 )

From b513da97560a1828677673a731b61ad421cc0ef0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 29 Jan 2020 10:03:01 +0100
Subject: [PATCH 043/171] spec is running again

---
 webapp/layouts/error.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue
index 657f96266..9143a7ff1 100644
--- a/webapp/layouts/error.vue
+++ b/webapp/layouts/error.vue
@@ -2,10 +2,7 @@
   <div class="error-container">
     <img class="error-image" :src="image" />
     <br />
-    <span v-if="error.message === 'This page could not be found'" class="error-message">
-      {{ $t('error-pages.default') }}
-    </span>
-    <span v-else class="error-message">{{ $t(error.message) }}</span>
+    <span class="error-message">{{ $t(message) }}</span>
     <br />
     <nuxt-link to="/">{{ $t('error-pages.back-to-index') }}</nuxt-link>
   </div>

From 30b90478a1439206f5a8d5912541b5a06d10d4bc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 29 Jan 2020 10:57:45 +0100
Subject: [PATCH 044/171] cypress test is passing again

---
 webapp/mixins/persistentLinks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/mixins/persistentLinks.js b/webapp/mixins/persistentLinks.js
index efc4392e2..ce41251f7 100644
--- a/webapp/mixins/persistentLinks.js
+++ b/webapp/mixins/persistentLinks.js
@@ -26,7 +26,7 @@ export default function(options = {}) {
       resource = response.data[Object.keys(response.data)[0]][0]
       if (resource) return redirect(`/${path}/${resource.id}/${resource.slug}`)
 
-      return error({ statusCode: 404, message })
+      return error({ statusCode: 404, key: message })
     },
   }
 }

From a74abbb053c9443975d9100905baca5a4107bff3 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 29 Jan 2020 20:39:47 +0100
Subject: [PATCH 045/171] Reorganize helm charts, add lifecycle hooks

- remove namespace, since it's best practice to use the cli to add it,
  @roschaefer points out
- organize templates into directories
- migrations should be ran after the backend has started...
- should init really be ran every time??
---
 deployment/helm/human-connection/Chart.yaml   |  2 +-
 .../letsencrypt-prod.yaml                     |  0
 .../letsencrypt-staging.yaml                  |  0
 .../{ => deployments}/deployment-backend.yaml |  7 +++--
 .../deployment-mailserver.yaml                |  3 +--
 .../deployment-maintenance.yaml               |  1 -
 .../{ => deployments}/deployment-neo4j.yaml   |  9 +++----
 .../{ => deployments}/deployment-web.yaml     |  5 ++--
 .../{ => ingress}/ingress.template.yaml       |  1 -
 .../{ => services}/service-backend.yaml       |  1 -
 .../{ => services}/service-mailserver.yaml    |  0
 .../{ => services}/service-maintenance.yaml   |  0
 .../{ => services}/service-neo4j.yaml         |  1 -
 .../{ => services}/service-webapp.yaml        |  1 -
 deployment/helm/human-connection/values.yaml  | 26 ++++++++++++-------
 .../human-connection/deployment-backend.yaml  |  2 +-
 deployment/volumes/uploads.yaml               |  2 +-
 17 files changed, 31 insertions(+), 30 deletions(-)
 rename deployment/helm/human-connection/templates/{ => cluster-issuers}/letsencrypt-prod.yaml (100%)
 rename deployment/helm/human-connection/templates/{ => cluster-issuers}/letsencrypt-staging.yaml (100%)
 rename deployment/helm/human-connection/templates/{ => deployments}/deployment-backend.yaml (84%)
 rename deployment/helm/human-connection/templates/{ => deployments}/deployment-mailserver.yaml (91%)
 rename deployment/helm/human-connection/templates/{ => deployments}/deployment-maintenance.yaml (95%)
 rename deployment/helm/human-connection/templates/{ => deployments}/deployment-neo4j.yaml (87%)
 rename deployment/helm/human-connection/templates/{ => deployments}/deployment-web.yaml (86%)
 rename deployment/helm/human-connection/templates/{ => ingress}/ingress.template.yaml (96%)
 rename deployment/helm/human-connection/templates/{ => services}/service-backend.yaml (87%)
 rename deployment/helm/human-connection/templates/{ => services}/service-mailserver.yaml (100%)
 rename deployment/helm/human-connection/templates/{ => services}/service-maintenance.yaml (100%)
 rename deployment/helm/human-connection/templates/{ => services}/service-neo4j.yaml (89%)
 rename deployment/helm/human-connection/templates/{ => services}/service-webapp.yaml (89%)

diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
index 0f303ade0..4e25227d7 100644
--- a/deployment/helm/human-connection/Chart.yaml
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "0.1.0"
+appVersion: "0.2.2"
 description: A Helm chart for Human Connection
 name: human-connection
 version: 0.1.0
diff --git a/deployment/helm/human-connection/templates/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/letsencrypt-prod.yaml
rename to deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
diff --git a/deployment/helm/human-connection/templates/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/letsencrypt-staging.yaml
rename to deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
diff --git a/deployment/helm/human-connection/templates/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
similarity index 84%
rename from deployment/helm/human-connection/templates/deployment-backend.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index e30e66431..68d582d41 100644
--- a/deployment/helm/human-connection/templates/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-backend
-  namespace: human-connection
 spec:
   replicas: 1
   minReadySeconds: 15
@@ -26,7 +25,11 @@ spec:
       containers:
       - name: backend
         image: humanconnection/nitro-backend:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "{{ .Values.application.initializeCommand }}", "&&", "{{ .Values.application.migrationsCommand }}"]
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
similarity index 91%
rename from deployment/helm/human-connection/templates/deployment-mailserver.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
index 4bc8eaadc..608fb8092 100644
--- a/deployment/helm/human-connection/templates/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-mailserver
-  namespace: human-connection
 spec:
   replicas: 1
   minReadySeconds: 15
@@ -20,7 +19,7 @@ spec:
       containers:
       - name: mailserver
         image: djfarrelly/maildev
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 80
         - containerPort: 25
diff --git a/deployment/helm/human-connection/templates/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
similarity index 95%
rename from deployment/helm/human-connection/templates/deployment-maintenance.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
index c414fb452..ee877f16e 100644
--- a/deployment/helm/human-connection/templates/deployment-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-maintenance
-  namespace: human-connection
 spec:
   selector:
     matchLabels:
diff --git a/deployment/helm/human-connection/templates/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
similarity index 87%
rename from deployment/helm/human-connection/templates/deployment-neo4j.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
index c157832dd..0f75434ae 100644
--- a/deployment/helm/human-connection/templates/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-neo4j
-  namespace: human-connection
 spec:
   replicas: 1
   strategy:
@@ -23,8 +22,8 @@ spec:
     spec:
       containers:
       - name: neo4j
-        image: humanconnection/neo4j:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: humanconnection/neo4j:0.2.2
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 7687
         - containerPort: 7474
@@ -36,12 +35,10 @@ spec:
         env:
         - name: NEO4J_dbms_security_procedures_unrestricted
           value: "algo.*,apoc.*"
-        - name: SECURE_FILE_PERMISSIONS
-          value: "yes"
           {{- range $key, $val := .Values.neo4jConfig }}
         - name: NEO4J_{{ $key }}
           value: {{ $val | quote }}
-          {{- end}}
+          {{- end }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
similarity index 86%
rename from deployment/helm/human-connection/templates/deployment-web.yaml
rename to deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index 1f8930612..f9fc3d747 100644
--- a/deployment/helm/human-connection/templates/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-webapp
-  namespace: human-connection
 spec:
   replicas: 2
   minReadySeconds: 15
@@ -19,8 +18,8 @@ spec:
     spec:
       containers:
       - name: webapp
-        image: humanconnection/nitro-web:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: humanconnection/nitro-web:0.2.2
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
similarity index 96%
rename from deployment/helm/human-connection/templates/ingress.template.yaml
rename to deployment/helm/human-connection/templates/ingress/ingress.template.yaml
index 12ef4c9c4..434e2b3dd 100644
--- a/deployment/helm/human-connection/templates/ingress.template.yaml
+++ b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
@@ -2,7 +2,6 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name:  {{ .Release.Name }}-ingress
-  namespace: human-connection
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: {{ .Values.letsencryptIssuer }}
diff --git a/deployment/helm/human-connection/templates/service-backend.yaml b/deployment/helm/human-connection/templates/services/service-backend.yaml
similarity index 87%
rename from deployment/helm/human-connection/templates/service-backend.yaml
rename to deployment/helm/human-connection/templates/services/service-backend.yaml
index d750703a8..b9d40ef8a 100644
--- a/deployment/helm/human-connection/templates/service-backend.yaml
+++ b/deployment/helm/human-connection/templates/services/service-backend.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-backend
-  namespace: human-connection
 spec:
   ports:
     - name: graphql
diff --git a/deployment/helm/human-connection/templates/service-mailserver.yaml b/deployment/helm/human-connection/templates/services/service-mailserver.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/service-mailserver.yaml
rename to deployment/helm/human-connection/templates/services/service-mailserver.yaml
diff --git a/deployment/helm/human-connection/templates/service-maintenance.yaml b/deployment/helm/human-connection/templates/services/service-maintenance.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/service-maintenance.yaml
rename to deployment/helm/human-connection/templates/services/service-maintenance.yaml
diff --git a/deployment/helm/human-connection/templates/service-neo4j.yaml b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
similarity index 89%
rename from deployment/helm/human-connection/templates/service-neo4j.yaml
rename to deployment/helm/human-connection/templates/services/service-neo4j.yaml
index ec3bb1b6c..547dad6c7 100644
--- a/deployment/helm/human-connection/templates/service-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-neo4j
-  namespace: human-connection
 spec:
   ports:
   - name: bolt
diff --git a/deployment/helm/human-connection/templates/service-webapp.yaml b/deployment/helm/human-connection/templates/services/service-webapp.yaml
similarity index 89%
rename from deployment/helm/human-connection/templates/service-webapp.yaml
rename to deployment/helm/human-connection/templates/services/service-webapp.yaml
index f6ea7206f..99677aa05 100644
--- a/deployment/helm/human-connection/templates/service-webapp.yaml
+++ b/deployment/helm/human-connection/templates/services/service-webapp.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-webapp
-  namespace: human-connection
 spec:
   ports:
     - name: {{ .Release.Name }}-webapp
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 8efcd0c06..0e86c74b8 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -1,24 +1,32 @@
 domain: develop.human-connection.org
 commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
-pullPolicy: Always
 
 # configs
+application:
+  initializeCommand: "yarn prod:migrate init"
+  migrationsCommand: "yarn prod:migrate up"
 developmentMailserverDomain: "mailserver.human-connection.org"
 humanConnectionDomain: "develop.human-connection.org"
-supportEmail: "devcom@human-connection.org"
+image:
+  pullPolicy: Always
 letsencryptIssuer: "letsencrypt-prod"
-smtpHost: "mailserver.human-connection"
-smtpPort: "25"
-smtpUsername:
-smtpPassword:
-neo4jResourceRequestsMemory: "1G"
-neo4jResourceLimitsMemory: "2G"
 neo4jConfig:
   apoc_import_file_enabled: "true"
   dbms_memory_pagecache_size: "490M"
   dbms_memory_heap_max__size: "500M"
   dbms_memory_heap_initial__size: "500M"
-
+neo4jResourceLimitsMemory: "2G"
+neo4jResourceRequestsMemory: "1G"
+supportEmail: "devcom@human-connection.org"
+smtpHost: "mailserver.human-connection"
+smtpPort: "25"
+smtpUsername:
+smtpPassword:
+volumes:
+  uploads:
+    storage: 5Gi
+  neo4jData:
+    storage: 8Gi
 # secrets
 jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA=="
 privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
diff --git a/deployment/human-connection/deployment-backend.yaml b/deployment/human-connection/deployment-backend.yaml
index 0f75127e5..00aab9ffd 100644
--- a/deployment/human-connection/deployment-backend.yaml
+++ b/deployment/human-connection/deployment-backend.yaml
@@ -38,7 +38,7 @@ spec:
             name: human-connection
         image: humanconnection/nitro-backend:latest
         imagePullPolicy: Always
-        name: nitro-backend
+        name: backend
         ports:
         - containerPort: 4000
           protocol: TCP
diff --git a/deployment/volumes/uploads.yaml b/deployment/volumes/uploads.yaml
index 2bd64c9ee..ce87b2184 100644
--- a/deployment/volumes/uploads.yaml
+++ b/deployment/volumes/uploads.yaml
@@ -9,4 +9,4 @@
       - ReadWriteOnce
     resources:
       requests:
-        storage: 25Gi
+        storage: 8Gi

From c3548e5d8d9aace5a8010b55c13795f04254bdbc Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 15:50:51 +0100
Subject: [PATCH 046/171] Add db-migrations-job, not working yet

---
 .../deployments/deployment-backend.yaml       |  4 ----
 .../templates/jobs/db-migration.yaml          | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 deployment/helm/human-connection/templates/jobs/db-migration.yaml

diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index 68d582d41..555c1fee8 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -26,10 +26,6 @@ spec:
       - name: backend
         image: humanconnection/nitro-backend:latest
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/bin/sh", "-c", "{{ .Values.application.initializeCommand }}", "&&", "{{ .Values.application.migrationsCommand }}"]
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/jobs/db-migration.yaml b/deployment/helm/human-connection/templates/jobs/db-migration.yaml
new file mode 100644
index 000000000..a8cb2aaf7
--- /dev/null
+++ b/deployment/helm/human-connection/templates/jobs/db-migration.yaml
@@ -0,0 +1,23 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-db-migrations
+  annotations:
+    "helm.sh/hook": post-upgrade
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": hook-succeeded, hook-failed
+spec:
+  template:
+    metadata:
+      name: {{ .Release.Name }}
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: db-migrations-job
+        image: humanconnection/nitro-backend:latest
+        command: ["/bin/sh", "-c", "{{ .Values.application.migrationsCommand }}"]
+        envFrom:
+          - configMapRef:
+              name: {{ .Release.Name }}-configmap
+          - secretRef:
+              name: {{ .Release.Name }}-secrets
\ No newline at end of file

From 2e6dfbbd42afd525fb987f6a53c52c2339c87d42 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 16:37:12 +0100
Subject: [PATCH 047/171] Refactor values.yaml following Helm best practices

- Variables should use camel case.
- Favor flat hierarchy over nested.
- "Every defined property in values.yaml should be documented. The
  documentation string should begin with the name of the property it
describes, and then give at least a one-sentence description."
- Source, https://helm.sh/docs/topics/chart_best_practices/values/
---
 .../deployments/deployment-backend.yaml       |  2 +-
 .../deployments/deployment-mailserver.yaml    |  2 +-
 .../deployments/deployment-neo4j.yaml         |  9 +---
 .../templates/deployments/deployment-web.yaml |  2 +-
 .../templates/ingress/ingress.template.yaml   |  4 +-
 .../templates/jobs/db-migration.yaml          |  2 +-
 deployment/helm/human-connection/values.yaml  | 49 +++++++++++--------
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index 555c1fee8..ad5a26473 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -25,7 +25,7 @@ spec:
       containers:
       - name: backend
         image: humanconnection/nitro-backend:latest
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
index 608fb8092..13fa63521 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: mailserver
         image: djfarrelly/maildev
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
         - containerPort: 80
         - containerPort: 25
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
index 0f75434ae..195e57b5a 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
@@ -23,7 +23,7 @@ spec:
       containers:
       - name: neo4j
         image: humanconnection/neo4j:0.2.2
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
         - containerPort: 7687
         - containerPort: 7474
@@ -32,13 +32,6 @@ spec:
             memory: {{ .Values.neo4jResourceRequestsMemory | default "1G" | quote }}
           limits:
             memory: {{ .Values.neo4jResourceLimitsMemory | default "1G" | quote }}
-        env:
-        - name: NEO4J_dbms_security_procedures_unrestricted
-          value: "algo.*,apoc.*"
-          {{- range $key, $val := .Values.neo4jConfig }}
-        - name: NEO4J_{{ $key }}
-          value: {{ $val | quote }}
-          {{- end }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index f9fc3d747..3ec56e5bc 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: webapp
         image: humanconnection/nitro-web:0.2.2
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
index 434e2b3dd..d5ec3c1af 100644
--- a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
+++ b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
@@ -9,10 +9,10 @@ metadata:
 spec:
   tls:
     - hosts:
-      - {{ .Values.humanConnectionDomain }}
+      - {{ .Values.domain }}
       secretName: tls
   rules:
-    - host: {{ .Values.humanConnectionDomain }}
+    - host: {{ .Values.domain }}
       http:
         paths:
           - path: /
diff --git a/deployment/helm/human-connection/templates/jobs/db-migration.yaml b/deployment/helm/human-connection/templates/jobs/db-migration.yaml
index a8cb2aaf7..782d54aa3 100644
--- a/deployment/helm/human-connection/templates/jobs/db-migration.yaml
+++ b/deployment/helm/human-connection/templates/jobs/db-migration.yaml
@@ -15,7 +15,7 @@ spec:
       containers:
       - name: db-migrations-job
         image: humanconnection/nitro-backend:latest
-        command: ["/bin/sh", "-c", "{{ .Values.application.migrationsCommand }}"]
+        command: ["/bin/sh", "-c", "{{ .Values.dbMigrations }}"]
         envFrom:
           - configMapRef:
               name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 0e86c74b8..ed14aee79 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -1,33 +1,40 @@
+# domain is the user-facing domain.
 domain: develop.human-connection.org
+# commit is the latest github commit deployed.
 commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
-
-# configs
-application:
-  initializeCommand: "yarn prod:migrate init"
-  migrationsCommand: "yarn prod:migrate up"
-developmentMailserverDomain: "mailserver.human-connection.org"
-humanConnectionDomain: "develop.human-connection.org"
-image:
-  pullPolicy: Always
+# dbInitialization runs the database initializations in a post-install hook.
+dbInitializion: "yarn prod:migrate init"
+# dbMigrations runs the database migrations in a post-upgrade hook.
+dbMigrations: "yarn prod:migrate up"
+# pullPolicy indicates when, if ever, pods pull a new image from docker hub.
+pullPolicy: Always
+# letsencryptIssuer is used by cert-manager to set up certificates with the given provider.
 letsencryptIssuer: "letsencrypt-prod"
+# neo4jConfig changes any default neo4j config/adds it.
 neo4jConfig:
-  apoc_import_file_enabled: "true"
-  dbms_memory_pagecache_size: "490M"
-  dbms_memory_heap_max__size: "500M"
-  dbms_memory_heap_initial__size: "500M"
+  # acceptLicenseAgreement is used to agree to the license agreement for neo4j's enterprise edition.
+  acceptLicenseAgreement: "yes"
+  # apocImportFileEnabled enables the import of files to neo4j using the plugin apoc 
+  apocImportFileEnabled: "true"
+  # dbmsMemoryHeapInitialSize configures initial heap size. By default, it is calculated based on available system resources.(valid units are `k`, `K`, `m`, `M`, `g`, `G`)
+  dbmsMemoryHeapInitialSize: "500M"
+  # dbmsMemoryHeapMaxSize configures maximum heap size. By default it is calculated based on available system resources.(valid units are `k`, `K`, `m`, `M`, `g`, `G`)
+  dbmsMemoryHeapMaxSize: "500M"
+  # dbmsMemoryPagecacheSize configures the amount of memory to use for mapping the store files, in bytes (or 'k', 'm', and 'g')
+  dbmsMemoryPagecacheSize: "490M"
+# neo4jResourceLimitsMemory configures the memory limits available.
 neo4jResourceLimitsMemory: "2G"
+# neo4jResourceLimitsMemory configures the memory available for requests.
 neo4jResourceRequestsMemory: "1G"
+# supportEmail is used for letsencrypt certs.
 supportEmail: "devcom@human-connection.org"
+# smtpHost is the host for the mailserver.
 smtpHost: "mailserver.human-connection"
+# smtpPort is the port to be used for the mailserver.
 smtpPort: "25"
-smtpUsername:
-smtpPassword:
-volumes:
-  uploads:
-    storage: 5Gi
-  neo4jData:
-    storage: 8Gi
-# secrets
+# jwtSecret is used to encode/decode a user's JWT for authentication
 jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA=="
+# privateKeyPassphrase is used for activity pub
 privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
+# mapboxToken is used for the Mapbox API, geolocalization.
 mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E="

From 43753e52f2a96634ddcc9bf33a52e6be7af1bc82 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 16:48:36 +0100
Subject: [PATCH 048/171] Rename Job file following Helm best practices

- "Template file names should reflect the resource kind in the name."
- Source, https://helm.sh/docs/topics/chart_best_practices/templates/#structure-of-templates
---
 .../templates/jobs/{db-migration.yaml => job-db-migration.yaml}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename deployment/helm/human-connection/templates/jobs/{db-migration.yaml => job-db-migration.yaml} (100%)

diff --git a/deployment/helm/human-connection/templates/jobs/db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/jobs/db-migration.yaml
rename to deployment/helm/human-connection/templates/jobs/job-db-migration.yaml

From 7472a0bc722081881f2bacf9a76207cd597478ed Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 17:20:15 +0100
Subject: [PATCH 049/171] Add labels following Helm best practices

- There are 4 recommended labels, and one optional that were added.
- Source, https://helm.sh/docs/topics/chart_best_practices/labels/
---
 .../templates/cluster-issuers/letsencrypt-prod.yaml         | 6 ++++++
 .../templates/cluster-issuers/letsencrypt-staging.yaml      | 6 ++++++
 .../templates/deployments/deployment-backend.yaml           | 6 ++++++
 .../templates/deployments/deployment-mailserver.yaml        | 6 ++++++
 .../templates/deployments/deployment-maintenance.yaml       | 6 ++++++
 .../templates/deployments/deployment-neo4j.yaml             | 6 ++++++
 .../templates/deployments/deployment-web.yaml               | 6 ++++++
 .../templates/ingress/ingress.template.yaml                 | 6 ++++++
 .../human-connection/templates/jobs/job-db-migration.yaml   | 6 ++++++
 .../templates/services/service-backend.yaml                 | 6 ++++++
 .../templates/services/service-mailserver.yaml              | 6 ++++++
 .../templates/services/service-maintenance.yaml             | 6 ++++++
 .../human-connection/templates/services/service-neo4j.yaml  | 6 ++++++
 .../human-connection/templates/services/service-webapp.yaml | 6 ++++++
 14 files changed, 84 insertions(+)

diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
index 65bd160e1..ac11e76b8 100644
--- a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
+++ b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
@@ -2,6 +2,12 @@ apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-prod
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   acme:
     server: https://acme-v02.api.letsencrypt.org/directory
diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
index f8315c9be..cc9d9fdd7 100644
--- a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
+++ b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
@@ -2,6 +2,12 @@ apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
   name: letsencrypt-staging
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   acme:
     server: https://acme-staging-v02.api.letsencrypt.org/directory
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index ad5a26473..61e0b22a2 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-backend
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
index 13fa63521..11491163f 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
@@ -3,6 +3,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-mailserver
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
index ee877f16e..86b3fbd4e 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-maintenance
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   selector:
     matchLabels:
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
index 195e57b5a..04b58953a 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-neo4j
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 1
   strategy:
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index 3ec56e5bc..30f3ffd16 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -2,6 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name:  {{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: 2
   minReadySeconds: 15
diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
index d5ec3c1af..eb8dd65be 100644
--- a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
+++ b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml
@@ -2,6 +2,12 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name:  {{ .Release.Name }}-ingress
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: {{ .Values.letsencryptIssuer }}
diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
index 782d54aa3..675bcf344 100644
--- a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
+++ b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
@@ -2,6 +2,12 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ .Release.Name }}-db-migrations
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     "helm.sh/hook": post-upgrade
     "helm.sh/hook-weight": "0"
diff --git a/deployment/helm/human-connection/templates/services/service-backend.yaml b/deployment/helm/human-connection/templates/services/service-backend.yaml
index b9d40ef8a..af23e6910 100644
--- a/deployment/helm/human-connection/templates/services/service-backend.yaml
+++ b/deployment/helm/human-connection/templates/services/service-backend.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-backend
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: graphql
diff --git a/deployment/helm/human-connection/templates/services/service-mailserver.yaml b/deployment/helm/human-connection/templates/services/service-mailserver.yaml
index e5e22aa37..685becb1d 100644
--- a/deployment/helm/human-connection/templates/services/service-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/services/service-mailserver.yaml
@@ -3,6 +3,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-mailserver
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
   - name: web
diff --git a/deployment/helm/human-connection/templates/services/service-maintenance.yaml b/deployment/helm/human-connection/templates/services/service-maintenance.yaml
index a82473e2e..d641ca8ba 100644
--- a/deployment/helm/human-connection/templates/services/service-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/services/service-maintenance.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-maintenance
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: web
diff --git a/deployment/helm/human-connection/templates/services/service-neo4j.yaml b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
index 547dad6c7..f5c7d5b38 100644
--- a/deployment/helm/human-connection/templates/services/service-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/services/service-neo4j.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-neo4j
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
   - name: bolt
diff --git a/deployment/helm/human-connection/templates/services/service-webapp.yaml b/deployment/helm/human-connection/templates/services/service-webapp.yaml
index 99677aa05..d762c2a55 100644
--- a/deployment/helm/human-connection/templates/services/service-webapp.yaml
+++ b/deployment/helm/human-connection/templates/services/service-webapp.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ .Release.Name }}-webapp
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: human-connection
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   ports:
     - name: {{ .Release.Name }}-webapp

From 4cbe8a2c5a5484488291c66e2543e0df0472db04 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 17:34:24 +0100
Subject: [PATCH 050/171] Update deployments following Helm best practices

- image is set configurable and set to the app version for version
  control
- imagePullPolicy revert earlier changes to flatten hierarchy since helm
  create uses .Values.image.pullPolicy
- update imagePullPolicy to IfNotPresent since this is the default with
  helm create and fits with our strategy as well.
- Source, https://helm.sh/docs/topics/chart_best_practices/pods/
---
 .../templates/deployments/deployment-backend.yaml  |  4 ++--
 .../deployments/deployment-mailserver.yaml         |  2 +-
 .../deployments/deployment-maintenance.yaml        |  2 +-
 .../templates/deployments/deployment-neo4j.yaml    |  4 ++--
 .../templates/deployments/deployment-web.yaml      |  2 +-
 .../templates/jobs/job-db-migration.yaml           |  2 +-
 deployment/helm/human-connection/values.yaml       | 14 ++++++++++++--
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
index 61e0b22a2..33aa8a0e0 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
@@ -30,8 +30,8 @@ spec:
     spec:
       containers:
       - name: backend
-        image: humanconnection/nitro-backend:latest
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.backendImage }}:{{ .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
index 11491163f..85c587197 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
@@ -25,7 +25,7 @@ spec:
       containers:
       - name: mailserver
         image: djfarrelly/maildev
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 80
         - containerPort: 25
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
index 86b3fbd4e..b12069f7e 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
@@ -24,7 +24,7 @@ spec:
           env:
             - name: HOST
               value: 0.0.0.0
-          image: humanconnection/maintenance:latest
+          image: "{{ .Values.maintenanceImage }}:{{ .Chart.AppVersion }}"
           ports:
             - containerPort: 80
           imagePullPolicy: Always
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
index 04b58953a..ae244fdce 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
@@ -28,8 +28,8 @@ spec:
     spec:
       containers:
       - name: neo4j
-        image: humanconnection/neo4j:0.2.2
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.neo4jImage }}:{{ .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 7687
         - containerPort: 7474
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index 30f3ffd16..c0a62560f 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -25,7 +25,7 @@ spec:
       containers:
       - name: webapp
         image: humanconnection/nitro-web:0.2.2
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-configmap
diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
index 675bcf344..81fd92e13 100644
--- a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
+++ b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
@@ -20,7 +20,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: db-migrations-job
-        image: humanconnection/nitro-backend:latest
+        image: "{{ .Values.backendImage }}:{{ .Chart.AppVersion }}"
         command: ["/bin/sh", "-c", "{{ .Values.dbMigrations }}"]
         envFrom:
           - configMapRef:
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index ed14aee79..1858fca55 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -6,8 +6,18 @@ commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
 dbInitializion: "yarn prod:migrate init"
 # dbMigrations runs the database migrations in a post-upgrade hook.
 dbMigrations: "yarn prod:migrate up"
-# pullPolicy indicates when, if ever, pods pull a new image from docker hub.
-pullPolicy: Always
+# bakendImage is the docker image for the backend deployment
+backendImage: humanconnection/nitro-backend
+# maintenanceImage is the docker image for the maintenance deployment
+maintenanceImage: humanconnection/maintenance
+# neo4jImage is the docker image for the neo4j deployment
+neo4jImage: humanconnection/neo4j
+# webappImage is the docker image for the webapp deployment
+webappImage: humanconnection/nitro-web
+# image configures pullPolicy related to the docker images
+image:
+  # pullPolicy indicates when, if ever, pods pull a new image from docker hub.
+  pullPolicy: IfNotPresent
 # letsencryptIssuer is used by cert-manager to set up certificates with the given provider.
 letsencryptIssuer: "letsencrypt-prod"
 # neo4jConfig changes any default neo4j config/adds it.

From 8647cba64887accdfc5656617825e2ff7134412b Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 20:59:56 +0100
Subject: [PATCH 051/171] Temporarily use latest image for migration job

- it hasn't been deployed yet, therefore is not in any versioned image
---
 .../human-connection/templates/jobs/job-db-migration.yaml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
index 81fd92e13..8a924f44b 100644
--- a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
+++ b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
@@ -10,7 +10,7 @@ metadata:
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     "helm.sh/hook": post-upgrade
-    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-weight": "5"
     "helm.sh/hook-delete-policy": hook-succeeded, hook-failed
 spec:
   template:
@@ -20,7 +20,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: db-migrations-job
-        image: "{{ .Values.backendImage }}:{{ .Chart.AppVersion }}"
+        image: "{{ .Values.backendImage }}:latest"
         command: ["/bin/sh", "-c", "{{ .Values.dbMigrations }}"]
         envFrom:
           - configMapRef:

From baf3b7818d9f85760f3f0a5c04884d2795a0c26a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 21:00:56 +0100
Subject: [PATCH 052/171] Escape double quotes to deploy configmap

- It was failing without them... also ACCEPT_LICENSE_AGREEMENT wasn't
  set properly using .Values
---
 deployment/helm/human-connection/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 1858fca55..38ca20fbb 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -23,9 +23,9 @@ letsencryptIssuer: "letsencrypt-prod"
 # neo4jConfig changes any default neo4j config/adds it.
 neo4jConfig:
   # acceptLicenseAgreement is used to agree to the license agreement for neo4j's enterprise edition.
-  acceptLicenseAgreement: "yes"
+  acceptLicenseAgreement: \"yes\"
   # apocImportFileEnabled enables the import of files to neo4j using the plugin apoc 
-  apocImportFileEnabled: "true"
+  apocImportFileEnabled: \"true\"
   # dbmsMemoryHeapInitialSize configures initial heap size. By default, it is calculated based on available system resources.(valid units are `k`, `K`, `m`, `M`, `g`, `G`)
   dbmsMemoryHeapInitialSize: "500M"
   # dbmsMemoryHeapMaxSize configures maximum heap size. By default it is calculated based on available system resources.(valid units are `k`, `K`, `m`, `M`, `g`, `G`)
@@ -39,9 +39,9 @@ neo4jResourceRequestsMemory: "1G"
 # supportEmail is used for letsencrypt certs.
 supportEmail: "devcom@human-connection.org"
 # smtpHost is the host for the mailserver.
-smtpHost: "mailserver.human-connection"
+smtpHost: "mailserver.human-connection.org"
 # smtpPort is the port to be used for the mailserver.
-smtpPort: "25"
+smtpPort: \"25\"
 # jwtSecret is used to encode/decode a user's JWT for authentication
 jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA=="
 # privateKeyPassphrase is used for activity pub

From 9f3f6cfe02054afd017648106dad4de3952c5479 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 30 Jan 2020 21:02:27 +0100
Subject: [PATCH 053/171] Set up PVC with helm!!

- It turns out we can set it up with helm, it was just an issue with not
  starting with a clean slate. I guess it probably would have been
better to just set it up from scratch and deleted the develop server,
like we intend to do in production.
---
 .../templates/volumes/pvc-neo4j-data.yaml            | 10 ++++++++++
 .../templates/volumes/pvc-uploads.yaml               | 12 ++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
 create mode 100644 deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml

diff --git a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml b/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
new file mode 100644
index 000000000..e89844181
--- /dev/null
+++ b/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: neo4j-data-claim
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
diff --git a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml b/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml
new file mode 100644
index 000000000..4d2ae7627
--- /dev/null
+++ b/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml
@@ -0,0 +1,12 @@
+
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: uploads-claim
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 8Gi
+

From b9e56868606d8a1d3b3209f555c119acd43e1325 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 31 Jan 2020 15:32:33 +0100
Subject: [PATCH 054/171] Add basic documentation for Helm deploy

---
 deployment/README.md                       |  9 ++-
 deployment/helm/human-connection/README.md | 72 ++++++++++++++++++++++
 2 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 deployment/helm/human-connection/README.md

diff --git a/deployment/README.md b/deployment/README.md
index 0615ccf9b..09dcd5f00 100644
--- a/deployment/README.md
+++ b/deployment/README.md
@@ -1,11 +1,10 @@
 # Human-Connection Nitro \| Deployment Configuration
 
-We deploy with [kubernetes](https://kubernetes.io/). In order to deploy your own
-network you have to [install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-and get a kubernetes cluster.
+There are a couple different ways we have tested to deploy an instance of Human Connection, with [kubernetes](https://kubernetes.io/) and via [Helm](https://helm.sh/docs/). In order to manage your own
+network, you have to [install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/), [install Helm](https://helm.sh/docs/intro/install/) (optional, but the preferred way),
+and set up a kubernetes cluster. Since there are many different options to host your cluster, we won't go into specifics here.
 
 We have tested two different kubernetes providers: [Minikube](./minikube/README.md)
 and [Digital Ocean](./digital-ocean/README.md).
 
-Check out the specific documentation for your provider. After that, learn how 
-to apply the specific kubernetes configuration for [Human Connection](./human-connection/README.md).
+Check out the specific documentation for your provider. After that, choose whether you want to go with the recommended deploy option [Helm](./helm/README.md), or use kubernetes to apply the configuration for [Human Connection](./human-connection/README.md).
diff --git a/deployment/helm/human-connection/README.md b/deployment/helm/human-connection/README.md
new file mode 100644
index 000000000..55859a77c
--- /dev/null
+++ b/deployment/helm/human-connection/README.md
@@ -0,0 +1,72 @@
+# Helm installation of Human Connection
+
+Deploying Human Connection with Helm is very straight forward. All you have to
+do is to change certain parameters, like domain names and API keys, then you
+just install our provided Helm chart to your cluster.
+
+## Configuration
+
+You can customize the network with your configuration by changing the `values.yaml`, all variables will be available as
+environment variables in your deployed kubernetes pods.
+
+Probably you want to change this environment variable to your actual domain:
+
+```bash
+# in folder /deployment/helm
+CLIENT_URI: "https://develop.human-connection.org"
+```
+
+If you want to edit secrets, you have to `base64` encode them. See [kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/secret/#creating-a-secret-manually). You can also use `helm-secrets`, but we have yet to test it.
+
+```bash
+# example how to base64 a string:
+$ echo -n 'admin' | base64
+YWRtaW4=
+```
+Those secrets get `base64` decoded and are available as environment variables in
+your deployed kubernetes pods.
+
+# https
+If you start with setting up the `https`, when you install the app, it will automatically take care of the certificates for you.
+
+First check that you are using `Helm v3`, this is important since it removes the need for `Tiller`. See, [FAQ](https://helm.sh/docs/faq/#removal-of-tiller)
+
+```bash
+$ helm version
+# output should look similar to this:
+#version.BuildInfo{Version:"v3.0.2", GitCommit:"19e47ee3283ae98139d98460de796c1be1e3975f", GitTreeState:"clean", GoVersion:"go1.13.5"}
+```
+
+Apply cert-manager CRDs before installing (or it will fail)
+
+```bash
+$ kubectl apply --validate=false -f https://raw.githubusercontent.com/jetstack/cert-manager/release-0.13.0/deploy/manifests/00-crds.yaml
+```
+
+Next, create the `cert-manager` namespace
+```bash
+$ kubectl create namespace cert-manager
+```
+Add the `jetstack` repo and update
+
+```bash
+$ helm repo add jetstack https://charts.jetstack.io
+$ helm repo update
+```
+
+Install cert-manager
+```bash
+$ helm install cert-manager --namespace cert-manager --version v0.13.0 jetstack/cert-manager
+```
+
+# Deploy
+
+Once you are satisfied with the configuration, you can install the app.
+
+```bash
+# in folder /deployment/helm
+$ helm install develop ./ --namespace human-connection
+```
+Where `develop` is the release name, in this case develop for our develop server and `human-connection` is the namespace, again customize for your needs. The release name can be anything you want. Just keep in mind that it is used in the templates to prepend the `CLIENT_URI` and other places.
+
+This will set up everything you need for the network, including `deployments`, and their `pods`, `services`, `ingress`, `volumes`(PersitentVolumes), `PersistentVolumeClaims`, and even `ClusterIssuers` for https certificates.

From 39ea0a556badbb81b371179c074c2f60f5793ebc Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 3 Feb 2020 18:22:21 +0100
Subject: [PATCH 055/171] Remove github release script

- Looking at our releases, https://github.com/Human-Connection/Human-Connection/releases, the ones created from our build server, are not sufficient.

As part of the deploy process, I have been manually creating the Releases in Github, using our CHANGELOG.md.... I propose we remove this script from our build server, as it's now breaking our master build and it's not being used.
---
 .travis.yml               |  4 ----
 scripts/github_release.sh | 16 ----------------
 2 files changed, 20 deletions(-)
 delete mode 100755 scripts/github_release.sh

diff --git a/.travis.yml b/.travis.yml
index f598594cb..621453bc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,7 +69,3 @@ deploy:
     script: bash scripts/deploy.sh
     on:
       branch: master
-  - provider: script
-    script: bash scripts/github_release.sh
-    on:
-      branch: master
diff --git a/scripts/github_release.sh b/scripts/github_release.sh
deleted file mode 100755
index 93f50289d..000000000
--- a/scripts/github_release.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-ROOT_DIR=$(dirname "$0")/..
-RELEASE_DIR="${ROOT_DIR}/release"
-
-VERSION=$(jq -r ".version" $ROOT_DIR/package.json)
-
-# mkdir -p $RELEASE_DIR
-
-# The following command part produces 854M on my machine
-# apps=(nitro-web nitro-backend neo4j maintenance-worker maintenance)
-# for app in "${apps[@]}"
-# do
-#   docker image save "humanconnection/${app}:latest" | gzip > "${RELEASE_DIR}/${app}.${VERSION}.tar.gz"
-# done
-
-ghr -c "${VERSION}" "${VERSION}"

From 5931e363ef6f69aad58d8352f9adfb6388fccdb3 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 3 Feb 2020 19:17:48 +0100
Subject: [PATCH 056/171] Use original createdAt for merged users/emails
 (#2969)

- Also, use original verifiedAt date for emails. These users only have
  newly created accounts/emails because of our blunder. Their nodes
should reflect when they became members/verified their emails.
---
 .../20200123150105-merge_duplicate_user_accounts.js        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/db/migrations/20200123150105-merge_duplicate_user_accounts.js b/backend/src/db/migrations/20200123150105-merge_duplicate_user_accounts.js
index ec38befc5..377f971e9 100644
--- a/backend/src/db/migrations/20200123150105-merge_duplicate_user_accounts.js
+++ b/backend/src/db/migrations/20200123150105-merge_duplicate_user_accounts.js
@@ -34,12 +34,11 @@ export function up(next) {
                 return txc
                   .run(
                     `
-                  MATCH (oldUser:User)-[:PRIMARY_EMAIL]->(oldEmail:EmailAddress {email: $email}), (oldUser)-[previousRelationship]-(oldEmail)
+                  MATCH (oldUser:User)-[:PRIMARY_EMAIL]->(oldEmail:EmailAddress {email: $email})
                   MATCH (user:User)-[:PRIMARY_EMAIL]->(email:EmailAddress {email: $normalizedEmail})
-                  DELETE previousRelationship
                   WITH oldUser, oldEmail, user, email
-                  CALL apoc.refactor.mergeNodes([user, oldUser], { properties: 'discard', mergeRels: true }) YIELD node as mergedUser
-                  CALL apoc.refactor.mergeNodes([email, oldEmail], { properties: 'discard', mergeRels: true }) YIELD node as mergedEmail
+                  CALL apoc.refactor.mergeNodes([user, oldUser], { properties: { createdAt: 'overwrite', \`.*\`: 'discard' }, mergeRels: true }) YIELD node as mergedUser
+                  CALL apoc.refactor.mergeNodes([email, oldEmail], { properties: { createdAt: 'overwrite', verifiedAt: 'overwrite', \`.*\`: 'discard' }, mergeRels: true }) YIELD node as mergedEmail
                   RETURN user {.*}, email {.*}
               `,
                     { email, normalizedEmail },

From 335e7127b8fe439d45b32d55bac9e1d7a111c5b7 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 3 Feb 2020 21:14:38 +0100
Subject: [PATCH 057/171] Update mute/unmute icon to unused icon

- we are already using eye/eye-slash for disable/release
---
 webapp/assets/_new/icons/svgs/microphone-slash.svg | 5 +++++
 webapp/assets/_new/icons/svgs/microphone.svg       | 6 ++++++
 webapp/components/ContentMenu/ContentMenu.vue      | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 webapp/assets/_new/icons/svgs/microphone-slash.svg
 create mode 100644 webapp/assets/_new/icons/svgs/microphone.svg

diff --git a/webapp/assets/_new/icons/svgs/microphone-slash.svg b/webapp/assets/_new/icons/svgs/microphone-slash.svg
new file mode 100644
index 000000000..9802dbd5f
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/microphone-slash.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>microphone-slash</title>
+<path d="M3.719 2.281l7.281 7.281v-3.563c0-1.103 0.897-2 2-2h6c1.103 0 2 0.897 2 2v12c0 0.438-0.135 0.858-0.375 1.188l1.406 1.406c0.604-0.697 0.969-1.6 0.969-2.594v-4h2v4c0 1.544-0.601 2.936-1.563 4l6.281 6.281-1.438 1.438-26-26zM13 6v5.563l6 6v-11.563h-6zM7 14h2v4c0 2.206 1.794 4 4 4h4.813l1.938 1.938c-0.245 0.031-0.496 0.063-0.75 0.063h-2v2h4v2h-10v-2h4v-2h-2c-3.309 0-6-2.691-6-6v-4zM11 15.188l2 2v0.813h0.813l2 2h-2.813c-1.103 0-2-0.897-2-2v-2.813z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/microphone.svg b/webapp/assets/_new/icons/svgs/microphone.svg
new file mode 100644
index 000000000..121342b70
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/microphone.svg
@@ -0,0 +1,6 @@
+
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>microphone</title>
+<path d="M13 4h6c1.093 0 2 0.907 2 2v12c0 1.093-0.907 2-2 2h-6c-1.093 0-2-0.907-2-2v-12c0-1.093 0.907-2 2-2zM13 6v12h6v-12h-6zM7 14h2v4c0 2.22 1.78 4 4 4h6c2.22 0 4-1.78 4-4v-4h2v4c0 3.302-2.698 6-6 6h-2v2h4v2h-10v-2h4v-2h-2c-3.302 0-6-2.698-6-6v-4z"></path>
+</svg>
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 5ce73c461..ee2bd4a62 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -161,7 +161,7 @@ export default {
               callback: () => {
                 this.$emit('unmute', this.resource)
               },
-              icon: 'eye',
+              icon: 'microphone',
             })
           } else {
             routes.push({
@@ -169,7 +169,7 @@ export default {
               callback: () => {
                 this.$emit('mute', this.resource)
               },
-              icon: 'eye-slash',
+              icon: 'microphone-slash',
             })
           }
           if (this.resource.blocked) {

From 6c15d6cf098987e852dfe8c70a0f769a63a39d4c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:30:20 +0100
Subject: [PATCH 058/171] build(deps): bump @nuxtjs/axios from 5.9.4 to 5.9.5
 in /webapp (#2962)

Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.4 to 5.9.5.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.4...v5.9.5)

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

diff --git a/webapp/package.json b/webapp/package.json
index 8f44913e7..33f8f05d1 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -59,7 +59,7 @@
   "dependencies": {
     "@human-connection/styleguide": "0.5.22",
     "@nuxtjs/apollo": "^4.0.0-rc19",
-    "@nuxtjs/axios": "~5.9.4",
+    "@nuxtjs/axios": "~5.9.5",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.19",
     "@nuxtjs/sentry": "^3.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b9eda1842..38a57d1be 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1682,16 +1682,16 @@
     vue-cli-plugin-apollo "^0.21.3"
     webpack-node-externals "^1.7.2"
 
-"@nuxtjs/axios@~5.9.4":
-  version "5.9.4"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/axios/-/axios-5.9.4.tgz#45e7a44da38ea420685842268eb0298102acc64b"
-  integrity sha512-lwugsdVU4BEyY7rnYSsipGh4qlqEJOyForxF9C9wttVVT5IBvLlHiPE6Ownxl7gbqXKa819UKOqIPmb94DVV9A==
+"@nuxtjs/axios@~5.9.5":
+  version "5.9.5"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/axios/-/axios-5.9.5.tgz#5adc0acc4deb7e1d67ab7240c741a401a6c01823"
+  integrity sha512-5sMsl5PbNSbAOou75wN2ztDAfGi6pU12zZQvfkDBz3s9KnKST/Azfc1FLw2Y8TR4UaDv074vt20oxK+z7AnH1A==
   dependencies:
     "@nuxtjs/proxy" "^1.3.3"
     axios "^0.19.2"
     axios-retry "^3.1.2"
     consola "^2.11.3"
-    defu "^0.0.4"
+    defu "^1.0.0"
 
 "@nuxtjs/dotenv@~1.4.1":
   version "1.4.1"
@@ -6626,10 +6626,10 @@ defu@^0.0.3:
   resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.3.tgz#bdc3ea1e1ab2120d4d4a129147f3ba9b7f9fe103"
   integrity sha512-u/fe4fBwrD0KACvI0sYWTWFzooqONZq8ywPnK0ZkAgLNwaDTKpSWvMiiU4QmzhrQCXu8Y0+HIWP8amE18lsL4A==
 
-defu@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.4.tgz#9294753fff9a88217635ed387e4a451f1738e6ff"
-  integrity sha512-rgzSYjB7bq5P6uPTPOlFYy/hw4SR/Ml+SM/ZlRx1BEcgUmcTA8yqnzByRiA4npIuJPb1uRJo6ROx++Xs5QooqQ==
+defu@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defu/-/defu-1.0.0.tgz#43acb09dfcf81866fa3b0fc047ece18e5c30df71"
+  integrity sha512-1Y1KRFxiiq+LYsZ3iP7xYSR8bHfmHFOUpDunZCN1ld1fGfDJWJIvkUBtjl3apnBwPuJtL/H7cwwlLYX8xPkraQ==
 
 delayed-stream@~1.0.0:
   version "1.0.0"

From 5097c41cec739be2e5f0010b00338b7cee0bf3c0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:30:37 +0100
Subject: [PATCH 059/171] build(deps-dev): bump @storybook/vue from 5.3.9 to
 5.3.10 in /webapp (#2961)

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 33f8f05d1..38700bd81 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -102,7 +102,7 @@
     "@storybook/addon-a11y": "^5.3.9",
     "@storybook/addon-actions": "^5.3.9",
     "@storybook/addon-notes": "^5.3.9",
-    "@storybook/vue": "~5.3.9",
+    "@storybook/vue": "~5.3.10",
     "@vue/cli-shared-utils": "~4.1.2",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 38a57d1be..f7b49f38f 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2177,6 +2177,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.10.tgz#60a969329fdee455a491e95e9f2ed982faa97e65"
+  integrity sha512-n+cQrXHIiasyqWvthg9y51OCEmjmKWMrX2XQcG1i+9J9RCNkLQ77Tj3LWefT5dJbi77Fa2/TzOShRiQqaaFNiQ==
+  dependencies:
+    "@storybook/api" "5.3.10"
+    "@storybook/channels" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/addons@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.9.tgz#f2492de356e0cd38e3da357f4dafa058a4756e36"
@@ -2213,6 +2226,32 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.10.tgz#45927f7cbba111842729f85f8f9a38ab2c0d3793"
+  integrity sha512-vyRpZgMECc0Er1mBsr6o43aZQ3KA2Zin38AQo/5oW7sE+tCsjHSljhxB7+qlrf9FuheU4PWqV4KAKp52WHwFhg==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/channels" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "5.3.10"
+    "@storybook/theming" "5.3.10"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.2.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.9.tgz#090119c6fd4082442e926a434d3d171535ec6784"
@@ -2239,6 +2278,17 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channel-postmessage@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.10.tgz#0d5ede72e4057a20b5c2ad5d871134f3cba54b78"
+  integrity sha512-YHc6FCc9RSpDoYfa1LUGNwHXKx3KjW1m5Q86g86sV8Rnj+guy5atDRSmL2i/OKTONQO4Edp1er+UGFzyUd+a2Q==
+  dependencies:
+    "@storybook/channels" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.2.0"
+
 "@storybook/channel-postmessage@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.9.tgz#3846ae7ea5bc2fe36b1ef64fbc215f480cf8a189"
@@ -2257,6 +2307,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.10.tgz#6556b0fbe99bc0234a9a54de3c94e9e1cf55e4e3"
+  integrity sha512-VbXhwCQ6T7VMhD/YTBqvkWDnnl9CsZLL9MLameM4E+WxLrGpxHIl7sSvJ5av5YPgJPxaNJpPMeVSxdi5u4quxg==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/channels@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.9.tgz#7ee8f6e6f4c9465227120d6711805b5e6862107f"
@@ -2264,6 +2321,29 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-api@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.10.tgz#74c9c36a62d653f5eb29ceb84c3acbec19aad254"
+  integrity sha512-bYFgdzsaxdlWlZzNpDqWWLUaX31rc4xHdyy1MJ+dl65AnubPrLacvvqSCVYK+VdRAWHX+T7Bcvt2sRtwka7oEQ==
+  dependencies:
+    "@storybook/addons" "5.3.10"
+    "@storybook/channel-postmessage" "5.3.10"
+    "@storybook/channels" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    "@storybook/csf" "0.0.1"
+    "@types/webpack-env" "^1.15.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    stable "^0.1.8"
+    ts-dedent "^1.1.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.9.tgz#43ae2651bf303e832e97c014fd6c77a523669fd9"
@@ -2294,6 +2374,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.10.tgz#3f1ab223ccc5389004f76d9cab792083003d1db9"
+  integrity sha512-WCgXrr44Z8ScDiAVju5WLdm0am0JALo1XvUir1uP7j0f/h38/yA1+Jk1wXzAISdqOQN/CLl+o1H66rntEh/ijA==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-logger@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.9.tgz#06654be9caa8d37366270b0426c2d5acb217f504"
@@ -2326,6 +2413,33 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
+"@storybook/components@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.10.tgz#09cb0e931ff27d90ded3b94b8d4cd1ac52007c52"
+  integrity sha512-azGOazbkAJguGLZ7MOA8ZMh+Y2MTxhOcT7+jCVyl/AqpYuKjRR8cogZCWkbg5DnQsj79XNBr4eFWJ64m8dlUZw==
+  dependencies:
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/theming" "5.3.10"
+    "@types/react-syntax-highlighter" "11.0.2"
+    "@types/react-textarea-autosize" "^4.3.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^2.1.0"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^11.0.2"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+    ts-dedent "^1.1.0"
+
 "@storybook/components@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.9.tgz#1fbc688770889ddadb8c603f5a4dbcf987f3eb0f"
@@ -2360,6 +2474,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/core-events@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.10.tgz#3fa271f5f47ec9822c488b91d4ea7c298eb7ed6c"
+  integrity sha512-HxE8inbyoBtKqUR6cnNHBvHI55nRLYf8RGEB7BuazYtF5v2FBFRghngKJ+4ELz0Rw9Hv2jiU93S6zfTaOg6euw==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/core-events@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.9.tgz#3c7fbc20204ae4b937c896ed6281e782cc09c4aa"
@@ -2367,26 +2488,26 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.9.tgz#a13149714c46788555641124ed4f9fb7359e4550"
-  integrity sha512-AsyNLlFczEz5wGu92fJA6ioiSkUtK2Qgr+fXNOAFXA/FLhgBIijsNoAvEwkfCs8Koe3xNkbMRE1Tk4WRIl0kCw==
+"@storybook/core@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.10.tgz#862574b61da6f484facb40fed48ad99badf42574"
+  integrity sha512-KdCsfT8XZsPbyB90YRJJVVh7cac6TZhb0+xtEgepH8JozePrHwWRpt7y37u8XnFewnvsaUvWvRKcQiC6/K1oTg==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.7.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.3.9"
-    "@storybook/channel-postmessage" "5.3.9"
-    "@storybook/client-api" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/core-events" "5.3.9"
+    "@storybook/addons" "5.3.10"
+    "@storybook/channel-postmessage" "5.3.10"
+    "@storybook/client-api" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/core-events" "5.3.10"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "5.3.9"
-    "@storybook/router" "5.3.9"
-    "@storybook/theming" "5.3.9"
-    "@storybook/ui" "5.3.9"
+    "@storybook/node-logger" "5.3.10"
+    "@storybook/router" "5.3.10"
+    "@storybook/theming" "5.3.10"
+    "@storybook/ui" "5.3.10"
     airbnb-js-shims "^2.2.1"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.7.2"
@@ -2453,10 +2574,10 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.9.tgz#5de49697b5e2565a4a84bd56244a424368f5e726"
-  integrity sha512-Uxk7YjlIMkf5Bsyw/EOdlYa4JT3m+FUqb5bV+vtkfzPhzKA9FLdSFEh5OVKct4lG74XxOgaKWJxudINeWKz0qQ==
+"@storybook/node-logger@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.10.tgz#5bf4b8ce352901cd629401cc903b15e423ccd76c"
+  integrity sha512-ivasRTdJPFj9qi9q4ozkn6lhWi16cubf9AZwC5Or5HJE4OJkSsowecJBu28l2p887yexDkCDazOIvR9XtEIoIA==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^3.0.0"
@@ -2478,6 +2599,21 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
+"@storybook/router@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.10.tgz#a30f2694f4fa586ce4e398d02d4db7b70161551d"
+  integrity sha512-WQwsiOnvhqtAi7LKDygI03vk/CJG23/jqRtqDvjEhf2K3oRQmW3ZpPZkt6/W+UTkRlzp2bYMZFBYa0/HxEYITQ==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/csf" "0.0.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/router@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.9.tgz#3c6e01f4dced9de8e8c5c314352fdc437f2441c2"
@@ -2511,6 +2647,24 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
+"@storybook/theming@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.10.tgz#6f53df9684d998ce3dfdb22babfaeb667b7f250d"
+  integrity sha512-5/RQQS6u7BuJ8ufiqohAZ6EBLi6PwvJ3KcLMU21Dces/i0/e/HukXzUJVS0DVOno4bROkf98fYIv+MetpvIX+g==
+  dependencies:
+    "@emotion/core" "^10.0.20"
+    "@emotion/styled" "^10.0.17"
+    "@storybook/client-logger" "5.3.10"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.19"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+    ts-dedent "^1.1.0"
+
 "@storybook/theming@5.3.9":
   version "5.3.9"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.9.tgz#caaeea398f9e630394298ccfe8f36a185a289e4f"
@@ -2529,20 +2683,20 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
-"@storybook/ui@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.9.tgz#7e084ef93abb90b50ac18d4eea879c1f16b3e741"
-  integrity sha512-J1ktdeNaEGJmJUNFPGej71eVmjKct9DXaZq88eY3hwjrdfbBIPFrF6kUcAiP4SY900VlwMKuEtUJDcJpz55FYw==
+"@storybook/ui@5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.10.tgz#7af027773f8fa300c02447455b85d26d8a762b13"
+  integrity sha512-YVsFL7ZF2reDhubwjafyJK+eKKo5n9Np+VRMPnjeqpjd3+/N70Wg4VnT/AqgKrCXfCGExit+CVf3wbwBpnP1Kw==
   dependencies:
     "@emotion/core" "^10.0.20"
-    "@storybook/addons" "5.3.9"
-    "@storybook/api" "5.3.9"
-    "@storybook/channels" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/components" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    "@storybook/router" "5.3.9"
-    "@storybook/theming" "5.3.9"
+    "@storybook/addons" "5.3.10"
+    "@storybook/api" "5.3.10"
+    "@storybook/channels" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/components" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    "@storybook/router" "5.3.10"
+    "@storybook/theming" "5.3.10"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2569,13 +2723,13 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.9.tgz#1b36a165013066f788519806a46983dfc72c02ef"
-  integrity sha512-JazXqAi9lj+p4IgZsBmdniR9VfB+lTsVNUWcoc2BVvsKFqHH7GdB7xv/H9Eme7njU57+dKyPQfCZab1QvG0IYQ==
+"@storybook/vue@~5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.10.tgz#7f7a091b26910bf05e3fc765564e88b532936f52"
+  integrity sha512-e57AS1dgN1It8ZI1pT09zACxuGM87ekbxWYzGlivDRPI2qqTiZ1zHkwf+V3KV4j+HW+TNocBItl5tHfjqv7Giw==
   dependencies:
-    "@storybook/addons" "5.3.9"
-    "@storybook/core" "5.3.9"
+    "@storybook/addons" "5.3.10"
+    "@storybook/core" "5.3.10"
     "@types/webpack-env" "^1.15.0"
     core-js "^3.0.1"
     global "^4.3.2"

From a07db122ebf9713c1a62aec2f1cbc5eefd7f0e3c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:30:56 +0100
Subject: [PATCH 060/171] build(deps): bump metascraper-image from 5.10.6 to
 5.10.7 in /backend (#2960)

Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 63d895802..27986e13a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -73,7 +73,7 @@
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.10.6",
     "metascraper-description": "^5.10.6",
-    "metascraper-image": "^5.10.6",
+    "metascraper-image": "^5.10.7",
     "metascraper-lang": "^5.10.6",
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.10.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 3df6b1593..20ebd500d 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1175,10 +1175,10 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.10.6":
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.10.6.tgz#0b786607212925a577926fd0cd0313a49de3499c"
-  integrity sha512-/jvhlM3RKGYMoUK8D8S1r3tN03/EYizCqWF7zDx0aBMC8Ihp33DRGs9oNdsgkgwzVF7O/YpDm55l9K+qVJlsyQ==
+"@metascraper/helpers@^5.10.6", "@metascraper/helpers@^5.10.7":
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.10.7.tgz#4d330204372ce5c1afedfc3ac891fb373f72c085"
+  integrity sha512-YkL4vTF4grgNTFhe9t4qsD0c5aEjxWoC0cpvMICs6JriRtedwjVfiwWhaGiTbU3pGFhmLgE9fV42wXOXGUGjMQ==
   dependencies:
     audio-extensions "0.0.0"
     chrono-node "~1.4.2"
@@ -1194,7 +1194,7 @@
     lodash "~4.17.15"
     memoize-one "~5.1.1"
     mime-types "~2.1.26"
-    normalize-url "~4.5.0"
+    normalize-url "~5.0.0"
     smartquotes "~2.3.1"
     title "~3.4.1"
     truncate "~2.1.0"
@@ -6190,12 +6190,12 @@ metascraper-description@^5.10.6:
   dependencies:
     "@metascraper/helpers" "^5.10.6"
 
-metascraper-image@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.10.6.tgz#b23ec4bfab0467342b294f3d049c7b7e9a1dd071"
-  integrity sha512-/+m0VaaqnBgNREun/8jcq+clc4s9Z0FAuMO/TQf/mrz9SbcmpHeTD0WpiGJgEa9zYSbuEQYHdBkxhpw+SdJPCA==
+metascraper-image@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.10.7.tgz#9b1da02f2e748fd388dea6394d29b6e43c367924"
+  integrity sha512-xrR4Rl8UNwwyzMfrKH3RtaC775aHDXVT0TQEzn5p5uYfd4evLI2O+jr1CIBIl1d3CXqVxWCQWBY3gA7RtcjgWQ==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-lang-detector@^4.10.2:
   version "4.10.2"
@@ -6702,10 +6702,10 @@ normalize-url@~4.2.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.2.0.tgz#e747f16b58e6d7f391495fd86415fa04ec7c9897"
   integrity sha512-n69+KXI+kZApR+sPwSkoAXpGlNkaiYyoHHqKOFPjJWvwZpew/EjKvuPE4+tStNgb42z5yLtdakgZCQI+LalSPg==
 
-normalize-url@~4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
-  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+normalize-url@~5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-5.0.0.tgz#f46c9dc20670495e4e18fbd1b4396e41d199f63c"
+  integrity sha512-bAEm2fx8Dq/a35Z6PIRkkBBJvR56BbEJvhpNtvCZ4W9FyORSna77fn+xtYFjqk5JpBS+fMnAOG/wFgkQBmB7hw==
 
 npm-bundled@^1.0.1:
   version "1.0.6"

From 841d7d03e514be942c6f6596390b73706e65494d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:31:45 +0100
Subject: [PATCH 061/171] build(deps): bump metascraper-youtube from 5.10.6 to
 5.10.7 in /backend (#2957)

Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

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

diff --git a/backend/package.json b/backend/package.json
index 27986e13a..cf29c2f79 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -82,7 +82,7 @@
     "metascraper-title": "^5.10.6",
     "metascraper-url": "^5.10.6",
     "metascraper-video": "^5.10.6",
-    "metascraper-youtube": "^5.10.6",
+    "metascraper-youtube": "^5.10.7",
     "migrate": "^1.6.2",
     "minimatch": "^3.0.4",
     "mustache": "^4.0.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 20ebd500d..8da98eea2 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6258,12 +6258,12 @@ metascraper-video@^5.10.6:
     "@metascraper/helpers" "^5.10.6"
     lodash "~4.17.15"
 
-metascraper-youtube@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-youtube/-/metascraper-youtube-5.10.6.tgz#6cacabb1791b06ed98a7da69aa00c1c6c50a2dfe"
-  integrity sha512-Yl5kEFawqpSGmVSG2yTVZj7mGfRSFGQ2A4cxpqSbaPIUCGJwG9BUJkMzyUG0m6jGrg0zI5CmeZGNBAXzgKGz4g==
+metascraper-youtube@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-youtube/-/metascraper-youtube-5.10.7.tgz#6c3313563ee57cb71c496fa99c129ad41fe22291"
+  integrity sha512-T4ZawYpW/2lyoVUY9RM92YCxkuyhNDXFxg8XAG9u2hoNZ5elrHLOv67ao5zMHa7IXZY3A7IGDOBd1NfoShnToA==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
     get-video-id "~3.1.4"
     is-reachable "~4.0.0"
     p-locate "~4.1.0"

From 2ee9e5b11cce1248f967893d713d71468641c449 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:32:06 +0100
Subject: [PATCH 062/171] build(deps-dev): bump eslint-plugin-import in
 /backend (#2955)

Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.0 to 2.20.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.0...v2.20.1)

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

diff --git a/backend/package.json b/backend/package.json
index cf29c2f79..680ea534a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -118,7 +118,7 @@
     "eslint": "~6.8.0",
     "eslint-config-prettier": "~6.10.0",
     "eslint-config-standard": "~14.1.0",
-    "eslint-plugin-import": "~2.20.0",
+    "eslint-plugin-import": "~2.20.1",
     "eslint-plugin-jest": "~23.6.0",
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-prettier": "~3.1.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 8da98eea2..2e6458879 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3625,10 +3625,10 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz#d749a7263fb6c29980def8e960d380a6aa6aecaa"
-  integrity sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==
+eslint-plugin-import@~2.20.1:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
+  integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==
   dependencies:
     array-includes "^3.0.3"
     array.prototype.flat "^1.2.1"

From 4472edd12f2ce7393cdb62904fbbd0e42579bc99 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:32:55 +0100
Subject: [PATCH 063/171] build(deps): bump metascraper-publisher in /backend
 (#2954)

Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 680ea534a..4fa2ea290 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -77,7 +77,7 @@
     "metascraper-lang": "^5.10.6",
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.10.6",
-    "metascraper-publisher": "^5.10.6",
+    "metascraper-publisher": "^5.10.7",
     "metascraper-soundcloud": "^5.10.6",
     "metascraper-title": "^5.10.6",
     "metascraper-url": "^5.10.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 2e6458879..734d65412 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6220,12 +6220,12 @@ metascraper-logo@^5.10.6:
   dependencies:
     "@metascraper/helpers" "^5.10.6"
 
-metascraper-publisher@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.10.6.tgz#95dde6ecef3c7b890ac625893ab374096bebe1f4"
-  integrity sha512-4jTOpbIwXBADl6z39UzQ4DZLeVoj4Q+5dcHbEgGn9MQ9878FgxiJKyrHzYvqfe9fRNd0PcaFMuuwLyhz58haoA==
+metascraper-publisher@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.10.7.tgz#7add40be1625a4215e2ec36dedaaaf213c1870e2"
+  integrity sha512-aRws5ksH+gzb49nc41oJdoJS2jG/2vC3GCi68n4Evy/TL7TYCnbZXqcgT5U0ne1kFxCZlHB6rl0DcXkx/JlT5Q==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-soundcloud@^5.10.6:
   version "5.10.6"

From 9e18068da713a3bd21b52ba09fc465170cf201cd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 00:32:56 +0000
Subject: [PATCH 064/171] build(deps): bump metascraper-date from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 27986e13a..d448601d3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -71,7 +71,7 @@
     "metascraper-audio": "^5.10.6",
     "metascraper-author": "^5.10.6",
     "metascraper-clearbit-logo": "^5.3.0",
-    "metascraper-date": "^5.10.6",
+    "metascraper-date": "^5.10.7",
     "metascraper-description": "^5.10.6",
     "metascraper-image": "^5.10.7",
     "metascraper-lang": "^5.10.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 20ebd500d..ae9cc0fc0 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6176,12 +6176,12 @@ metascraper-clearbit-logo@^5.3.0:
   dependencies:
     got "~9.6.0"
 
-metascraper-date@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.10.6.tgz#dbdc0ddb4f4220ad1ea412b4a686900c1b138cf6"
-  integrity sha512-WfZw7WhkMKrrq96ZcAxS01/YjiDBpAPt5e3ggnCfLi2ZzC370w9J0INUo7gAtujaNZvgTTSEcrDD7AbTVMSYKA==
+metascraper-date@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-5.10.7.tgz#580891d98f14438658610d951e5454a0658eb5f3"
+  integrity sha512-S1ZsvYrOccS6EGvlAJT7Ph08uRgIE+aYlTRSCR8wG8P0j0Ta/srUKbPySxv+xXqDXuRIChtErSIsBgORg8uNjg==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-description@^5.10.6:
   version "5.10.6"

From 42df14067251ed542b92b3368030ba1347e5c2b2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 00:33:02 +0000
Subject: [PATCH 065/171] build(deps): bump @nuxtjs/pwa in /webapp

Bumps [@nuxtjs/pwa](https://github.com/nuxt-community/pwa-module) from 3.0.0-beta.19 to 3.0.0-beta.20.
- [Release notes](https://github.com/nuxt-community/pwa-module/releases)
- [Changelog](https://github.com/nuxt-community/pwa-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/pwa-module/compare/v3.0.0-beta.19...v3.0.0-beta.20)

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

diff --git a/webapp/package.json b/webapp/package.json
index 38700bd81..25605968d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -61,7 +61,7 @@
     "@nuxtjs/apollo": "^4.0.0-rc19",
     "@nuxtjs/axios": "~5.9.5",
     "@nuxtjs/dotenv": "~1.4.1",
-    "@nuxtjs/pwa": "^3.0.0-beta.19",
+    "@nuxtjs/pwa": "^3.0.0-beta.20",
     "@nuxtjs/sentry": "^3.1.0",
     "@nuxtjs/style-resources": "~1.0.0",
     "accounting": "~0.4.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f7b49f38f..c2ca143a6 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1709,12 +1709,12 @@
     consola "^2.5.6"
     http-proxy-middleware "^0.19.1"
 
-"@nuxtjs/pwa@^3.0.0-beta.19":
-  version "3.0.0-beta.19"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/pwa/-/pwa-3.0.0-beta.19.tgz#4685c8137a5b588126b3ee4d469f6806423f958f"
-  integrity sha512-5c7CB2qrrlpu7BmJeWX9GN//uK1SiEzBbT+ykH11ZfUxQyXiO3QTm1f6tTOnG/P5v4kRIGYdBr0wmRbA/Hv1cw==
+"@nuxtjs/pwa@^3.0.0-beta.20":
+  version "3.0.0-beta.20"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/pwa/-/pwa-3.0.0-beta.20.tgz#56766da5485c09cb73307285292203f4a4417d5d"
+  integrity sha512-pZhGBqRvTCItvAdZ6PSZtqJUKT6ybphXCykfHh95KzW0cGf10QH/ETPci2AMDEzfx4jW2hImGSmLBToVWOV7Uw==
   dependencies:
-    defu "^0.0.3"
+    defu "^1.0.0"
     execa "^1.0.0"
     fs-extra "^8.1.0"
     hasha "^5.0.0"
@@ -6775,11 +6775,6 @@ defu@^0.0.1:
   resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.1.tgz#74dc4d64e401d7f95c6755fe98bc5cd688833a8f"
   integrity sha512-Pz9yznbSzVTNA67lcfqVnktROx2BrrBBcmQqGrfe0zdiN5pl5GQogLA4uaP3U1pR1LHIZpEYTAh2sn+v4rH1dA==
 
-defu@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.3.tgz#bdc3ea1e1ab2120d4d4a129147f3ba9b7f9fe103"
-  integrity sha512-u/fe4fBwrD0KACvI0sYWTWFzooqONZq8ywPnK0ZkAgLNwaDTKpSWvMiiU4QmzhrQCXu8Y0+HIWP8amE18lsL4A==
-
 defu@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defu/-/defu-1.0.0.tgz#43acb09dfcf81866fa3b0fc047ece18e5c30df71"
@@ -7670,23 +7665,7 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-3.2.0.tgz#18326b79c7ab7fbd6610fd900c1b9e95fa48f90a"
-  integrity sha512-kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    p-finally "^2.0.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
-execa@^3.4.0:
+execa@^3.2.0, execa@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
   integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==

From a7b6d82cda4a3559457e517171c8b08568a4d9eb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:33:13 +0100
Subject: [PATCH 066/171] build(deps-dev): bump @storybook/addon-actions in
 /webapp (#2953)

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 38700bd81..6c626fb3a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
     "@storybook/addon-a11y": "^5.3.9",
-    "@storybook/addon-actions": "^5.3.9",
+    "@storybook/addon-actions": "^5.3.10",
     "@storybook/addon-notes": "^5.3.9",
     "@storybook/vue": "~5.3.10",
     "@vue/cli-shared-utils": "~4.1.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f7b49f38f..e52cff17d 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2125,17 +2125,17 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.9.tgz#fc8b1d912c87f418e69c2b52031d29465bb4867b"
-  integrity sha512-saTxUXnu8O8pE1G2yPDY8NbvK+qZS27HcoeN3HzU/ooAQDffMTnreU4C8LU6/yKAx4KBDvXS4oyiBguOlQfIgg==
+"@storybook/addon-actions@^5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.10.tgz#08cfaa656a787990260e73e5b556efd903a92dcc"
+  integrity sha512-k4LT2pMiUm3WljBGWGlMsPVJhmESfLiyos0BV2apLIXEVb0L/O8rEJtZ9GBEab63lZVb4Yxo0yGbGIk6In13bQ==
   dependencies:
-    "@storybook/addons" "5.3.9"
-    "@storybook/api" "5.3.9"
-    "@storybook/client-api" "5.3.9"
-    "@storybook/components" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    "@storybook/theming" "5.3.9"
+    "@storybook/addons" "5.3.10"
+    "@storybook/api" "5.3.10"
+    "@storybook/client-api" "5.3.10"
+    "@storybook/components" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    "@storybook/theming" "5.3.10"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"

From 54f3b629019b828e4a084a0d6dcfc683d677aeb7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 00:34:50 +0000
Subject: [PATCH 067/171] build(deps-dev): bump eslint-plugin-import in /webapp

Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.0 to 2.20.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.0...v2.20.1)

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

diff --git a/webapp/package.json b/webapp/package.json
index 38700bd81..8fdf8c979 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -120,7 +120,7 @@
     "eslint-config-prettier": "~6.10.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-loader": "~3.0.3",
-    "eslint-plugin-import": "~2.20.0",
+    "eslint-plugin-import": "~2.20.1",
     "eslint-plugin-jest": "~23.6.0",
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-prettier": "~3.1.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f7b49f38f..1ea0138a6 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7405,10 +7405,10 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz#d749a7263fb6c29980def8e960d380a6aa6aecaa"
-  integrity sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==
+eslint-plugin-import@~2.20.1:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
+  integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==
   dependencies:
     array-includes "^3.0.3"
     array.prototype.flat "^1.2.1"

From afb609e421ebcbfb7642a89f8ccd2d7c9e0c9274 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 00:34:59 +0000
Subject: [PATCH 068/171] build(deps): bump metascraper-soundcloud in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 4fa2ea290..a911adb1e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -78,7 +78,7 @@
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.10.6",
     "metascraper-publisher": "^5.10.7",
-    "metascraper-soundcloud": "^5.10.6",
+    "metascraper-soundcloud": "^5.10.7",
     "metascraper-title": "^5.10.6",
     "metascraper-url": "^5.10.6",
     "metascraper-video": "^5.10.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 734d65412..fb25b3a6d 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6227,12 +6227,12 @@ metascraper-publisher@^5.10.7:
   dependencies:
     "@metascraper/helpers" "^5.10.7"
 
-metascraper-soundcloud@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.10.6.tgz#7aff2e17214b6939719ea726a0f5a5fe2a48c5a5"
-  integrity sha512-WO+B81e04Hng4/YOtq4dpNv9CrGWVemrNuZk3iIJU+B+gF3YpzdERxS4aIpM7KHcY/c8xu3xDM3LrSUWXWjM3g==
+metascraper-soundcloud@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.10.7.tgz#64a5518324ea69576ab9c206f29a60160fb89e91"
+  integrity sha512-KPM/g+l1m0tp4YOu8qF1RUT7yondaY1S/0aieUUFck/iE3VA1i3MJTLLygIc+67fcbHqcz60qfPTOvYbl6sIPw==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
     tldts "~5.6.3"
 
 metascraper-title@^5.10.6:

From 0bb2e3278121f0e17b96e7be16d7658eed2e3e85 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 00:35:50 +0000
Subject: [PATCH 069/171] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 6c626fb3a..7f3cceb97 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -99,7 +99,7 @@
     "@babel/core": "~7.8.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
-    "@storybook/addon-a11y": "^5.3.9",
+    "@storybook/addon-a11y": "^5.3.10",
     "@storybook/addon-actions": "^5.3.10",
     "@storybook/addon-notes": "^5.3.9",
     "@storybook/vue": "~5.3.10",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index e52cff17d..ae1d64fc2 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2103,17 +2103,17 @@
   dependencies:
     type-detect "4.0.8"
 
-"@storybook/addon-a11y@^5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.9.tgz#4b075bd25570ba1bbefee207aac2385984098a0b"
-  integrity sha512-4ba+hxOyhNQa07+87OTLdKvsK/aCRooGNPPMRlEy41dacyEJLNAWDh7PQHCn15NogS4Ie9YNlCnmNkfDpHWz7w==
+"@storybook/addon-a11y@^5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.10.tgz#356b93905cf1615476c7ec35461b965ea3f0617d"
+  integrity sha512-+KXtbpoutUuWZ6EMIT5eTvvXnUbrgYEQFDqQGh7ecOxzPwEKJ92gX8wogZ07VvMQ2Wyg98E+B12G+WN8ga/idw==
   dependencies:
-    "@storybook/addons" "5.3.9"
-    "@storybook/api" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/components" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    "@storybook/theming" "5.3.9"
+    "@storybook/addons" "5.3.10"
+    "@storybook/api" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/components" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    "@storybook/theming" "5.3.10"
     axe-core "^3.3.2"
     core-js "^3.0.1"
     global "^4.3.2"
@@ -2289,17 +2289,6 @@
     global "^4.3.2"
     telejson "^3.2.0"
 
-"@storybook/channel-postmessage@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.9.tgz#3846ae7ea5bc2fe36b1ef64fbc215f480cf8a189"
-  integrity sha512-gMzPwxTsN0Xgpd01ERlC2lpJzzeOMgP+eSruHh1pwieplL8CEctn8HV1eXrAtF/JtFIXjd4jkoRHAwRptHuJ2w==
-  dependencies:
-    "@storybook/channels" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^3.2.0"
-
 "@storybook/channels@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
@@ -2344,29 +2333,6 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.9.tgz#43ae2651bf303e832e97c014fd6c77a523669fd9"
-  integrity sha512-c2AO8R/CKJfOGCQxWva6te7Fhlbs+6nzBj14rnb+BC6e7zORuozLNugGXTc7w2aR7manI86WFjSWWfzX64Jr3w==
-  dependencies:
-    "@storybook/addons" "5.3.9"
-    "@storybook/channel-postmessage" "5.3.9"
-    "@storybook/channels" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    "@storybook/csf" "0.0.1"
-    "@types/webpack-env" "^1.15.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    stable "^0.1.8"
-    ts-dedent "^1.1.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-logger@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"

From 3dc6661b86d11f786e318d8054892bba9eddcefb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 01:43:47 +0100
Subject: [PATCH 070/171] build(deps-dev): bump codecov from 3.6.2 to 3.6.4
 (#2943)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.6.2 to 3.6.4.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.6.2...v3.6.4)

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

diff --git a/package.json b/package.json
index d13d467d1..caed8a5b2 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "@babel/register": "^7.8.3",
     "auto-changelog": "^1.16.2",
     "bcryptjs": "^2.4.3",
-    "codecov": "^3.6.2",
+    "codecov": "^3.6.4",
     "cross-env": "^6.0.3",
     "cucumber": "^6.0.5",
     "cypress": "^3.8.3",
diff --git a/yarn.lock b/yarn.lock
index 4fa261ccf..f6fae5cc5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1211,12 +1211,17 @@ add-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
-agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+agent-base@5:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
+  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+
+agent-base@6:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
+  integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==
   dependencies:
-    es6-promisify "^5.0.0"
+    debug "4"
 
 ajv@^6.5.5:
   version "6.10.0"
@@ -1314,7 +1319,7 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-argv@^0.0.2:
+argv@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
   integrity sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=
@@ -2015,17 +2020,17 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codecov@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.6.2.tgz#9503533d744233f6864f8f3ead9435d285ed3f47"
-  integrity sha512-i1VYZYY3M8Lodk/QRsIWYVimkuhl0oMSiM2itxbTbEIjB0PCSWP1cI7cscu5P0MayggoTl6I/jkXV2go8Ub8/Q==
+codecov@^3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.6.4.tgz#c993a58704ad5f15dcdd6aa3c3af22070c69eb18"
+  integrity sha512-R9zEcTR5/IDLepdGUHAkRMZOIKhBE1NRGS1N2H96zhBOskhdW9Q22GtYYyecbZL1aheU00D2F21nNBGRISui0A==
   dependencies:
-    argv "^0.0.2"
-    ignore-walk "^3.0.1"
-    js-yaml "^3.13.1"
-    teeny-request "^3.11.3"
-    urlgrey "^0.4.4"
-    validator "^12.1.0"
+    argv "0.0.2"
+    ignore-walk "3.0.3"
+    js-yaml "3.13.1"
+    teeny-request "6.0.1"
+    urlgrey "0.4.4"
+    validator "12.2.0"
 
 coffeeify@3.0.1:
   version "3.0.1"
@@ -2723,7 +2728,7 @@ debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@4.1.1, debug@^4.1.0:
+debug@4, debug@4.1.1, debug@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -3037,18 +3042,6 @@ es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@@ -3738,6 +3731,14 @@ htmlescape@^1.1.0:
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
   integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
+http-proxy-agent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.0.tgz#6b74d332e1934a1107b97e97de4a00e267c790fe"
+  integrity sha512-GX0FA6+IcDf4Oxc/FBWgYj4zKgo/DnZrksaG9jyuQLExs6xlX+uI5lcA8ymM3JaZTRrF/4s2UX19wJolyo7OBA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -3752,13 +3753,13 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+https-proxy-agent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
+  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
   dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
+    agent-base "5"
+    debug "4"
 
 iconv-lite@^0.4.4:
   version "0.4.24"
@@ -3772,10 +3773,10 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
   integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+ignore-walk@3.0.3, ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
   dependencies:
     minimatch "^3.0.4"
 
@@ -4263,7 +4264,7 @@ js-string-escape@^1.0.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1, js-yaml@^3.9.0:
+js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.9.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -6273,6 +6274,13 @@ stream-combiner2@^1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
+stream-events@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
+  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
+  dependencies:
+    stubs "^3.0.0"
+
 stream-http@^2.0.0:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
@@ -6432,6 +6440,11 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+stubs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
+  integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls=
+
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -6483,13 +6496,15 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-teeny-request@^3.11.3:
-  version "3.11.3"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-3.11.3.tgz#335c629f7645e5d6599362df2f3230c4cbc23a55"
-  integrity sha512-CKncqSF7sH6p4rzCgkb/z/Pcos5efl0DmolzvlqRQUNcpRIruOhY9+T1FsIlyEbfWd7MsFpodROOwHYh2BaXzw==
+teeny-request@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.1.tgz#9b1f512cef152945827ba7e34f62523a4ce2c5b0"
+  integrity sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g==
   dependencies:
-    https-proxy-agent "^2.2.1"
+    http-proxy-agent "^4.0.0"
+    https-proxy-agent "^4.0.0"
     node-fetch "^2.2.0"
+    stream-events "^1.0.5"
     uuid "^3.3.2"
 
 test-exclude@^6.0.0:
@@ -6796,7 +6811,7 @@ url@0.11.0, url@~0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-urlgrey@^0.4.4:
+urlgrey@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
   integrity sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=
@@ -6853,10 +6868,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-12.1.0.tgz#a3a7315d5238cbc15e46ad8d5e479aafa7119925"
-  integrity sha512-gIC2RBuFRi574Rb9vewGCJ7TCLxHXNx6EKthEgs+Iz0pYa9a9Te1VLG/bGLsAyGWrqR5FfR7tbFUI7FEF2LiGA==
+validator@12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
+  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
 
 verror@1.10.0, verror@^1.9.0:
   version "1.10.0"

From 1c920c747a39da2e807ff2e1949c315af7796653 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 04:20:08 +0000
Subject: [PATCH 071/171] build(deps): bump @sentry/node from 5.11.2 to 5.12.0
 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 4fa2ea290..243c7c1c8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.0",
-    "@sentry/node": "^5.11.2",
+    "@sentry/node": "^5.12.0",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 734d65412..bf2028fec 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1275,83 +1275,83 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@sentry/apm@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.11.2.tgz#35961b9d2319ad21ae91f1b697998a8c523f1919"
-  integrity sha512-qn4HiSZ+6b1Gg+DlXdHVpiPPEbRu4IicGSbI8HTJLzrlsjoaBQPPkDwtuQUBVq21tU3RYXnTwrl9m45KuX6alA==
+"@sentry/apm@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.12.0.tgz#6ec9c11d2754ab597bd0752b55fbbf2537f1d96b"
+  integrity sha512-tpD6c0dVKkG+QPEubTTr54TDFdR/FWldnHwkhq4CST2uwkEm26o95iuNhMx9WE7EJhpXjaFKpZB0TB8frFIqkg==
   dependencies:
-    "@sentry/browser" "5.11.2"
-    "@sentry/hub" "5.11.2"
-    "@sentry/minimal" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/browser" "5.12.0"
+    "@sentry/hub" "5.12.0"
+    "@sentry/minimal" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/browser@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.11.2.tgz#f0b19bd97e9f09a20e9f93a9835339ed9ab1f5a4"
-  integrity sha512-ls6ARX5m+23ld8OsuoPnR+kehjR5ketYWRcDYlmJDX2VOq5K4EzprujAo8waDB0o5a92yLXQ0ZSoK/zzAV2VoA==
+"@sentry/browser@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.12.0.tgz#d2c5b683eca6d5489a2c5b237712a8c9de9d4427"
+  integrity sha512-e8uQML/1Wz2A6610yEvTdICf7L2IH15z6kcjwEqTsaD5uBCmpCiebGZABb45OSe9u8J0xccqi5G7M8lcxj1L7w==
   dependencies:
-    "@sentry/core" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/core" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/core@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.11.2.tgz#f2d9d37940d291dbcb9a9e4a012f76919474bdf6"
-  integrity sha512-IFCXGy7ebqIq/Kb8RVryCo/SjwhPcrfBmOjkicr4+DxN1UybLre2N3p9bejQMPIteOfDVHlySLYeipjTf+mxZw==
+"@sentry/core@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.12.0.tgz#d6380c4ef7beee5f418ac1d0e5be86a2de2af449"
+  integrity sha512-wY4rsoX71QsGpcs9tF+OxKgDPKzIFMRvFiSRcJoPMfhFsTilQ/CBMn/c3bDtWQd9Bnr/ReQIL6NbnIjUsPHA4Q==
   dependencies:
-    "@sentry/hub" "5.11.2"
-    "@sentry/minimal" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/hub" "5.12.0"
+    "@sentry/minimal" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/hub@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.11.2.tgz#a3b7ec27cd4cea2cddd75c372fbf1b4bc04c6aae"
-  integrity sha512-5BiDin6ZPsaiTm29rCC41MAjP1vOaKniqfjtXHVPm7FeOBA2bpHm95ncjLkshKGJTPfPZHXTpX/1IZsHrfGVEA==
+"@sentry/hub@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.12.0.tgz#5e8c8f249f5bdbeb8cc4ec02c2ccc53a67f2cc02"
+  integrity sha512-3k7yE8BEVJsKx8mR4LcI4IN0O8pngmq44OcJ/fRUUBAPqsT38jsJdP2CaWhdlM1jiNUzUDB1ktBv6/lY+VgcoQ==
   dependencies:
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.11.2.tgz#ae417699342266ecd109a97e53cd9519c0893b21"
-  integrity sha512-oNuJuz3EZhVtamzABmPdr6lcYo06XHLWb2LvgnoNaYcMD1ExUSvhepOSyZ2h5STCMbmVgGVfXBNPV9RUTp8GZg==
+"@sentry/minimal@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.12.0.tgz#2611e2aa520c1edb7999e6de51bd65ec66341757"
+  integrity sha512-fk73meyz4k4jCg9yzbma+WkggsfEIQWI2e2TWfYsRGcrV3RnlSrXyM4D91/A8Bjx10SNezHPUFHjasjlHXOkyA==
   dependencies:
-    "@sentry/hub" "5.11.2"
-    "@sentry/types" "5.11.0"
+    "@sentry/hub" "5.12.0"
+    "@sentry/types" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/node@^5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.11.2.tgz#575c320b624c218d2155183f6bbe82b732bfb1f2"
-  integrity sha512-jYq9u76BdAbOKPuYg39Xh/+797MevzjMkCIC9cw/bQxAm6nHc3FXeKqd79O33jO4Jag0JL+Bz/0JidgrKgKgXg==
+"@sentry/node@^5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.12.0.tgz#9781d3cf4d7f664acacb9775912f67a3a465c259"
+  integrity sha512-Q059wrvv7JDTfdlnI4GCAOW9BLeRxxx8P+TYK/t41ZgEbwTob/VU+rn+p7zQm8beHMM3IBtUKE54AmpHYnhJ/A==
   dependencies:
-    "@sentry/apm" "5.11.2"
-    "@sentry/core" "5.11.2"
-    "@sentry/hub" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/apm" "5.12.0"
+    "@sentry/core" "5.12.0"
+    "@sentry/hub" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     cookie "^0.3.1"
     https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.11.0.tgz#40f0f3174362928e033ddd9725d55e7c5cb7c5b6"
-  integrity sha512-1Uhycpmeo1ZK2GLvrtwZhTwIodJHcyIS6bn+t4IMkN9MFoo6ktbAfhvexBDW/IDtdLlCGJbfm8nIZerxy0QUpg==
+"@sentry/types@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.12.0.tgz#5367e53c74261beea01502e3f7b6f3d822682a31"
+  integrity sha512-aZbBouBLrKB8wXlztriIagZNmsB+wegk1Jkl6eprqRW/w24Sl/47tiwH8c5S4jYTxdAiJk+SAR10AAuYmIN3zg==
 
-"@sentry/utils@5.11.1":
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.11.1.tgz#aa19fcc234cf632257b2281261651d2fac967607"
-  integrity sha512-O0Zl4R2JJh8cTkQ8ZL2cDqGCmQdpA5VeXpuBbEl1v78LQPkBDISi35wH4mKmLwMsLBtTVpx2UeUHBj0KO5aLlA==
+"@sentry/utils@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.12.0.tgz#62967f934a3ee6d21472eac0219084e37225933e"
+  integrity sha512-fYUadGLbfTCbs4OG5hKCOtv2jrNE4/8LHNABy9DwNJ/t5DVtGqWAZBnxsC+FG6a3nVqCpxjFI9AHlYsJ2wsf7Q==
   dependencies:
-    "@sentry/types" "5.11.0"
+    "@sentry/types" "5.12.0"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":

From 8350e56592f7eb0e848452fe9e676e18e88b3d88 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:28:43 +0000
Subject: [PATCH 072/171] build(deps): bump metascraper-description in /backend

Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.11.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.11.0)

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

diff --git a/backend/package.json b/backend/package.json
index 4415299c5..6a432945b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -72,7 +72,7 @@
     "metascraper-author": "^5.10.6",
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.10.7",
-    "metascraper-description": "^5.10.6",
+    "metascraper-description": "^5.11.0",
     "metascraper-image": "^5.10.7",
     "metascraper-lang": "^5.10.6",
     "metascraper-lang-detector": "^4.10.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index b1b6992c1..77c7385d5 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6183,12 +6183,12 @@ metascraper-date@^5.10.7:
   dependencies:
     "@metascraper/helpers" "^5.10.7"
 
-metascraper-description@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.10.6.tgz#ebb4459a4e1acdc473534d1b898b7958b1769eb6"
-  integrity sha512-d3d6UMsNnD8Dy7gxA05iTOj5QmJrFQTw1+IrW9CiOfdNsYq0H+m265a9lRaXcyJdqkzmGnv/d52C0BtUDOrkRw==
+metascraper-description@^5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.11.0.tgz#1f7edfae7ffc353512975cafaa5b862fc5141709"
+  integrity sha512-or62L9EbIwBxjsu6gShTKi1z1XQ4Hvml8MrdydL4tiSUJpwf+lXc6gVOP8+nlKPPRkiAhXt2M9k4mfkGoX0erQ==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-image@^5.10.7:
   version "5.10.7"

From f7f313950f852bb100474b7ec7a1077d9e5be638 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:28:43 +0000
Subject: [PATCH 073/171] build(deps): bump metascraper-lang from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 4415299c5..fc0ef58a2 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -74,7 +74,7 @@
     "metascraper-date": "^5.10.7",
     "metascraper-description": "^5.10.6",
     "metascraper-image": "^5.10.7",
-    "metascraper-lang": "^5.10.6",
+    "metascraper-lang": "^5.10.7",
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.10.6",
     "metascraper-publisher": "^5.10.7",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index b1b6992c1..2e253884d 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6206,12 +6206,12 @@ metascraper-lang-detector@^4.10.2:
     franc "~4.0.0"
     iso-639-3 "~1.1.0"
 
-metascraper-lang@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.10.6.tgz#d4130257f6604095e9af8d796a6bde5815f6c667"
-  integrity sha512-JDhNbP1iSnPV7d6PklIIdBSzlwqbtvH+n810Isa5/PGuvUkJzNkTAUN+eTM1i6YcTlMp1N2gYsQG9uwfpMwFog==
+metascraper-lang@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.10.7.tgz#fe07c359b757ef3c5ba0a330da97173945196fde"
+  integrity sha512-ulLq7g+X4F9XzoScNflkhwWUuoSycbOqJ8j7vT6E/sHYPid+BdUnw2yaxAqXOdsrsbUEWzkiDwrJiq37XWCpDA==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-logo@^5.10.6:
   version "5.10.6"

From 2df2bf99a249be1032e7029e1ed72affbfa7428b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:29:48 +0000
Subject: [PATCH 074/171] build(deps): bump metascraper-video from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 5783fb850..102457fe0 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -81,7 +81,7 @@
     "metascraper-soundcloud": "^5.10.7",
     "metascraper-title": "^5.10.6",
     "metascraper-url": "^5.10.6",
-    "metascraper-video": "^5.10.6",
+    "metascraper-video": "^5.10.7",
     "metascraper-youtube": "^5.10.7",
     "migrate": "^1.6.2",
     "minimatch": "^3.0.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f3db1dc87..fdd40889d 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6250,12 +6250,12 @@ metascraper-url@^5.10.6:
   dependencies:
     "@metascraper/helpers" "^5.10.6"
 
-metascraper-video@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.10.6.tgz#8425d2dfc378b20612e8ef9324989a33bc0341b3"
-  integrity sha512-DzWBCe/z86QFv6mN9ZDmvk32FMWv+nPDSkyMEL7RCU6VeQOFFAOjwhDglp2qBMs8Xif358bQ4H/0akLZpDUfvw==
+metascraper-video@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.10.7.tgz#2892819a3613ddac115ada7fb1b28d74a646f974"
+  integrity sha512-+fjiL/Vq0DGd7dMvBTdFKrOK2YH2myHssSChRZVZLl3gzyo4YEWpnOWBhfuoky0caOcs9+RVAxF9pE1TdTFmbA==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
     lodash "~4.17.15"
 
 metascraper-youtube@^5.10.7:

From 75137ce716dadcc6f0ceeed6a2b0fe5c50fa7b8f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:33:20 +0000
Subject: [PATCH 075/171] build(deps-dev): bump @storybook/addon-notes in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 5fea314d7..172dcf8ae 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -101,7 +101,7 @@
     "@babel/preset-env": "~7.8.4",
     "@storybook/addon-a11y": "^5.3.10",
     "@storybook/addon-actions": "^5.3.10",
-    "@storybook/addon-notes": "^5.3.9",
+    "@storybook/addon-notes": "^5.3.10",
     "@storybook/vue": "~5.3.10",
     "@vue/cli-shared-utils": "~4.1.2",
     "@vue/eslint-config-prettier": "~6.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 36fe2d967..68e773b1c 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2145,18 +2145,18 @@
     react-inspector "^4.0.0"
     uuid "^3.3.2"
 
-"@storybook/addon-notes@^5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.9.tgz#2c53434717f6731bb42deb6ae5c7638bc9cf4188"
-  integrity sha512-vTgOBqvi4eplWI5/l9pldyyttLaRTEp5k/CCNB8MqMv8mATH83KxzPFdKburGIKRJTstvjl6wKN9dpd4FZ7EnA==
+"@storybook/addon-notes@^5.3.10":
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.10.tgz#fcd815e7aed48f443e8b8b794ec892b2450bf6e8"
+  integrity sha512-ZnMEd9Wk6llzUPSumVH3g7MBeUNlPDZpQMT+bYgs0bQVwIig/4YSOJ1F//td/tXBA67Oq8iogbz9aU24erJkcA==
   dependencies:
-    "@storybook/addons" "5.3.9"
-    "@storybook/api" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/components" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    "@storybook/router" "5.3.9"
-    "@storybook/theming" "5.3.9"
+    "@storybook/addons" "5.3.10"
+    "@storybook/api" "5.3.10"
+    "@storybook/client-logger" "5.3.10"
+    "@storybook/components" "5.3.10"
+    "@storybook/core-events" "5.3.10"
+    "@storybook/router" "5.3.10"
+    "@storybook/theming" "5.3.10"
     core-js "^3.0.1"
     global "^4.3.2"
     markdown-to-jsx "^6.10.3"
@@ -2190,19 +2190,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/addons@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.9.tgz#f2492de356e0cd38e3da357f4dafa058a4756e36"
-  integrity sha512-LrlO6nQ4S6yroFuG9Pn1rXhg0AjT/jx7UKZjZTJNqo4ZdPy88QhQO0ClbOVL+KhUiY773zEBYIk0BvwA3WYtSQ==
-  dependencies:
-    "@storybook/api" "5.3.9"
-    "@storybook/channels" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
@@ -2252,32 +2239,6 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.9.tgz#090119c6fd4082442e926a434d3d171535ec6784"
-  integrity sha512-ix6WS880K5C3H4wjEN0IKqIlVNV0f7zHgvyRf8maL1UFEya5wkBkZg9REDOiCH0tSByzRN73NmPdII3Q1FoAvA==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/channels" "5.3.9"
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/core-events" "5.3.9"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "5.3.9"
-    "@storybook/theming" "5.3.9"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channel-postmessage@5.3.10":
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.10.tgz#0d5ede72e4057a20b5c2ad5d871134f3cba54b78"
@@ -2303,13 +2264,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/channels@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.9.tgz#7ee8f6e6f4c9465227120d6711805b5e6862107f"
-  integrity sha512-8JFTDTI4hQyAJPDBgwnK99lye2oyxEheko4vD2Pv5M7LblcFBZJuCRhO5wiBsgHi5eV4srSD9kuBsPkYSxB2Xw==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-api@5.3.10":
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.10.tgz#74c9c36a62d653f5eb29ceb84c3acbec19aad254"
@@ -2347,13 +2301,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-logger@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.9.tgz#06654be9caa8d37366270b0426c2d5acb217f504"
-  integrity sha512-EbA9id/Fk2BZkIWGSICYh+Iu4j7JFRZce4Lp69/MPmHpQk8YKnjL6NdxGsHj/83OFQ9CCbtqNOBzBdtiCy/23w==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/components@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
@@ -2406,33 +2353,6 @@
     simplebar-react "^1.0.0-alpha.6"
     ts-dedent "^1.1.0"
 
-"@storybook/components@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.9.tgz#1fbc688770889ddadb8c603f5a4dbcf987f3eb0f"
-  integrity sha512-R4xDR3pIYu7yPHex6DG3PPC3ekLgQuG03ZMQEgCfmWdl2wKXcLtEfQPYLRpC59xnQobfR3wqWgqrGchW54HPow==
-  dependencies:
-    "@storybook/client-logger" "5.3.9"
-    "@storybook/theming" "5.3.9"
-    "@types/react-syntax-highlighter" "11.0.2"
-    "@types/react-textarea-autosize" "^4.3.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^2.1.0"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^11.0.2"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-    ts-dedent "^1.1.0"
-
 "@storybook/core-events@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
@@ -2447,13 +2367,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.9.tgz#3c7fbc20204ae4b937c896ed6281e782cc09c4aa"
-  integrity sha512-JFnVjOHMnxbArIHEGuVvAcQuwf0l2yUJEsx5zJZ6OkCOFXKGDjqATGNtyZEOhVXTwONIWT6Y6ZTfKZLmdiSksQ==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core@5.3.10":
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.10.tgz#862574b61da6f484facb40fed48ad99badf42574"
@@ -2580,21 +2493,6 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
-"@storybook/router@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.9.tgz#3c6e01f4dced9de8e8c5c314352fdc437f2441c2"
-  integrity sha512-z7ptxekGRAXP7hU74wdfeFY/ugrHXtpQcAM1X0k4tvbasJpm+fvqAD3yEYQpfEDL7cLlHEFLbOm6xDqtf1e5qQ==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/csf" "0.0.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/theming@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"
@@ -2631,24 +2529,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
-"@storybook/theming@5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.9.tgz#caaeea398f9e630394298ccfe8f36a185a289e4f"
-  integrity sha512-1vG+H1D5j2vcMv54eEKixAoa4UlTuS/dxMZubJfcZYY1PDNtnvQM6B1CE/4EU+qsIYPFQiGFXB4b6gjCFYIFpQ==
-  dependencies:
-    "@emotion/core" "^10.0.20"
-    "@emotion/styled" "^10.0.17"
-    "@storybook/client-logger" "5.3.9"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-    ts-dedent "^1.1.0"
-
 "@storybook/ui@5.3.10":
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.10.tgz#7af027773f8fa300c02447455b85d26d8a762b13"

From 6b6c913194cef94d8e047609abe8b445581be188 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:33:57 +0000
Subject: [PATCH 076/171] build(deps): bump @nuxtjs/sentry from 3.1.0 to 3.2.2
 in /webapp

Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.1.0 to 3.2.2.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.1.0...v3.2.2)

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

diff --git a/webapp/package.json b/webapp/package.json
index 13077032f..64118829e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,7 +62,7 @@
     "@nuxtjs/axios": "~5.9.5",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
-    "@nuxtjs/sentry": "^3.1.0",
+    "@nuxtjs/sentry": "^3.2.2",
     "@nuxtjs/style-resources": "~1.0.0",
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.5",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f300764c6..cae26b9ca 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1721,10 +1721,10 @@
     jimp-compact "^0.8.0"
     workbox-cdn "^4.3.1"
 
-"@nuxtjs/sentry@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.1.0.tgz#2ec9097d62054b943ba3edd0a722fe0ac214592e"
-  integrity sha512-oEpcnNWoz7Uw+L1W9YAxL0ccW28xDPwcHauF4XhhGa7ZbhKQ8hZqgR9kPn7rCNuWRWL3WZR+oWpxLst4+Uy6Cw==
+"@nuxtjs/sentry@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.2.2.tgz#ee0add861b18844f8367e1e30d5c7bac1e5f5c91"
+  integrity sha512-eoHSoN9+QiHwIBY8aa8sVgZnh9X73BqlZy0qtO3LthM2awROFEYJ3sqIGkhrucgTrRM8na6LAFNEvd64QI9sCw==
   dependencies:
     "@sentry/browser" "^5.11.2"
     "@sentry/integrations" "^5.11.1"

From 572b942c86d870f1058e4d3134be2d9b04d1daee Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 11:00:15 +0000
Subject: [PATCH 077/171] build(deps): bump metascraper-logo from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 0ed3bc188..14d700624 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -76,7 +76,7 @@
     "metascraper-image": "^5.10.7",
     "metascraper-lang": "^5.10.7",
     "metascraper-lang-detector": "^4.10.2",
-    "metascraper-logo": "^5.10.6",
+    "metascraper-logo": "^5.10.7",
     "metascraper-publisher": "^5.10.7",
     "metascraper-soundcloud": "^5.10.7",
     "metascraper-title": "^5.10.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 6b1ce500b..1cace74bd 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6213,12 +6213,12 @@ metascraper-lang@^5.10.7:
   dependencies:
     "@metascraper/helpers" "^5.10.7"
 
-metascraper-logo@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.10.6.tgz#22223ce79e4017f159b2a9ddc311d2eb636043b5"
-  integrity sha512-/uGW+X43T6Oj5DxWqAhANII9BdhQuM+e7O6/Vu116uLqW6cOJ/RDp5qp7ngKF41L0zCLd8Q2Xw2nduHi6tC4Uw==
+metascraper-logo@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.10.7.tgz#335812b9aae5d814b22294cdd402d62fa14a46f1"
+  integrity sha512-Ic9WgvRqm3pUlsMfSirzCK9+qmQ9pbv/u9APn8PM5y66zNJoSCOVWbEIoEA0bVPHbGKGKFvsgrOm3VkMoVUF0Q==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-publisher@^5.10.7:
   version "5.10.7"

From 0d6cbabcf80213ceade4d98723741ba252d39fca Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 12:34:27 +0000
Subject: [PATCH 078/171] build(deps): bump metascraper from 5.10.6 to 5.11.0
 in /backend

Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.11.0.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.11.0)

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

diff --git a/backend/package.json b/backend/package.json
index 8d59b6b8f..1c49ab9cb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -67,7 +67,7 @@
     "linkifyjs": "~2.1.8",
     "lodash": "~4.17.14",
     "merge-graphql-schemas": "^1.7.6",
-    "metascraper": "^5.10.6",
+    "metascraper": "^5.11.0",
     "metascraper-audio": "^5.10.6",
     "metascraper-author": "^5.10.6",
     "metascraper-clearbit-logo": "^5.3.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 3155318c3..b34f8f901 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6268,12 +6268,12 @@ metascraper-youtube@^5.10.7:
     is-reachable "~4.0.0"
     p-locate "~4.1.0"
 
-metascraper@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.10.6.tgz#d1249577a768566b86bd099cc2256df45cf05181"
-  integrity sha512-mPEDvoyHLWb0AlTE05W43vfKGgBJ99s5AYAhB4IiRgGR9uq8j7/ktTZaS/+pyFopYrEoe71L/k4KbYgNPQRASA==
+metascraper@^5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.11.0.tgz#bbb25eb055c0ec03992df99c10c48057751ee56b"
+  integrity sha512-IocQqdSQnOpbai0X9Cu37w/AKeSfU513MCfaFzzcvWgI8s6mGQ1DWRFPvkx0ahtixpP0/ifE4t7ycODrtepRxQ==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
     cheerio "~1.0.0-rc.3"
     cheerio-advanced-selectors "~2.0.1"
     lodash "~4.17.15"

From 9b6dfb12ee80733d0cf3854535af30c9fb3881d5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 4 Feb 2020 14:21:56 +0100
Subject: [PATCH 079/171] Add issue template for Refactoring tickets

- We want to have an issue created for each PR merged in, sometimes we
  are just refactoring deprecated or legacy code and there should be an
option to create these tickets.
---
 .github/ISSUE_TEMPLATE/refactor_tickets.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/refactor_tickets.md

diff --git a/.github/ISSUE_TEMPLATE/refactor_tickets.md b/.github/ISSUE_TEMPLATE/refactor_tickets.md
new file mode 100644
index 000000000..f728211c9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/refactor_tickets.md
@@ -0,0 +1,19 @@
+---
+name: 🐛 Refactor ticket
+about: Help us improve our code by refactoring it.
+labels: refactor
+title: 🐛 [Refactor] 
+---
+
+## :zap: Refactor ticket
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
+
+### Motive
+<!-- What is the purpose of this refactoring? If it's removing depcrecated code, please link to the deprecation notice. -->
+
+### Implementation
+<!-- Please, docment any ideas of how the code should be refactored. -->
+
+### Additional context
+<!-- Add other context or background about the feature request here.-->
+

From 7ba7ab211fdcef0688b03ac2d609570a2d56140c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 4 Feb 2020 14:42:42 +0100
Subject: [PATCH 080/171] fix: Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

following @roschaefer PR suggestion

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
---
 .github/ISSUE_TEMPLATE/refactor_tickets.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/refactor_tickets.md b/.github/ISSUE_TEMPLATE/refactor_tickets.md
index f728211c9..3de2201a1 100644
--- a/.github/ISSUE_TEMPLATE/refactor_tickets.md
+++ b/.github/ISSUE_TEMPLATE/refactor_tickets.md
@@ -12,8 +12,7 @@ title: 🐛 [Refactor]
 <!-- What is the purpose of this refactoring? If it's removing depcrecated code, please link to the deprecation notice. -->
 
 ### Implementation
-<!-- Please, docment any ideas of how the code should be refactored. -->
+<!-- Please, document any ideas of how the code should be refactored. -->
 
 ### Additional context
 <!-- Add other context or background about the feature request here.-->
-

From 5fad1bb628263fa21810f98e9f4fa52866b96591 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 4 Feb 2020 15:46:08 +0100
Subject: [PATCH 081/171] Update to version 0.3.0, version image in webapp

---
 deployment/helm/human-connection/Chart.yaml                     | 2 +-
 .../human-connection/templates/deployments/deployment-web.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
index 4e25227d7..4ffa93622 100644
--- a/deployment/helm/human-connection/Chart.yaml
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "0.2.2"
+appVersion: "0.3.0"
 description: A Helm chart for Human Connection
 name: human-connection
 version: 0.1.0
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
index c0a62560f..3314f7ec0 100644
--- a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
+++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: webapp
-        image: humanconnection/nitro-web:0.2.2
+        image: "{{ .Values.webappImage }}:{{ .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         envFrom:
         - configMapRef:

From 5bbba483f81de1d603d095ab1480b821431a2ecf Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 4 Feb 2020 16:39:30 +0100
Subject: [PATCH 082/171] Follow PR review suggestions

- update icon, I hope
- fix typos
- includes Related issues section
---
 .github/ISSUE_TEMPLATE/refactor_tickets.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/refactor_tickets.md b/.github/ISSUE_TEMPLATE/refactor_tickets.md
index 3de2201a1..b6c799f67 100644
--- a/.github/ISSUE_TEMPLATE/refactor_tickets.md
+++ b/.github/ISSUE_TEMPLATE/refactor_tickets.md
@@ -1,15 +1,17 @@
 ---
-name: 🐛 Refactor ticket
+name: 🔧 Refactor ticket
 about: Help us improve our code by refactoring it.
 labels: refactor
-title: 🐛 [Refactor] 
+title: 🔧 [Refactor]
 ---
 
 ## :zap: Refactor ticket
-<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
 
 ### Motive
 <!-- What is the purpose of this refactoring? If it's removing depcrecated code, please link to the deprecation notice. -->
+### Related issues
+<!-- Are there any related issues to link to? Please paste them below for reference. -->
 
 ### Implementation
 <!-- Please, document any ideas of how the code should be refactored. -->

From 28d0b307d4a31f6d909e314e6ef5659ed6238d91 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Tue, 4 Feb 2020 16:58:27 +0100
Subject: [PATCH 083/171] feat: proposals for changes incorporated, tests
 started

---
 .../components/ContributionForm/ContributionForm.spec.js  | 2 +-
 webapp/components/ContributionForm/ContributionForm.vue   | 8 ++++----
 webapp/components/MasonryGrid/MasonryGrid.spec.js         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 16c0e998b..c5e3e3a07 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -235,7 +235,7 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
-        it('deleted a teaser image', async () => {
+        it('deletes a teaser image', async () => {
           expectedParams.variables.imageUpload = imageUpload
           wrapper.find(TeaserImage).vm.$emit('addTeaserImage', imageUpload)
           wrapper.find(TeaserImage).vm.$emit('deleteImage', null)
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 35cb8aadc..d28b7efbc 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -7,23 +7,23 @@
     @submit="submit"
   >
     <template slot-scope="{ errors }">
-      <ds-button
+      <base-button
         v-if="(contribution && contribution.image) || form.teaserImage"
         @click.prevent="deleteImage"
         icon="close"
         class="delete-image"
-      ></ds-button>
+      ></base-button>
       <hc-teaser-image
+        :class="{ '--blur-image': form.blurImage }"
         ref="deleteImage"
         :contribution="contribution"
         @addTeaserImage="addTeaserImage"
-        :class="{ '--blur-image': form.blurImage }"
         @addImageAspectRatio="addImageAspectRatio"
       >
         <img
           v-if="contribution"
           class="contribution-image"
-          :src="contribution.image || proxyApiUrl"
+          :src="contribution.image | proxyApiUrl"
         />
       </hc-teaser-image>
 
diff --git a/webapp/components/MasonryGrid/MasonryGrid.spec.js b/webapp/components/MasonryGrid/MasonryGrid.spec.js
index b42b9b221..2582c2204 100644
--- a/webapp/components/MasonryGrid/MasonryGrid.spec.js
+++ b/webapp/components/MasonryGrid/MasonryGrid.spec.js
@@ -16,7 +16,7 @@ describe('MasonryGrid', () => {
   it('adds the "reset-grid-height" class when itemsCalculating is more than 0', () => {
     wrapper.setData({ itemsCalculating: 1 })
 
-    expect(wrapper.classes()).toContain('reset-grid-height')
+    expect(wrapper.classes()).toContain('ds-grid')
   })
 
   it('removes the "reset-grid-height" class when itemsCalculating is 0', () => {

From 0e49702b7e79fc46722cf4b19e797203158d60d5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 04:16:54 +0000
Subject: [PATCH 084/171] build(deps): bump @sentry/node from 5.12.0 to 5.12.3
 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 729d5fb2e..303cd3ce4 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.0",
-    "@sentry/node": "^5.12.0",
+    "@sentry/node": "^5.12.3",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5ce76293a..3bea7a393 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1275,22 +1275,22 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@sentry/apm@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.12.0.tgz#6ec9c11d2754ab597bd0752b55fbbf2537f1d96b"
-  integrity sha512-tpD6c0dVKkG+QPEubTTr54TDFdR/FWldnHwkhq4CST2uwkEm26o95iuNhMx9WE7EJhpXjaFKpZB0TB8frFIqkg==
+"@sentry/apm@5.12.3":
+  version "5.12.3"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.12.3.tgz#23a5e9c771a8748f59426a1d0f8b1fbb9b72a717"
+  integrity sha512-OSGEeo4b1Gsu/TUcWMx9vmgSnQvR+zM+1Iwq5xFQAK2ET3Y4gBFqZ1iRt2hxlzr8KCQmQTQc1mao1X0tmidFQg==
   dependencies:
-    "@sentry/browser" "5.12.0"
+    "@sentry/browser" "5.12.1"
     "@sentry/hub" "5.12.0"
     "@sentry/minimal" "5.12.0"
     "@sentry/types" "5.12.0"
     "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/browser@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.12.0.tgz#d2c5b683eca6d5489a2c5b237712a8c9de9d4427"
-  integrity sha512-e8uQML/1Wz2A6610yEvTdICf7L2IH15z6kcjwEqTsaD5uBCmpCiebGZABb45OSe9u8J0xccqi5G7M8lcxj1L7w==
+"@sentry/browser@5.12.1":
+  version "5.12.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.12.1.tgz#dc1f268595269fb7277f55eb625c7e92d76dc01b"
+  integrity sha512-Zl7VdppUxctyaoqMSEhnDJp2rrupx8n8N2n3PSooH74yhB2Z91nt84mouczprBsw3JU1iggGyUw9seRFzDI1hw==
   dependencies:
     "@sentry/core" "5.12.0"
     "@sentry/types" "5.12.0"
@@ -1326,12 +1326,12 @@
     "@sentry/types" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/node@^5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.12.0.tgz#9781d3cf4d7f664acacb9775912f67a3a465c259"
-  integrity sha512-Q059wrvv7JDTfdlnI4GCAOW9BLeRxxx8P+TYK/t41ZgEbwTob/VU+rn+p7zQm8beHMM3IBtUKE54AmpHYnhJ/A==
+"@sentry/node@^5.12.3":
+  version "5.12.3"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.12.3.tgz#4a4934b04c5163fc340312eaf0d152990aa7140f"
+  integrity sha512-QwqN+i6IC3/YrNq7kqxH7YiXtZYY8tBuJqFi84WbiMHF7MAqxMSPNQJGfX2GJuMHKHwn6IZdgSE8+FkfN9zGLQ==
   dependencies:
-    "@sentry/apm" "5.12.0"
+    "@sentry/apm" "5.12.3"
     "@sentry/core" "5.12.0"
     "@sentry/hub" "5.12.0"
     "@sentry/types" "5.12.0"

From 4724e8e6ee35a457bb6af6f19bb1602db3f8aaa5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 04:17:18 +0000
Subject: [PATCH 085/171] build(deps): bump metascraper-url from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 729d5fb2e..d7f91916f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -80,7 +80,7 @@
     "metascraper-publisher": "^5.10.7",
     "metascraper-soundcloud": "^5.10.7",
     "metascraper-title": "^5.10.6",
-    "metascraper-url": "^5.10.6",
+    "metascraper-url": "^5.10.7",
     "metascraper-video": "^5.10.7",
     "metascraper-youtube": "^5.10.7",
     "migrate": "^1.6.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5ce76293a..7e3f110fa 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6243,12 +6243,12 @@ metascraper-title@^5.10.6:
     "@metascraper/helpers" "^5.10.6"
     lodash "~4.17.15"
 
-metascraper-url@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.10.6.tgz#45f0ea173fecfe56d60b3cddd3c018f9f4fd9b92"
-  integrity sha512-7F6uAsI27iVXxUMwwzXH0ret81CX1jgtoGCMz+TvZkyS0z4aUs0r8QpYRYEQuXrW+JawRVik0up54F/ScslObQ==
+metascraper-url@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.10.7.tgz#42b71c8540c13baafb7757972ea672721d63e019"
+  integrity sha512-z1LBPTupU5cF36/i/iGe0rzLbO7iGBSdbgEOztLcnIhnMC8Nl9xjvIrlvNciKTMxDyr3JGrvFFWugFzwMzVoQg==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-video@^5.10.7:
   version "5.10.7"

From 73ed5e89faa0523eedde522da06db14bfe1f186b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 04:18:03 +0000
Subject: [PATCH 086/171] build(deps): bump graphql-tag from 2.10.1 to 2.10.2
 in /backend

Bumps [graphql-tag](https://github.com/apollographql/graphql-tag) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/apollographql/graphql-tag/releases)
- [Changelog](https://github.com/apollographql/graphql-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/graphql-tag/compare/v2.10.1...v2.10.2)

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

diff --git a/backend/package.json b/backend/package.json
index 729d5fb2e..0bd6ef553 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-shield": "~7.0.9",
-    "graphql-tag": "~2.10.1",
+    "graphql-tag": "~2.10.2",
     "helmet": "~3.21.2",
     "jsonwebtoken": "~8.5.1",
     "linkifyjs": "~2.1.8",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5ce76293a..ccff8b609 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4492,10 +4492,10 @@ graphql-subscriptions@^1.0.0:
   dependencies:
     iterall "^1.2.1"
 
-graphql-tag@^2.9.2, graphql-tag@~2.10.1:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
-  integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
+graphql-tag@^2.9.2, graphql-tag@~2.10.2:
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.2.tgz#e42214d0dde29e8db5d55b0107efdb2d461ed270"
+  integrity sha512-7rUuJkVGyedBiVJ/hPaxndDnzxANUZ+QhTu0KUzgTGtP3ibY/hSUl9em21aVh5BNMJsmMc4nVuOTBoiAUJ2xBQ==
 
 graphql-tools@^4.0.0, graphql-tools@^4.0.4, graphql-tools@^4.0.5:
   version "4.0.5"

From aed4dcffe0f5a4a1260c61cc17f98e1c7be0d1a4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 04:18:29 +0000
Subject: [PATCH 087/171] build(deps): bump metascraper-audio from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 729d5fb2e..3e021a8d0 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -68,7 +68,7 @@
     "lodash": "~4.17.14",
     "merge-graphql-schemas": "^1.7.6",
     "metascraper": "^5.11.0",
-    "metascraper-audio": "^5.10.6",
+    "metascraper-audio": "^5.10.7",
     "metascraper-author": "^5.10.6",
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.10.7",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5ce76293a..bd9fdd4e4 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6154,12 +6154,12 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-metascraper-audio@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.10.6.tgz#095892445b90d40bc54e54f69536a80e36fd9e4c"
-  integrity sha512-wTVtYK8Ico82caIi6HlkyGgUaBC21X/vhT2aQ4LKcg+gHoOhJcmWNd5me9VhaRJ7gTV/7yKkL5A54fBcjcn8Kg==
+metascraper-audio@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.10.7.tgz#ba9f8333a7b71d388a0bf88dff64fc4f06595566"
+  integrity sha512-VHZlT21bh/TWnHOQMGret3UcMdJOsyWvagK7MG8rLczYmrPEtvxnJjwPhyrEj1oJC+fz2P//bfQ6gyrD4HrmEQ==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
 
 metascraper-author@^5.10.6:
   version "5.10.6"

From 7aa1baae9fec156915d2988d83fbe2b1a52a411e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 04:21:15 +0000
Subject: [PATCH 088/171] build(deps-dev): bump @storybook/vue from 5.3.10 to
 5.3.12 in /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 9e912e95b..7bad41328 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -102,7 +102,7 @@
     "@storybook/addon-a11y": "^5.3.10",
     "@storybook/addon-actions": "^5.3.10",
     "@storybook/addon-notes": "^5.3.10",
-    "@storybook/vue": "~5.3.10",
+    "@storybook/vue": "~5.3.12",
     "@vue/cli-shared-utils": "~4.1.2",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 722357476..368c03a4f 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2190,6 +2190,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.12.tgz#77fb0e0d3ac9eb70414bff4b03c12bbccfe31716"
+  integrity sha512-5jVns+wq95ZismEQ5ByDhrEFzDH8OIEj2BLSPT7VTbik7iLC+h7H2toWKAwIYZCxAuq0OTy6ZpIyhU/R2YuO4w==
+  dependencies:
+    "@storybook/api" "5.3.12"
+    "@storybook/channels" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
@@ -2239,6 +2252,32 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.12.tgz#7d1ca7a487fb9b6604d26cae756e291015908d35"
+  integrity sha512-wYsr97vqARwmOordlPY17MJ9PrHSCsSM9JRC/zh698kXQGwYnse1nErzAiwj8YxuItfWGzE06kqjZBccnfSxPQ==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/channels" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "5.3.12"
+    "@storybook/theming" "5.3.12"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.2.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.3.10":
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.10.tgz#0d5ede72e4057a20b5c2ad5d871134f3cba54b78"
@@ -2250,6 +2289,17 @@
     global "^4.3.2"
     telejson "^3.2.0"
 
+"@storybook/channel-postmessage@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.12.tgz#945c9702f335018f6224af3159bf4d33c66a131e"
+  integrity sha512-yQZ6Ef0KnxI7vxJrcJaBYeZpxhl/18WEFtAO9MphvYvtd1dudqKNqdx9B/30PIXb7c/SptvGJR/EZhsRNr4Oug==
+  dependencies:
+    "@storybook/channels" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.2.0"
+
 "@storybook/channels@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
@@ -2264,6 +2314,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.12.tgz#dd2e111377f0eaafa0e66746cb6628322615ade9"
+  integrity sha512-sfSHIRUusjZ69WhfPp8BrfmlGg80PYTNCBSE+1apK/WkgzYJyGgQmJgRAW6HTFqjawD7T+utAtarsqS30jo9jQ==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.3.10":
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.10.tgz#74c9c36a62d653f5eb29ceb84c3acbec19aad254"
@@ -2287,6 +2344,29 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.12.tgz#7c18921d0290b30b020ad7d41fbda170009780bd"
+  integrity sha512-Qzi+pS9FwqrArnG1VMV4QJxEdvw7KVc2ufgax7jCvK8JtDlSVe1/qpbJn7U3o1z4TPY/u3m6PbBLJDoSWTVonw==
+  dependencies:
+    "@storybook/addons" "5.3.12"
+    "@storybook/channel-postmessage" "5.3.12"
+    "@storybook/channels" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    "@storybook/csf" "0.0.1"
+    "@types/webpack-env" "^1.15.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    stable "^0.1.8"
+    ts-dedent "^1.1.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"
@@ -2301,6 +2381,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.12.tgz#64033dd647b6ce6971977e4f5ce2908de21526eb"
+  integrity sha512-LsKDW4ijGJjyRg3GetS/OtVS+8ESxydVG55jvAlExHehUcVRvrPew5MsW63CRTQDpZsoh1aT9oV1yr8eYu1HZg==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
@@ -2353,6 +2440,33 @@
     simplebar-react "^1.0.0-alpha.6"
     ts-dedent "^1.1.0"
 
+"@storybook/components@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.12.tgz#0d930343624d459f46cd55b140be979709ee5a29"
+  integrity sha512-Ma67yaSJHaNqLjp2csOZvHdu1Sk1eMke29WVEWjPYUBzzaZK7ZlmGiXzN0roYJVGaqHkl2f7xxRfPfWQp9NCIw==
+  dependencies:
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/theming" "5.3.12"
+    "@types/react-syntax-highlighter" "11.0.2"
+    "@types/react-textarea-autosize" "^4.3.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^2.1.0"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^11.0.2"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+    ts-dedent "^1.1.0"
+
 "@storybook/core-events@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
@@ -2367,26 +2481,33 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.10.tgz#862574b61da6f484facb40fed48ad99badf42574"
-  integrity sha512-KdCsfT8XZsPbyB90YRJJVVh7cac6TZhb0+xtEgepH8JozePrHwWRpt7y37u8XnFewnvsaUvWvRKcQiC6/K1oTg==
+"@storybook/core-events@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.12.tgz#188526c9003884104cce4fcd20448ca34d14d9f7"
+  integrity sha512-qUX0xvADM8LBUtzeTi8r803eeikyzooH8HwnUg6GP238NRnR13BK/tSnBx6XpJubGL5gv9a1jZJQWxP25KPHfA==
+  dependencies:
+    core-js "^3.0.1"
+
+"@storybook/core@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.12.tgz#972cec3c7ee3e78a628a017c0b72bb6a52d9146d"
+  integrity sha512-oqffKLyMEVREeOC8O1RVO+xn68zk4wZkjWN9KbhbMoP3zdxM1gdvpsemdVE1C008mZfe1A/KBwuuEmcn9EBTNw==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.7.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.3.10"
-    "@storybook/channel-postmessage" "5.3.10"
-    "@storybook/client-api" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/core-events" "5.3.10"
+    "@storybook/addons" "5.3.12"
+    "@storybook/channel-postmessage" "5.3.12"
+    "@storybook/client-api" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/core-events" "5.3.12"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "5.3.10"
-    "@storybook/router" "5.3.10"
-    "@storybook/theming" "5.3.10"
-    "@storybook/ui" "5.3.10"
+    "@storybook/node-logger" "5.3.12"
+    "@storybook/router" "5.3.12"
+    "@storybook/theming" "5.3.12"
+    "@storybook/ui" "5.3.12"
     airbnb-js-shims "^2.2.1"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.7.2"
@@ -2453,10 +2574,10 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.10.tgz#5bf4b8ce352901cd629401cc903b15e423ccd76c"
-  integrity sha512-ivasRTdJPFj9qi9q4ozkn6lhWi16cubf9AZwC5Or5HJE4OJkSsowecJBu28l2p887yexDkCDazOIvR9XtEIoIA==
+"@storybook/node-logger@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.12.tgz#df25b725583cb5aa799b6c5b8103a8ea0921d3ba"
+  integrity sha512-ytIqS1Lx+gWFBNxwWOK7F63702YYsoU90UFQNUMC44lC1L7tOI9BQXtGIWTvmXJYns+O5pHHOVKkHLT9EGX2OA==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^3.0.0"
@@ -2493,6 +2614,21 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/router@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.12.tgz#f08d75793790aacc5543c55e62d08d3bb00188fd"
+  integrity sha512-IuI/MMFb27XGFaFjaUCYUgK+P4jeGLBDI4cCn6Fezb5RRgpdOf2DobDIUZtujSmvPnEF8C+SJE/v1dXihRO1Xg==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/csf" "0.0.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/theming@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"
@@ -2529,20 +2665,38 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
-"@storybook/ui@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.10.tgz#7af027773f8fa300c02447455b85d26d8a762b13"
-  integrity sha512-YVsFL7ZF2reDhubwjafyJK+eKKo5n9Np+VRMPnjeqpjd3+/N70Wg4VnT/AqgKrCXfCGExit+CVf3wbwBpnP1Kw==
+"@storybook/theming@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.12.tgz#70908dc23c0635765256fc4dbb7cd6d318886dfe"
+  integrity sha512-LwyFBbxYtm2rr86mA0d+oYisIpW2GrDqmv0ZGEmx9EqKK1JwG3N99VSK7iHig6vpNu42LHLakuaqK55H2Q7YcA==
   dependencies:
     "@emotion/core" "^10.0.20"
-    "@storybook/addons" "5.3.10"
-    "@storybook/api" "5.3.10"
-    "@storybook/channels" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/components" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    "@storybook/router" "5.3.10"
-    "@storybook/theming" "5.3.10"
+    "@emotion/styled" "^10.0.17"
+    "@storybook/client-logger" "5.3.12"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.19"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+    ts-dedent "^1.1.0"
+
+"@storybook/ui@5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.12.tgz#c66f6a1302d2ff80a8b94402d95648d1b28066f8"
+  integrity sha512-dVYJJkwjfGkz3u0lnfawnT6hqBRnANVlKEYirKYZyQ/RouCN3naNh9Sagrpg7hJHYib4Ny6J/pyaNdfdieDS+w==
+  dependencies:
+    "@emotion/core" "^10.0.20"
+    "@storybook/addons" "5.3.12"
+    "@storybook/api" "5.3.12"
+    "@storybook/channels" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/components" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    "@storybook/router" "5.3.12"
+    "@storybook/theming" "5.3.12"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2569,13 +2723,13 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.10.tgz#7f7a091b26910bf05e3fc765564e88b532936f52"
-  integrity sha512-e57AS1dgN1It8ZI1pT09zACxuGM87ekbxWYzGlivDRPI2qqTiZ1zHkwf+V3KV4j+HW+TNocBItl5tHfjqv7Giw==
+"@storybook/vue@~5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.12.tgz#95d50d55475eea243c466b512ff1b040d09aae34"
+  integrity sha512-lwQxiI8ZBiP/jYAultvi9b89/7l/aJCcwopvcFPFFUeskFBhgDr/7BwAuuwWaUDAi5oPCJ7xXYh/mNnCKUzGiA==
   dependencies:
-    "@storybook/addons" "5.3.10"
-    "@storybook/core" "5.3.10"
+    "@storybook/addons" "5.3.12"
+    "@storybook/core" "5.3.12"
     "@types/webpack-env" "^1.15.0"
     core-js "^3.0.1"
     global "^4.3.2"

From 010402351d9d0182f2e32b150feade987a40781e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 07:57:24 +0000
Subject: [PATCH 089/171] build(deps): bump metascraper-title from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index 41ecee411..13eb00704 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -79,7 +79,7 @@
     "metascraper-logo": "^5.10.7",
     "metascraper-publisher": "^5.10.7",
     "metascraper-soundcloud": "^5.10.7",
-    "metascraper-title": "^5.10.6",
+    "metascraper-title": "^5.10.7",
     "metascraper-url": "^5.10.7",
     "metascraper-video": "^5.10.7",
     "metascraper-youtube": "^5.10.7",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 6577328a1..75c8a4925 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6235,12 +6235,12 @@ metascraper-soundcloud@^5.10.7:
     "@metascraper/helpers" "^5.10.7"
     tldts "~5.6.3"
 
-metascraper-title@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.10.6.tgz#0fd9a9bed7a0b990663086cdab45d11cd8cd3c7d"
-  integrity sha512-x4P8zr0x6Gh3gt26tf2xfjikG9xNS9MC3z4N2VP+OrYNuCc7Vz6TU+DR/DLAeZphsb1flgTd3P4iUfPUcWVTEQ==
+metascraper-title@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.10.7.tgz#037aaa8cbdc79d1dde186887eb2bba542281315e"
+  integrity sha512-iQYaMdGpBPj6dyk7rbP+zYo7EroC/1yY27jocAqUnMRTfrHXTR7kGucR0vi4y14BiFRLBTLSNbZbM4KAUQsFjg==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
     lodash "~4.17.15"
 
 metascraper-url@^5.10.7:

From 4d7c31a5509a02af67e88ad0c345dc31344aed71 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 07:58:24 +0000
Subject: [PATCH 090/171] build(deps): bump metascraper-author from 5.10.6 to
 5.10.7 in /backend

Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

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

diff --git a/backend/package.json b/backend/package.json
index c29faa1bb..02e211937 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -69,7 +69,7 @@
     "merge-graphql-schemas": "^1.7.6",
     "metascraper": "^5.11.0",
     "metascraper-audio": "^5.10.7",
-    "metascraper-author": "^5.10.6",
+    "metascraper-author": "^5.10.7",
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.10.7",
     "metascraper-description": "^5.11.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f25da95c4..b1077368a 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6161,12 +6161,12 @@ metascraper-audio@^5.10.7:
   dependencies:
     "@metascraper/helpers" "^5.10.7"
 
-metascraper-author@^5.10.6:
-  version "5.10.6"
-  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.10.6.tgz#1ceaacec776d46629300db25e17657fe35a14a20"
-  integrity sha512-L2P/Fp0npaQcowbwi1vHKJbSYc99cio58/yYRm205xGfgMCRMpYOrYB+ecizXgeSSRiv8G8SXLrLXOLJ5K+SdA==
+metascraper-author@^5.10.7:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.10.7.tgz#99b3a2b982b7a63feea41554659be3db7bf7035c"
+  integrity sha512-AdNkcqy+eqs2Eeh+6odhIWArR4pWVlrCx3jMaho0BDY6ZnKgJP44HtlPNkghQpBaueoKX6CycGKraITzwjGj1w==
   dependencies:
-    "@metascraper/helpers" "^5.10.6"
+    "@metascraper/helpers" "^5.10.7"
     lodash "~4.17.15"
 
 metascraper-clearbit-logo@^5.3.0:

From b0ebb0c0d67a84b3ee99eb4a486b6df87ad04ee1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 08:00:04 +0000
Subject: [PATCH 091/171] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 7bad41328..fd98d7832 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -99,7 +99,7 @@
     "@babel/core": "~7.8.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
-    "@storybook/addon-a11y": "^5.3.10",
+    "@storybook/addon-a11y": "^5.3.12",
     "@storybook/addon-actions": "^5.3.10",
     "@storybook/addon-notes": "^5.3.10",
     "@storybook/vue": "~5.3.12",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 368c03a4f..9bb715070 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2103,17 +2103,17 @@
   dependencies:
     type-detect "4.0.8"
 
-"@storybook/addon-a11y@^5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.10.tgz#356b93905cf1615476c7ec35461b965ea3f0617d"
-  integrity sha512-+KXtbpoutUuWZ6EMIT5eTvvXnUbrgYEQFDqQGh7ecOxzPwEKJ92gX8wogZ07VvMQ2Wyg98E+B12G+WN8ga/idw==
+"@storybook/addon-a11y@^5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.12.tgz#859470d07296bd950aa867e4e1d9ce5b2c668437"
+  integrity sha512-jqm0y8e50rHtkkIi8EoWyxIgCPFnQJs8fOQHZlYPhOuZ+bnsSPVprFQ9gLqAuY13rF26NZwWCPVyR7v9VR9vPw==
   dependencies:
-    "@storybook/addons" "5.3.10"
-    "@storybook/api" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/components" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    "@storybook/theming" "5.3.10"
+    "@storybook/addons" "5.3.12"
+    "@storybook/api" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/components" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    "@storybook/theming" "5.3.12"
     axe-core "^3.3.2"
     core-js "^3.0.1"
     global "^4.3.2"

From 7371c5b35c3e674e45cfebb93835e2454bea588a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 5 Feb 2020 10:46:55 +0100
Subject: [PATCH 092/171] Add DevOps issue template

---
 .github/ISSUE_TEMPLATE/devops_ticket.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/devops_ticket.md

diff --git a/.github/ISSUE_TEMPLATE/devops_ticket.md b/.github/ISSUE_TEMPLATE/devops_ticket.md
new file mode 100644
index 000000000..3507e25bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/devops_ticket.md
@@ -0,0 +1,24 @@
+---
+name: :boom: DevOps ticket
+about: Help us manage our deployed App.
+labels: devops
+title: :boom: [DevOps]
+---
+
+## :fire: DevOps ticket
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
+
+### Motive
+<!-- Why does this task need to be done? What can we benefit from this? -->
+
+### Related issues
+<!-- Are there any related issues to link to? Please paste them below for reference. -->
+
+### Implementation
+<!-- Please, document any ideas of how the task can be performed. -->
+
+### Validation
+<!-- How can we make sure that this task was successful? -->
+
+### Additional context
+<!-- Add other context or background about the feature request here.-->

From 13644faf7961f732e7b85a28a73d3d081d4dcc40 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 10:07:06 +0000
Subject: [PATCH 093/171] build(deps-dev): bump @storybook/addon-notes in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index fd98d7832..4ef753134 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -101,7 +101,7 @@
     "@babel/preset-env": "~7.8.4",
     "@storybook/addon-a11y": "^5.3.12",
     "@storybook/addon-actions": "^5.3.10",
-    "@storybook/addon-notes": "^5.3.10",
+    "@storybook/addon-notes": "^5.3.12",
     "@storybook/vue": "~5.3.12",
     "@vue/cli-shared-utils": "~4.1.2",
     "@vue/eslint-config-prettier": "~6.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 9bb715070..8867ccf84 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2145,18 +2145,18 @@
     react-inspector "^4.0.0"
     uuid "^3.3.2"
 
-"@storybook/addon-notes@^5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.10.tgz#fcd815e7aed48f443e8b8b794ec892b2450bf6e8"
-  integrity sha512-ZnMEd9Wk6llzUPSumVH3g7MBeUNlPDZpQMT+bYgs0bQVwIig/4YSOJ1F//td/tXBA67Oq8iogbz9aU24erJkcA==
+"@storybook/addon-notes@^5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.12.tgz#979aa20d701f4b4a8a2e411a55b183648fea5cac"
+  integrity sha512-j00wcQLb/a/f95OzYTN12rO54SvaIvpZEy5a4B+ZxmeH2/krd908tdqKMfJq4IoQv8v/WfbYCUXVaSL6Kgqhiw==
   dependencies:
-    "@storybook/addons" "5.3.10"
-    "@storybook/api" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/components" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    "@storybook/router" "5.3.10"
-    "@storybook/theming" "5.3.10"
+    "@storybook/addons" "5.3.12"
+    "@storybook/api" "5.3.12"
+    "@storybook/client-logger" "5.3.12"
+    "@storybook/components" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    "@storybook/router" "5.3.12"
+    "@storybook/theming" "5.3.12"
     core-js "^3.0.1"
     global "^4.3.2"
     markdown-to-jsx "^6.10.3"

From 9241c6f5dbc3e3e5ec5ce457f18dcac965309db2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2020 12:41:57 +0000
Subject: [PATCH 094/171] build(deps-dev): bump @storybook/addon-actions in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 4ef753134..620a53165 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
     "@storybook/addon-a11y": "^5.3.12",
-    "@storybook/addon-actions": "^5.3.10",
+    "@storybook/addon-actions": "^5.3.12",
     "@storybook/addon-notes": "^5.3.12",
     "@storybook/vue": "~5.3.12",
     "@vue/cli-shared-utils": "~4.1.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 8867ccf84..63f1b4bd8 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2125,17 +2125,17 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.10.tgz#08cfaa656a787990260e73e5b556efd903a92dcc"
-  integrity sha512-k4LT2pMiUm3WljBGWGlMsPVJhmESfLiyos0BV2apLIXEVb0L/O8rEJtZ9GBEab63lZVb4Yxo0yGbGIk6In13bQ==
+"@storybook/addon-actions@^5.3.12":
+  version "5.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.12.tgz#024678ddd207f050e42c5f8e20b5064cf9839a38"
+  integrity sha512-3j6ZJROcH4bm8vpaM2RU/sRdoOLF9DpVWiE6uutlrVEV6eWuexrUAYwSzuF4Pjr1LUWDSDIT9pEES+tHdn9Rww==
   dependencies:
-    "@storybook/addons" "5.3.10"
-    "@storybook/api" "5.3.10"
-    "@storybook/client-api" "5.3.10"
-    "@storybook/components" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    "@storybook/theming" "5.3.10"
+    "@storybook/addons" "5.3.12"
+    "@storybook/api" "5.3.12"
+    "@storybook/client-api" "5.3.12"
+    "@storybook/components" "5.3.12"
+    "@storybook/core-events" "5.3.12"
+    "@storybook/theming" "5.3.12"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -2177,19 +2177,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/addons@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.10.tgz#60a969329fdee455a491e95e9f2ed982faa97e65"
-  integrity sha512-n+cQrXHIiasyqWvthg9y51OCEmjmKWMrX2XQcG1i+9J9RCNkLQ77Tj3LWefT5dJbi77Fa2/TzOShRiQqaaFNiQ==
-  dependencies:
-    "@storybook/api" "5.3.10"
-    "@storybook/channels" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/addons@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.12.tgz#77fb0e0d3ac9eb70414bff4b03c12bbccfe31716"
@@ -2226,32 +2213,6 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.10.tgz#45927f7cbba111842729f85f8f9a38ab2c0d3793"
-  integrity sha512-vyRpZgMECc0Er1mBsr6o43aZQ3KA2Zin38AQo/5oW7sE+tCsjHSljhxB7+qlrf9FuheU4PWqV4KAKp52WHwFhg==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/channels" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "5.3.10"
-    "@storybook/theming" "5.3.10"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.12.tgz#7d1ca7a487fb9b6604d26cae756e291015908d35"
@@ -2278,17 +2239,6 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.10.tgz#0d5ede72e4057a20b5c2ad5d871134f3cba54b78"
-  integrity sha512-YHc6FCc9RSpDoYfa1LUGNwHXKx3KjW1m5Q86g86sV8Rnj+guy5atDRSmL2i/OKTONQO4Edp1er+UGFzyUd+a2Q==
-  dependencies:
-    "@storybook/channels" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^3.2.0"
-
 "@storybook/channel-postmessage@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.12.tgz#945c9702f335018f6224af3159bf4d33c66a131e"
@@ -2307,13 +2257,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/channels@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.10.tgz#6556b0fbe99bc0234a9a54de3c94e9e1cf55e4e3"
-  integrity sha512-VbXhwCQ6T7VMhD/YTBqvkWDnnl9CsZLL9MLameM4E+WxLrGpxHIl7sSvJ5av5YPgJPxaNJpPMeVSxdi5u4quxg==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/channels@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.12.tgz#dd2e111377f0eaafa0e66746cb6628322615ade9"
@@ -2321,29 +2264,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-api@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.10.tgz#74c9c36a62d653f5eb29ceb84c3acbec19aad254"
-  integrity sha512-bYFgdzsaxdlWlZzNpDqWWLUaX31rc4xHdyy1MJ+dl65AnubPrLacvvqSCVYK+VdRAWHX+T7Bcvt2sRtwka7oEQ==
-  dependencies:
-    "@storybook/addons" "5.3.10"
-    "@storybook/channel-postmessage" "5.3.10"
-    "@storybook/channels" "5.3.10"
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/core-events" "5.3.10"
-    "@storybook/csf" "0.0.1"
-    "@types/webpack-env" "^1.15.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    stable "^0.1.8"
-    ts-dedent "^1.1.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.12.tgz#7c18921d0290b30b020ad7d41fbda170009780bd"
@@ -2374,13 +2294,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-logger@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.10.tgz#3f1ab223ccc5389004f76d9cab792083003d1db9"
-  integrity sha512-WCgXrr44Z8ScDiAVju5WLdm0am0JALo1XvUir1uP7j0f/h38/yA1+Jk1wXzAISdqOQN/CLl+o1H66rntEh/ijA==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-logger@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.12.tgz#64033dd647b6ce6971977e4f5ce2908de21526eb"
@@ -2413,33 +2326,6 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/components@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.10.tgz#09cb0e931ff27d90ded3b94b8d4cd1ac52007c52"
-  integrity sha512-azGOazbkAJguGLZ7MOA8ZMh+Y2MTxhOcT7+jCVyl/AqpYuKjRR8cogZCWkbg5DnQsj79XNBr4eFWJ64m8dlUZw==
-  dependencies:
-    "@storybook/client-logger" "5.3.10"
-    "@storybook/theming" "5.3.10"
-    "@types/react-syntax-highlighter" "11.0.2"
-    "@types/react-textarea-autosize" "^4.3.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^2.1.0"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^11.0.2"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-    ts-dedent "^1.1.0"
-
 "@storybook/components@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.12.tgz#0d930343624d459f46cd55b140be979709ee5a29"
@@ -2474,13 +2360,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.10.tgz#3fa271f5f47ec9822c488b91d4ea7c298eb7ed6c"
-  integrity sha512-HxE8inbyoBtKqUR6cnNHBvHI55nRLYf8RGEB7BuazYtF5v2FBFRghngKJ+4ELz0Rw9Hv2jiU93S6zfTaOg6euw==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core-events@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.12.tgz#188526c9003884104cce4fcd20448ca34d14d9f7"
@@ -2599,21 +2478,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.10.tgz#a30f2694f4fa586ce4e398d02d4db7b70161551d"
-  integrity sha512-WQwsiOnvhqtAi7LKDygI03vk/CJG23/jqRtqDvjEhf2K3oRQmW3ZpPZkt6/W+UTkRlzp2bYMZFBYa0/HxEYITQ==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/csf" "0.0.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/router@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.12.tgz#f08d75793790aacc5543c55e62d08d3bb00188fd"
@@ -2647,24 +2511,6 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/theming@5.3.10":
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.10.tgz#6f53df9684d998ce3dfdb22babfaeb667b7f250d"
-  integrity sha512-5/RQQS6u7BuJ8ufiqohAZ6EBLi6PwvJ3KcLMU21Dces/i0/e/HukXzUJVS0DVOno4bROkf98fYIv+MetpvIX+g==
-  dependencies:
-    "@emotion/core" "^10.0.20"
-    "@emotion/styled" "^10.0.17"
-    "@storybook/client-logger" "5.3.10"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-    ts-dedent "^1.1.0"
-
 "@storybook/theming@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.12.tgz#70908dc23c0635765256fc4dbb7cd6d318886dfe"

From 2f43069ea01fc838559116c348b0213b72257115 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 5 Feb 2020 17:37:38 +0100
Subject: [PATCH 095/171] Subscribe to notifications/remove polling

- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
---
 backend/src/index.js                          |  3 +-
 .../notifications/notificationsMiddleware.js  | 21 ++++++----
 backend/src/schema/resolvers/notifications.js | 21 +++++-----
 backend/src/schema/resolvers/posts.js         |  4 +-
 backend/src/schema/types/type/NOTIFIED.gql    |  4 ++
 backend/src/schema/types/type/Post.gql        |  4 ++
 .../src/schema/types/type/Subscription.gql    |  4 --
 backend/src/server.js                         | 31 +++++++-------
 .../NotificationMenu/NotificationMenu.vue     | 31 +++++++++-----
 webapp/constants/notifications.js             |  1 -
 webapp/graphql/User.js                        |  7 +++-
 webapp/pages/index.vue                        | 40 ++++++++++---------
 webapp/plugins/apollo-config.js               |  2 +-
 13 files changed, 98 insertions(+), 75 deletions(-)
 delete mode 100644 backend/src/schema/types/type/Subscription.gql
 delete mode 100644 webapp/constants/notifications.js

diff --git a/backend/src/index.js b/backend/src/index.js
index 0eb4f51b6..59718dad1 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -1,10 +1,11 @@
 import createServer from './server'
 import CONFIG from './config'
 
-const { app, server, httpServer } = createServer()
+const { server, httpServer } = createServer()
 const url = new URL(CONFIG.GRAPHQL_URI)
 httpServer.listen({ port: url.port }, () => {
   /* eslint-disable-next-line no-console */
   console.log(`🚀 Server ready at http://localhost:${url.port}${server.graphqlPath}`)
+  /* eslint-disable-next-line no-console */
   console.log(`🚀 Subscriptions ready at ws://localhost:${url.port}${server.subscriptionsPath}`)
 })
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index d20873ceb..87818c5d7 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -1,9 +1,10 @@
 import extractMentionedUsers from './mentions/extractMentionedUsers'
 import { validateNotifyUsers } from '../validation/validationMiddleware'
-import { PubSub } from 'apollo-server'
-
-const pubsub = new PubSub()
-const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
+import {
+  pubsub,
+  NOTIFICATION_ADDED,
+  transformReturnType,
+} from '../../schema/resolvers/notifications'
 
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
@@ -56,6 +57,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
         WHERE user.id in $idsOfUsers
         AND NOT (user)-[:BLOCKED]-(author)
         MERGE (post)-[notification:NOTIFIED {reason: $reason}]->(user)
+        WITH notification, post AS resource, user
       `
       break
     }
@@ -67,6 +69,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
       AND NOT (user)-[:BLOCKED]-(author)
       AND NOT (user)-[:BLOCKED]-(postAuthor)
       MERGE (comment)-[notification:NOTIFIED {reason: $reason}]->(user)
+      WITH notification, comment AS resource, user
       `
       break
     }
@@ -78,12 +81,16 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
     WHEN notification.createdAt IS NULL
     THEN notification END ).createdAt = toString(datetime())
     SET notification.updatedAt = toString(datetime())
-    RETURN notification
+    RETURN notification, resource, user, labels(resource)[0] AS type
   `
   const session = context.driver.session()
   const writeTxResultPromise = session.writeTransaction(async transaction => {
-    const notificationTransactionResponse = await transaction.run(mentionedCypher, { id, idsOfUsers, reason })
-    return notificationTransactionResponse.records.map(record => record.get('notification').properties)
+    const notificationTransactionResponse = await transaction.run(mentionedCypher, {
+      id,
+      idsOfUsers,
+      reason,
+    })
+    return notificationTransactionResponse.records.map(transformReturnType)
   })
   try {
     const [notification] = await writeTxResultPromise
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index f92292bfc..c8d36b034 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -1,16 +1,14 @@
 import log from './helpers/databaseLogger'
 import { PubSub } from 'apollo-server'
+import { withFilter } from 'graphql-subscriptions'
 
-const pubsub = new PubSub()
-const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
-
-const resourceTypes = ['Post', 'Comment']
-
-const transformReturnType = record => {
+export const pubsub = new PubSub()
+export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
+export const transformReturnType = record => {
   return {
     ...record.get('notification').properties,
     from: {
-      __typename: record.get('resource').labels.find(l => resourceTypes.includes(l)),
+      __typename: record.get('type'),
       ...record.get('resource').properties,
     },
     to: {
@@ -22,7 +20,12 @@ const transformReturnType = record => {
 export default {
   Subscription: {
     notificationAdded: {
-      subscribe: () => pubsub.asyncIterator([NOTIFICATION_ADDED]),
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(NOTIFICATION_ADDED),
+        (payload, variables) => {
+          return payload.notificationAdded.to.id === variables.userId
+        },
+      ),
     },
   },
   Query: {
@@ -90,7 +93,7 @@ export default {
           ` 
             MATCH (resource {id: $resourceId})-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
             SET notification.read = TRUE
-            RETURN resource, notification, user
+            RETURN resource, notification, user, labels(resource)[0] AS type
           `,
           { resourceId: args.id, id: currentUser.id },
         )
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 11f6eebc3..4cb787e2f 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -1,16 +1,14 @@
 import uuid from 'uuid/v4'
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import { isEmpty } from 'lodash'
-import { UserInputError } from 'apollo-server'
+import { UserInputError, PubSub } from 'apollo-server'
 import fileUpload from './fileUpload'
 import Resolver from './helpers/Resolver'
 import { filterForMutedUsers } from './helpers/filterForMutedUsers'
-import { PubSub } from 'apollo-server'
 
 const pubsub = new PubSub()
 const POST_ADDED = 'POST_ADDED'
 
-
 const maintainPinnedPosts = params => {
   const pinnedPostFilter = { pinned: true }
   if (isEmpty(params.filter)) {
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index af91460f7..558041b6a 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -30,3 +30,7 @@ type Query {
 type Mutation {
   markAsRead(id: ID!): NOTIFIED
 }
+
+type Subscription {
+  notificationAdded(userId: ID!): NOTIFIED
+}
\ No newline at end of file
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 71fcb9605..484ad937e 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -245,3 +245,7 @@ type Query {
       """
     )
 }
+
+type Subscription {
+  postAdded: Post
+}
diff --git a/backend/src/schema/types/type/Subscription.gql b/backend/src/schema/types/type/Subscription.gql
deleted file mode 100644
index a2f8b11b9..000000000
--- a/backend/src/schema/types/type/Subscription.gql
+++ /dev/null
@@ -1,4 +0,0 @@
-type Subscription {
-  postAdded: Post
-  notificationAdded: NOTIFIED
-}
\ No newline at end of file
diff --git a/backend/src/server.js b/backend/src/server.js
index d20fa5e63..b7e751bae 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -3,7 +3,6 @@ import http from 'http'
 import helmet from 'helmet'
 import { ApolloServer } from 'apollo-server-express'
 
-
 import CONFIG from './config'
 import middleware from './middleware'
 import { getNeode, getDriver } from './db/neo4j'
@@ -11,23 +10,22 @@ import decode from './jwt/decode'
 import schema from './schema'
 import webfinger from './activitypub/routes/webfinger'
 
-
 const driver = getDriver()
 const neode = getNeode()
 
-const getContext = async (req) => {
-    const user = await decode(driver, req.headers.authorization)
-    return {
-      driver,
-      neode,
-      user,
-      req,
-      cypherParams: {
-        currentUserId: user ? user.id : null,
-      },
-    }
+const getContext = async req => {
+  const user = await decode(driver, req.headers.authorization)
+  return {
+    driver,
+    neode,
+    user,
+    req,
+    cypherParams: {
+      currentUserId: user ? user.id : null,
+    },
+  }
 }
-export const context = async (options) => {
+export const context = async options => {
   const { connection, req } = options
   if (connection) {
     return connection.context
@@ -63,9 +61,8 @@ const createServer = options => {
   app.use('/.well-known/', webfinger())
   app.use(express.static('public'))
   server.applyMiddleware({ app, path: '/' })
-  const httpServer = http.createServer(app);
-  server.installSubscriptionHandlers(httpServer);
-
+  const httpServer = http.createServer(app)
+  server.installSubscriptionHandlers(httpServer)
 
   return { server, httpServer, app }
 }
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index b18203b45..d00ab2837 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -22,13 +22,12 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import unionBy from 'lodash/unionBy'
-import { NOTIFICATIONS_POLL_INTERVAL } from '~/constants/notifications'
-import { notificationQuery, markAsReadMutation } from '~/graphql/User'
+import { notificationQuery, markAsReadMutation, notificationAdded } from '~/graphql/User'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import Dropdown from '~/components/Dropdown'
 import NotificationList from '../NotificationList/NotificationList'
-import { notificationAdded } from '~/graphql/User'
 
 export default {
   name: 'NotificationMenu',
@@ -59,6 +58,9 @@ export default {
     },
   },
   computed: {
+    ...mapGetters({
+      user: 'auth/user',
+    }),
     unreadNotificationsCount() {
       const result = this.notifications.reduce((count, notification) => {
         return notification.read ? count : count + 1
@@ -77,17 +79,24 @@ export default {
           orderBy: 'updatedAt_desc',
         }
       },
-      // pollInterval: NOTIFICATIONS_POLL_INTERVAL,
-      // update({ notifications }) {
-      //   return unionBy(notifications, this.notifications, notification => notification.id).sort(
-      //     (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
-      //   )
-      // },
       subscribeToMore: {
         document: notificationAdded(),
+        variables() {
+          return {
+            userId: this.user.id,
+          }
+        },
         updateQuery: (previousResult, { subscriptionData }) => {
-          const { data: { notificationAdded: newNotification } } = subscriptionData
-          return { notifications: [newNotification, ...previousResult.notifications] }
+          const {
+            data: { notificationAdded: newNotification },
+          } = subscriptionData
+          return {
+            notifications: unionBy(
+              [newNotification],
+              previousResult.notifications,
+              notification => notification.id,
+            ).sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt)),
+          }
         },
       },
       error(error) {
diff --git a/webapp/constants/notifications.js b/webapp/constants/notifications.js
deleted file mode 100644
index 190bb64f8..000000000
--- a/webapp/constants/notifications.js
+++ /dev/null
@@ -1 +0,0 @@
-export const NOTIFICATIONS_POLL_INTERVAL = 60000
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index dfc6ca097..65fdf6d10 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -70,6 +70,7 @@ export const notificationQuery = i18n => {
         read
         reason
         createdAt
+        updatedAt
         from {
           __typename
           ... on Post {
@@ -108,6 +109,7 @@ export const markAsReadMutation = i18n => {
         read
         reason
         createdAt
+        updatedAt
         from {
           __typename
           ... on Post {
@@ -137,12 +139,13 @@ export const notificationAdded = () => {
     ${commentFragment}
     ${postFragment}
 
-    subscription notifications {
-      notificationAdded {
+    subscription notifications($userId: ID!) {
+      notificationAdded(userId: $userId) {
         id
         read
         reason
         createdAt
+        updatedAt
         from {
           __typename
           ... on Post {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 5d42aab3b..c3441dd41 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -78,7 +78,6 @@ import gql from 'graphql-tag'
 import {
   userFragment,
   postFragment,
-  commentFragment,
   postCountsFragment,
   userCountsFragment,
   locationAndBadgesFragment,
@@ -225,30 +224,33 @@ export default {
       fetchPolicy: 'cache-and-network',
       subscribeToMore: {
         document: gql`
-    ${userFragment}
-    ${userCountsFragment}
-    ${locationAndBadgesFragment('EN')}
-    ${postFragment}
-    ${postCountsFragment}
-    ${tagsCategoriesAndPinnedFragment}
+          ${userFragment}
+          ${userCountsFragment}
+          ${locationAndBadgesFragment('EN')}
+          ${postFragment}
+          ${postCountsFragment}
+          ${tagsCategoriesAndPinnedFragment}
 
-        subscription Post {
-          postAdded {
-            ...post
-            ...postCounts
-            ...tagsCategoriesAndPinned
-            author {
-              ...user
-              ...userCounts
-              ...locationAndBadges
+          subscription Post {
+            postAdded {
+              ...post
+              ...postCounts
+              ...tagsCategoriesAndPinned
+              author {
+                ...user
+                ...userCounts
+                ...locationAndBadges
+              }
             }
           }
-        }`,
+        `,
         updateQuery: (previousResult, { subscriptionData }) => {
-          const { data: { postAdded: newPost } } = subscriptionData
+          const {
+            data: { postAdded: newPost },
+          } = subscriptionData
           return { Post: [newPost, ...previousResult.Post] }
         },
-      }
+      },
     },
   },
 }
diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js
index a4487c0bb..a3ac9805e 100644
--- a/webapp/plugins/apollo-config.js
+++ b/webapp/plugins/apollo-config.js
@@ -17,7 +17,7 @@ export default ({ app }) => {
     credentials: true,
     tokenName: 'human-connection-token',
     persisting: false,
-    websocketsOnly: true,
+    websocketsOnly: false,
     cache: new InMemoryCache({ fragmentMatcher }),
   }
 }

From 110165691a4fd808cb6b85952ea4f60d5bbc4a21 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 5 Feb 2020 18:42:31 +0100
Subject: [PATCH 096/171] Refactor out transformReturnType function

- we have introduced a better way to return all the info we want without
  needing to make multiple database queries. It was introduced by
@roschaefer in the PR for the notifications query, but we hadn't
refactored markAsRead yet.
- Now that we are subscribing to notifications, we need to have the same
  return info as the notification query.

- Co-authored-by: Tirokk <wolle.huss@pjannto.com>
---
 .../notifications/notificationsMiddleware.js  | 26 ++++++++-----------
 backend/src/schema/resolvers/notifications.js | 23 +++++++---------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 87818c5d7..a91ed2c06 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -1,10 +1,6 @@
 import extractMentionedUsers from './mentions/extractMentionedUsers'
 import { validateNotifyUsers } from '../validation/validationMiddleware'
-import {
-  pubsub,
-  NOTIFICATION_ADDED,
-  transformReturnType,
-} from '../../schema/resolvers/notifications'
+import { pubsub, NOTIFICATION_ADDED } from '../../schema/resolvers/notifications'
 
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
@@ -57,31 +53,31 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
         WHERE user.id in $idsOfUsers
         AND NOT (user)-[:BLOCKED]-(author)
         MERGE (post)-[notification:NOTIFIED {reason: $reason}]->(user)
-        WITH notification, post AS resource, user
+        WITH notification, user,
+        post {.*, __typename: labels(post)[0], author: properties(author) } as finalResource
       `
       break
     }
     case 'mentioned_in_comment': {
       mentionedCypher = `
-      MATCH (postAuthor: User)-[:WROTE]->(post: Post)<-[:COMMENTS]-(comment: Comment { id: $id })<-[:WROTE]-(author: User)
+      MATCH (postAuthor: User)-[:WROTE]->(post: Post)<-[:COMMENTS]-(comment: Comment { id: $id })<-[:WROTE]-(commenter: User)
       MATCH (user: User)
       WHERE user.id in $idsOfUsers
-      AND NOT (user)-[:BLOCKED]-(author)
+      AND NOT (user)-[:BLOCKED]-(commenter)
       AND NOT (user)-[:BLOCKED]-(postAuthor)
       MERGE (comment)-[notification:NOTIFIED {reason: $reason}]->(user)
-      WITH notification, comment AS resource, user
+      WITH notification, user,
+      comment {.*, __typename: labels(comment)[0], author: properties(commenter), post:  post {.*, author: properties(postAuthor)} } as finalResource
       `
       break
     }
   }
   mentionedCypher += `
+    WITH notification, finalResource, user
     SET notification.read = FALSE
-    SET (
-    CASE
-    WHEN notification.createdAt IS NULL
-    THEN notification END ).createdAt = toString(datetime())
+    SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
     SET notification.updatedAt = toString(datetime())
-    RETURN notification, resource, user, labels(resource)[0] AS type
+    RETURN notification {.*, from: finalResource, to: properties(user)}
   `
   const session = context.driver.session()
   const writeTxResultPromise = session.writeTransaction(async transaction => {
@@ -90,7 +86,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
       idsOfUsers,
       reason,
     })
-    return notificationTransactionResponse.records.map(transformReturnType)
+    return notificationTransactionResponse.records.map(record => record.get('notification'))
   })
   try {
     const [notification] = await writeTxResultPromise
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index c8d36b034..50c6798aa 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -4,18 +4,6 @@ import { withFilter } from 'graphql-subscriptions'
 
 export const pubsub = new PubSub()
 export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
-export const transformReturnType = record => {
-  return {
-    ...record.get('notification').properties,
-    from: {
-      __typename: record.get('type'),
-      ...record.get('resource').properties,
-    },
-    to: {
-      ...record.get('user').properties,
-    },
-  }
-}
 
 export default {
   Subscription: {
@@ -93,12 +81,19 @@ export default {
           ` 
             MATCH (resource {id: $resourceId})-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
             SET notification.read = TRUE
-            RETURN resource, notification, user, labels(resource)[0] AS type
+            WITH user, notification, resource,
+            [(resource)<-[:WROTE]-(author:User) | author {.*}] as authors,
+            [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] as posts
+            WITH resource, user, notification, authors, posts,
+            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} as finalResource
+            RETURN notification {.*, from: finalResource, to: properties(user)}
           `,
           { resourceId: args.id, id: currentUser.id },
         )
         log(markNotificationAsReadTransactionResponse)
-        return markNotificationAsReadTransactionResponse.records.map(transformReturnType)
+        return markNotificationAsReadTransactionResponse.records.map(record =>
+          record.get('notification'),
+        )
       })
       try {
         const [notifications] = await writeTxResultPromise

From 1c6a5503dbfad133f80e379d53b09d5435a56486 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 5 Feb 2020 19:06:55 +0100
Subject: [PATCH 097/171] Get subscriptions working with notifyUserOfComment

- Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
---
 .../notifications/notificationsMiddleware.js  | 40 ++++++++++---------
 backend/src/schema/resolvers/notifications.js | 12 +++---
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index a91ed2c06..9890979e9 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -54,7 +54,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
         AND NOT (user)-[:BLOCKED]-(author)
         MERGE (post)-[notification:NOTIFIED {reason: $reason}]->(user)
         WITH notification, user,
-        post {.*, __typename: labels(post)[0], author: properties(author) } as finalResource
+        post {.*, __typename: labels(post)[0], author: properties(author) } AS finalResource
       `
       break
     }
@@ -67,7 +67,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
       AND NOT (user)-[:BLOCKED]-(postAuthor)
       MERGE (comment)-[notification:NOTIFIED {reason: $reason}]->(user)
       WITH notification, user,
-      comment {.*, __typename: labels(comment)[0], author: properties(commenter), post:  post {.*, author: properties(postAuthor)} } as finalResource
+      comment {.*, __typename: labels(comment)[0], author: properties(commenter), post:  post {.*, author: properties(postAuthor)} } AS finalResource
       `
       break
     }
@@ -101,24 +101,26 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
 const notifyUsersOfComment = async (label, commentId, postAuthorId, reason, context) => {
   await validateNotifyUsers(label, reason)
   const session = context.driver.session()
-
+  const writeTxResultPromise = await session.writeTransaction(async transaction => {
+    const notificationTransactionResponse = await transaction.run(
+      `
+      MATCH (postAuthor:User {id: $postAuthorId})-[:WROTE]->(post:Post)<-[:COMMENTS]-(comment:Comment { id: $commentId })<-[:WROTE]-(commenter:User)
+      WHERE NOT (postAuthor)-[:BLOCKED]-(commenter)
+      MERGE (comment)-[notification:NOTIFIED {reason: $reason}]->(postAuthor)
+      SET notification.read = FALSE
+      SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
+      SET notification.updatedAt = toString(datetime())
+      WITH notification, postAuthor, post,
+      comment {.*, __typename: labels(comment)[0], author: properties(commenter), post:  post {.*, author: properties(postAuthor) } } AS finalResource
+      RETURN notification {.*, from: finalResource, to: properties(postAuthor)}
+    `,
+      { commentId, postAuthorId, reason },
+    )
+    return notificationTransactionResponse.records.map(record => record.get('notification'))
+  })
   try {
-    await session.writeTransaction(async transaction => {
-      await transaction.run(
-        `
-        MATCH (postAuthor:User {id: $postAuthorId})-[:WROTE]->(post:Post)<-[:COMMENTS]-(comment:Comment { id: $commentId })<-[:WROTE]-(commenter:User)
-        WHERE NOT (postAuthor)-[:BLOCKED]-(commenter)
-        MERGE (comment)-[notification:NOTIFIED {reason: $reason}]->(postAuthor)
-        SET notification.read = FALSE
-        SET (
-        CASE
-        WHEN notification.createdAt IS NULL
-        THEN notification END ).createdAt = toString(datetime())
-        SET notification.updatedAt = toString(datetime())
-      `,
-        { commentId, postAuthorId, reason },
-      )
-    })
+    const [notification] = await writeTxResultPromise
+    return pubsub.publish(NOTIFICATION_ADDED, { notificationAdded: notification })
   } finally {
     session.close()
   }
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 50c6798aa..116ac3e0e 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -51,10 +51,10 @@ export default {
           MATCH (resource {deleted: false, disabled: false})-[notification:NOTIFIED]->(user:User {id:$id})
           ${whereClause}
           WITH user, notification, resource,
-          [(resource)<-[:WROTE]-(author:User) | author {.*}] as authors,
-          [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] as posts
+          [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
+          [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
           WITH resource, user, notification, authors, posts,
-          resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} as finalResource
+          resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
           RETURN notification {.*, from: finalResource, to: properties(user)}
           ${orderByClause}
           ${offset} ${limit}
@@ -82,10 +82,10 @@ export default {
             MATCH (resource {id: $resourceId})-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
             SET notification.read = TRUE
             WITH user, notification, resource,
-            [(resource)<-[:WROTE]-(author:User) | author {.*}] as authors,
-            [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] as posts
+            [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
+            [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
             WITH resource, user, notification, authors, posts,
-            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} as finalResource
+            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
             RETURN notification {.*, from: finalResource, to: properties(user)}
           `,
           { resourceId: args.id, id: currentUser.id },

From 6cf067937d72d8c3bba0158e4e2e5fb9aae822a5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 5 Feb 2020 20:24:23 +0100
Subject: [PATCH 098/171] Clean up

- remove the code for subscriptions to Post as we won't implement this
  at this time... I've created a new branch with the code that can be
built on later
- remove unused subscription path
- add possibility to use websockets uri for production env.
---
 backend/src/config/index.js            |  1 -
 backend/src/schema/resolvers/posts.js  | 12 +-------
 backend/src/schema/types/type/Post.gql |  4 ---
 webapp/pages/index.vue                 | 38 --------------------------
 webapp/plugins/apollo-config.js        |  2 +-
 5 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 59ab20af7..2f8d0ed22 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -49,7 +49,6 @@ export const serverConfigs = {
   CLIENT_URI,
   GRAPHQL_URI,
   PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true',
-  SUBSCRIPTIONS_PATH: '/subscriptions',
 }
 
 export const developmentConfigs = {
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 4cb787e2f..af8165997 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -1,14 +1,11 @@
 import uuid from 'uuid/v4'
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import { isEmpty } from 'lodash'
-import { UserInputError, PubSub } from 'apollo-server'
+import { UserInputError } from 'apollo-server'
 import fileUpload from './fileUpload'
 import Resolver from './helpers/Resolver'
 import { filterForMutedUsers } from './helpers/filterForMutedUsers'
 
-const pubsub = new PubSub()
-const POST_ADDED = 'POST_ADDED'
-
 const maintainPinnedPosts = params => {
   const pinnedPostFilter = { pinned: true }
   if (isEmpty(params.filter)) {
@@ -20,12 +17,6 @@ const maintainPinnedPosts = params => {
 }
 
 export default {
-  Subscription: {
-    postAdded: {
-      // Additional event labels can be passed to asyncIterator creation
-      subscribe: () => pubsub.asyncIterator([POST_ADDED]),
-    },
-  },
   Query: {
     Post: async (object, params, context, resolveInfo) => {
       params = await filterForMutedUsers(params, context)
@@ -111,7 +102,6 @@ export default {
       })
       try {
         const [post] = await writeTxResultPromise
-        pubsub.publish(POST_ADDED, { postAdded: post })
         return post
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 484ad937e..71fcb9605 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -245,7 +245,3 @@ type Query {
       """
     )
 }
-
-type Subscription {
-  postAdded: Post
-}
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index c3441dd41..609c3d800 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -74,15 +74,6 @@ import { mapGetters, mapMutations } from 'vuex'
 import { filterPosts } from '~/graphql/PostQuery.js'
 import PostMutations from '~/graphql/PostMutations'
 import UpdateQuery from '~/components/utils/UpdateQuery'
-import gql from 'graphql-tag'
-import {
-  userFragment,
-  postFragment,
-  postCountsFragment,
-  userCountsFragment,
-  locationAndBadgesFragment,
-  tagsCategoriesAndPinnedFragment,
-} from '~/graphql/Fragments'
 
 export default {
   components: {
@@ -222,35 +213,6 @@ export default {
         this.posts = Post
       },
       fetchPolicy: 'cache-and-network',
-      subscribeToMore: {
-        document: gql`
-          ${userFragment}
-          ${userCountsFragment}
-          ${locationAndBadgesFragment('EN')}
-          ${postFragment}
-          ${postCountsFragment}
-          ${tagsCategoriesAndPinnedFragment}
-
-          subscription Post {
-            postAdded {
-              ...post
-              ...postCounts
-              ...tagsCategoriesAndPinned
-              author {
-                ...user
-                ...userCounts
-                ...locationAndBadges
-              }
-            }
-          }
-        `,
-        updateQuery: (previousResult, { subscriptionData }) => {
-          const {
-            data: { postAdded: newPost },
-          } = subscriptionData
-          return { Post: [newPost, ...previousResult.Post] }
-        },
-      },
     },
   },
 }
diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js
index a3ac9805e..b89d9a188 100644
--- a/webapp/plugins/apollo-config.js
+++ b/webapp/plugins/apollo-config.js
@@ -9,7 +9,7 @@ export default ({ app }) => {
   const backendUrl = process.env.GRAPHQL_URI || 'http://localhost:4000'
 
   return {
-    wsEndpoint: 'ws://localhost:4000/graphql', // optional
+    wsEndpoint: process.env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
     httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {
       credentials: 'same-origin',

From 7ac973f9a1d0e095d9275b0e63a762b9b26b984a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 5 Feb 2020 20:45:56 +0100
Subject: [PATCH 099/171] Refactor cypher statement to simplify

- it's questionable whether this simplifies it or not, and actually adds
  one line of code, but now it looks more similiar to the code in the
notifications query
---
 .../notifications/notificationsMiddleware.js         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 9890979e9..11337468c 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -53,8 +53,7 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
         WHERE user.id in $idsOfUsers
         AND NOT (user)-[:BLOCKED]-(author)
         MERGE (post)-[notification:NOTIFIED {reason: $reason}]->(user)
-        WITH notification, user,
-        post {.*, __typename: labels(post)[0], author: properties(author) } AS finalResource
+        WITH post AS resource, notification, user
       `
       break
     }
@@ -66,14 +65,17 @@ const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
       AND NOT (user)-[:BLOCKED]-(commenter)
       AND NOT (user)-[:BLOCKED]-(postAuthor)
       MERGE (comment)-[notification:NOTIFIED {reason: $reason}]->(user)
-      WITH notification, user,
-      comment {.*, __typename: labels(comment)[0], author: properties(commenter), post:  post {.*, author: properties(postAuthor)} } AS finalResource
+      WITH comment AS resource, notification, user
       `
       break
     }
   }
   mentionedCypher += `
-    WITH notification, finalResource, user
+    WITH notification, user, resource,
+    [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
+    [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
+    WITH resource, user, notification, authors, posts,
+    resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
     SET notification.read = FALSE
     SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
     SET notification.updatedAt = toString(datetime())

From cdddd5b092eadcb970c5792c897cd9b7667f705e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2020 04:19:04 +0000
Subject: [PATCH 100/171] build(deps): bump graphql-shield from 7.0.9 to 7.0.10
 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.9 to 7.0.10.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.9...v7.0.10)

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

diff --git a/backend/package.json b/backend/package.json
index 5337561f9..f462b431c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -60,7 +60,7 @@
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
-    "graphql-shield": "~7.0.9",
+    "graphql-shield": "~7.0.10",
     "graphql-tag": "~2.10.2",
     "helmet": "~3.21.2",
     "jsonwebtoken": "~8.5.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 4098653cc..49fb7ae5b 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1175,7 +1175,7 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.10.6", "@metascraper/helpers@^5.10.7":
+"@metascraper/helpers@^5.10.7":
   version "5.10.7"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.10.7.tgz#4d330204372ce5c1afedfc3ac891fb373f72c085"
   integrity sha512-YkL4vTF4grgNTFhe9t4qsD0c5aEjxWoC0cpvMICs6JriRtedwjVfiwWhaGiTbU3pGFhmLgE9fV42wXOXGUGjMQ==
@@ -1607,10 +1607,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yup@0.26.29":
-  version "0.26.29"
-  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.29.tgz#5a533ad6f74e442436698e20b1441c68a7a1c931"
-  integrity sha512-M81oZOgLap0b0I/BySnpLwHjOj1BFxUKV1ytG2Kqj3jmkh8F3H11PEnk658UniftpjTXdueloOL+KZYn+SMQ9w==
+"@types/yup@0.26.30":
+  version "0.26.30"
+  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.30.tgz#0d6066505bb67e7b9b161b2082c4cdfcdafd6a6b"
+  integrity sha512-b/uklO68T/eShWnxjlgwOJlEFOQ11ib3i1wQQiLmHqFJTxDMvz+tb4XzThGQISzOcelMnoSdb1Po4s69YkEQeg==
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
@@ -4476,12 +4476,12 @@ graphql-middleware@~4.0.2:
   dependencies:
     graphql-tools "^4.0.5"
 
-graphql-shield@~7.0.9:
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.9.tgz#8248916e9636a7e3c05719a52fd13f2d37ccaeb2"
-  integrity sha512-2Dfddd2hcObCSqAj64c/Aaxvs7gaoD2QU14crj7H486QjS8jIAtEPUyLVyv8SmJ1ZD7jT6wqx6wrB15Npn5Sgw==
+graphql-shield@~7.0.10:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.10.tgz#c25517a07e97bfd74089fde66ea2d2044addf743"
+  integrity sha512-m1HPQ3DpzuW8b7derWcsjjYtiBk+Hjgb1eL/0YK/Y2A0EV7vDQzJwRzlIwn9My7Xv+F4DJwm25yydnnUNpZt8g==
   dependencies:
-    "@types/yup" "0.26.29"
+    "@types/yup" "0.26.30"
     object-hash "^2.0.0"
     yup "^0.28.0"
 

From f1e60b236239bd6360c4533d9a9fd8598c00f848 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2020 08:04:09 +0000
Subject: [PATCH 101/171] build(deps): bump graphql-tag from 2.10.2 to 2.10.3
 in /backend

Bumps [graphql-tag](https://github.com/apollographql/graphql-tag) from 2.10.2 to 2.10.3.
- [Release notes](https://github.com/apollographql/graphql-tag/releases)
- [Changelog](https://github.com/apollographql/graphql-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/graphql-tag/compare/v2.10.2...v2.10.3)

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

diff --git a/backend/package.json b/backend/package.json
index f462b431c..894963e85 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-shield": "~7.0.10",
-    "graphql-tag": "~2.10.2",
+    "graphql-tag": "~2.10.3",
     "helmet": "~3.21.2",
     "jsonwebtoken": "~8.5.1",
     "linkifyjs": "~2.1.8",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 49fb7ae5b..895eb4594 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4492,10 +4492,10 @@ graphql-subscriptions@^1.0.0:
   dependencies:
     iterall "^1.2.1"
 
-graphql-tag@^2.9.2, graphql-tag@~2.10.2:
-  version "2.10.2"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.2.tgz#e42214d0dde29e8db5d55b0107efdb2d461ed270"
-  integrity sha512-7rUuJkVGyedBiVJ/hPaxndDnzxANUZ+QhTu0KUzgTGtP3ibY/hSUl9em21aVh5BNMJsmMc4nVuOTBoiAUJ2xBQ==
+graphql-tag@^2.9.2, graphql-tag@~2.10.3:
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz#ea1baba5eb8fc6339e4c4cf049dabe522b0edf03"
+  integrity sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA==
 
 graphql-tools@^4.0.0, graphql-tools@^4.0.4, graphql-tools@^4.0.5:
   version "4.0.5"

From 0851ad4c5098ee3aef257b72505d2962902c4dca Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 6 Feb 2020 10:33:56 +0100
Subject: [PATCH 102/171] Add end line

---
 backend/src/schema/types/type/NOTIFIED.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 558041b6a..88ecd3882 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -33,4 +33,4 @@ type Mutation {
 
 type Subscription {
   notificationAdded(userId: ID!): NOTIFIED
-}
\ No newline at end of file
+}

From ef9d351fcfb6e79f53e18fce4bcd2fca0adcc117 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 20 Dec 2019 01:54:04 +0100
Subject: [PATCH 103/171] swap lat and lng

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

diff --git a/backend/src/schema/resolvers/users/location.js b/backend/src/schema/resolvers/users/location.js
index 3f3638bf5..cc00d9e0a 100644
--- a/backend/src/schema/resolvers/users/location.js
+++ b/backend/src/schema/resolvers/users/location.js
@@ -34,8 +34,8 @@ const createLocation = async (session, mapboxData) => {
     namePL: mapboxData.text_pl,
     nameRU: mapboxData.text_ru,
     type: mapboxData.id.split('.')[0].toLowerCase(),
-    lat: mapboxData.center && mapboxData.center.length ? mapboxData.center[0] : null,
-    lng: mapboxData.center && mapboxData.center.length ? mapboxData.center[1] : null,
+    lng: mapboxData.center && mapboxData.center.length ? mapboxData.center[0] : null,
+    lat: mapboxData.center && mapboxData.center.length ? mapboxData.center[1] : null,
   }
 
   let mutation =

From 976583b23589bcec7896cd7c01af3e17e650fc23 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 20 Dec 2019 02:54:35 +0100
Subject: [PATCH 104/171] fixing test for geolocation

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

diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index f7315174c..af13dba5b 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -42,7 +42,7 @@ const updateUserMutation = gql`
 let newlyCreatedNodesWithLocales = [
   {
     city: {
-      lng: 41.1534,
+      lat: 41.1534,
       nameES: 'Hamburg',
       nameFR: 'Hamburg',
       nameIT: 'Hamburg',
@@ -55,7 +55,7 @@ let newlyCreatedNodesWithLocales = [
       name: 'Hamburg',
       namePL: 'Hamburg',
       id: 'place.5977106083398860',
-      lat: -74.5763,
+      lng: -74.5763,
     },
     state: {
       namePT: 'Nova Jérsia',
@@ -151,7 +151,7 @@ describe('userMiddleware', () => {
       newlyCreatedNodesWithLocales = [
         {
           city: {
-            lng: 53.55,
+            lat: 53.55,
             nameES: 'Hamburgo',
             nameFR: 'Hambourg',
             nameIT: 'Amburgo',
@@ -164,7 +164,7 @@ describe('userMiddleware', () => {
             namePL: 'Hamburg',
             name: 'Hamburg',
             id: 'region.10793468240398860',
-            lat: 10,
+            lng: 10,
           },
           country: {
             namePT: 'Alemanha',

From cb8b2acffd8d4e026151321e40fc503f3103e539 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Jan 2020 02:44:47 +0100
Subject: [PATCH 105/171] swap lng and lat in db seed

---
 backend/src/db/seed.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index ba7ace90b..69b1f8dfe 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -32,8 +32,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         id: 'region.5127278006398860',
         name: 'Hamburg',
         type: 'region',
-        lat: 10.0,
-        lng: 53.55,
+        lng: 10.0,
+        lat: 53.55,
         nameES: 'Hamburgo',
         nameFR: 'Hambourg',
         nameIT: 'Amburgo',
@@ -48,8 +48,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         id: 'region.14880313158564380',
         type: 'region',
         name: 'Berlin',
-        lat: 13.38333,
-        lng: 52.51667,
+        lng: 13.38333,
+        lat: 52.51667,
         nameES: 'Berlín',
         nameFR: 'Berlin',
         nameIT: 'Berlino',
@@ -78,8 +78,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         id: 'region.9397217726497330',
         name: 'Paris',
         type: 'region',
-        lat: 2.35183,
-        lng: 48.85658,
+        lng: 2.35183,
+        lat: 48.85658,
         nameES: 'París',
         nameFR: 'Paris',
         nameIT: 'Parigi',

From 4905b09b3e722655c65051ece7ee12c3c38c1390 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 6 Feb 2020 20:47:45 +0100
Subject: [PATCH 106/171] migration added to swap lat and lng in db

---
 ...0206190233-swap_latitude_with_longitude.js | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js

diff --git a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
new file mode 100644
index 000000000..35d85430e
--- /dev/null
+++ b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
@@ -0,0 +1,54 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description = 'This migration swaps the value stored in Location.lat with the value of Location.lng.'
+
+export async function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Implement your migration here.
+    await transaction.run(`
+        MATCH (l:Location) WHERE NOT(l.lat IS NULL)
+        WITH l.lng AS longitude, l.lat AS latitude, l AS Location
+        SET Location.lat = longitude, Location.lng = latitude
+    `)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+  } finally {
+    session.close()
+  }
+}
+
+export async function down(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Implement your migration here.
+    await transaction.run(
+      `
+        MATCH (l:Location) WHERE NOT(l.lat IS NULL)
+        WITH l.lng AS longitude, l.lat AS latitude, l AS Location
+        SET Location.lat = longitude, Location.lng = latitude      `,
+    )
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+  } finally {
+    session.close()
+  }
+}

From 86f298f8e5ce588da1ac6751ed3cc15dea346fdb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 6 Feb 2020 23:00:06 +0100
Subject: [PATCH 107/171] prettier, prettier

---
 .../migrations/20200206190233-swap_latitude_with_longitude.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
index 35d85430e..0e11c8007 100644
--- a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
+++ b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
@@ -1,6 +1,7 @@
 import { getDriver } from '../../db/neo4j'
 
-export const description = 'This migration swaps the value stored in Location.lat with the value of Location.lng.'
+export const description =
+  'This migration swaps the value stored in Location.lat with the value of Location.lng.'
 
 export async function up(next) {
   const driver = getDriver()

From ae0ac37f3da50d3e847b46d9fce1b4cf8ac0a3a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2020 04:17:26 +0000
Subject: [PATCH 108/171] build(deps): bump apollo-server from 2.9.16 to 2.10.0
 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 894963e85..1259e2ca6 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -43,7 +43,7 @@
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
     "apollo-link-http": "~1.5.16",
-    "apollo-server": "~2.9.16",
+    "apollo-server": "~2.10.0",
     "apollo-server-express": "^2.9.16",
     "babel-plugin-transform-runtime": "^6.23.0",
     "bcryptjs": "~2.4.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 895eb4594..7db186ea7 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1845,10 +1845,10 @@ apollo-client@~2.6.8:
     tslib "^1.10.0"
     zen-observable "^0.8.0"
 
-apollo-datasource@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.6.4.tgz#c0d1604b1a97e004844d4b61bd819a9a6b0a409f"
-  integrity sha512-u4eu6Q94q6KuZacZfdo4vCevA81F4QWeTYEXUvoksQMJpiacPHHe0DJrofKVKvxngUp5kCi1RnPXSc6kBY+/oA==
+apollo-datasource@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.0.tgz#2a6d82edb2eba21b4ddf21877009ba39ff821945"
+  integrity sha512-Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==
   dependencies:
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
@@ -1860,13 +1860,13 @@ apollo-engine-reporting-protobuf@^0.4.4:
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
-apollo-engine-reporting@^1.4.14:
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.14.tgz#71a6509ebe86385da43df500cd0940525a3e8674"
-  integrity sha512-cCG9qDOPwbh87ZjQGHgmnP3oPqhqjIZcNmm/lNtWkWXGTlxV/jmUEqpVi+wsDbE5gR7d1OFk6GqSy2ZQh+S+Bw==
+apollo-engine-reporting@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.5.0.tgz#6e3746de14fc87e14c289c0776a2d350e6f50918"
+  integrity sha512-Pe2DelijZ2QHqkqv8E97iOb32l+FIMT2nxpQsuH+nWi+96cCFJJJHjm3RLAPEUuvGOgW9dFYQP3J91EyC5O0tQ==
   dependencies:
     apollo-engine-reporting-protobuf "^0.4.4"
-    apollo-graphql "^0.3.7"
+    apollo-graphql "^0.4.0"
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
     apollo-server-errors "^2.3.4"
@@ -1892,10 +1892,10 @@ apollo-errors@^1.9.0:
     assert "^1.4.1"
     extendable-error "^0.1.5"
 
-apollo-graphql@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.7.tgz#533232ed48b0b6dbcf5635f65e66cf8677a5b768"
-  integrity sha512-ghW16xx9tRcyL38Pw6G5OidMnYn+CNUGZWmvqQgEO2nRy4T0ONPZZBOvGrIMtJQ70oEykNMKGm0zm6PdHdxd8Q==
+apollo-graphql@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.0.tgz#dd0afe31a6241b8e2ded20b906c9ee8dfbe03497"
+  integrity sha512-abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg==
   dependencies:
     apollo-env "^0.6.1"
     lodash.sortby "^4.7.0"
@@ -1943,18 +1943,18 @@ apollo-server-caching@^0.5.1:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.16.tgz#b4c869a6babfa6906fbbf1e6facf3b7231dbf777"
-  integrity sha512-4ftdjSfs/3aEare9QNTVSF0yUvXETxiohuDLZ7gmMIQxNnZhUjVXiZL1rYKuIZ12uH7xLvh/DwkXRt6nLG/lZA==
+apollo-server-core@^2.10.0, apollo-server-core@^2.9.16:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.10.0.tgz#b8d51bdffe6529f0e3ca670ee8f1238765cfade4"
+  integrity sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/graphql-upload" "^8.0.0"
     "@types/ws" "^6.0.0"
     apollo-cache-control "^0.8.11"
-    apollo-datasource "^0.6.4"
-    apollo-engine-reporting "^1.4.14"
+    apollo-datasource "^0.7.0"
+    apollo-engine-reporting "^1.5.0"
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
     apollo-server-errors "^2.3.4"
@@ -1983,10 +1983,10 @@ apollo-server-errors@^2.3.4:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.4.tgz#b70ef01322f616cbcd876f3e0168a1a86b82db34"
   integrity sha512-Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA==
 
-apollo-server-express@^2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.16.tgz#4c30b1769426c010b37943c0fb7766e5825973a0"
-  integrity sha512-ZDc7GP+piUm67alJ0DIE9f36tHcCiNm3PHMLIVJlVE/rcGwzRjV5rardRqeslljQiO2J+1IwXKwJ0/kRrZ4JvQ==
+apollo-server-express@^2.10.0, apollo-server-express@^2.9.16:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.10.0.tgz#7d87ff54e378cdcb135eb3d093f20fca7fc0d1bc"
+  integrity sha512-adDQts4QmkX2ENU7JibV1EwRl3ESnpnpImXIMvg8Cm7kX2wSbzwm8LecQNujwWJtkAPTCEAcnPBDyKwWjTQ6/g==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/accepts" "^1.3.5"
@@ -1994,7 +1994,7 @@ apollo-server-express@^2.9.16:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.2"
     accepts "^1.3.5"
-    apollo-server-core "^2.9.16"
+    apollo-server-core "^2.10.0"
     apollo-server-types "^0.2.10"
     body-parser "^1.18.3"
     cors "^2.8.4"
@@ -2028,13 +2028,13 @@ apollo-server-types@^0.2.10:
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
 
-apollo-server@~2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.16.tgz#c0054ed70ecb637cb3f585ff46fb4a060730076f"
-  integrity sha512-dqB1shkjl9ne7DfSHXDH5sT70llr9zswLL+/g/4zt4/H+k+2pkD1BShQkNIK7PBYcVa8KvRAHXiHTXZ36GCspA==
+apollo-server@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.10.0.tgz#93b924b089f7c4070e88aa29a8b9472c1d5d0f82"
+  integrity sha512-ITXkklSgrNfohFh4juvHWrtLz/82iw9CkBUW+G5T8NxHaqxm1Lpus1Ck2VsXmCgNplYi6mODRjUl087qdlU2Rw==
   dependencies:
-    apollo-server-core "^2.9.16"
-    apollo-server-express "^2.9.16"
+    apollo-server-core "^2.10.0"
+    apollo-server-express "^2.10.0"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"

From 7dca739325be8e36040935bae46fab2e5bd207bf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2020 04:17:46 +0000
Subject: [PATCH 109/171] build(deps-dev): bump apollo-server-testing in
 /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 894963e85..2803a6eb9 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -109,7 +109,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
     "@babel/register": "^7.8.3",
-    "apollo-server-testing": "~2.9.16",
+    "apollo-server-testing": "~2.10.0",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.3",
     "babel-jest": "~25.1.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 895eb4594..cc4981837 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1845,10 +1845,10 @@ apollo-client@~2.6.8:
     tslib "^1.10.0"
     zen-observable "^0.8.0"
 
-apollo-datasource@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.6.4.tgz#c0d1604b1a97e004844d4b61bd819a9a6b0a409f"
-  integrity sha512-u4eu6Q94q6KuZacZfdo4vCevA81F4QWeTYEXUvoksQMJpiacPHHe0DJrofKVKvxngUp5kCi1RnPXSc6kBY+/oA==
+apollo-datasource@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.0.tgz#2a6d82edb2eba21b4ddf21877009ba39ff821945"
+  integrity sha512-Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==
   dependencies:
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
@@ -1860,13 +1860,13 @@ apollo-engine-reporting-protobuf@^0.4.4:
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
-apollo-engine-reporting@^1.4.14:
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.14.tgz#71a6509ebe86385da43df500cd0940525a3e8674"
-  integrity sha512-cCG9qDOPwbh87ZjQGHgmnP3oPqhqjIZcNmm/lNtWkWXGTlxV/jmUEqpVi+wsDbE5gR7d1OFk6GqSy2ZQh+S+Bw==
+apollo-engine-reporting@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.5.0.tgz#6e3746de14fc87e14c289c0776a2d350e6f50918"
+  integrity sha512-Pe2DelijZ2QHqkqv8E97iOb32l+FIMT2nxpQsuH+nWi+96cCFJJJHjm3RLAPEUuvGOgW9dFYQP3J91EyC5O0tQ==
   dependencies:
     apollo-engine-reporting-protobuf "^0.4.4"
-    apollo-graphql "^0.3.7"
+    apollo-graphql "^0.4.0"
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
     apollo-server-errors "^2.3.4"
@@ -1892,10 +1892,10 @@ apollo-errors@^1.9.0:
     assert "^1.4.1"
     extendable-error "^0.1.5"
 
-apollo-graphql@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.7.tgz#533232ed48b0b6dbcf5635f65e66cf8677a5b768"
-  integrity sha512-ghW16xx9tRcyL38Pw6G5OidMnYn+CNUGZWmvqQgEO2nRy4T0ONPZZBOvGrIMtJQ70oEykNMKGm0zm6PdHdxd8Q==
+apollo-graphql@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.0.tgz#dd0afe31a6241b8e2ded20b906c9ee8dfbe03497"
+  integrity sha512-abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg==
   dependencies:
     apollo-env "^0.6.1"
     lodash.sortby "^4.7.0"
@@ -1943,18 +1943,18 @@ apollo-server-caching@^0.5.1:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.16.tgz#b4c869a6babfa6906fbbf1e6facf3b7231dbf777"
-  integrity sha512-4ftdjSfs/3aEare9QNTVSF0yUvXETxiohuDLZ7gmMIQxNnZhUjVXiZL1rYKuIZ12uH7xLvh/DwkXRt6nLG/lZA==
+apollo-server-core@^2.10.0, apollo-server-core@^2.9.16:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.10.0.tgz#b8d51bdffe6529f0e3ca670ee8f1238765cfade4"
+  integrity sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/graphql-upload" "^8.0.0"
     "@types/ws" "^6.0.0"
     apollo-cache-control "^0.8.11"
-    apollo-datasource "^0.6.4"
-    apollo-engine-reporting "^1.4.14"
+    apollo-datasource "^0.7.0"
+    apollo-engine-reporting "^1.5.0"
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
     apollo-server-errors "^2.3.4"
@@ -2012,12 +2012,12 @@ apollo-server-plugin-base@^0.6.10:
   dependencies:
     apollo-server-types "^0.2.10"
 
-apollo-server-testing@~2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.16.tgz#35e9b0b102a11bac8db2fce04281cb43e7993d45"
-  integrity sha512-CLfYZY2Htwzw6iPlFO32/SNXNstWQsvGd5/FQ8KEwRpNfYM4g0rAE98y/THEQTvTh0xPH+qWxA7CVQcc7/FMbQ==
+apollo-server-testing@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.10.0.tgz#c8d7fc2d4e6eaf84232aaa7c125d9fae691fbcf4"
+  integrity sha512-wBJ/CT3ZN5nmSySMqgpAFwX/I3yzsQhRGR8MCK/16MjhEZH6svNaJWzoif6gaocj0NyVBJvOIijuMTecG9+6vg==
   dependencies:
-    apollo-server-core "^2.9.16"
+    apollo-server-core "^2.10.0"
 
 apollo-server-types@^0.2.10:
   version "0.2.10"

From 46edc3fdd5b83c2f00506f595b1254d7597767e0 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 7 Feb 2020 14:24:54 +0100
Subject: [PATCH 110/171] Replace buildList with array of Promises

reason: Rosie.js does not support promises. So for the time being, we
shall not use more than one `after` callback and we shall not use
buildList as it does not return a `Promise.all([])`. We have to ask the
maintainers of Rosie.js if they accept the breaking change of returning
a Promise always.
---
 backend/src/db/seed.js | 473 ++++++++++++++++++++++++-----------------
 1 file changed, 273 insertions(+), 200 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index 04f7f7bdb..32a20145b 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -933,253 +933,326 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       trollingComment.update({ disabled: true, updatedAt: new Date().toISOString(), closed: true }),
     ])
 
-    await Factory.buildList('user', 30)
+    await Promise.all([...Array(30).keys()].map(() => Factory.build('user')))
 
-    await Factory.buildList(
-      'post',
-      30,
-      {
-        image: faker.image.unsplash.objects(),
-      },
-      {
-        categoryIds: ['cat1'],
-        author: jennyRostock,
-      },
+    await Promise.all(
+      [...Array(30).keys()].map(() =>
+        Factory.build(
+          'post',
+          {
+            image: faker.image.unsplash.objects(),
+          },
+          {
+            categoryIds: ['cat1'],
+            author: jennyRostock,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      6,
-      {},
-      {
-        author: jennyRostock,
-        postId: 'p2',
-      },
+    await Promise.all(
+      [...Array(6).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: jennyRostock,
+            postId: 'p2',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      4,
-      {},
-      {
-        author: jennyRostock,
-        postId: 'p15',
-      },
+    await Promise.all(
+      [...Array(4).keys()].map(() =>
+        Factory.build(
+          'comment',
+          4,
+          {},
+          {
+            author: jennyRostock,
+            postId: 'p15',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      2,
-      {},
-      {
-        author: jennyRostock,
-        postId: 'p4',
-      },
+    await Promise.all(
+      [...Array(2).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: jennyRostock,
+            postId: 'p4',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'post',
-      21,
-      {
-        image: faker.image.unsplash.buildings(),
-      },
-      {
-        author: peterLustig,
-      },
+    await Promise.all(
+      [...Array(21).keys()].map(() =>
+        Factory.build(
+          'post',
+          {
+            image: faker.image.unsplash.buildings(),
+          },
+          {
+            author: peterLustig,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      3,
-      {},
-      {
-        author: peterLustig,
-        postId: 'p4',
-      },
+    await Promise.all(
+      [...Array(3).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: peterLustig,
+            postId: 'p4',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      5,
-      {},
-      {
-        author: peterLustig,
-        postId: 'p14',
-      },
+    await Promise.all(
+      [...Array(3).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: peterLustig,
+            postId: 'p14',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      6,
-      {},
-      {
-        author: peterLustig,
-        postId: 'p0',
-      },
+    await Promise.all(
+      [...Array(6).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: peterLustig,
+            postId: 'p0',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'post',
-      11,
-      {
-        image: faker.image.unsplash.food(),
-      },
-      {
-        author: dewey,
-      },
+    await Promise.all(
+      [...Array(11).keys()].map(() =>
+        Factory.build(
+          'post',
+          {
+            image: faker.image.unsplash.food(),
+          },
+          {
+            author: dewey,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      7,
-      {},
-      {
-        author: dewey,
-        postId: 'p2',
-      },
+    await Promise.all(
+      [...Array(7).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: dewey,
+            postId: 'p2',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      5,
-      {},
-      {
-        author: dewey,
-        postId: 'p6',
-      },
+    await Promise.all(
+      [...Array(5).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: dewey,
+            postId: 'p6',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      2,
-      {},
-      {
-        author: dewey,
-        postId: 'p9',
-      },
+    await Promise.all(
+      [...Array(2).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: dewey,
+            postId: 'p9',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'post',
-      16,
-      {
-        image: faker.image.unsplash.technology(),
-      },
-      {
-        author: louie,
-      },
+    await Promise.all(
+      [...Array(16).keys()].map(() =>
+        Factory.build(
+          'post',
+          {
+            image: faker.image.unsplash.technology(),
+          },
+          {
+            author: louie,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      4,
-      {},
-      {
-        postId: 'p1',
-        author: louie,
-      },
+    await Promise.all(
+      [...Array(4).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            postId: 'p1',
+            author: louie,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      8,
-      {},
-      {
-        author: louie,
-        postId: 'p10',
-      },
+    await Promise.all(
+      [...Array(8).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: louie,
+            postId: 'p10',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      5,
-      {},
-      {
-        author: louie,
-        postId: 'p13',
-      },
+    await Promise.all(
+      [...Array(5).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: louie,
+            postId: 'p13',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'post',
-      45,
-      {
-        image: faker.image.unsplash.people(),
-      },
-      {
-        author: bobDerBaumeister,
-      },
+    await Promise.all(
+      [...Array(45).keys()].map(() =>
+        Factory.build(
+          'post',
+          {
+            image: faker.image.unsplash.people(),
+          },
+          {
+            author: bobDerBaumeister,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      2,
-      {},
-      {
-        author: bobDerBaumeister,
-        postId: 'p2',
-      },
+    await Promise.all(
+      [...Array(2).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: bobDerBaumeister,
+            postId: 'p2',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      3,
-      {},
-      {
-        author: bobDerBaumeister,
-        postId: 'p12',
-      },
+    await Promise.all(
+      [...Array(3).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: bobDerBaumeister,
+            postId: 'p12',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      7,
-      {},
-      {
-        author: bobDerBaumeister,
-        postId: 'p13',
-      },
+    await Promise.all(
+      [...Array(7).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: bobDerBaumeister,
+            postId: 'p13',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'post',
-      8,
-      {
-        image: faker.image.unsplash.nature(),
-      },
-      {
-        author: huey,
-      },
+    await Promise.all(
+      [...Array(8).keys()].map(() =>
+        Factory.build(
+          'post',
+          {
+            image: faker.image.unsplash.nature(),
+          },
+          {
+            author: huey,
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      6,
-      {},
-      {
-        author: huey,
-        postId: 'p0',
-      },
+    await Promise.all(
+      [...Array(6).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: huey,
+            postId: 'p0',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      8,
-      {},
-      {
-        author: huey,
-        postId: 'p13',
-      },
+    await Promise.all(
+      [...Array(8).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: huey,
+            postId: 'p13',
+          },
+        ),
+      ),
     )
 
-    await Factory.buildList(
-      'comment',
-      9,
-      {},
-      {
-        author: huey,
-        postId: 'p15',
-      },
+    await Promise.all(
+      [...Array(8).keys()].map(() =>
+        Factory.build(
+          'comment',
+          {},
+          {
+            author: huey,
+            postId: 'p15',
+          },
+        ),
+      ),
     )
 
     await Factory.build('donations')

From 6271b53b30153f01a5c86931d7bc28fecaa761db Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 7 Feb 2020 14:48:55 +0100
Subject: [PATCH 111/171] Set up Subscriptions with RedisPubSub

---
 backend/package.json                          |  2 +
 backend/src/config/index.js                   |  6 +-
 .../notifications/notificationsMiddleware.js  |  2 +-
 backend/src/schema/resolvers/notifications.js |  5 +-
 backend/src/server.js                         | 23 +++++++
 backend/yarn.lock                             | 66 +++++++++++++++++++
 6 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index b7d74c102..a4b8eb032 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -60,9 +60,11 @@
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
+    "graphql-redis-subscriptions": "^2.1.2",
     "graphql-shield": "~7.0.9",
     "graphql-tag": "~2.10.2",
     "helmet": "~3.21.2",
+    "ioredis": "^4.14.1",
     "jsonwebtoken": "~8.5.1",
     "linkifyjs": "~2.1.8",
     "lodash": "~4.17.14",
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 2f8d0ed22..8bbff8817 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -20,6 +20,9 @@ const {
   NEO4J_PASSWORD = 'neo4j',
   CLIENT_URI = 'http://localhost:3000',
   GRAPHQL_URI = 'http://localhost:4000',
+  REDIS_DOMAIN,
+  REDIS_PORT,
+  REDIS_PASSWORD,
 } = process.env
 
 export const requiredConfigs = {
@@ -58,7 +61,7 @@ export const developmentConfigs = {
 }
 
 export const sentryConfigs = { SENTRY_DSN_BACKEND, COMMIT }
-
+export const redisConfiig = { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD }
 export default {
   ...requiredConfigs,
   ...smtpConfigs,
@@ -66,4 +69,5 @@ export default {
   ...serverConfigs,
   ...developmentConfigs,
   ...sentryConfigs,
+  ...redisConfiig,
 }
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 11337468c..4636b8e9f 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -1,6 +1,6 @@
 import extractMentionedUsers from './mentions/extractMentionedUsers'
 import { validateNotifyUsers } from '../validation/validationMiddleware'
-import { pubsub, NOTIFICATION_ADDED } from '../../schema/resolvers/notifications'
+import { pubsub, NOTIFICATION_ADDED } from '../../server'
 
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 116ac3e0e..cf35fa8a1 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -1,9 +1,6 @@
 import log from './helpers/databaseLogger'
-import { PubSub } from 'apollo-server'
 import { withFilter } from 'graphql-subscriptions'
-
-export const pubsub = new PubSub()
-export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
+import { pubsub, NOTIFICATION_ADDED } from '../../server'
 
 export default {
   Subscription: {
diff --git a/backend/src/server.js b/backend/src/server.js
index b7e751bae..4c02b8ddb 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -9,7 +9,30 @@ import { getNeode, getDriver } from './db/neo4j'
 import decode from './jwt/decode'
 import schema from './schema'
 import webfinger from './activitypub/routes/webfinger'
+import { RedisPubSub } from 'graphql-redis-subscriptions'
+import Redis from 'ioredis'
 
+export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
+const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG
+let prodPubsub, devPubsub
+const options = {
+  host: REDIS_DOMAIN,
+  port: REDIS_PORT,
+  password: REDIS_PASSWORD,
+  retryStrategy: times => {
+    return Math.min(times * 50, 2000)
+  },
+}
+
+if (options.host && options.port && options.password) {
+  prodPubsub = new RedisPubSub({
+    publisher: new Redis(options),
+    subscriber: new Redis(options),
+  })
+} else {
+  devPubsub = new RedisPubSub()
+}
+export const pubsub = prodPubsub || devPubsub
 const driver = getDriver()
 const neode = getNeode()
 
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 68e70fea6..eebe5c73b 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2774,6 +2774,11 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
+cluster-key-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+  integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3254,6 +3259,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+denque@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
+  integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
+
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -4476,6 +4486,15 @@ graphql-middleware@~4.0.2:
   dependencies:
     graphql-tools "^4.0.5"
 
+graphql-redis-subscriptions@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/graphql-redis-subscriptions/-/graphql-redis-subscriptions-2.1.2.tgz#9c1b744bace0c6ba99dd0ebafe0148cad1df3301"
+  integrity sha512-l69KbGxyYfVHxvE+Dzv9/hXg/q+Xnjfx1JsrJD6ikePuSsNaCSNxr+MubSTNF3Gt3C/+JZs4FaWImFeK/+X2og==
+  dependencies:
+    iterall "^1.2.2"
+  optionalDependencies:
+    ioredis "^4.6.3"
+
 graphql-shield@~7.0.9:
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.9.tgz#8248916e9636a7e3c05719a52fd13f2d37ccaeb2"
@@ -4920,6 +4939,21 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+ioredis@^4.14.1, ioredis@^4.6.3:
+  version "4.14.1"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.14.1.tgz#b73ded95fcf220f106d33125a92ef6213aa31318"
+  integrity sha512-94W+X//GHM+1GJvDk6JPc+8qlM7Dul+9K+lg3/aHixPN7ZGkW6qlvX0DG6At9hWtH2v3B32myfZqWoANUJYGJA==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.1.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    redis-commands "1.5.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.0.1"
+
 ip-regex@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
@@ -5960,11 +5994,21 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -7506,6 +7550,23 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
+redis-commands@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
+  integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
+
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
+  dependencies:
+    redis-errors "^1.0.0"
+
 referrer-policy@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e"
@@ -8203,6 +8264,11 @@ stacktrace-js@^2.0.0:
     stack-generator "^2.0.1"
     stacktrace-gps "^3.0.1"
 
+standard-as-callback@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126"
+  integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"

From 069c637c844f23383997ae7e686aa3a54dd16980 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 7 Feb 2020 15:10:45 +0100
Subject: [PATCH 112/171] Run yarn install to update yarn.lock

---
 backend/yarn.lock | 68 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/backend/yarn.lock b/backend/yarn.lock
index 819b215c5..a3011433e 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1943,7 +1943,7 @@ apollo-server-caching@^0.5.1:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.10.0, apollo-server-core@^2.9.16:
+apollo-server-core@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.10.0.tgz#b8d51bdffe6529f0e3ca670ee8f1238765cfade4"
   integrity sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==
@@ -2774,6 +2774,11 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
+cluster-key-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+  integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3254,6 +3259,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+denque@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
+  integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
+
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -4476,6 +4486,15 @@ graphql-middleware@~4.0.2:
   dependencies:
     graphql-tools "^4.0.5"
 
+graphql-redis-subscriptions@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/graphql-redis-subscriptions/-/graphql-redis-subscriptions-2.1.2.tgz#9c1b744bace0c6ba99dd0ebafe0148cad1df3301"
+  integrity sha512-l69KbGxyYfVHxvE+Dzv9/hXg/q+Xnjfx1JsrJD6ikePuSsNaCSNxr+MubSTNF3Gt3C/+JZs4FaWImFeK/+X2og==
+  dependencies:
+    iterall "^1.2.2"
+  optionalDependencies:
+    ioredis "^4.6.3"
+
 graphql-shield@~7.0.10:
   version "7.0.10"
   resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.10.tgz#c25517a07e97bfd74089fde66ea2d2044addf743"
@@ -4920,6 +4939,21 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+ioredis@^4.14.1, ioredis@^4.6.3:
+  version "4.14.1"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.14.1.tgz#b73ded95fcf220f106d33125a92ef6213aa31318"
+  integrity sha512-94W+X//GHM+1GJvDk6JPc+8qlM7Dul+9K+lg3/aHixPN7ZGkW6qlvX0DG6At9hWtH2v3B32myfZqWoANUJYGJA==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.1.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    redis-commands "1.5.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.0.1"
+
 ip-regex@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
@@ -5960,11 +5994,21 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -7506,6 +7550,23 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
+redis-commands@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
+  integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
+
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
+  dependencies:
+    redis-errors "^1.0.0"
+
 referrer-policy@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e"
@@ -8203,6 +8264,11 @@ stacktrace-js@^2.0.0:
     stack-generator "^2.0.1"
     stacktrace-gps "^3.0.1"
 
+standard-as-callback@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126"
+  integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"

From a77f8d92bc6b590beb77fe081fbe69c9b75a90a6 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Sat, 8 Feb 2020 17:55:07 +0100
Subject: [PATCH 113/171] Speed up factories a little

---
 backend/src/db/seed.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index 32a20145b..f966f8b07 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -475,8 +475,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           imageBlurred: true,
         },
         {
-          author: dewey,
           categoryIds: ['cat10'],
+          author: dewey,
         },
       ),
       Factory.build(
@@ -499,8 +499,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           language: sample(languages),
         },
         {
-          author: bobDerBaumeister,
           categoryIds: ['cat13'],
+          author: bobDerBaumeister,
         },
       ),
       Factory.build(
@@ -512,8 +512,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           imageAspectRatio: 300 / 450,
         },
         {
-          author: jennyRostock,
           categoryIds: ['cat14'],
+          author: jennyRostock,
         },
       ),
       Factory.build(
@@ -523,8 +523,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           language: sample(languages),
         },
         {
-          author: huey,
           categoryIds: ['cat15'],
+          author: huey,
         },
       ),
     ])
@@ -998,6 +998,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
             image: faker.image.unsplash.buildings(),
           },
           {
+            categoryIds: ['cat1'],
             author: peterLustig,
           },
         ),
@@ -1051,6 +1052,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
             image: faker.image.unsplash.food(),
           },
           {
+            categoryIds: ['cat1'],
             author: dewey,
           },
         ),
@@ -1104,6 +1106,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
             image: faker.image.unsplash.technology(),
           },
           {
+            categoryIds: ['cat1'],
             author: louie,
           },
         ),
@@ -1157,6 +1160,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
             image: faker.image.unsplash.people(),
           },
           {
+            categoryIds: ['cat1'],
             author: bobDerBaumeister,
           },
         ),
@@ -1210,6 +1214,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
             image: faker.image.unsplash.nature(),
           },
           {
+            categoryIds: ['cat1'],
             author: huey,
           },
         ),

From 38088235789b6aa4caed80d8268895958fae5d07 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2020 04:16:48 +0000
Subject: [PATCH 114/171] build(deps-dev): bump codecov from 3.6.4 to 3.6.5

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.6.4 to 3.6.5.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/commits)

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

diff --git a/package.json b/package.json
index caed8a5b2..1234d09be 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "@babel/register": "^7.8.3",
     "auto-changelog": "^1.16.2",
     "bcryptjs": "^2.4.3",
-    "codecov": "^3.6.4",
+    "codecov": "^3.6.5",
     "cross-env": "^6.0.3",
     "cucumber": "^6.0.5",
     "cypress": "^3.8.3",
diff --git a/yarn.lock b/yarn.lock
index f6fae5cc5..cf51f0b46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2020,17 +2020,16 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codecov@^3.6.4:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.6.4.tgz#c993a58704ad5f15dcdd6aa3c3af22070c69eb18"
-  integrity sha512-R9zEcTR5/IDLepdGUHAkRMZOIKhBE1NRGS1N2H96zhBOskhdW9Q22GtYYyecbZL1aheU00D2F21nNBGRISui0A==
+codecov@^3.6.5:
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.6.5.tgz#d73ce62e8a021f5249f54b073e6f2d6a513f172a"
+  integrity sha512-v48WuDMUug6JXwmmfsMzhCHRnhUf8O3duqXvltaYJKrO1OekZWpB/eH6iIoaxMl8Qli0+u3OxptdsBOYiD7VAQ==
   dependencies:
     argv "0.0.2"
     ignore-walk "3.0.3"
     js-yaml "3.13.1"
     teeny-request "6.0.1"
     urlgrey "0.4.4"
-    validator "12.2.0"
 
 coffeeify@3.0.1:
   version "3.0.1"
@@ -6868,11 +6867,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
-  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
-
 verror@1.10.0, verror@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"

From 64d90e5311139e8fdcb1d954b35004073ba8dc0b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2020 04:17:22 +0000
Subject: [PATCH 115/171] build(deps): bump graphql-shield from 7.0.10 to
 7.0.11 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.10 to 7.0.11.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.10...v7.0.11)

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

diff --git a/backend/package.json b/backend/package.json
index ae4ae0804..50c5e1011 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -60,7 +60,7 @@
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
-    "graphql-shield": "~7.0.10",
+    "graphql-shield": "~7.0.11",
     "graphql-tag": "~2.10.3",
     "helmet": "~3.21.2",
     "jsonwebtoken": "~8.5.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 819b215c5..4df5537a1 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1943,7 +1943,7 @@ apollo-server-caching@^0.5.1:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.10.0, apollo-server-core@^2.9.16:
+apollo-server-core@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.10.0.tgz#b8d51bdffe6529f0e3ca670ee8f1238765cfade4"
   integrity sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==
@@ -4476,10 +4476,10 @@ graphql-middleware@~4.0.2:
   dependencies:
     graphql-tools "^4.0.5"
 
-graphql-shield@~7.0.10:
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.10.tgz#c25517a07e97bfd74089fde66ea2d2044addf743"
-  integrity sha512-m1HPQ3DpzuW8b7derWcsjjYtiBk+Hjgb1eL/0YK/Y2A0EV7vDQzJwRzlIwn9My7Xv+F4DJwm25yydnnUNpZt8g==
+graphql-shield@~7.0.11:
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.11.tgz#78d49f346326be71090d35d8f5843da9ee8136e2"
+  integrity sha512-iWn/aiom2c8NuOj60euWTmsKKUjX1DB4ynBcDitQOLXG3WrWgss2Iolzr553qooJvkR5czeAFgPlZgI+nUgwsQ==
   dependencies:
     "@types/yup" "0.26.30"
     object-hash "^2.0.0"

From 7a3cd7546918750783799a7852c413aa00bd20e3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2020 04:18:27 +0000
Subject: [PATCH 116/171] build(deps-dev): bump eslint-plugin-jest in /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.6.0 to 23.7.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.6.0...v23.7.0)

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

diff --git a/backend/package.json b/backend/package.json
index ae4ae0804..a4452ca12 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -119,7 +119,7 @@
     "eslint-config-prettier": "~6.10.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.20.1",
-    "eslint-plugin-jest": "~23.6.0",
+    "eslint-plugin-jest": "~23.7.0",
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-prettier": "~3.1.2",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 819b215c5..ef6ca77e4 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1943,7 +1943,7 @@ apollo-server-caching@^0.5.1:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.10.0, apollo-server-core@^2.9.16:
+apollo-server-core@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.10.0.tgz#b8d51bdffe6529f0e3ca670ee8f1238765cfade4"
   integrity sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==
@@ -3643,13 +3643,12 @@ eslint-plugin-import@~2.20.1:
     read-pkg-up "^2.0.0"
     resolve "^1.12.0"
 
-eslint-plugin-jest@~23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.6.0.tgz#508b32f80d44058c8c01257c0ee718cfbd521e9d"
-  integrity sha512-GH8AhcFXspOLqak7fqnddLXEJsrFyvgO8Bm60SexvKSn1+3rWYESnCiWUOCUcBTprNSDSE4CtAZdM4EyV6gPPw==
+eslint-plugin-jest@~23.7.0:
+  version "23.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.7.0.tgz#84d5603b6e745b59898cb6750df6a44782a39b04"
+  integrity sha512-zkiyGlvJeHNjAEz8FaIxTXNblJJ/zj3waNbYbgflK7K6uy0cpE5zJBt/JpJtOBGM/UGkC6BqsQ4n0y7kQ2HA8w==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
-    micromatch "^4.0.2"
 
 eslint-plugin-node@~11.0.0:
   version "11.0.0"

From e8410a62dce3457584e163cddca9f009309a7aae Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2020 04:31:28 +0000
Subject: [PATCH 117/171] build(deps-dev): bump @vue/cli-shared-utils in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 620a53165..0d36bef1d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -103,7 +103,7 @@
     "@storybook/addon-actions": "^5.3.12",
     "@storybook/addon-notes": "^5.3.12",
     "@storybook/vue": "~5.3.12",
-    "@vue/cli-shared-utils": "~4.1.2",
+    "@vue/cli-shared-utils": "~4.2.2",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
     "@vue/test-utils": "~1.0.0-beta.31",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 63f1b4bd8..d5d6cf14b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2821,6 +2821,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.6.tgz#9cbfcb62c50947217f4d88d4d274cc40c22625a9"
   integrity sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/npmlog@^4.1.2":
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4"
@@ -3025,10 +3030,10 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
     camelcase "^5.0.0"
 
-"@vue/cli-shared-utils@~4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.1.2.tgz#d33984c8790ad869ef77f5229abd3e8e584fe58b"
-  integrity sha512-uQAVqxCWdL5ipZ0TPu6SVsdokQp4yHt8SzzpUGhq8TkW4vwalGddJAAJrqZHMl91ZTIJ4p4ixofmCaaJo5rSRA==
+"@vue/cli-shared-utils@~4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.2.2.tgz#953fec34115cb12d0820012a9d7400f8c27d6660"
+  integrity sha512-EK5wcxgjadqUpSzfh6Bnxd46Zx+SAaHusygqV11UZKHr4EObc/SjCpq7c7drmFkBjRqmVvrHs4jRnJJo5VgCgQ==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.2"
@@ -3038,6 +3043,7 @@
     node-ipc "^9.1.1"
     open "^6.3.0"
     ora "^3.4.0"
+    read-pkg "^5.1.1"
     request "^2.87.0"
     request-promise-native "^1.0.8"
     semver "^6.1.0"
@@ -11582,7 +11588,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -13811,6 +13817,16 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -15952,6 +15968,11 @@ type-fest@^0.5.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2"
   integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==
 
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
 type-fest@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.0.tgz#ee92ee2ec95479869dec66d17d9698666b90f29d"

From 8f6d71e4bead5172cc765dce46425c9bafcc14ed Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 10:46:55 +0100
Subject: [PATCH 118/171] Update helm charts

---
 deployment/.gitignore                                       | 2 ++
 deployment/helm/human-connection/README.md                  | 2 +-
 .../human-connection/templates/volumes/pvc-neo4j-data.yaml  | 2 +-
 .../human-connection/templates/volumes/pvc-uploads.yaml     | 6 +++++-
 deployment/volumes/neo4j-data.yaml                          | 2 +-
 deployment/volumes/uploads.yaml                             | 2 +-
 deployment/volumes/volume-snapshots/snapshot.yaml           | 4 ++--
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/deployment/.gitignore b/deployment/.gitignore
index 14cfa18ed..61e591624 100644
--- a/deployment/.gitignore
+++ b/deployment/.gitignore
@@ -2,3 +2,5 @@ secrets.yaml
 configmap.yaml
 **/secrets.yaml
 **/configmap.yaml
+**/staging-values.yaml
+**/production-values.yaml
\ No newline at end of file
diff --git a/deployment/helm/human-connection/README.md b/deployment/helm/human-connection/README.md
index 55859a77c..444f9da15 100644
--- a/deployment/helm/human-connection/README.md
+++ b/deployment/helm/human-connection/README.md
@@ -64,7 +64,7 @@ $ helm install cert-manager --namespace cert-manager --version v0.13.0 jetstack/
 Once you are satisfied with the configuration, you can install the app.
 
 ```bash
-# in folder /deployment/helm
+# in folder /deployment/helm/human-connection
 $ helm install develop ./ --namespace human-connection
 ```
 Where `develop` is the release name, in this case develop for our develop server and `human-connection` is the namespace, again customize for your needs. The release name can be anything you want. Just keep in mind that it is used in the templates to prepend the `CLIENT_URI` and other places.
diff --git a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml b/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
index e89844181..3f85d3ae8 100644
--- a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
+++ b/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
@@ -7,4 +7,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 5Gi
+      storage: {{ .Values.neo4jStorage }}
diff --git a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml b/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml
index 4d2ae7627..7eb81135b 100644
--- a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml
+++ b/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml
@@ -4,9 +4,13 @@ apiVersion: v1
 metadata:
   name: uploads-claim
 spec:
+  dataSource:
+    name: uploads-snapshot
+    kind: VolumeSnapshot
+    apiGroup: snapshot.storage.k8s.io
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 8Gi
+      storage:  {{ .Values.uploadsStorage }}
 
diff --git a/deployment/volumes/neo4j-data.yaml b/deployment/volumes/neo4j-data.yaml
index 1f453a684..c060750ec 100644
--- a/deployment/volumes/neo4j-data.yaml
+++ b/deployment/volumes/neo4j-data.yaml
@@ -9,4 +9,4 @@
       - ReadWriteOnce
     resources:
       requests:
-        storage: 5Gi
+        storage: {{ .Values.neo4jStorage }}
diff --git a/deployment/volumes/uploads.yaml b/deployment/volumes/uploads.yaml
index ce87b2184..c174bf2cb 100644
--- a/deployment/volumes/uploads.yaml
+++ b/deployment/volumes/uploads.yaml
@@ -9,4 +9,4 @@
       - ReadWriteOnce
     resources:
       requests:
-        storage: 8Gi
+        storage: {{ .Values.uploadsStorage }}
diff --git a/deployment/volumes/volume-snapshots/snapshot.yaml b/deployment/volumes/volume-snapshots/snapshot.yaml
index 3c3487e14..10a22daf5 100644
--- a/deployment/volumes/volume-snapshots/snapshot.yaml
+++ b/deployment/volumes/volume-snapshots/snapshot.yaml
@@ -2,9 +2,9 @@
   apiVersion: snapshot.storage.k8s.io/v1alpha1
   kind: VolumeSnapshot
   metadata:
-    name: neo4j-data-snapshot
+    name: uploads-snapshot
     namespace: human-connection
   spec:
     source:
-      name: neo4j-data-claim
+      name: uploads-claim
       kind: PersistentVolumeClaim

From 3b29d480e3915ad9ff30945ff8598d74588ed20c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 12:34:40 +0100
Subject: [PATCH 119/171] Display unblock feature only for blocking user

- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
---
 backend/src/schema/types/type/User.gql        |  7 ++++-
 cypress/integration/common/steps.js           | 30 +++++++++++++++++++
 .../user_profile/BlockUser.feature            | 11 +++++++
 webapp/components/ContentMenu/ContentMenu.vue |  2 +-
 webapp/pages/profile/_id/_slug.vue            |  4 +--
 5 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 71cc1edb0..ec9bfeba7 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -68,7 +68,12 @@ type User {
   RETURN COUNT(u) >= 1
   """
   )
-  
+  hasBlocked: Boolean! @cypher(
+  statement: """
+  MATCH (this)<-[:BLOCKED]-(user:User {id: $cypherParams.currentUserId})
+  RETURN COUNT(user) >= 1
+  """
+  )
   blocked: Boolean! @cypher(
   statement: """
   MATCH (this)-[:BLOCKED]-(user:User {id: $cypherParams.currentUserId})
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 36dbb50d4..753160b84 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -558,6 +558,20 @@ When("I block the user {string}", name => {
     });
 });
 
+When("a user has blocked me", () => {
+  cy.neode()
+    .first("User", {
+      name: narratorParams.name
+    })
+    .then(blockedUser => {
+      cy.neode()
+        .first("User", {
+          name: 'Harassing User'
+        })
+        .relateTo(blockedUser, "blocked");
+    });
+});
+
 When("I log in with:", table => {
   const [firstRow] = table.hashes();
   const {
@@ -583,4 +597,20 @@ Then("they should not see the comment from", () => {
 
 Then("they should see a text explaining commenting is not possible", () => {
   cy.get('.ds-placeholder').should('contain', "Commenting is not possible at this time on this post.")
+})
+
+Then("I should see no users in my blocked users list", () => {
+  cy.get('.ds-placeholder')
+    .should('contain', "So far, you have not blocked anybody.")
+})
+
+Then("I should not see {string} from the content menu in the user info box", link => {
+  cy.get(".user-content-menu .base-button").click()
+  cy.get(".popover .ds-menu-item-link")
+    .should('not.contain', link)
+})
+
+Then('I should not see {string} button', button => {
+  cy.get('.ds-card-content')
+    .should('not.contain', '.action-buttons')
 })
\ No newline at end of file
diff --git a/cypress/integration/user_profile/BlockUser.feature b/cypress/integration/user_profile/BlockUser.feature
index 43efe7807..50b90ee62 100644
--- a/cypress/integration/user_profile/BlockUser.feature
+++ b/cypress/integration/user_profile/BlockUser.feature
@@ -44,3 +44,14 @@ Feature: Block a User
     Then I should see the following posts in the select dropdown:
       | title                   |
       | previously created post |
+
+  Scenario: Blocked users cannot see they are blocked in their list
+    Given a user has blocked me 
+    And I navigate to my "Blocked users" settings page
+    Then I should see no users in my blocked users list
+
+  Scenario: Blocked users should not see link or button to unblock, only blocking users
+    Given a user has blocked me
+    When I visit the profile page of the annoying user
+    And I should not see "Unblock user" from the content menu in the user info box
+    And I should not see "Unblock user" button
\ No newline at end of file
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index ee2bd4a62..2be51c6ac 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -172,7 +172,7 @@ export default {
               icon: 'microphone-slash',
             })
           }
-          if (this.resource.blocked) {
+          if (this.resource.hasBlocked) {
             routes.push({
               label: this.$t(`settings.blocked-users.unblock`),
               callback: () => {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 80471fff4..4d9653dcb 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -67,14 +67,14 @@
             </ds-flex-item>
           </ds-flex>
           <div v-if="!myProfile" class="action-buttons">
-            <base-button v-if="user.blocked" @click="unblockUser(user)">
+            <base-button v-if="user.hasBlocked" @click="unblockUser(user)">
               {{ $t('settings.blocked-users.unblock') }}
             </base-button>
             <base-button v-if="user.isMuted" @click="unmuteUser(user)">
               {{ $t('settings.muted-users.unmute') }}
             </base-button>
             <hc-follow-button
-              v-if="!(user.blocked || user.isMuted)"
+              v-if="!(user.hasBlocked || user.isMuted)"
               :follow-id="user.id"
               :is-followed="user.followedByCurrentUser"
               @optimistic="optimisticFollow"

From 70bb034343f556a44fd4b96e1abdc9a020617cb3 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 13:13:51 +0100
Subject: [PATCH 120/171] Remove unused email property from user factory

---
 backend/src/db/factories.js | 1 -
 backend/yarn.lock           | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js
index aa6fcec22..7a8979b3c 100644
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@@ -44,7 +44,6 @@ Factory.define('userWithoutEmailAddress')
   .attrs({
     id: uuid,
     name: faker.name.findName,
-    email: faker.internet.email,
     password: '1234',
     role: 'user',
     avatar: faker.internet.avatar,
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 7811c2b81..b092c3864 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1943,7 +1943,7 @@ apollo-server-caching@^0.5.1:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.10.0, apollo-server-core@^2.9.16:
+apollo-server-core@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.10.0.tgz#b8d51bdffe6529f0e3ca670ee8f1238765cfade4"
   integrity sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==
@@ -7923,11 +7923,6 @@ serve-static@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"

From bcf9680ad993f0566a57d400cd76cda531cceb38 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 14:33:49 +0100
Subject: [PATCH 121/171] Add type resolver for hasBlocked

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

diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index d1d9111b6..55e4165b7 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -252,9 +252,11 @@ export default {
         followedByCurrentUser:
           'MATCH (this)<-[:FOLLOWS]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
         blocked:
-          'MATCH (this)<-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
+          'MATCH (this)-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
         isMuted:
           'MATCH (this)<-[:MUTED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
+        hasBlocked:
+          'MATCH (this)<-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
       },
       count: {
         contributionsCount:

From 5347f734af524c18565f0cf0e8497d074d77c40c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 16:25:00 +0100
Subject: [PATCH 122/171] Fix cypress tests/frontend implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 backend/src/schema/resolvers/users.js              |  2 +-
 backend/src/schema/types/type/User.gql             |  2 +-
 cypress/integration/common/steps.js                | 13 +++++++++----
 cypress/integration/user_profile/BlockUser.feature |  5 ++++-
 webapp/components/ContentMenu/ContentMenu.vue      |  2 +-
 webapp/graphql/User.js                             |  1 +
 webapp/pages/post/_id/_slug/index.vue              |  2 +-
 webapp/pages/profile/_id/_slug.vue                 |  4 ++--
 8 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 55e4165b7..cbdc683e8 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -255,7 +255,7 @@ export default {
           'MATCH (this)-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
         isMuted:
           'MATCH (this)<-[:MUTED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
-        hasBlocked:
+        isBlocked:
           'MATCH (this)<-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
       },
       count: {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index ec9bfeba7..baefc9d29 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -68,7 +68,7 @@ type User {
   RETURN COUNT(u) >= 1
   """
   )
-  hasBlocked: Boolean! @cypher(
+  isBlocked: Boolean! @cypher(
   statement: """
   MATCH (this)<-[:BLOCKED]-(user:User {id: $cypherParams.currentUserId})
   RETURN COUNT(user) >= 1
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 52e8d7bba..c51290537 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -591,13 +591,18 @@ Then("I should see no users in my blocked users list", () => {
     .should('contain', "So far, you have not blocked anybody.")
 })
 
-Then("I should not see {string} from the content menu in the user info box", link => {
+Then("I {string} see {string} from the content menu in the user info box", (condition, link) => {
   cy.get(".user-content-menu .base-button").click()
   cy.get(".popover .ds-menu-item-link")
-    .should('not.contain', link)
+    .should(condition === 'should' ? 'contain' : 'not.contain', link)
 })
 
 Then('I should not see {string} button', button => {
-  cy.get('.ds-card-content')
-    .should('not.contain', '.action-buttons')
+  cy.get('.ds-card-content .action-buttons')
+    .should('have.length', 1)
+})
+
+Then('I should see the {string} button', button => {
+  cy.get('.ds-card-content .action-buttons .base-button')
+    .should('contain', button)
 })
diff --git a/cypress/integration/user_profile/BlockUser.feature b/cypress/integration/user_profile/BlockUser.feature
index bf56e2b02..256d79dfb 100644
--- a/cypress/integration/user_profile/BlockUser.feature
+++ b/cypress/integration/user_profile/BlockUser.feature
@@ -11,6 +11,7 @@ Feature: Block a User
   Scenario: Block a user
     Given I am on the profile page of the annoying user
     When I click on "Block user" from the content menu in the user info box
+    And I "should" see "Unblock user" from the content menu in the user info box
     And I navigate to my "Blocked users" settings page
     Then I can see the following table:
       | Avatar | Name           |
@@ -28,6 +29,7 @@ Feature: Block a User
     When I visit the profile page of the annoying user
     And I click on "Block user" from the content menu in the user info box
     And I get removed from his follower collection
+    And I "should" see "Unblock user" from the content menu in the user info box
 
   Scenario: Posts of blocked users are not filtered from search results
     Given "Harassing User" wrote a post "You can still see my posts"
@@ -53,5 +55,6 @@ Feature: Block a User
   Scenario: Blocked users should not see link or button to unblock, only blocking users
     Given a user has blocked me
     When I visit the profile page of the annoying user
-    And I should not see "Unblock user" from the content menu in the user info box
+    And I "should not" see "Unblock user" from the content menu in the user info box
+    And I should see the "Follow" button
     And I should not see "Unblock user" button
\ No newline at end of file
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 2be51c6ac..cee8a6f5c 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -172,7 +172,7 @@ export default {
               icon: 'microphone-slash',
             })
           }
-          if (this.resource.hasBlocked) {
+          if (this.resource.isBlocked) {
             routes.push({
               label: this.$t(`settings.blocked-users.unblock`),
               callback: () => {
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index a73941794..c36383a95 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -24,6 +24,7 @@ export default i18n => {
         createdAt
         followedByCurrentUser
         isMuted
+        isBlocked
         blocked
         following(first: 7) {
           ...user
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 1d107941a..8115294c5 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -97,7 +97,7 @@
           :post="post"
           @createComment="createComment"
         />
-        <ds-placeholder v-else>
+        <ds-placeholder v-if="post.author.blocked">
           {{ $t('settings.blocked-users.explanation.commenting-disabled') }}
           <br />
           {{ $t('settings.blocked-users.explanation.commenting-explanation') }}
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 4d9653dcb..372b73b40 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -67,14 +67,14 @@
             </ds-flex-item>
           </ds-flex>
           <div v-if="!myProfile" class="action-buttons">
-            <base-button v-if="user.hasBlocked" @click="unblockUser(user)">
+            <base-button v-if="user.isBlocked" @click="unblockUser(user)">
               {{ $t('settings.blocked-users.unblock') }}
             </base-button>
             <base-button v-if="user.isMuted" @click="unmuteUser(user)">
               {{ $t('settings.muted-users.unmute') }}
             </base-button>
             <hc-follow-button
-              v-if="!(user.hasBlocked || user.isMuted)"
+              v-if="!user.isMuted && !user.isBlocked"
               :follow-id="user.id"
               :is-followed="user.followedByCurrentUser"
               @optimistic="optimisticFollow"

From 409150813d7c13a09d5a9a8df4b4d42f2a5b869f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 17:19:19 +0100
Subject: [PATCH 123/171] Update to use PubSub in development

- for some reason RedisPubSub works locally, but with docker it tries to
  connect to Redis and therefore it doesn't pass the build. PubSub is
imported from graphql-subscriptions which is a dependency of
apollo-server-express, and suitable for dev purposes.
---
 backend/src/server.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/server.js b/backend/src/server.js
index 4c02b8ddb..d64ee72f1 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -2,7 +2,6 @@ import express from 'express'
 import http from 'http'
 import helmet from 'helmet'
 import { ApolloServer } from 'apollo-server-express'
-
 import CONFIG from './config'
 import middleware from './middleware'
 import { getNeode, getDriver } from './db/neo4j'
@@ -10,6 +9,7 @@ import decode from './jwt/decode'
 import schema from './schema'
 import webfinger from './activitypub/routes/webfinger'
 import { RedisPubSub } from 'graphql-redis-subscriptions'
+import { PubSub } from 'graphql-subscriptions'
 import Redis from 'ioredis'
 
 export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
@@ -23,14 +23,13 @@ const options = {
     return Math.min(times * 50, 2000)
   },
 }
-
 if (options.host && options.port && options.password) {
   prodPubsub = new RedisPubSub({
     publisher: new Redis(options),
     subscriber: new Redis(options),
   })
 } else {
-  devPubsub = new RedisPubSub()
+  devPubsub = new PubSub()
 }
 export const pubsub = prodPubsub || devPubsub
 const driver = getDriver()

From 13d46ff336d285b935e387f1e7790443d9f37f87 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 17:23:50 +0100
Subject: [PATCH 124/171] v0.3.1

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

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

From 63ef9e339d8fcf0f9be57231cbefaa8190f51eb9 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 17:33:31 +0100
Subject: [PATCH 125/171] chore: Update to v0.3.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 842838f83..8067daad4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,67 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.3.1](https://github.com/Human-Connection/Human-Connection/compare/v0.3.0...v0.3.1)
+
+> 10 February 2020
+
+- fix: Display unblock feature only for blocking user [`#3034`](https://github.com/Human-Connection/Human-Connection/pull/3034)
+- refactor(factories): Refactor test factories with rosie.js [`#2921`](https://github.com/Human-Connection/Human-Connection/pull/2921)
+- build(deps-dev): bump @vue/cli-shared-utils from 4.1.2 to 4.2.2 in /webapp [`#3031`](https://github.com/Human-Connection/Human-Connection/pull/3031)
+- build(deps): bump graphql-shield from 7.0.10 to 7.0.11 in /backend [`#3028`](https://github.com/Human-Connection/Human-Connection/pull/3028)
+- build(deps-dev): bump codecov from 3.6.4 to 3.6.5 [`#3027`](https://github.com/Human-Connection/Human-Connection/pull/3027)
+- chore: Add DevOps issue template [`#2999`](https://github.com/Human-Connection/Human-Connection/pull/2999)
+- fix: Error pages can be translated [`#2826`](https://github.com/Human-Connection/Human-Connection/pull/2826)
+- build(deps-dev): bump apollo-server-testing from 2.9.16 to 2.10.0 in /backend [`#3020`](https://github.com/Human-Connection/Human-Connection/pull/3020)
+- build(deps): bump apollo-server from 2.9.16 to 2.10.0 in /backend [`#3019`](https://github.com/Human-Connection/Human-Connection/pull/3019)
+- build(deps): bump graphql-tag from 2.10.2 to 2.10.3 in /backend [`#3011`](https://github.com/Human-Connection/Human-Connection/pull/3011)
+- build(deps): bump graphql-shield from 7.0.9 to 7.0.10 in /backend [`#3010`](https://github.com/Human-Connection/Human-Connection/pull/3010)
+- build(deps-dev): bump @storybook/addon-actions from 5.3.10 to 5.3.12 in /webapp [`#2998`](https://github.com/Human-Connection/Human-Connection/pull/2998)
+- build(deps-dev): bump @storybook/addon-notes from 5.3.10 to 5.3.12 in /webapp [`#2997`](https://github.com/Human-Connection/Human-Connection/pull/2997)
+- build(deps-dev): bump @storybook/addon-a11y from 5.3.10 to 5.3.12 in /webapp [`#2996`](https://github.com/Human-Connection/Human-Connection/pull/2996)
+- build(deps): bump metascraper-author from 5.10.6 to 5.10.7 in /backend [`#2994`](https://github.com/Human-Connection/Human-Connection/pull/2994)
+- build(deps): bump metascraper-title from 5.10.6 to 5.10.7 in /backend [`#2978`](https://github.com/Human-Connection/Human-Connection/pull/2978)
+- build(deps-dev): bump @storybook/vue from 5.3.10 to 5.3.12 in /webapp [`#2995`](https://github.com/Human-Connection/Human-Connection/pull/2995)
+- build(deps): bump metascraper-audio from 5.10.6 to 5.10.7 in /backend [`#2993`](https://github.com/Human-Connection/Human-Connection/pull/2993)
+- build(deps): bump graphql-tag from 2.10.1 to 2.10.2 in /backend [`#2992`](https://github.com/Human-Connection/Human-Connection/pull/2992)
+- build(deps): bump metascraper-url from 5.10.6 to 5.10.7 in /backend [`#2991`](https://github.com/Human-Connection/Human-Connection/pull/2991)
+- build(deps): bump @sentry/node from 5.12.0 to 5.12.3 in /backend [`#2990`](https://github.com/Human-Connection/Human-Connection/pull/2990)
+- build(deps-dev): bump @storybook/addon-notes from 5.3.9 to 5.3.10 in /webapp [`#2951`](https://github.com/Human-Connection/Human-Connection/pull/2951)
+- build(deps): bump metascraper from 5.10.6 to 5.11.0 in /backend [`#2976`](https://github.com/Human-Connection/Human-Connection/pull/2976)
+- build(deps): bump metascraper-logo from 5.10.6 to 5.10.7 in /backend [`#2975`](https://github.com/Human-Connection/Human-Connection/pull/2975)
+- chore: Add issue template for Refactoring tickets [`#2983`](https://github.com/Human-Connection/Human-Connection/pull/2983)
+- build(deps): bump @nuxtjs/sentry from 3.1.0 to 3.2.2 in /webapp [`#2974`](https://github.com/Human-Connection/Human-Connection/pull/2974)
+- build(deps): bump metascraper-video from 5.10.6 to 5.10.7 in /backend [`#2952`](https://github.com/Human-Connection/Human-Connection/pull/2952)
+- build(deps): bump metascraper-lang from 5.10.6 to 5.10.7 in /backend [`#2950`](https://github.com/Human-Connection/Human-Connection/pull/2950)
+- build(deps): bump metascraper-description from 5.10.6 to 5.11.0 in /backend [`#2948`](https://github.com/Human-Connection/Human-Connection/pull/2948)
+- build(deps): bump @sentry/node from 5.11.2 to 5.12.0 in /backend [`#2977`](https://github.com/Human-Connection/Human-Connection/pull/2977)
+- build(deps): bump @nuxtjs/pwa from 3.0.0-beta.19 to 3.0.0-beta.20 in /webapp [`#2959`](https://github.com/Human-Connection/Human-Connection/pull/2959)
+- build(deps-dev): bump @storybook/addon-a11y from 5.3.9 to 5.3.10 in /webapp [`#2956`](https://github.com/Human-Connection/Human-Connection/pull/2956)
+- build(deps-dev): bump eslint-plugin-import from 2.20.0 to 2.20.1 in /webapp [`#2949`](https://github.com/Human-Connection/Human-Connection/pull/2949)
+- build(deps): bump metascraper-soundcloud from 5.10.6 to 5.10.7 in /backend [`#2945`](https://github.com/Human-Connection/Human-Connection/pull/2945)
+- build(deps): bump metascraper-date from 5.10.6 to 5.10.7 in /backend [`#2944`](https://github.com/Human-Connection/Human-Connection/pull/2944)
+- build(deps-dev): bump codecov from 3.6.2 to 3.6.4 [`#2943`](https://github.com/Human-Connection/Human-Connection/pull/2943)
+- build(deps-dev): bump @storybook/addon-actions in /webapp [`#2953`](https://github.com/Human-Connection/Human-Connection/pull/2953)
+- build(deps): bump metascraper-publisher in /backend [`#2954`](https://github.com/Human-Connection/Human-Connection/pull/2954)
+- build(deps-dev): bump eslint-plugin-import in /backend [`#2955`](https://github.com/Human-Connection/Human-Connection/pull/2955)
+- build(deps): bump metascraper-youtube from 5.10.6 to 5.10.7 in /backend [`#2957`](https://github.com/Human-Connection/Human-Connection/pull/2957)
+- build(deps): bump metascraper-image from 5.10.6 to 5.10.7 in /backend [`#2960`](https://github.com/Human-Connection/Human-Connection/pull/2960)
+- build(deps-dev): bump @storybook/vue from 5.3.9 to 5.3.10 in /webapp [`#2961`](https://github.com/Human-Connection/Human-Connection/pull/2961)
+- build(deps): bump @nuxtjs/axios from 5.9.4 to 5.9.5 in /webapp [`#2962`](https://github.com/Human-Connection/Human-Connection/pull/2962)
+- fix: Update mute/unmute icon to unused icon [`#2973`](https://github.com/Human-Connection/Human-Connection/pull/2973)
+- fix: Remove github release script breaking build [`#2971`](https://github.com/Human-Connection/Human-Connection/pull/2971)
+- Use original createdAt for merged users/emails [`#2969`](https://github.com/Human-Connection/Human-Connection/pull/2969)
+- Fix typo [`#2966`](https://github.com/Human-Connection/Human-Connection/pull/2966)
+- chore: Update to v0.3.0 [`#2941`](https://github.com/Human-Connection/Human-Connection/pull/2941)
+- Replace buildList with array of Promises [`46edc3f`](https://github.com/Human-Connection/Human-Connection/commit/46edc3fdd5b83c2f00506f595b1254d7597767e0)
+- build(deps-dev): bump @storybook/addon-notes in /webapp [`75137ce`](https://github.com/Human-Connection/Human-Connection/commit/75137ce716dadcc6f0ceeed6a2b0fe5c50fa7b8f)
+- Update to v0.3.0 [`dbe2c4c`](https://github.com/Human-Connection/Human-Connection/commit/dbe2c4cdd5bab2195c6369b84989507b9f7da768)
+
 #### [v0.3.0](https://github.com/Human-Connection/Human-Connection/compare/v0.2.1...v0.3.0)
 
 > 31 January 2020
 
+- build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /webapp [`#2939`](https://github.com/Human-Connection/Human-Connection/pull/2939)
 - feat: 🍰 Direct Reply On Comment [`#2608`](https://github.com/Human-Connection/Human-Connection/pull/2608)
 - build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend [`#2938`](https://github.com/Human-Connection/Human-Connection/pull/2938)
 - fix: deploy script with new naming convention [`#2930`](https://github.com/Human-Connection/Human-Connection/pull/2930)
@@ -181,9 +238,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - refactor(modules): Various import fixes [`#2773`](https://github.com/Human-Connection/Human-Connection/issues/2773) [`#2774`](https://github.com/Human-Connection/Human-Connection/issues/2774)
 - feat(webapp): Display deployed version in footer [`#1831`](https://github.com/Human-Connection/Human-Connection/issues/1831)
 - fix #2229 [`#2229`](https://github.com/Human-Connection/Human-Connection/issues/2229)
-- refactor: Make `db:setup` init stage of `migrate` [`b063847`](https://github.com/Human-Connection/Human-Connection/commit/b063847849a84db885337dc8e84e75ddaf87011f)
-- Improve styling per @alina-beck review [`bcc1ab1`](https://github.com/Human-Connection/Human-Connection/commit/bcc1ab167e8b1dfdac1ec0a05a0c14e8234bcabc)
-- test(cypress): Cover "Pinned post" feature [`d49afc2`](https://github.com/Human-Connection/Human-Connection/commit/d49afc25cfa1c1f98ed04f78dd3ff826cd85ae25)
+- Get rid of different factory files [`fc36729`](https://github.com/Human-Connection/Human-Connection/commit/fc367297e3e054f09b7f8f31788ab68d87f6babf)
+- Refactor factory for comments [`2fc71d7`](https://github.com/Human-Connection/Human-Connection/commit/2fc71d75a5d5eab9c3467e94e00257ef6dd7d8a0)
+- Refactor user factory [`2a79c53`](https://github.com/Human-Connection/Human-Connection/commit/2a79c53765b73f9b91691eb75f55cf8c9e48306e)
 
 #### [v0.2.1](https://github.com/Human-Connection/Human-Connection/compare/v0.2.0...v0.2.1)
 
diff --git a/backend/package.json b/backend/package.json
index de9bd3a6c..8f874c0a7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-backend",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
diff --git a/webapp/package.json b/webapp/package.json
index 0d36bef1d..cc802db61 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-webapp",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Human Connection Frontend",
   "authors": [
     "Grzegorz Leoniec (appinteractive)",

From 00195f16154b5108897edb66763d479177fd815a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 19:16:41 +0100
Subject: [PATCH 126/171] Increase body parser limit

- The default limit is only 100kb
- we are getting many requests that exceed this limit
- not sure about what would be an appropriate limit, but have seen 50mb
  in many examples.
---
 backend/src/server.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/server.js b/backend/src/server.js
index 02e166b71..1b40b5e1a 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -7,6 +7,7 @@ import { getNeode, getDriver } from './db/neo4j'
 import decode from './jwt/decode'
 import schema from './schema'
 import webfinger from './activitypub/routes/webfinger'
+import bodyParser from 'body-parser'
 
 const driver = getDriver()
 const neode = getNeode()
@@ -45,6 +46,8 @@ const createServer = options => {
   app.use(helmet())
   app.use('/.well-known/', webfinger())
   app.use(express.static('public'))
+  app.use(bodyParser.json({ limit: '50mb' }))
+  app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }))
   server.applyMiddleware({ app, path: '/' })
 
   return { server, app }

From 708ab6ecde17b0ea5a177b9625ba37573a2e96f4 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 10 Feb 2020 19:21:53 +0100
Subject: [PATCH 127/171] Set equal to nginx max body size

---
 backend/src/server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/server.js b/backend/src/server.js
index 1b40b5e1a..02da4c6aa 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -46,8 +46,8 @@ const createServer = options => {
   app.use(helmet())
   app.use('/.well-known/', webfinger())
   app.use(express.static('public'))
-  app.use(bodyParser.json({ limit: '50mb' }))
-  app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }))
+  app.use(bodyParser.json({ limit: '10mb' }))
+  app.use(bodyParser.urlencoded({ limit: '10mb', extended: true }))
   server.applyMiddleware({ app, path: '/' })
 
   return { server, app }

From 11989edca26ea0be4fe0ec5e256e7d676ca5dff0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2020 04:22:25 +0000
Subject: [PATCH 128/171] build(deps-dev): bump vue-svg-loader from 0.15.0 to
 0.16.0 in /webapp

Bumps [vue-svg-loader](https://github.com/visualfanatic/vue-svg-loader) from 0.15.0 to 0.16.0.
- [Release notes](https://github.com/visualfanatic/vue-svg-loader/releases)
- [Commits](https://github.com/visualfanatic/vue-svg-loader/compare/0.15.0...0.16.0)

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

diff --git a/webapp/package.json b/webapp/package.json
index cc802db61..03ed63577 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -142,7 +142,7 @@
     "style-resources-loader": "~1.3.3",
     "vue-jest": "~3.0.5",
     "vue-loader": "~15.8.3",
-    "vue-svg-loader": "~0.15.0",
+    "vue-svg-loader": "~0.16.0",
     "vue-template-compiler": "^2.6.11"
   }
 }
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index d5d6cf14b..01508d334 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -15361,10 +15361,10 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
 
-svg-to-vue@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/svg-to-vue/-/svg-to-vue-0.6.0.tgz#d5de9ec7126ac3c11adf8cfad013a6264ef57184"
-  integrity sha512-SYGJMBq5EHt/nIJxZ4kA9A6bilaFXtOPFJRoMQ2ml/jFP4N9L7HVFTm+5WCFN3QFnEUXtH6BHzpoOlwP1/5+2A==
+svg-to-vue@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/svg-to-vue/-/svg-to-vue-0.7.0.tgz#ec86deb1742be38319462e36703af1dfa2f9fad9"
+  integrity sha512-Tg2nMmf3BQorYCAjxbtTkYyWPVSeox5AZUFvfy4MoWK/5tuQlnA/h3LAlTjV3sEvOC5FtUNovRSj3p784l4KOA==
   dependencies:
     svgo "^1.3.2"
 
@@ -16554,13 +16554,13 @@ vue-style-loader@^4.1.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-svg-loader@~0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/vue-svg-loader/-/vue-svg-loader-0.15.0.tgz#09bb9929c3f8955a246ea80909e26139badc0509"
-  integrity sha512-698GfXu9k2wPxI382Qf7MfrtBXjIjThqmOsksVKHqeTvVO+Ary9q69SVzA6EEJmj5vmF5u1KRVb/I1BDh4fPTQ==
+vue-svg-loader@~0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/vue-svg-loader/-/vue-svg-loader-0.16.0.tgz#adccbdc9aca90132bde9c9d96cd49f74efecd345"
+  integrity sha512-2RtFXlTCYWm8YAEO2qAOZ2SuIF2NvLutB5muc3KDYoZq5ZeCHf8ggzSan3ksbbca7CJ/Aw57ZnDF4B7W/AkGtw==
   dependencies:
     loader-utils "^1.2.3"
-    svg-to-vue "^0.6.0"
+    svg-to-vue "^0.7.0"
 
 vue-sweetalert-icons@~4.2.0:
   version "4.2.0"

From 1ae6769c7d65f12a2b2f9fe665f9cbe26a898200 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 11 Feb 2020 11:33:47 +0100
Subject: [PATCH 129/171] spec for location swapped lng and lat too

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

diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js
index aba11f9bc..728baaa87 100644
--- a/backend/src/schema/resolvers/locations.spec.js
+++ b/backend/src/schema/resolvers/locations.spec.js
@@ -53,8 +53,8 @@ describe('resolvers', () => {
           id: 'region.9397217726497330',
           name: 'Paris',
           type: 'region',
-          lat: 2.35183,
-          lng: 48.85658,
+          lng: 2.35183,
+          lat: 48.85658,
           nameEN: 'Paris',
         })
 

From 8773589d82668ef3c62768f8ba5f3e8635f11db0 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 11 Feb 2020 11:57:25 +0100
Subject: [PATCH 130/171] Add develop mailserver, upgrade version

---
 deployment/helm/human-connection/Chart.yaml  | 2 +-
 deployment/helm/human-connection/values.yaml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml
index 4ffa93622..525d5a8e8 100644
--- a/deployment/helm/human-connection/Chart.yaml
+++ b/deployment/helm/human-connection/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "0.3.0"
+appVersion: "0.3.1"
 description: A Helm chart for Human Connection
 name: human-connection
 version: 0.1.0
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml
index 38ca20fbb..f30704f89 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/human-connection/values.yaml
@@ -48,3 +48,6 @@ jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA=="
 privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
 # mapboxToken is used for the Mapbox API, geolocalization.
 mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E="
+uploadsStorage: "25Gi"
+neo4jStorage: "5Gi"
+developmentMailserverDomain: nitro-mailserver.human-connection.org
\ No newline at end of file

From 31cec2cf0c295352d4e032a24ed7ac219a912c8e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 11 Feb 2020 14:37:10 +0100
Subject: [PATCH 131/171] improved migration

---
 ...0206190233-swap_latitude_with_longitude.js | 32 ++++---------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
index 0e11c8007..381d6db1d 100644
--- a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
+++ b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
@@ -3,11 +3,10 @@ import { getDriver } from '../../db/neo4j'
 export const description =
   'This migration swaps the value stored in Location.lat with the value of Location.lng.'
 
-export async function up(next) {
+const swap = async function(next) {
   const driver = getDriver()
   const session = driver.session()
   const transaction = session.beginTransaction()
-
   try {
     // Implement your migration here.
     await transaction.run(`
@@ -23,33 +22,16 @@ export async function up(next) {
     await transaction.rollback()
     // eslint-disable-next-line no-console
     console.log('rolled back')
+    throw new Error(error)
   } finally {
     session.close()
   }
 }
 
+export async function up(next) {
+  swap(next)
+}
+
 export async function down(next) {
-  const driver = getDriver()
-  const session = driver.session()
-  const transaction = session.beginTransaction()
-
-  try {
-    // Implement your migration here.
-    await transaction.run(
-      `
-        MATCH (l:Location) WHERE NOT(l.lat IS NULL)
-        WITH l.lng AS longitude, l.lat AS latitude, l AS Location
-        SET Location.lat = longitude, Location.lng = latitude      `,
-    )
-    await transaction.commit()
-    next()
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.log(error)
-    await transaction.rollback()
-    // eslint-disable-next-line no-console
-    console.log('rolled back')
-  } finally {
-    session.close()
-  }
+  swap(next)
 }

From 2adfe1665be6d638b348bdc6f9cad41b8a185174 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 11 Feb 2020 21:44:19 +0100
Subject: [PATCH 132/171] Implement direct login in cypress tests

- there is a manualLogin for tests which test the manual logging in, all
  others just set the cookie in the frontend
---
 .../administration/TagsAndCategories.feature  |  3 +-
 cypress/integration/common/report.js          | 15 ++--
 cypress/integration/common/steps.js           | 86 ++++++++-----------
 .../moderation/ReportContent.feature          |  3 +-
 .../notifications/Mentions.feature            |  8 +-
 .../user_account/ChangePassword.feature       |  3 +-
 .../integration/user_account/Login.feature    |  2 +-
 cypress/plugins/index.js                      |  2 +-
 cypress/support/commands.js                   | 13 ++-
 package.json                                  |  3 +
 yarn.lock                                     | 77 ++++++++++++++++-
 11 files changed, 141 insertions(+), 74 deletions(-)

diff --git a/cypress/integration/administration/TagsAndCategories.feature b/cypress/integration/administration/TagsAndCategories.feature
index f93cdb59c..516966c6b 100644
--- a/cypress/integration/administration/TagsAndCategories.feature
+++ b/cypress/integration/administration/TagsAndCategories.feature
@@ -14,9 +14,8 @@ Feature: Tags and Categories
   looking at the popularity of a tag.
 
   Background:
-    Given my user account has the role "admin"
+    Given I am logged in with a "admin" role
     And we have a selection of tags and categories as well as posts
-    And I am logged in
 
   Scenario: See an overview of categories
     When I navigate to the administration dashboard
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 664d71d1b..cc424ef3e 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -32,15 +32,20 @@ Given("I see David Irving's post on the post page", page => {
 Given('I am logged in with a {string} role', role => {
   cy.factory().build('user', {
     termsAndConditionsAgreedVersion: VERSION,
-    role
+    role,
+    name: `${role} is my name`
   }, {
     email: `${role}@example.org`,
     password: '1234',
   })
-  cy.login({
-    email: `${role}@example.org`,
-    password: '1234'
-  })
+  cy.neode()
+    .first("User", {
+      name: `${role} is my name`,
+    })
+    .then(async user => {
+      const userJson = await user.toJson()
+      cy.login(userJson)
+    })
 })
 
 When('I click on "Report Post" from the content menu of the post', () => {
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index c51290537..209db7426 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -35,9 +35,27 @@ const annoyingParams = {
 };
 
 Given("I am logged in", () => {
-  cy.login(loginCredentials);
+  cy.neode()
+    .first("User", {
+      name: narratorParams.name
+    })
+    .then(async user => {
+      const userJson = await user.toJson()
+      cy.login(userJson)
+    })
 });
 
+Given("I log in as {string}", name => {
+  cy.neode()
+    .first("User", {
+      name
+    })
+    .then(async user => {
+      const userJson = await user.toJson()
+      cy.login(userJson)
+    })
+})
+
 Given("the {string} user searches for {string}", (_, postTitle) => {
   cy.logout()
     .login({ email: annoyingParams.email, password: '1234' })
@@ -122,7 +140,7 @@ Given("I am on the {string} page", page => {
 });
 
 When("I fill in my email and password combination and click submit", () => {
-  cy.login(loginCredentials);
+  cy.manualLogin(loginCredentials);
 });
 
 When(/(?:when )?I refresh the page/, () => {
@@ -306,12 +324,21 @@ Then(
   }
 );
 
-Given("my user account has the following login credentials:", table => {
+Given("I am logged in with these credentials:", table => {
   loginCredentials = table.hashes()[0];
   cy.debug();
   cy.factory().build("user", {
     ...termsAndConditionsAgreedVersion,
+    name: loginCredentials.email,
   }, loginCredentials);
+  cy.neode()
+    .first("User", {
+      name: loginCredentials.email,
+    })
+    .then(async user => {
+      const userJson = await user.toJson()
+      cy.login(userJson)
+    })
 });
 
 When("I fill the password form with:", table => {
@@ -330,45 +357,16 @@ When("submit the form", () => {
 
 Then("I cannot login anymore with password {string}", password => {
   cy.reload();
-  const {
-    email
-  } = loginCredentials;
-  cy.visit(`/login`);
-  cy.get("input[name=email]")
-    .trigger("focus")
-    .type(email);
-  cy.get("input[name=password]")
-    .trigger("focus")
-    .type(password);
-  cy.get("button[name=submit]")
-    .as("submitButton")
-    .click();
-  cy.get(".iziToast-wrapper").should(
-    "contain",
-    "Incorrect email address or password."
-  );
+  const { email } = loginCredentials
+  cy.manualLogin({ email, password })
+    .get(".iziToast-wrapper").should("contain", "Incorrect email address or password.");
 });
 
 Then("I can login successfully with password {string}", password => {
   cy.reload();
-  cy.login({
-    ...loginCredentials,
-    ...{
-      password
-    }
-  });
-  cy.get(".iziToast-wrapper").should("contain", "You are logged in!");
-});
-
-When("I log in with the following credentials:", table => {
-  const {
-    email,
-    password
-  } = table.hashes()[0];
-  cy.login({
-    email,
-    password
-  });
+  const { email } = loginCredentials
+  cy.manualLogin({ email, password })
+    .get(".iziToast-wrapper").should("contain", "You are logged in!");
 });
 
 When("open the notification menu and click on the first item", () => {
@@ -559,18 +557,6 @@ When("a user has blocked me", () => {
     });
 });
 
-When("I log in with:", table => {
-  const [firstRow] = table.hashes();
-  const {
-    Email,
-    Password
-  } = firstRow;
-  cy.login({
-    email: Email,
-    password: Password
-  });
-});
-
 Then("I see only one post with the title {string}", title => {
   cy.get(".main-container")
     .find(".post-link")
diff --git a/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature
index 105bad5e6..be1a07786 100644
--- a/cypress/integration/moderation/ReportContent.feature
+++ b/cypress/integration/moderation/ReportContent.feature
@@ -62,9 +62,8 @@ Feature: Report and Moderate
     Given somebody reported the following posts:
       | submitterEmail           | resourceId | reasonCategory | reasonDescription |
       | p2.submitter@example.org | p2         | other          | Offensive content |
-    And my user account has the role "moderator"
+    And I am logged in with a "moderator" role
     And there is an annoying user who has muted me
-    And I am logged in
     When I click on the avatar menu in the top right corner
     And I click on "Moderation"
     Then I see all the reported posts including from the user who muted me
diff --git a/cypress/integration/notifications/Mentions.feature b/cypress/integration/notifications/Mentions.feature
index ef2694abc..02dc0abd2 100644
--- a/cypress/integration/notifications/Mentions.feature
+++ b/cypress/integration/notifications/Mentions.feature
@@ -11,9 +11,7 @@ Feature: Notification for a mention
       | Matt Rider        | matt-rider        | matt@example.org  | 4321     |
 
   Scenario: Mention another user, re-login as this user and see notifications
-    Given I log in with the following credentials:
-      | email             | password |
-      | wolle@example.org | 1234     |
+    Given I log in as "Wolle aus Hamburg"
     And I start to write a new post with the title "Hey Matt" beginning with:
       """
       Big shout to our fellow contributor
@@ -23,9 +21,7 @@ Feature: Notification for a mention
     And I choose "en" as the language for the post
     And I click on "Save"
     When I log out
-    And I log in with the following credentials:
-      | email            | password |
-      | matt@example.org | 4321     |
+    And I log in as "Matt Rider"
     And see 1 unread notifications in the top menu
     And open the notification menu and click on the first item
     Then I get to the post page of ".../hey-matt"
diff --git a/cypress/integration/user_account/ChangePassword.feature b/cypress/integration/user_account/ChangePassword.feature
index 44e4e5483..dbdf724f7 100644
--- a/cypress/integration/user_account/ChangePassword.feature
+++ b/cypress/integration/user_account/ChangePassword.feature
@@ -9,10 +9,9 @@ Feature: Change password
   password or just out of an good habit, you want to change your password.
 
   Background:
-    Given my user account has the following login credentials:
+    Given I am logged in with these credentials:
       | email            | password |
       | user@example.org | exposed  |
-    And I am logged in
 
   Scenario: Change my password
     Given I am on the "settings" page
diff --git a/cypress/integration/user_account/Login.feature b/cypress/integration/user_account/Login.feature
index 3837f7042..6e8f60a56 100644
--- a/cypress/integration/user_account/Login.feature
+++ b/cypress/integration/user_account/Login.feature
@@ -7,7 +7,7 @@ Feature: Authentication
     Given I have a user account
 
   Scenario: Log in
-    When I visit the "/login" page
+    When I visit the "login" page
     And I fill in my email and password combination and click submit
     Then I can click on my profile picture in the top right corner
     And I can see my name "Peter Lustig" in the dropdown menu
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index 893b99f4f..cc6ac0e91 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -23,7 +23,7 @@ module.exports = (on, config) => {
   config.env.NEO4J_URI = parsed.NEO4J_URI
   config.env.NEO4J_USERNAME = parsed.NEO4J_USERNAME
   config.env.NEO4J_PASSWORD = parsed.NEO4J_PASSWORD
-
+  config.env.JWT_SECRET = parsed.JWT_SECRET
   on('file:preprocessor', cucumber())
   return config
 }
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index a8ef25e7d..f3035dcdd 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -18,6 +18,7 @@ import helpers from "./helpers";
 import { GraphQLClient, request } from 'graphql-request'
 import { gql } from '../../backend/src/helpers/jest'
 import config from '../../backend/src/config'
+import encode from '../../backend/src/jwt/encode'
 
 const switchLang = name => {
   cy.get(".locale-menu").click();
@@ -47,7 +48,13 @@ Cypress.Commands.add("switchLanguage", (name, force) => {
   }
 });
 
-Cypress.Commands.add("login", ({ email, password }) => {
+Cypress.Commands.add("login", user => {
+  const token = encode(user)
+  cy.setCookie('human-connection-token', token)
+    .visit("/")
+});
+
+Cypress.Commands.add("manualLogin", ({ email, password }) => {
   cy.visit(`/login`);
   cy.get("input[name=email]")
     .trigger("focus")
@@ -58,11 +65,9 @@ Cypress.Commands.add("login", ({ email, password }) => {
   cy.get("button[name=submit]")
     .as("submitButton")
     .click();
-  cy.get(".iziToast-message").should("contain", "You are logged in!");
-  cy.location("pathname").should("eq", "/");
 });
 
-Cypress.Commands.add("logout", (email, password) => {
+Cypress.Commands.add("logout", () => {
   cy.visit(`/logout`);
   cy.location("pathname").should("contain", "/login"); // we're out
 });
diff --git a/package.json b/package.json
index ec54cdb7e..c0fcbce02 100644
--- a/package.json
+++ b/package.json
@@ -52,5 +52,8 @@
   },
   "resolutions": {
     "set-value": "^2.0.1"
+  },
+  "dependencies": {
+    "jsonwebtoken": "^8.5.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 0b9447910..68ba8ae0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1763,6 +1763,11 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2927,6 +2932,13 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 electron-to-chromium@^1.3.341:
   version "1.3.344"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz#f1397a633c35e726730c24be1084cd25c3ee8148"
@@ -4336,6 +4348,22 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
+jsonwebtoken@^8.5.1:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
+  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^5.6.0"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4346,6 +4374,23 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4508,17 +4553,47 @@ lodash.clonedeep@4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
+
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
+
+lodash.isinteger@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
+
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
+
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
-lodash.once@^4.1.1:
+lodash.once@^4.0.0, lodash.once@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=

From fb429f6ef34f3cfb492a2253c013b2ecdc4a701f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 11 Feb 2020 21:57:20 +0100
Subject: [PATCH 133/171] Fix BlockUser/MuteUser.feature

---
 cypress/integration/common/steps.js | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 209db7426..73de67480 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -58,8 +58,15 @@ Given("I log in as {string}", name => {
 
 Given("the {string} user searches for {string}", (_, postTitle) => {
   cy.logout()
-    .login({ email: annoyingParams.email, password: '1234' })
-    .get(".searchable-input .ds-select-search")
+  cy.neode()
+    .first("User", {
+      id: "annoying-user"
+    })
+    .then(async user => {
+      const userJson = await user.toJson()
+      cy.login(userJson)
+    })
+  cy.get(".searchable-input .ds-select-search")
     .focus()
     .type(postTitle);
 });
@@ -131,8 +138,15 @@ When("I visit the {string} page", page => {
 
 When("a blocked user visits the post page of one of my authored posts", () => {
   cy.logout()
-    .login({ email: annoyingParams.email, password: annoyingParams.password })
-    .openPage('/post/previously-created-post')
+  cy.neode()
+    .first("User", {
+      name: 'Harassing User'
+    })
+    .then(async user => {
+      const userJson = await user.toJson()
+      cy.login(userJson)
+    })
+  cy.openPage('post/previously-created-post')
 })
 
 Given("I am on the {string} page", page => {
@@ -438,15 +452,15 @@ Given("there is an annoying user who has muted me", () => {
 });
 
 Given("I am on the profile page of the annoying user", name => {
-  cy.openPage("/profile/annoying-user/spammy-spammer");
+  cy.openPage("profile/annoying-user/spammy-spammer");
 });
 
 When("I visit the profile page of the annoying user", name => {
-  cy.openPage("/profile/annoying-user");
+  cy.openPage("profile/annoying-user");
 });
 
 When("I ", name => {
-  cy.openPage("/profile/annoying-user");
+  cy.openPage("profile/annoying-user");
 });
 
 When(

From 2f0e40e0e464e12f3350f5222011656a8fa851ce Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 11 Feb 2020 23:18:37 +0100
Subject: [PATCH 134/171] build(deps): Node v13 compatbility

Through https://github.com/jaydenseric/graphql-upload/issues/170#issue-527336432
---
 backend/package.json |  3 +++
 backend/yarn.lock    | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 8f874c0a7..e3c71cf83 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -129,5 +129,8 @@
     "prettier": "~1.19.1",
     "rosie": "^2.0.1",
     "supertest": "~4.0.2"
+  },
+  "resolutions": {
+    "fs-capacitor": "6.0.0"
   }
 }
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 04fd28ce5..7696e37f6 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4202,10 +4202,10 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-fs-capacitor@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c"
-  integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA==
+fs-capacitor@6.0.0, fs-capacitor@^2.0.4:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-6.0.0.tgz#b4b89e3281d61df1c573e788d9ee6ec4c7c94da4"
+  integrity sha512-I+jZLV2q+ivQK/+Mu5FIYAECHgjoo8GBYJsBBQbNeU0aW1m25LU4E+MkLNq0kcJBjrp8Z6fhxpSeS8SyJyGkrw==
 
 fs-minipass@^1.2.5:
   version "1.2.6"
@@ -7923,6 +7923,11 @@ serve-static@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"

From b6f505d4be975a7d0adc9beea35c956e395f775a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 04:17:48 +0000
Subject: [PATCH 135/171] build(deps): bump request from 2.88.0 to 2.88.2 in
 /backend

Bumps [request](https://github.com/request/request) from 2.88.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

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

diff --git a/backend/package.json b/backend/package.json
index 8f874c0a7..5a18fe648 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -93,7 +93,7 @@
     "nodemailer": "^6.4.2",
     "nodemailer-html-to-text": "^3.1.0",
     "npm-run-all": "~4.1.5",
-    "request": "~2.88.0",
+    "request": "~2.88.2",
     "sanitize-html": "~1.21.1",
     "slug": "~2.1.1",
     "trunc-html": "~1.1.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 04fd28ce5..a933f865e 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4535,7 +4535,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -6325,24 +6325,12 @@ migrate@^1.6.2:
     mkdirp "^0.5.1"
     slug "^0.9.2"
 
-mime-db@1.40.0:
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-
 mime-db@1.43.0:
   version "1.43.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
   integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
 
-mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.22, mime-types@~2.1.24:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
-  dependencies:
-    mime-db "1.40.0"
-
-mime-types@~2.1.26:
+mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.22, mime-types@~2.1.24, mime-types@~2.1.26:
   version "2.1.26"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
   integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
@@ -7328,7 +7316,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24, psl@^1.1.28:
+psl@^1.1.28:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd"
   integrity sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==
@@ -7351,11 +7339,6 @@ punycode2@~1.0.0:
   resolved "https://registry.yarnpkg.com/punycode2/-/punycode2-1.0.0.tgz#e2b4b9a9a8ff157d0b84438e203181ee7892dfd8"
   integrity sha1-4rS5qaj/FX0LhEOOIDGB7niS39g=
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -7628,10 +7611,10 @@ request-promise-native@^1.0.7, request-promise-native@^1.0.8:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.88.0, request@~2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+request@^2.88.0, request@~2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -7640,7 +7623,7 @@ request@^2.88.0, request@~2.88.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -7650,7 +7633,7 @@ request@^2.88.0, request@~2.88.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -8673,7 +8656,7 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^2.3.3:
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -8690,14 +8673,6 @@ tough-cookie@^3.0.1:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"

From 3f1f60edf51c1da4b96390a51abdecee6eaf51b2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 04:24:18 +0000
Subject: [PATCH 136/171] build(deps-dev): bump @storybook/vue from 5.3.12 to
 5.3.13 in /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 03ed63577..c174a5e58 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -102,7 +102,7 @@
     "@storybook/addon-a11y": "^5.3.12",
     "@storybook/addon-actions": "^5.3.12",
     "@storybook/addon-notes": "^5.3.12",
-    "@storybook/vue": "~5.3.12",
+    "@storybook/vue": "~5.3.13",
     "@vue/cli-shared-utils": "~4.2.2",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 01508d334..006367bc0 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2190,6 +2190,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.13.tgz#8c16fbab1142e2cd4bdfb93ffcb35a883dac2866"
+  integrity sha512-Yjn8PXhSYw4bnB/l8ybhMw3eqpJlV3HlwMECYhRtVm+wTqal9OQlZkam5xclWm6PF/6DhyiPCt6vlXN3vfVGPA==
+  dependencies:
+    "@storybook/api" "5.3.13"
+    "@storybook/channels" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
@@ -2239,6 +2252,32 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.13.tgz#51cbdb461ff2ee8468a3c54411f42f07aa307f5d"
+  integrity sha512-ZOBUOz0aRPD7w8UngcVOjwcXt417Zboi0ERW+Atn22ZUYqI3zri8M9EerLHvyKw7J42/gEIqQqg5PyfPcLJmeQ==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/channels" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "5.3.13"
+    "@storybook/theming" "5.3.13"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.2.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.12.tgz#945c9702f335018f6224af3159bf4d33c66a131e"
@@ -2250,6 +2289,17 @@
     global "^4.3.2"
     telejson "^3.2.0"
 
+"@storybook/channel-postmessage@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.13.tgz#80cf8136bf4b96b2f9b291d3cc81e5d02abecc98"
+  integrity sha512-FMrl49ipHPXB0XPuwXm/2GWM5b53iFFz9V4/SQC1s31kxAU99QFmWXWvRKbM29FpAVHvTdjQllIiOWgdTH8jAA==
+  dependencies:
+    "@storybook/channels" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.2.0"
+
 "@storybook/channels@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
@@ -2264,6 +2314,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.13.tgz#2adf4595988e2586f1a360cf4760f16338ffec26"
+  integrity sha512-lD4HXmfoKJAnAlAYwQJ5dDXG3WnW7jpW3wJieRwvQGDFHQSXdJ3Lv5/zv2y+TM06Jx8O2esaepNw+VzjMw3/Qg==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.3.12":
   version "5.3.12"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.12.tgz#7c18921d0290b30b020ad7d41fbda170009780bd"
@@ -2287,6 +2344,29 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.13.tgz#0d41ae3846a6ae2ebbbeef0ca945c3ee6448ba2e"
+  integrity sha512-GZCFtpU764X8TW+RYRNybIGHKJOa2fYW28I0hEPXXE0J4BeU4Z++SCeNhVBa+0tPoQ3jbsdA7M4Q5Q5UeaG2Nw==
+  dependencies:
+    "@storybook/addons" "5.3.13"
+    "@storybook/channel-postmessage" "5.3.13"
+    "@storybook/channels" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    "@storybook/csf" "0.0.1"
+    "@types/webpack-env" "^1.15.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    stable "^0.1.8"
+    ts-dedent "^1.1.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"
@@ -2301,6 +2381,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.13.tgz#1c2abf0fc53009cf159eb76e30cf32ce2b9327b1"
+  integrity sha512-unfhCgsGWWqNpM8t8S5coDcTgpWtOq3Kj4LEHivNjdHZFdf8WMLidW79ZTiyk/Nzx7RvZKgkvf7f6EtZniD55w==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
@@ -2353,6 +2440,33 @@
     simplebar-react "^1.0.0-alpha.6"
     ts-dedent "^1.1.0"
 
+"@storybook/components@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.13.tgz#646f8347ffa38298e3f9c1d15866c2167f577027"
+  integrity sha512-AwMnLCStwqLWsBzXp7m/QXuJin//0l4FH+OXmnD/6GC8qEy4JuutEOPW35IE/Mp9KAvbapHcnPTRMmDohUsTcw==
+  dependencies:
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/theming" "5.3.13"
+    "@types/react-syntax-highlighter" "11.0.2"
+    "@types/react-textarea-autosize" "^4.3.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^2.1.0"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^11.0.2"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+    ts-dedent "^1.1.0"
+
 "@storybook/core-events@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
@@ -2367,26 +2481,33 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.12.tgz#972cec3c7ee3e78a628a017c0b72bb6a52d9146d"
-  integrity sha512-oqffKLyMEVREeOC8O1RVO+xn68zk4wZkjWN9KbhbMoP3zdxM1gdvpsemdVE1C008mZfe1A/KBwuuEmcn9EBTNw==
+"@storybook/core-events@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.13.tgz#df74d2ffe29a1924557dc67e46d5d399893b2b11"
+  integrity sha512-RAnQe/I+1Ri+aYGhaNn07467cyespNX9R9i1AzFT/baBOQF2N+998mfgRu4/i/Q9YuOXIyHhw1a7JHbE/8e1lw==
+  dependencies:
+    core-js "^3.0.1"
+
+"@storybook/core@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.13.tgz#a6653befc867aa46bb53b43c1f4b8c51a9aa5845"
+  integrity sha512-HS//95j14XOb9ChYJBDHyZKAqFD2WsUh1q7sMMynSpKgHJjyfYI12rwxH5vDIrJ7CLBQbrMWrgOITjB9/cLJKA==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.7.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.3.12"
-    "@storybook/channel-postmessage" "5.3.12"
-    "@storybook/client-api" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/core-events" "5.3.12"
+    "@storybook/addons" "5.3.13"
+    "@storybook/channel-postmessage" "5.3.13"
+    "@storybook/client-api" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/core-events" "5.3.13"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "5.3.12"
-    "@storybook/router" "5.3.12"
-    "@storybook/theming" "5.3.12"
-    "@storybook/ui" "5.3.12"
+    "@storybook/node-logger" "5.3.13"
+    "@storybook/router" "5.3.13"
+    "@storybook/theming" "5.3.13"
+    "@storybook/ui" "5.3.13"
     airbnb-js-shims "^2.2.1"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.7.2"
@@ -2453,10 +2574,10 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.12.tgz#df25b725583cb5aa799b6c5b8103a8ea0921d3ba"
-  integrity sha512-ytIqS1Lx+gWFBNxwWOK7F63702YYsoU90UFQNUMC44lC1L7tOI9BQXtGIWTvmXJYns+O5pHHOVKkHLT9EGX2OA==
+"@storybook/node-logger@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.13.tgz#f41c611c3b200add8d85777f19970bdabaa94634"
+  integrity sha512-ZpuyKALHq/ZyynXnsW254JaULWZLPBFw007tkJhE5z/CLy059cIVovQhX/8Ivt3FG3qwWmcqQ0ISHFi0dJpqnA==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^3.0.0"
@@ -2493,6 +2614,21 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/router@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.13.tgz#1ef971488036083ee284323fe8814b8795f94626"
+  integrity sha512-C6PNKHxKwpNHPeQkd9ZfsIBfSBTEhWEbn9cVMPSTrUyjfaGWxbKBP8zuBIXhezIv8B2gv2bQrT62hrmsXUcCVg==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/csf" "0.0.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/theming@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"
@@ -2529,20 +2665,38 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
-"@storybook/ui@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.12.tgz#c66f6a1302d2ff80a8b94402d95648d1b28066f8"
-  integrity sha512-dVYJJkwjfGkz3u0lnfawnT6hqBRnANVlKEYirKYZyQ/RouCN3naNh9Sagrpg7hJHYib4Ny6J/pyaNdfdieDS+w==
+"@storybook/theming@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.13.tgz#17e8101e2d3ad3fb6245b2cb15b07e9f2a9881cd"
+  integrity sha512-Zb07pDt8Sv5uq+xDW3TsiTXS9IGwUNwpkR6UQgKILFJ7HX2q4Tt9r+wIi1QCwozcROx4w/bP/8MAKpEAT212lw==
   dependencies:
     "@emotion/core" "^10.0.20"
-    "@storybook/addons" "5.3.12"
-    "@storybook/api" "5.3.12"
-    "@storybook/channels" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/components" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    "@storybook/router" "5.3.12"
-    "@storybook/theming" "5.3.12"
+    "@emotion/styled" "^10.0.17"
+    "@storybook/client-logger" "5.3.13"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.19"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+    ts-dedent "^1.1.0"
+
+"@storybook/ui@5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.13.tgz#c829bc1cbcd0995e4888056a9f43fbf8a7c22ee4"
+  integrity sha512-pEXWFPF097OjvbgwvMjLsjLsDViu6yBMmUcL+nd3jvtxyxkuzv5X+2J14N8Nz0veJysbp+5+5A8kKGTO+spZfA==
+  dependencies:
+    "@emotion/core" "^10.0.20"
+    "@storybook/addons" "5.3.13"
+    "@storybook/api" "5.3.13"
+    "@storybook/channels" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/components" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    "@storybook/router" "5.3.13"
+    "@storybook/theming" "5.3.13"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2569,13 +2723,13 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.12.tgz#95d50d55475eea243c466b512ff1b040d09aae34"
-  integrity sha512-lwQxiI8ZBiP/jYAultvi9b89/7l/aJCcwopvcFPFFUeskFBhgDr/7BwAuuwWaUDAi5oPCJ7xXYh/mNnCKUzGiA==
+"@storybook/vue@~5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.13.tgz#5dde7cc6419cc2c577a9574b71b09bfc66aad832"
+  integrity sha512-8XbMMQZ3gbor7JXqoVH/DSNbCchQP0VxyUBCszrNtEleWX/l5a79Bx4+uo4mmKUGbvbhkzHqEsT9pouwKVbFhg==
   dependencies:
-    "@storybook/addons" "5.3.12"
-    "@storybook/core" "5.3.12"
+    "@storybook/addons" "5.3.13"
+    "@storybook/core" "5.3.13"
     "@types/webpack-env" "^1.15.0"
     core-js "^3.0.1"
     global "^4.3.2"

From 999cd392cb89a279682b299cb79f8e0b7d1369ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 09:53:32 +0000
Subject: [PATCH 137/171] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index c174a5e58..088e94900 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -99,7 +99,7 @@
     "@babel/core": "~7.8.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
-    "@storybook/addon-a11y": "^5.3.12",
+    "@storybook/addon-a11y": "^5.3.13",
     "@storybook/addon-actions": "^5.3.12",
     "@storybook/addon-notes": "^5.3.12",
     "@storybook/vue": "~5.3.13",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 006367bc0..4e3c9d630 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2103,17 +2103,17 @@
   dependencies:
     type-detect "4.0.8"
 
-"@storybook/addon-a11y@^5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.12.tgz#859470d07296bd950aa867e4e1d9ce5b2c668437"
-  integrity sha512-jqm0y8e50rHtkkIi8EoWyxIgCPFnQJs8fOQHZlYPhOuZ+bnsSPVprFQ9gLqAuY13rF26NZwWCPVyR7v9VR9vPw==
+"@storybook/addon-a11y@^5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.13.tgz#7c2c9b89428a7881ab9dfe2912817767d9cd5753"
+  integrity sha512-wq9943/EETV+KZtdtGN5cMYwlAb4cMU4jelCpqNFUkGQ2ScMH6aOqUb8hP1coCXPZN0s86yPZp6tCmPTmkjhdA==
   dependencies:
-    "@storybook/addons" "5.3.12"
-    "@storybook/api" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/components" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    "@storybook/theming" "5.3.12"
+    "@storybook/addons" "5.3.13"
+    "@storybook/api" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/components" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    "@storybook/theming" "5.3.13"
     axe-core "^3.3.2"
     core-js "^3.0.1"
     global "^4.3.2"

From 5d8d4d79551b06394c42cc11f54673258f842cc7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 09:53:35 +0000
Subject: [PATCH 138/171] build(deps-dev): bump @storybook/addon-notes in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index c174a5e58..5e2aad55e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -101,7 +101,7 @@
     "@babel/preset-env": "~7.8.4",
     "@storybook/addon-a11y": "^5.3.12",
     "@storybook/addon-actions": "^5.3.12",
-    "@storybook/addon-notes": "^5.3.12",
+    "@storybook/addon-notes": "^5.3.13",
     "@storybook/vue": "~5.3.13",
     "@vue/cli-shared-utils": "~4.2.2",
     "@vue/eslint-config-prettier": "~6.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 006367bc0..8eb95f33b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2145,18 +2145,18 @@
     react-inspector "^4.0.0"
     uuid "^3.3.2"
 
-"@storybook/addon-notes@^5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.12.tgz#979aa20d701f4b4a8a2e411a55b183648fea5cac"
-  integrity sha512-j00wcQLb/a/f95OzYTN12rO54SvaIvpZEy5a4B+ZxmeH2/krd908tdqKMfJq4IoQv8v/WfbYCUXVaSL6Kgqhiw==
+"@storybook/addon-notes@^5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.13.tgz#aea8fc9eb95a397cdf13dfeea3bb401608f0f5c6"
+  integrity sha512-DKM4ih3Ns+vGira4PUsjRg7LAyzhsYmq/Rr4yOkOqO0o8Z/ElWw/uMcygvKEfTqJGm7n8kaCzZVz/YmRkAbfJA==
   dependencies:
-    "@storybook/addons" "5.3.12"
-    "@storybook/api" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/components" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    "@storybook/router" "5.3.12"
-    "@storybook/theming" "5.3.12"
+    "@storybook/addons" "5.3.13"
+    "@storybook/api" "5.3.13"
+    "@storybook/client-logger" "5.3.13"
+    "@storybook/components" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    "@storybook/router" "5.3.13"
+    "@storybook/theming" "5.3.13"
     core-js "^3.0.1"
     global "^4.3.2"
     markdown-to-jsx "^6.10.3"

From 9e71855b602261b5259a06c415211939d71d697a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 12 Feb 2020 15:45:06 +0100
Subject: [PATCH 139/171] Update devops_ticket.md

---
 .github/ISSUE_TEMPLATE/devops_ticket.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/devops_ticket.md b/.github/ISSUE_TEMPLATE/devops_ticket.md
index 3507e25bb..6f8ea55cb 100644
--- a/.github/ISSUE_TEMPLATE/devops_ticket.md
+++ b/.github/ISSUE_TEMPLATE/devops_ticket.md
@@ -1,8 +1,8 @@
 ---
-name: :boom: DevOps ticket
+name: 💥 DevOps ticket
 about: Help us manage our deployed App.
 labels: devops
-title: :boom: [DevOps]
+title: 💥 [DevOps]
 ---
 
 ## :fire: DevOps ticket

From d11e79854c8dd671a65654291846b990acd5bc44 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 12 Feb 2020 15:54:22 +0100
Subject: [PATCH 140/171] Add jsonwebtoken to development dependencies

---
 package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c0fcbce02..79798391c 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "expect": "^25.1.0",
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
+    "jsonwebtoken": "^8.5.1",
     "neo4j-driver": "^4.0.1",
     "neode": "^0.3.7",
     "npm-run-all": "^4.1.5",
@@ -52,8 +53,5 @@
   },
   "resolutions": {
     "set-value": "^2.0.1"
-  },
-  "dependencies": {
-    "jsonwebtoken": "^8.5.1"
   }
 }

From fa02a4dd33a06db28752360c2895261b60ba803f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 12 Feb 2020 17:53:38 +0100
Subject: [PATCH 141/171] Write cypress tests for ImageUploader

- have I missed any important features? too many tests?
---
 backend/src/db/factories.js                   |   3 +
 .../src/schema/resolvers/fileUpload/index.js  |  19 +++--
 .../src/schema/resolvers/fileUpload/spec.js   |  18 ++---
 cypress/fixtures/humanconnection.png          | Bin 0 -> 132723 bytes
 cypress/integration/common/post.js            |  71 ++++++++++++++++++
 .../integration/post/ImageUploader.feature    |  47 ++++++++++++
 webapp/components/TeaserImage/TeaserImage.vue |  37 ++++++---
 7 files changed, 163 insertions(+), 32 deletions(-)
 create mode 100644 cypress/fixtures/humanconnection.png
 create mode 100644 cypress/integration/post/ImageUploader.feature

diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js
index 7a8979b3c..1aa369e95 100644
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@@ -113,6 +113,9 @@ Factory.define('post')
   .attr('slug', ['slug', 'title'], (slug, title) => {
     return slug || slugify(title, { lower: true })
   })
+  .attr('language', ['language'], language => {
+    return language || 'en'
+  })
   .after(async (buildObject, options) => {
     const [post, author, categories, tags] = await Promise.all([
       neode.create('Post', buildObject),
diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js
index 960dde7f9..df0145057 100644
--- a/backend/src/schema/resolvers/fileUpload/index.js
+++ b/backend/src/schema/resolvers/fileUpload/index.js
@@ -1,24 +1,27 @@
 import { createWriteStream } from 'fs'
 import path from 'path'
 import slug from 'slug'
+import uuid from 'uuid/v4'
 
-const storeUpload = ({ createReadStream, fileLocation }) =>
-  new Promise((resolve, reject) =>
+const localFileUpload = async ({ createReadStream, uniqueFilename }) => {
+  await new Promise((resolve, reject) =>
     createReadStream()
-      .pipe(createWriteStream(`public${fileLocation}`))
+      .pipe(createWriteStream(`public${uniqueFilename}`))
       .on('finish', resolve)
       .on('error', reject),
   )
+  return uniqueFilename
+}
 
-export default async function fileUpload(params, { file, url }, uploadCallback = storeUpload) {
+export default async function fileUpload(params, { file, url }, uploadCallback = localFileUpload) {
   const upload = params[file]
   if (upload) {
     const { createReadStream, filename } = await upload
-    const { name } = path.parse(filename)
-    const fileLocation = `/uploads/${Date.now()}-${slug(name)}`
-    await uploadCallback({ createReadStream, fileLocation })
+    const { name, ext } = path.parse(filename)
+    const uniqueFilename = `/uploads/${uuid()}-${slug(name)}${ext}`
+    const location = await uploadCallback({ createReadStream, uniqueFilename })
     delete params[file]
-    params[url] = fileLocation
+    params[url] = location
   }
 
   return params
diff --git a/backend/src/schema/resolvers/fileUpload/spec.js b/backend/src/schema/resolvers/fileUpload/spec.js
index 5767d6457..fee0bf81b 100644
--- a/backend/src/schema/resolvers/fileUpload/spec.js
+++ b/backend/src/schema/resolvers/fileUpload/spec.js
@@ -1,5 +1,7 @@
 import fileUpload from '.'
 
+const uuid = '[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}'
+
 describe('fileUpload', () => {
   let params
   let uploadCallback
@@ -13,7 +15,7 @@ describe('fileUpload', () => {
         createReadStream: jest.fn(),
       },
     }
-    uploadCallback = jest.fn()
+    uploadCallback = jest.fn(({ uniqueFilename }) => uniqueFilename)
   })
 
   it('calls uploadCallback', async () => {
@@ -24,20 +26,13 @@ describe('fileUpload', () => {
   describe('file name', () => {
     it('saves the upload url in params[url]', async () => {
       await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback)
-      expect(params.attribute).toMatch(/^\/uploads\/\d+-avatar$/)
-    })
-
-    it('uses the name without file ending', async () => {
-      params.uploadAttribute.filename = 'somePng.png'
-      await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback)
-      expect(params.attribute).toMatch(/^\/uploads\/\d+-somePng/)
+      expect(params.attribute).toMatch(new RegExp(`^/uploads/${uuid}-avatar.jpg`))
     })
 
     it('creates a url safe name', async () => {
-      params.uploadAttribute.filename =
-        '/path/to/awkward?/ file-location/?foo- bar-avatar.jpg?foo- bar'
+      params.uploadAttribute.filename = '/path/to/awkward?/ file-location/?foo- bar-avatar.jpg'
       await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback)
-      expect(params.attribute).toMatch(/^\/uploads\/\d+-foo-bar-avatar$/)
+      expect(params.attribute).toMatch(new RegExp(`/uploads/${uuid}-foo-bar-avatar.jpg$`))
     })
 
     describe('in case of duplicates', () => {
@@ -50,7 +45,6 @@ describe('fileUpload', () => {
           uploadCallback,
         )
 
-        await new Promise(resolve => setTimeout(resolve, 1000))
         const { attribute: second } = await fileUpload(
           {
             ...params,
diff --git a/cypress/fixtures/humanconnection.png b/cypress/fixtures/humanconnection.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0576413ff0663ce0c79b6a0ef8ccd2ffbc77594
GIT binary patch
literal 132723
zcmd3Ng<DkL_cb65(nz<I3?SVp4I_<oGjw-{gp@SMkkZ{qhaeI|cZUc_BS=a8?)dq>
z|HC^xJj&EP_naMTuf2A(+FSYOnB<rU2nf#=6=XCJ5RmMFUv+d;;2HAjGfv<iWNRs~
z6aqqh0@l453h+0rg@Ohc0l|+60U;zD0pTz3RLCy`1kcw92nVJJ2*RHb5J+6I+to#Z
z7f{WW<z*0_;6M3Yr76HW5fo*lw0xG2a=dkk7XA(jK)<c7nw)^$z!%?>*H60?zmY1N
ztHg215-QVs)nBhuV7@r&ng$W!gIK`$$S6hEMhD{#pEEMoa+Xk7H#TTm(Oa>wj{3s(
z?nF2Cq?WivtUp~WU1whhq9D=#|Mw_JkKMf$V3F&JgS4&i!mKqxCURVq$~=bL1Lw@P
zkx$v#jQ?A70l$v;nRj%Uh-6~`<A96JC@<_zfw&Vz$X@1u4@cUzhND2}PI(D!b*^5w
zVPD15OY4LW|2>AnlN+o~C$Tx5UzCZ()M+c~2Js8U%ET*{=sXz!?@X;*wS#J(mgub~
zncq|r!HkOZ9<j$Nt`&5HUKFccb0R+`WOKonQoyW_kXt|ujppq)DJ2tMNVJ+@3aQrk
zo)#=O4pPstKO%!_CwwM5K^i#oaIa;K*^*`iwaAsQ_$Oq8|NFcWLHbiN<o3gSZ{`U`
zdIvimIx;tkafx1#*qB==5sY{mJMRrw0Mgj`3S-5&>JYkz(^S<iJ4WTYV!dIvYYkgB
z)VwWAgHeJ&lEf`C8h(4i*D@nE-G#c3q4iSL<KO%uA#Ky&>6r+0x(Fo&xXE*ri+d$(
zQCc>>Exe-~v*~8A&VqlcOj8M1RtBVvKoeXv#uFSbqbNL;fsmdjRc|O|U?jl{^WS|n
zm6PrJZ`tGgpXENGmCfn)Rd^?>?=Oy^<d*7=cZt=|K)2jqR_*$8WBxmboM*GC2eo4u
zv($3(yhMXtZ{<o0`+9cSW3~uZZpkYOi0_fO$^X5RN&_J`tztw1{##6XlGyf@e8452
z_+E}%gG!Y^`<9s(Mw~U#{LPuMP#XS$S+i8!`y3sYJC;aIC__Hqhd4tzhWUCKE~q#k
zSvLgjF>B}-9zO8M>_YG;B;}Z0r8`zfL*~dcpY!5{O^m+V(&i4^twzGBodV_A)-0sR
zd<8QV{#%OWe1Tq2U=(8W;9(PSQUf;RL3WcBx)U}^@py{{7}^x*RFdbO9|JZ)FYEbl
z%SWHjmwm*v$K|<qQw|AEOyZSLBs!3#x{gK2ljXU`FAr;>Wl;RLYNvvbJ)88}lc74m
zvR^7azT<|<p|Zc=RMgs`QBH$?<&OBvR$g(h*+%fh{pXfjcFCW&|AOja*^e|3EAbWI
z`(bUVf8VoPp;z*Qk1CM6m~1^J4s!TXv+@bdbzsE{Gx@AnQ&z7J{O@iOGe~^w!ui(&
zeed~W4$>?+5oBC*i`cFC-^MgMdQ=mtRB+eaOIW@%V1mwJ7n42y?U(yCcJfuRu@kpi
z3%BeJs*!%Waw}PV#j~eKyz1h%^WR6;EP+?^^|}kT<>qGhhFHEJOsDP8Ok)T4e^QPh
zD%{t67Sj37I-*%$!D<#Zto?6WXCcWfyeY!VkMw|z*hFriZjy0_jm4Mz<^k8=gLyh*
zAU;{+b-2^7D>ITR|7~m8b7q$@1Kxh;LcR42bKj?^9qa(R0?tl>fwOnE>DNWN<2jI4
zETVpq8IZGT<GpLl7S42)A1>TiFoUqh&JS(V4OrF7GSom436NVd0u+Hvjk3X+IKL*D
z;U^|-mwsCv9<72|>}1wilPT<{HZAQ(*6LSJ3N;}Ao|5R!-D<=5k`}}2AkC2rF-*bE
z^wK^yz;}i}@R=aAPlHZxEJL)ii02urE8z|VJmOI7vMCTj+Y7cSb@v%RF&W^#LQij(
zW|Q8+>|)hWLvGvFd-3zt|9hUSjH{D4^i|3oZQJyJ-|zui9W`J(hg_o4O{qVxyC(GC
zH_+4P6zDx-hL(SMwf}h?TqF3ur{6Pb+o2MEu+wByEa8S5J3fBW*8;uu6a+1b>vF5P
z;AFP{g}gFFVi%uy^IJ6J{N>J$P_eeZ|1Kz;#)8T@LS%KSj_Da3o&2O-@Uvt(&MzW-
z$9obK{MYQTK!gY;KMkT$ZOl%D+=8H6RzOTr!ycT*t}W5)j)B}_LbrUOJ4&qSuu@WE
zrN#iJF_&^)*q}NnI1dQo|AkJ$u`_;x2)}5V&zUl;t$9V5>tPT+=bdN4r)PU<J9`8^
zb{UXUjq`Wlf2RFe3%Qead*q2h`<%hP_k)Ne*S&Vk79rs0pPa+P*$Q;UV<5h`G1@EY
zz_Dt$NT`pT<FalFxl5cDAvkpir<%9Egzjv!rUUjF^j_uj30gi|8^eEQo8=a|XNBo0
z0o}1y!}k6FX)}fH#0WbxI2#+!K$RWk*?0-93~#M>XG>EdK4hUx7k5aKY&R&#%l|e@
zrACz4xI8-bw}DOib%8F&d&uo84g1(&NiIWzF&C1TKxFSre^5j2oSff&mQNAN(C9@E
zxCyN{!N23O0N<;^*J=yI)W%MR0k?h221gyD8X)=$LbnpsFfVT?o7+o=3$w|=&Tc1T
zJs)bq+3!ME&Hi0nAIaLt5?DG0tok$QdKRS3oV$%Ym{54k&8bPcD^VvccozCQ*>&gX
zvz`;<*tsz;OnwGLqR?oFCp1Wf@RKYzgN5(?kWm!;%gPjY%Fklpr@^xtG2T8gI=U5~
zUU!dCo=l^SexE0m2xNk5GaY+Ap<t?Ihi=T;<c@#)r{4cd@11`6BNTGuh|5Dg9PTU*
zv)JK<t(E9Gr2)=UUh_Mp&Prkudm`mx&X(RGYS`$XA1ff_SHf=va?4|B+h`%XW~0+3
zU$M!Kj1($au^Bl7s-@d2c1IK*u=$(VK?E4_R0@WTk&WC%PWX<h8t9z@(|4Tp5rxks
zERhWO&2KRr>_prK;d|=mhH%VUuEFyOa>Kw2+e?a0{M7me6tT|e%?Z3(@RkF*w*gpz
z*x31!<v9b>iA!Ax>KSia3fxgVyIJ(#>3@Ba2Fwe(!!}eTud*6i4SGsko%`@1H)MxX
zU;9xV+(EP64k3$kFV;O_8ap$?^`A8Y{3{o7dkN%RjlT4*=bNl<SHkIbF}ddkipq56
zKgP8r^)6ntbpThGRy62ytF(>mdE02H7<)Izwd$+%nVQq=H-S*)E?c?M1sMEUe|kCk
zQ){DMNiXathrG<JFTIT_5TSU-&V%Ign)JHkAgvehq~KOE2I=fj(z`SPPBsN2{!{DB
z7sg5^|9K$cV-&&Djbr-O;JG@1&V`uJ#c`qZ=F>~eO9JQ)D|aS7p|@XDVh1(8I@&w%
zfE!0~PD5%<N_?#&bIi7JsqQ5Qbcd8X6rWInE5dazse=Z1pLPwwnr(WI!wYs7(o4+b
zI8$N3WH12;G>Kgsl+0Xx6!1kaL3M<6pjZJ@{#m%-uPn?KbgqIjbM9M0?;^&@7{FEN
zyrt+1a9E%_J^7@@=8%m?B$ki<IdLDk3QK&VA-Bi8{gt`jqF=F#(WsMHxVRr{`#gFf
zDPD7Dp|%qcUu`H1<a-L7jnaJl#XYjc_2j%y?BJ0QQ6_0N>3Y<ihOwuBk$j<xg!j!6
z+x|f8=UWAtS$t-f2uO09oUTn|20WprsN3Zzg#;@Q-M@(0T4c6!d$p5DnjE^q-+e~z
zNx<>KtNCL)>CDdys#D7!Yi$`GNKlR*;Q^EtPG<hw_7)zj-#@rbM0qwSo|-YfgEEj?
zzbPbX7tl*eIVdqB`J}JnM}H9h#1gq-_qc)FMxgZhL{+ZxHW@LvP}j*wS-ILni#fuI
z&L>KO<H4heI^UMc!Mky4uatz9>%pe%YvTOmhVzwdc2&{TwM%^3))LCXlxMDYwTbab
zRK0b9i*Q_6nVQsQ*y1OX0AI3qk7R9Z1o)m!#j0{$oeXO>FO@DOx$VXfTqBl~&3*P$
zxXG+0Wm~=JiE?|W7cgw}?>Jo0v@4!G3EY)_4>VM=qw-a6G`YP=WT~C9SjSH^#+^U-
z`;>lTx|+%2!}Jqxk=Ci$mv!tcFQtPXUp*?e%ykBiQgr><Tg~A(n%gg4dE`9MHWJt0
zyub#3skQCo)hg<dBhj=W=xCGc2%VepFCkI^<G_v2=XaG-;KO%J9le~2>%V?K1@KC9
z*4aL+@2)IvvddI;riP%oHfDX<t2}$v#sl2aYsJ+2T3*;YuSt~>5a6%0g=GvHBNxsJ
zM4g)Q@6XbOujB}7z#eu4lLx}P?T-(Z!)@5&-1KF(59i;oT2pdspWKI(e;+74F@;ti
ziaOsrPCZv~`zWj6r4Azi#b{F<of;Xvg{P36JpjJ*S8tN2#rb81@94~61~Ckr88BA)
zF;{P1O<@OrGQUmXg^5gJd*_-9c|&(NXRw0{OCG35RCw;iVs;8`(i2L_IMU49uw%At
z0SsfC&Q?PDR<S-nuk?n(+&8#9jN<J{oQw>W8VaSczmMj@CK;IW;tb-S0`c|N|D5@$
zQs$c3RRz%lZXoioGoo0xB;S{Kdd6J&F=>%+psEBlA6uMX6t(Ft(wP=#tS^kdQa2lt
zqbYn3op+wNl9Xmpub(k%lBz4Y<hkhjz4H66H8**o%01}ah`DP%(HAqJ4<lA08Xhe2
z1)C*JRzfrgs(VNin%Ks0u-m5pP!i7WpQVu=%mPoYR=3?v8e)<q(*bN|u*fOQM{6MZ
zGn&m=*hWCYWQM`TdO=Lpn|ljH*}FO#pq7t1XIX%$D>Zf=_mfBYvqp+2@Z3*D)!C|Y
zb@Gh4?AfNf7we73o43URg~BB06abJUW9RQ!B72m$I=#Vn66;YAUsViPUcPRS@yCXv
zXWT15fc&+iy52#!fLj41^<>}*xv6y$KuJ=lC*IgU%NJXiWVVMjHMxct)Q+#$jWHI|
zWNAotI_aR`USIcq@H#3<>M%jBnJKeZEx2n}xPfB$iqe~@La(>vG9jwpm8ZIQ^Wu~C
zh?#66_QVM|e4x$4p_@&<HT#%l@`YUGhy=a28;~U$<8u*yEeoq{mxxK-@y-(UQ>B*A
zJ)LAv#*^50hkA#g>-#WqSJg`Yx%4XXGKrf#iA@sU!DfjzQ}$)$A~4Kz?Uqd}@%)qK
z(^czClWOLsHsjakZdnNX{A9ShLT~C1=@xiwNRUG|GCylIoB(|lDGkS4WRx_`2ze4J
zHan&gk}isC<2+4MCc1}cgoOdwc})vQ!r|-`azK#*-EmR}Wyo=57Z_i-1NNpTo^5`s
z*%X$i3KTlvE+-&NA9jtW%;*$n1GNzAX4|-1yn^oKBLCsivW6rf3GIa>g3L3oStNbC
z>jAtgy$F?3f7C9yk|xrYmfOC|%C%}FzSDB+%Wioh?YLlY=Om==>JQDwvzUTQ>Ipw*
zvshE`;U39GZ&++JYQ}>Cn~oV2*9gl&KiGk@ufmk9z>NrU9}%Za#~29Uie+xQE3GlN
z7kko;oh1><A+AKQ>J-+qhVdQl^p?N|o`TlYkH!`X0GhVDD*t4Us88Hb^PSFd+P0{>
zzKXi27}(w>{JW$adV#V;$8T+St%85lDrv!oMRlOAQ@+vV+A&G+p?D()y%Da86;b7+
z^+UA|qQQdi`mg3kCQ62vs0nNJtpTDv68l^>{(h=RL6@VE26jnHPJ#Jkk1lj)!In&P
z^z__DsQ~;}YRsPe01JKvl=-ZiXV5D#AW<aBt?{WVMoV{<S;)=Y2<?)S5i=_#)!%Z5
z=Q#ynPik~<${nyNC)RJHmQ9!N;LG+=8s-I!vn1}Co1yg-XZ&$K=*d~%%`dq$k3#Pn
z^gO4Yv(ugVn^Ab}YGS@PZ4=T;)TLS^j_RP_<FAi?=r5%3N)5WTA;9^W_#U0R5RdO^
zUH^)I?3~9oQbMJ1l^wccVVgct1P?i_YCt$r)(t|d-V9Ev^NG%`XI4pVxPJqfM;5n1
zvU%%10Hq}BSM@cV%huxq?d99vo@@K0L40Z4MHBRLr|=%!)CBTv*Zi%(UrG^cNlqvc
zTcqydQ0;0Syx)8R&D<LI1-y9r;$|<Pd&vJCqlJR?(~9%E4^tt>G|GXd-faE(TnZqy
zA0jQ-UA;_o%Do#`%wMMsu=A=k+~b<4QV@d~c(BziMl`q5qH>I6#yYzzY}2t)8xDGg
za)+5if7<)Gx;c7WoEPfWgdpe#0;c}Lz2~hB%2VS~ypee9D4`Ud-XbrK?Hb9On|(RU
zC~Lkh=U42w3)bzV&!?MkRu2lV#YmQ;S}1_1e;i5SmvHKkI%@;OK~?!a{EQi1(`YiB
zSSLja6#i-n@3;MrWulE08*)5`71`U5$`JB`!LXOT?f?OjVt(5&Upwo9LXe*KEFVj#
zF-HZV9Vm3Ndy|&}uuPn51c(46{>h+E^836!UUyH8qJr{qH)#Q#7hb7=(KFCreWcYM
zF;fpU_d7q_=|;>yOvIuR<85nZ)i4&c)^MvsF#!N8@C(;<eOaa%Pl`OY5+Tn@u)by@
zM|OM?&JOdWb3>2S+HKhRoDG>}TW;W>NXiVpwc>jN*4+J|nh2DkNj$5WlJV+!42hOH
zbvj@k=;`RbaFY9Kux+F=S5~{tZ{BH=HrmTEVpJ)(M=NBxU}`yS@6dc3P(nUE6A&)4
z4Ycp)>pB(N-=u0pXyz!SJj-LuxTM}Ie?9UG*s!>Z-$So#$*WewWqr0Jlcjn~BECHT
z%>7{$dD$ktgK_7U+7i{TU~k<CNQ9p{v$0_lbk-d_;U;8{AjFrARf9~0q@6a@3m^P4
z)%z~Ke<&Kz;M2>g1#yv1!@c9X@I*<57|*$@V@%_)<k&zTP9Jjl_%+U3SU*p&AoO{a
zC)rL&A)<8G-obnJ7BH&A!?83zyS<;@tUx7lEj5^*bP?GL<5$p2vMlKxNWG~3Ont;t
z&ZxBN%QCT*bpIemP;i)xyNKIOntCm*spYs{LAJlYF^z057Lau^QHqL(68Tri%4_*?
zr!`DWVn%uBz}-Rjj`*V85)K+_7e*fHr*}`y0z*}j@B<5Im6X_|#vb7&tMbg*ix-%`
z*>*GkDCJnOUZW|wpw{EZOJ;BaMQc*8TCQo17>E`oDieFdb>HmOI**goxPi#1UV%0Z
zGLgz38YRTh9lJgz09OuUzG%J^8XA)S%Po*|IR*Vg0mB}-=?s1hs>E6)|M3lPEi(as
zN%j~2_u(T`_#zh3_QiKc35bmij-543{hhWvkI)sI-R^&!6W`=%>NkdhflRURk;!7E
zi?S%AY*}Q)OGGu|-O%Xl@Vf>$mvrsWa;Wmv`DNkc@A;7d<Vax|i<@5lgw}=wE~0+c
zmCHuun8fa{Smk2xcxk4o<z^d13$s9O6b{}qKmP@;Q^mJ_2^PEc{tyg1BRQeX*qwKm
z)Ys+-FH`!U^B1eolNqQ+*|!X915^j34&+W(5Q^8eJDt<Uw3r5**W%IIQ)4}wh%z#w
zWQkPG*R26)f`coLc@V%%q)hFzsPm;8ypb&1Zmo9OL}=Flwz5mv#qy{Xam%360M&N6
zctSb;y}p+?77##}k!Jxoi5IBtjXU`*TjTy=q7i~+4=k!zOuFh~vA@h5K;s?Y5XYa<
z3PmJ*#(((RB%>#C3~(Hl#ft<Ql$Ko;Q#k?Z1;nlFxp^!L@T4(2su~~@rxFZ@rAUu?
zgtMyf0p&I&4`wULWhviRo#!%FKaLicJ{y;GbGW7b0?IVgju(wxlvrCN^XyT)jxu8m
z4O7>{`LUZ~!{uX=$3L#4606a8`CA7*@s+`C8Gi-oPcDoGH>w5WpAFS|N72_uJFFKW
zS;c0^G@mqxAZj|PDL4#%MCXO&Ax_4R>QXrjD1ALX#aoHhZC<lT9KLXd(^KX?&M{kz
z&ua!Tp*sV-{YLquPUN<Q^Gvf7&a?=#Tg&QVEJ(($^@_B$AGrW7xq}h+B`oo3@Atfv
zJ`e>09a$SV_;Kv^^-x+xcRjK~p|KHEVO|GOIY73AidBg{L^04ecwTRMd`xZn&)RXT
zof-7?mn~b~KMBU@qrlJBLn1pYFv<5A!vWut#sDqzo%RlmI(EilXvOogriXT0?OS=?
z{v2l<OMv_-AbUh_69>yb8rh_mq9b_r$~<Fy%8Hi0dczuNvEn%FzQR}Z=-=ilIrb2g
zLWR*Om+PRZ2EevAcAY0~RO57+5L`Qb&W43G9xcO>&)0vm95EeEoiH65YHiFz3G#%S
zsQ*O*Zw@NNAJbk24I}F5fszo;i?lelCsi<6I!=puV~)9xeasF`(+^LgqK{dMR~2c`
z88&Ck4r{2mt}Z3HR-1GlKYs}ro?%1ndvdfDD-uI)R$2J)oua;UxA!8$!V$-Ap+xXd
ztc2#vjVGzDzf}Vk_aD#>$AyZMrtYEe1V!NdMxU6gYl>cha}E(X%3}M;+g=q33=Pb*
z<JaYGj2daX6x{DK^NIjo9w-IqF9^L6dwG7wyw)L-{dx>viG5A+GasdzZ#@8cIKNyn
zN!0J`n87&FWVj9Top;sroDGlW_Q95z-pvOPM3h2{O;>esE`K9^EBN+?J?SK@TQ9;9
z$KGhqw{WjL3w^Fpw9@lK>en8eQc{$~reg8zWXzRPaGEqv=&1Q_q2Z=)Ba5@8c#^QZ
zn>ML)k3M!=neZQ)H&*?TT>uxX9_LrCQvKKxs=PHZjqTkn_EBQymP2Dh-$F|brhB?%
zDO24A99GuD&~zhRP_?p36w<%!@c=RD+Pe+@^7R<W!MO%Yl61}|{8(QO<ME5cuuU)j
zE$Up*HG&2+EPGdTTJ`Stp*vw4w|;rl+^@<ZlsQ|eniz;s#`mihHEiP|J&x9~LR-CC
zg+@^;ErrVC%OzcIDLF*ZV6k<Me>-4sc)7shADn9)^}f0E$welW`t|Y;20IennG>_v
zB!TYIQLcJCBX0_{c^wqk@}2V<V(*Nlj=jXN&`FQw`jiDw3mei^uOQ!&wI$|$7@cy9
z*_r2aFi8P;TY!>mxn1YIz5}xQ_^*5>a`Ocn%`0q0e2xV1HK%`97ktuMOUf0rje5pc
zz0mgkz<53_{m1_8`Z20Qo)ea|2KCCX=2jm11(v!mEmS-*hX^ag2ouSf)m;Su>znCJ
ze&}mY9at?=#Da272wcCayI@&5QX}_NsxiB+S_H2M?9D3-$GF&A)>*V~7bMIe!^*C6
z)AdGDV}V0bUCnbPG|!Lg>gIKOCcpZhHdFi;P>!UN=4Ft2@3WG1`k~5ppW6bsu!c}_
znHvo#PPJ!j{3O0GMzl(0$y~m5D<=KISsn{GNSuxh(<Gcjvgx+3eZKSUxMM5DoHx)W
zeZpzR2I?&uPUHL<qpbMKIQr;=%0mtYCUL8iXE(48AYr%g8_pRV{J1RVpn5Ui9_Q9u
zt+n=i{u&wbh3(&h%%b{eIUI}JQTn$G7UFci>eChn4}0qQ&~-K}ez_OH<+6G%M{gAE
zcOSsr!%JqwMxV4HS7?3k$lJeRbKU*%8$|oQZfw0)D<W<z1N;m?d<>U!j6>~|E5Epq
ztJ<bd{vAat!kThE^>sPUb9hQJEiXLr^KunB?jWjw0~qkU>7gfmvuyrVsu7Zm?BA^J
z>mKO)Ju1dUJiXO){4Xqyp_&E!pRCCqUu7C#A9&u0wCPiK_`o-yM}-6Dhu5KWVjAvL
zZIlX{9dP|^Ny)-NJU_ujkYsf|<D{*;w1{X`m&o9oQ_=t{lI4@SdCyz{ubWZ<zv>&S
z7SNlfh3Hv1lk0daZV&gw{H*uL{Q++H8(!>{1Q!709*z8-CZqj`F;JGF0or@pc+VKK
zvuYc;Hzc-^FZtEX4P_36&+0acw|_4&_I+ztb|Bk;2P}7abV9L|LM-wZ%oT!Y2QX8u
zZClWF#>sc3tsXwQhukBG-O+A2d9Gb8lOWS$fGcw4P+I=Q=l+tvXQ}S0U-m)yOfjND
zUu~wnrLyWcT~?1{Y?44+2F!?eW-^IQBX@FI9eb0^w*MI(tN^Z_nFQ6<U&x|XLc_$s
zPD73G(Ho1U{P9PrqM4oxMcsmfDcIyinKjWG>p!3bnrbBS6KMo44QE(7TSrMk_fg`F
zdm111Azzp8vk1CsJ^8W%vFF=`6wW#ekq;SSm$4TW!mH<C+4DuCY3elt0d9PAFY!H!
z$v7emiM|~-9I>*?E#IUtMesVZl^>ZVJqG2G-JX$peRGf;bDR{n+&lbOG%7+oZ)<wI
z9bxP@_;U>$3VG&m>f9DT8xZkm`AGvOaH50)+dit`(wgoxhHW0h{<sbVWdX?5Oh$uL
z(YmD7jrezWDdsoT1SsB;1)D7jiw$N7?P9)vCeAO0P^4Bl@?S7So?+R~ya!U~(CSVh
zkO<Sxa*rJN;WmhtckASraNXsbA^aa~_0McC)NwZ?97UaPAHVqSJa{VLC$^E+;IkEC
zcDHcfa4C?O_rh?JrOMMiaq}V8Z8eE)*&O3lvSl<s;VkK;ja#sQ?=&L2x($;U7s*_I
zuBEKyX7oxxFw~@A%0O;^t(5;jp>UAE^3Y!ApAWcLuRY&+GkqaK{10icQ@ghF7;o=D
zP~Zu{0`^?JaAA7uQzw(u@e|HVy2_*m+J~B-ycqUtlrMdb1G0`SuxuT1x0r2<W6aw;
z+!CBC%d-5gQ<6USr9WqQ_I7o54gKg%;@`j1{D^#8Q53Y}vpqkF0{PaD{=s(o&nM)T
zS)AX!gmo#JP9mN1Id{$gGPE(Q*$JzrpN+0`>d^mB+L4^uF+~RUgSv5KzeG+k>Q{XM
zGz?>x^i3Z(MFW||d&MrcXS-S`0uig*E5Zg^UH2I13+Mcnb<r!lNxi9;GaiD6eqrkt
z_)No_k7GfN&zfPuzfQG<eR5Pw-#1&!i_pue#+K%N49_z1s2+qOyyTrO0JTN`wPy?a
zbB%miNR0Yk->60Q2jbXyh9c)w$*$IkXxl_f8*z>}8PN2W<evQI*dS3Y8QNrv<A`ZT
zc6iysJ2GzV>U%`i7*~OEdbW^*te)TNZjmEG^{+CSY4Kd(S=r5kc>VMFAhG$I$7b06
zfFDJ7NAUq#r6bn>JFo*d1S%LK&K|yV3cX%XT0IN@-ZpHv9_NHFTB`?dbM;3f5<{8z
zh03C_X#cu8XN5uQdf3aPA1LaaoiDhQ|AC-@{F6ZSy%UJHk{aB%Q*a}GQJ2OcHHJ6W
zTy)l-dg&A{JoFhPT;m2pRLu)>u;gy{no0k8SAV==5%2k5xmU$?A5AmY!@IcMCY&?k
z)bqxJ%x+VF>#~+H!j?hXjWvzVSeMkA_u$V<VbGQQz@hnPnT@L9p8C3nViyJLzYpq}
zdO>FJ@*WRbEuoaIQ`HABQ<tXIPq*Ji=sWl69f|*0vO8y+qB6kfnSfbmw=tmmaaF|0
zcR~I~2HP6Kx7;kj(b&B8!`$NAHs}&-i@W*h-QTpIa)lJ}MI&jr40JoVV6vz6!JU(p
zGky9Q>Ns$|_QE|ujL_=KRCBk;o5Z!D=|XFLuH1@e_7rb+{@zVZJHYAV2~l^vEayIb
z2apMqx*aOMs6Y1n^iWri5xxCX(RXq#S7k|dZmd3BfhM6c42dQ5dX-?W?2Tz<2o^ke
zqKgq!iP)!coXqCWTctkx;(Oqf-Tma1zSO4=kVU%Q;Kg4XeW?^$>{V+?zf@IpY4j|4
zbq{xGzYb>n{4lPW=@Rxc#ww=a8ogi+D}<8a`pGN0%IMc>-FMg86fe?ma%j!|WO&^j
zU&f@^oA1mmjbrBh4S^QMC^@`*NyIDg&pi6jQ#aGU{J{}XSi--kXtv7i_%t@qMb)tC
zx?P!7t6;F6sMEjQwT!}peW9#weoQJ1mt(|LVxdU6AQN7ne7dUhh|=KsFp7Ar(QWaE
z@C+Q%0Y=SQw8?(~vTHPNNg(dYDeF=6_k$p=Mp3@DS97PRBl&@}b~ndFgSr2w?y5GL
z<d3)GV!%pO=<#6xR{W!pAS1E4Q^;dbK1PI+=qU@A@W0~~^A_rJS3!5c4o;Xgt;7#0
zWl2w<cbCc%-j8m5d<i5A1yrnh^_Vr(mkiC<BVItPFsP(^yI^uZ?>x-dm{4Jq=W2ZV
zyGLT8ai$-Bz-Ow{U8VL1OM;D&a9eg2j<fr7%21yKe)9Uw$b<-VA-qzyaxp@|edo;R
z6>}`|dRK^JXQG*e%LT(CCII8Pr#dMt(h`F$>RKszEGMerUt>d}1}9-MnZy228yv;I
zY((QD!4e6lo_-+vVaX`RDSg*xVm%d@jOC}|Jz&tt@uMFl_hup)R;TOx{Mo{K@8noF
zDdafHdHyc{$<8^T`v_Cq_*aDYo=^TBwm_%w63SDPsPmt8=XvV(>*}0VW`2KNe|IB<
za1{2#1))V`<^1PsgWyQKnJdB^Ikn@h?21X1BHc&CObQi!>5@d93N%sM&np~&3Lyn6
zq*XTGiwC9L`3p^1bkK6`)8fzK);}{-IEeNbUu}gY`iFaYb4)LQ#)VICE;DLX+s7mk
zC$sPM9lC+y<Q-ipTRzN$>%X~IVIWCfqqw4MjUwVtP6gvE8uUULQdLc)TY3?#naR%<
z&KxMOlm~WW>pukxV{c!re)rA__`UQ4=3@b6%cVNDIqPoTtdeewf*%3bAm8VuJq~Ww
z=sgu|JI~NDE#(4Un7vK<Q&|3Tzt~nB1bx5DG5K3M0U#>U>)mQ*_I7^>tER(1`!-fl
z_#zhrIPsO|vv7LH%SJy66lCDsv%KJ+m{Z%aGo40?ab>Lfb!ifG^Kt}Vk(i-UW{$Nc
z580O$Nz;9cn(jM(Fdfjzn_FT2(-yHXMm?Wv<U$qHcMr*VKZh^th-9Z9?4$0~&_K-#
z(*$HsOl3Np(as`cZUd0^INi5!O-LKi!n|OK%$Nk_$pRV#^Hv$?PN8i&ZYk*r&VZW$
zAOrafC?m$ssez(7k;R7@sQ7_aPAZ%X*XfFd_)zG7bxy8ZC5NilCbG;b+o1GF_MN-i
zq~|Get@1`o^F(Wuu>&n2%CWMi#8<cK@UCvb&){O>d(Nh?r%XUz0GGXB81SnAt$kW;
z+wP>wIcFrF7(+dH?|K#+kceeKZtaj5zQr>Uew)DyssnH|yJP$N^=)NL7`O84i<`&S
zH508NK+~}`_)(nT4NoE~8{L8yA<%{U_#0>HR|n6xBl6CL=7Ac#{-;PKp+BxE&8+`?
z6N|HLUzn;c03n3Kl0Wbz*_i;)GJZaGro-F6qE_XX5w3k&g($S14s_#z$})}RhMfSV
zCsXH)f;HVhxp7q~Mx8T_Wj2;2J&)P!R*$G3oWasMjB93Hr8S%YD6b|6z8s-tDqXNw
zYX!3d?I5?0cbstb3())*cvrYD>$-Xf90>>VBW^E`rIs)Z+EH;|2#t;DP-qMQ4Y)<{
z!qTQegMb!91G}_{%vhF3RGz033h{kDaK1wXlK|8~VSqpaDIiC%AUz#xDp;U}tqj8-
z^j=U_Rr5##=iQ)46I-egr5nP!<^;V9%rjghl7UVk+{2ZwEhz4%f+DM-dC}rQN~Gd=
z{f(bDi?QCm^NZduhmc6AysyT(%W$53)4olClV48}*MK_~XeIWFxgz9_q2zKR87J2H
zumUuhO>Xd;8l4_RpjiTFsXBy48gSu3?I-263DA}X2-k;~N@KKu^eOFC>lOjy6UA7W
zye8(QPjpz8bmKiX&@%)&>jS*7>LOjI9GS1q<+oo7*1=q>QqY}*DNt~vxsNq;$I!l=
z|7-zZ;`|qf#8V-+=m2rg8mSB@MB*X7Tw`b4F*}$nkrp(4HjJ6HG-2f0=v(i;9Any*
z1I33$eAK!{=PCJIiRtcgFm5Na2!qc%1as$?bnFayhHS?_ZS+`=`fWj13Vq&pr&~Ka
zK>#Db$$9;zs<Ua>;^D8|+m3&zE9eSl-}LN_y}ky#mB)Pt2ppPK=~2%NG0qYU8QYb8
zyU_r3#Za2nsj~J?-Zbb51<)~ORPb&9sF=nEMMApbr@W%>rLNNFFR3hTfP!Zt0R5A)
zO}c?%<Ne>L5L@NOgSDox6;+;lGvL-WLBW6q2Q3Dm5<q+BuSfPT@%RH-(s6xsnK{ED
zH-Kg>Y6?U{2WhoTITlOJkp8oF;)T{c>pdTq{9+&c>Wmb!oUTC<MIClp5DRZwM}H>s
zJ1opB<cUpF7-N;|Y(=Qo^ZlSSAyuRhc}B$Am&}L`&Uazvr}$dGgdSb$!Wk{+6N7vm
z!7WoVjGvMj+j<o65*CxFKIHXbB7nIPJ?hlb?E9^c?h)qKi&*DRl#BDmV8=h7I3V1>
zw(BS0@=lRprLzseHGuALWecAgpeBvknFhOEuxrsCxAY(5!YjiI$&mGJ>@Qfag|m$w
zw~3q_TO;pk)bW@`Mv+>7G@QFI8)I*D&>Nn|Mm1UseiTA8yH+=GSob7j<8L?LQnDU3
zJ_@mQe`|U_%Rnj?L=*JnUaS5vXyX5SA@$8C?n6NcyXgB{SWaC)7Z$(M^|$f&0xpY>
zFDO?}zpgQ(u771kj~SP?gi_kxs@z$<&M4c=NshW)mk#jWq<(acPEeORzMOkh7<IhA
z2t3TOfAJ4R=+Q-#=;K_{d0WBtFQ|ZMtf`!-wMoc&3~4spMECuxS*l@zlA*1u%UqrQ
z%)7+*=(_t6L$US8UnW3}YN4^+u7ca-F=B)Fb*>%EFKRr#|0ElX!!bOzf|W;cSw}yc
z*YB{{`${1g#81kxuKr=nZpG>+KwgUyy4Cfup*-{27}$8x%yI6;l<oBAVZ4|N^2`pX
zM}7spjnN`xq@2XOly<Xb0+!~-60;R7uw?mVV*@1l4@9-g{W{gE`(+-BcswHLzq;g)
z6-`HmN74ee#a4fdA>+0d$oSr(LHKzp-vaZ*##9e;JinM|De<c<0)~OU*yx))N0&xP
z$I<;VCLT$N?w0~=x(2~LL#YpM_~7EvpE!WF?9Vr4p!KMt4P(C37u7H^GJlbue)T~8
za2#*~;jjI&lplCz;DLWVvEiH&9-^CsEiOJ)C*eoM4;wfAddgpS)I<6C+H)aV#QXM<
z5X+vzfpdQ&wWp6PZ%pF7`j=eY6Bi2kfbGpJNhzB?t2rQk0i1!wuh2TVLZ>_jEW3u-
zuk*j?8<Cm?jEe9wA7P60Ax=Nv{#zDiuO=X(;#S<X2F;zwIv)xjx>c=Pbct^Vq=b0w
z?-imiZ$-5l&|8u~nOJGXYKcDM+q!tSy?@VtqARjZTk_lp4fY75xhRsVOw=yA6ZE3&
zeEin8oVql4nY%H3*Y$h;Poc1w>5iVtQZSWB*U7e>#|s&h@2VjRWA8S<iE(|;jqdBw
z5gp+@?(U<xF8d*uN5P`LNi(hilzTa@1CE-$#$S(_z3t(0XC1hXPtmC^nf}9HCmsql
z!sqLsuXVSbqW_#q+?~)OwHV5qE3_*zeg34y%F!0p=k%ZlBJVO{PTjvaDF16<HD+@1
z2Uy!_@QG})%=PrD&h_iAy7|ddU8;Uu3d8!dSwJz7AfKp)T92=+ZJFWLO3FM4m);EW
z=lUe8_igp$?l#}wc6U(f6+1R^0=))1Ab2x+JHXfW77(7k;Ssg|lVx8|V9S7;^}Gz;
zQdS{(@Sm%B>k{A)Jrf*3Vjh^BWMsKIFFaLF;L{q>3#@ST)>FB0v+8rg(X0_0N25Y0
zSNdI^jqb&B;sa3uk`v75k$gsv9_y?si~htNwQ@gnVrI+E=0EL4zJLP7IZ*D)#5|6Z
zakW*khOjH6-p8-D0kXGTkgkPqa0+OL-JOR`jZn|wnRbQ033&AK8?>*<<T!G|@STit
zoUG2<^52`Fh{z}dbgydn??)#3Xx7gIFWp+lud%^Jxi)Hd4-;L2o>JZ`C3j1=)nUz%
zj}DJyD$9HEfeQsL1~$+JPz_n!QmB3pn~-0^0z)$b4OOf>6yvI4s>)BG&7BY*UrY*?
z2UTP$m-0Nx)eD8U4Tl<Vr&e?hb|dZ4y|D%KqvMGb5k)y8&G+=JM<0C~)wilX7iu!L
zGhZK0sft!Pu5J~3$BE~7FPHV|EaY)E3?5koxnL{Fxj7yBe?f&2{c@E8N@g!1<=~%3
zl{~|Ey7H!B@7h@l?9+H*!BQuifUGme7$|E>^=gKGVW40Tp!?Ty1AFpl&BMaLX~pjm
z;D=+F{jA>X%1ni{uCFMh<Z||O{y;2uO+GNsM>mWAx@i64;?7Go<*R<bm~){6hgsA@
zAaXP9ffuLz5=Z=U*12<#@880Z;alL^vwtT8+klh6>7Duc_N~lpcuWWhfOe$;04E7o
zp91+`IW#z#XNC)qKcZ-Qu;2xDz>W&+GUbuLNH*$<MA>g|%y){q9FeS_cYQy|U$-!5
z*j**WweNXqBN^siQ$%IU30p><C;xj$Jbo5kiftf1p}7_4-L@3Eyg|j-%CL}!@i0*S
z&9Cn2{z_rBL@Dm^n%S&v4!)QoHuA!$KLw=gP{^%MVEnLc<OCpg&)52DkjMim$uHTI
z|74lBJQ52*vjd9TkP(4(xxJ30eL>$%%oho3Qyd{W3sDYhmzJazubqBKA=w9?M3{U!
zA@>-3_G5)|R&Lp_ubQY_YC%u>GeMs52$zT&ys8})LGeqt)Ae{OrZ%%obhls=`3?q1
zev?In@u%LvWx){Ns9pYRKwA=d#QvHS(B+nr=JNj)=c^?JI2pL$rEQ|;(m(Q~_{Z7D
z*iUzro*mEhjr?2p*P}>s=^68{Cf{cCdE_!|AXkjhI^Hk|2(Bq|-S}apvW#*Uz-!x#
z2_^ijT7P9Jzi7-ZoNou=e4(DmATe-#aC`^&<UmFSz|sKdE+qZvxCT+XbkYc1HcXfB
zr6@erRE9;Ib$LQiY;A+7<-JVpVkI=W(-Io3kw)pmN+!G+JXM1-?zhp)#Qt18Tkr&=
z23$-iP2Sd&{Y8Q6tuIpMst!+7>{yM3+4z+I?FAJ5!LgVhb;=JQ88qwLm~?Tp6Bxa{
z3YY`T-_-(;by<P#kOCo>(Yo0vquw7-rg9yOHE2aNnc#dvE9&|}w9k{BNR>Iq{R^c2
zRe~0WA2wn7qc;tLWvgGhcfi5vHoMP{*c@ftbWpYa`=n)bsx0JceRTWAeZdMI*UaBu
zT-g9x1?7Isu@}<-TRJ%-ThdakW%rqY^CZTJVE)mHBz{qJesLI;2t`!><V;2tA``!}
z_lfrX9_H|-t%N$rduq`FYPP-hn0U2|S;Xo7#!Cs-Fm5i(oh|NDJ%?hqGVLDRJWsQ=
zxFsuj{CN;8T-IW9+-j6zfMQKED*Q38n$!Ft0?)8LZ|cXqR!}OEiP12Z{lBd_@p(XK
zXKmdtgU&N>po5dB+Cx{jqH_fmfw`Kob7Cf2vc5An=+-GP{-6MGLGVEbo^@0Upa|mk
zdw(?qD(dcTdPqj|1HJi<>HUG{0vdRfi2|xI!WfJck{7|wpSvva{p)WsZfvP4S^cq)
z$4x&6|L?~+u7I9(6!(O??ag@78)n5s_0@K_*Q~OyMlo5xZBQ}-eL@=Fp(LY<+UMz*
z&PTCar1Qx0_=1$I0#}`ViU6!_n<4b{LG%Hn*Ut-y4}hwqx(HDG4xIJCh<w_<Zs!*3
zy`6n=tVs<8CMB3?ZbZl!Q{n?j0Eiwh?8Nx$L*$85&(65-9_@==UJ3jH-ROQ1G1JTb
zNE{4XeVX|NNQG|nRPZrFqR!yL`xH-3lDoqRbgI^K5QO^oK+vhp4U?Jzrxxk4Gjn5V
z|9UvVACII=F+hYNtQ{<$AZB(B35E6wBR#E>MU+umv=siBNbV3*AB-=ngO4A1=R$<!
zOxz7)b{H6enVC>YT0pD}p$J=MXf#9}rsRtU%2czX-y^Gg3*ynwW~dUWR9kLZYfTc4
zCKF4VS8i#OG3;Dc%GGlA4&*vXoxu_@E!7`?493^!9#djx_|v}}iUqqRD6?yP6>dlG
zG7`Zlf+s8G+HAS&<t~50?xi}Wx{tlrdm3?FMEdNSWp_y;;(++G1Q1A)jhzMXbY~g@
zQoKqd)9UX^`sLJ;auYtUkc{(nIX23c@}f10y4wmI=^RJZEjK3YF6*74-c_2t%g1<Y
zQw6ZlXyi$9pUO4joIRya6TLe%=&ZiQOkK4oFd|)#TD;oaL*2xZ%Uch*Q)?08tQC4d
zHRs&Ay4d>y5ztfbF&_v{5y=JCP<^h{h84imy4<9VI-h|>Lej6j_l}DpYp8nf%;Viw
z>!oc=5%>V~la!iMd%=?{=pBWi|7=3<$K>vHeJc{9gL#aZt5E41B<TFJntjgZq%oJ9
zO`Cv9)8k^JsSgwHNIOyo^L~!2&PqwfZ_G<cfjjj6aNK&$`t1O-P7t3o^$ZDB<Yw@B
zuR*0f<}!a_X{lff(GNK#rtC%UHqDUbKc@?a4{-*^HF%Ph+f&=uW{0_zj&2+6jAr#*
z6{PQLcYgTFD@H}~R&zoQ5-N@p5}Pq+RkT4F5Ft9Cs7IycwpWjXD9EEWFFVUCJqmC`
ztK%!muSvUZ9BBvzY=f;Zrb)7+1Uq`qwqIE$x&3@a-(!sJnsnm4uP2K+O4(fw?Ds+W
z-DPg9FN_kS=%I}yrRw8WnI_(k0TiYV`G_4BSC)F@6z9Edb^*Q8kjD1MlB6<yxoAx1
zlLS7@DlsdnP&QlH?>Q1gtCrl)@G@_a$JP$8>*N{@Uz3gLNQw-0t#>}ep#FKJ4DM@E
z&fPeX_R@tkVxE@>-)uiV?b05laec`1S2(q(HHv?Y9?pcV8|ur@VtzRrxY)2M_@&k(
zWUOIk@%0{y4tObQVB5=lyw>1#;4fj78$a2O-sN2I-k&RED*LvlXwI<1EsCg7`fZMC
zAU;0w#sa|e=0b;h{UqFFKD%srUWA}91UjEb87u$A^}5C?8Ja5tVZ(q0FOf-tS4t{~
zZkWmD(&cp9-pCz4?5CIts~xr#K!zK?oykoU#Cqc`1>^S_lWE!~T?ck0m`EIca1y-p
zL#ZOk>6Kj&`JhygI5)bix9?l5P;!pXmP|*_fkn4Pzly08lAy|4;}h|9Z3l-#a6Nn*
zgC<+l1x4Q5s4vK#WU*QTD{IHP&UeeTD$kR&vgD|L`nQ*^;PMOiptUfvetz?V#O6=0
zH(hBx#H%|tY%QVp(Gg8xkxrnLU9nm4H~&nqCxe|HLGq*Hu+3*F&OkD=?-@mO1x9S@
zuWpg$vVZOg+_}XB9nX-8q-BkIvvv;3JoRI}FEC%D)ORlO(qRb~p*>mMN#CvcFF0lg
z7N@W2*o!k`>H8Q&`hzI*>tM3igLpx=fgbKOaR2W=T$hARKhswqZhEV>Qa^&oRj$$a
zBr?RILl2Y{(zf`?4Hro@%>G<@I>;IJ>ViJIFZhqozO5F2Bo+BBS&Gsm@wgmY?O#JL
zT6}3inp4`BR79ZCo|BLu`cswY(|&_;`y;mA!p{JYHF7f#U4Jucq5?Nki+Q6$#n?CW
zJn<!G)*^&e`!4jX$7X8bm*MIum><{pgOI-ZA13YxESwD)7m#vUd=W>r)gR;(EVynP
zJnB4<TK?fG;wthICFkC`*vpnzR5k`EQx}7|5nu})9zG!yKxyqoc_wG64}*zYrn$L{
znZDkBix}F7`lWT%qkbP&ApJ)i&)&n7!kueu=u+g?*HVs_8&^^@Jy_vCibn&KF}1`@
z1Kr_+Gh*E5e?yFBqJU8;Ig!0-dh`tg>s1?|Rf$K@`rE*;mwxy=ikb7r1uQ$W+Bhkw
zYLU|<NXztlT|A#&>YIhF&Nq^c8Nwo2JXpkMxFlP359}b_tyMEx$Euy6Bk_aS#j4Kq
zz!MFet3Hi5+|koIzKP|&E9w4&@nWJ^T=NWLWp!7np2+vy@$XVUL41U4&)?3DPZ4&?
zG<Gf!3U9H%MM^bDM#@|FT!l=;RadX6%P#e!M>V~%P0l-AX_5l>1Tbyk3;TvPBbD|G
zwT{i$?9*#glq-V{TD|NinKw{zX2lqnc^*ovcfwhYJXa5;PV}L6dJt=^Tuin;tl!Qg
ztf5@b{6hGz@2L~Uze;$^kv(7R_T+b(H2`SSp;5_M4y4JkUtQE9`r%+e<?>GYeV3im
zJ?s-%{?hNJDe~sn$P@lnu$EUlrK_g50FXqPLBbWm!SU|21<AHZR;a=nFZ;RnXjO7u
ztJdfofBY#F+@%b+)Ps!(`&iZAFwoKjd%whklwC8YHvKY`AJWBkQQ#-9Yh$AL9ZL)=
zPHE4PIVRHH){)px0Z8A>pGr1(+L~usalRjC9!1yv)cid$xW5=qb=>v@(Z45PMeD*_
zw=Vda|Ke(dwCGlr?1`LBJ2ZV*(z+z{ttw(pF48NW=e*$1k+B(y;X}|ki>2%1NT5od
zcf}Z;<2pBUt5Jd+1PfXkONKL;qI@Qy+JIZ#cCz#84aD|vB&(_iyp`#AZSdSak4iOU
z@xwwRK&-yxL00z%c@CtoAVdXhp8mA+A#&t{;7)=z<}(i9LiVN5a#UtKndb&;AO$Rc
zE9{eC!8M;vt#6VC-iSh#^0d}RheK4i=7r;Acc^YmJyF?0CiK=z-igknD7ROviN{%J
z`%`I&LJpyS`kWLvsUm*16TWN_rNy`m{rTuP$>mL__yIYG@|k|B*0YEoAT<q)vTQ>&
z**M>qEU9Ii`!rE{SQDR!Cco>R4C-{SwGwAe^~qr3M5QPxG)S^_(rG*y*H_ZB@}mrp
z@xBlz8(?=jF<yvbh+h`qO&ukWam2Nk<M3Km2TwN~BHpVMUOiEMY4L>R_E3fk!s?3S
zwEQ<9@-udgk|Z?t4|{29iMdPRtBR-m7&eXv>YQ^3Tj4E<JjV<_NB>d^VRhFa_Ja%Q
zR>ZIxQVwZ7S8$^z^b}71N+*+Q6F%^GX-Fp_m2!leuYP;aq<5fFgk_LD*Cz29`PAfP
z;yihehfYk9^n)i(u&6hos-tV4DVmAQ2=pxi9&!2WTP3+l)9Qs#T}$4=D|5|sfae`j
zk(!++bf?xs-MJV_Q=`!K2b4*lrwZ%@ei)$Gk=cu4zjDa}?=X1%7=Iz9zsP2RCuEAj
z-KS}QugDg0)Jf&`<TukvJ4X6=v60A0jlDF!pP0LbI4rgS{b0ma8^2g3>aZA8K9|Vv
z`<*NMGDcF4ZpB<-B}*;LdreWNluMLNMgp`kK0csnkZt!c{q|jU3|CcN=^I1p$Elc~
z&$95Mxvp!BUN)krXT_NN>@ic%lRmy~Be1)!crc$WTRsb9f7ZOtmb6c9=Hj~YA)y-j
z+-A#JRqj67LID@-G#A8MzJc;nH*oouwz|A{rR_x`jV`+4B=IB)`|02>V!Q+iW*P_e
z+jzpgu%z^j2CMZ^4IKX;%4Z)bLU}E2h0rigc7JUsy*@E_5!0RVyDt{OBS%>I>R}t3
zA^X%NQKEhKi`;AAv)-72<#$>;o*fpLcs`l&1M+*Q(nxyOn;K-tqBJb0(=QtISQH;D
zzJYt>#ovERD}|!j)_#;7r7@uG#6y48L+szCM3iXkEj@n3nJcI;gW+Uh{63)nH1Q@I
z#c1+=SqC6=0nXI)bs4+ie%x7Vx~$T4jP@egyL*{GKOO9!j!Ju+j8Z#EC!9no3FmW{
ze}uQ-81^+cm53z1BxZU2$3ZDJ#8I_%^wY&49k&Hub9s?c5YgD#Dq-ur9wVT;NMg&E
zgOh=B@f8nEJ-7K+hjbr`!Kzo8zx6(lw|;Yxyt8_y@zGG$OYSWjA(|51rSPMS+%)#p
zjd3ECA+~V6Z)UUYE%ujXBU^&mBb>XYGE&z%l~CDh%-_qtNVX*n29b}Pl30N!hbVm2
zdFuypX^2yJ0{Dn9h~VhOupNI@S0KyyC-6G)ORo4bs`NK}fi@^Dz+AEmFryc<RSYPC
zfF758y&)aY{^Etf#k)3<fWCJ@4P;_Wh_hQMLRkg8SiLEqm{jZk+yyN@{dO;7(Lqf)
zZy&v)Y+q6E*iMjsJ$F?wzl$G-i$Q?lvQ?mg+g<-D^BjxLQz9h0oCc57K5}P1SSlHB
zsmeX@hhg3NW6pT))|el=SrX<QfzsrY9Zo1K;oXe#->32ESRx<a4EvP263?EQ1$;*5
zzsf6H3PSBm{I#8fNkBPMGpd`E`M&H8Mz1E&c0qgOF#D~67`5=z?lKEVq{oz2OK8Aw
zIS+jPkLchLE|<ipyv@})V*t*jC|o<CkQj;qbfo~nu7mzp&V15KZuoF3F!B%GYEiH9
zBLSwefC;Q{VBQ4~qXU{npjvtd-4TPUxVSn6#?HHmU}%#d?^r<U0Zivpa~wygfxJ_I
zAyWcIfwZRQz7F^8Q=oU|P3?9JP!es}qT4|J0(gD@W8J&KgA?(yE6Z=-^$0D03Cq}v
zICq|sZ;8Ur^5fwx7y-=$%fCGO2?fVnBj-=IZWqK2yVFe1E>4GtK9OsMWK1N#edf4h
z<ob8ZZeh*xJ-{RgT(xh@`OPp2a1_7bXZyWbXz}~IVGag!BN{%w`ikrvk)3j(?A(0{
zHd^ySI{k&mjAP-qw&D+2=RV9~Wm3vXt?P)kh+L7xFupoD=+9l*A%S>6vc*Zb$UWcv
zrM~u!pP4`zK|kiKuwVFG7<2*L&$LKej#TKpyX{;wBboKrWUmPC#s0+d<L1x~q<<NR
zF=qlR?t;{F9&fHfs?0mP1-_e_HYUJ$$m@W)$h<_daA3>`EYoP12n4{wkEGeZGk4bh
zyv$CMW;n<y<|E4vWTKyU6VZ6PE}1@5mK6cyl<=b=x1YLKbS_p(HU@$S9vV$j7H;!w
zNE!Fg?*C)yDx;!oyRM*sbhos0Np}jUbayul-Q6KAQWDb5&<rW9bi>dg-Q6+p-ag;A
zmO40#A2a(t*NJ`hIhTyoA10PxdVr=Hl4P|!xdwuY=qyt!R~%X(x)C5JaeDQ4$xpH?
z(vn=RI!|P2Hp?o(&Xl}j4`nTRsPhS|7r%+JE7tE_whEAE%B$Q|)!vXrn=$qZ;#}#3
zA1(D1caO89Ow!EKILC=h`O#20n6R?Kr0r}5*vO^ELg3yME^-guAQlF&$q;`OlMTLI
z{zA2M<CZHG*l@Lr+N6sP`WGD>*@8ba+X^$0=2Um>mf)bn^PXN&)3AoS(7tMg%)#2O
zCUOnKeUXk?=D8SZjc>ayLRMa@G+P<FuV)9Rhx;OuF)#A%`E$O;#pcP6GHQR^2@7Z+
zQ`mn=otes~XJPd*HGMHGkAnGx%iopnGSut9TR_`l5ybZ8^fM75O`0@^@dLRemVNQr
zDriW8YH!LO;RdwOKb@4Oy%mNOSoF^|l>eEVEW~;0O+S(YDPi8s8c_<UYQ~l{36diG
z=jvYGbuOCEy*5e22_?&Pcq6uBnsI)@h%y>>)9gujLe@}gtc0Gs@49{xtbyQ*sFQ?v
zB_$=uoo7_dnDltN4*6C*JdN1t--Fh(Gfq^2S*ooWGPBA|8VPBdqkMGm$+UWr#VMe4
zU6i4=-g#>`8yL*w5b)d0*N!8Ymg}r`3#Z+zVTOIk8tA!#e3$>ONQpEynBpS}a%0$y
zFD`%5CkKJ|be;6p+E6_(g(ry$dE6#fB|OY6>8Q(*Z2cqjbg#e;Xfw7n_D1c{D)&`j
z@dck5oJwDCP#=x$X_YikRW7~K<v{&%r|>zU>OIe-pk(7-s`IEVe<x4t*P!pjcaTd?
z^W?n+kZyht@Bv~m{(Gpdyt{vi(iY5>CgBubEgk43*Vai^xbkGI+9TP9_H!f6Gyuo$
zG4hI*iyL4%b#4y5J2}Ml_@8K4UXHo6b+3Md9oGh}$IXg}Pkz<D`f|6e3Cq3786AlK
zz*;()PW`z({-Xno-sR<qFE}?I(T?=xm4^D_7XPUd3stT;UG~aniiv5C{eP;KoD~lO
zD^t!4eVk**oMmg&a=U_*^S_#qg^S(nU=>8T#k^A$^OydDy~U31l0h^DsrOiKSt5U}
zwNqt{Qapb-9<K;^!Th}%<K(_;{qKXliOGf@L(+oavkQn6ZIWkIwM;2aWj<Kb1Iev~
zhjoU{UvTc*??S8J$P6SFMTv(C3?)w}RuZ{x+_&NbitLjxG+$=kg9YBoDd?tdI>zJp
z?NRlQcX<CG&=1mBmj(n+VJW~1j^@|<JcJ*_szGb7FV4HAzt2o)n|5Q-izW5^=R-y`
zcj-vGQDc(thD5)x*Zhng<k56vZDl=KqJ8YxFT)+X!I0_B?oQ}B8u(DtP1<!=?f1s<
zv2&QNo*O$+obre9<Zht5g#A*3qqE)iXS<wpvR|HYqm0P9=yc}jE>Ec@eSD`~!1=L!
zx!Jxvh6ka&v`y;D#Z@uRQ603Q6AL+rXHj#Z=h8|`9JFFyxYHyGJ!rsdv7YC=$c!Ce
ze<Rbu*oSiE(l`VY(1i>^ReYJMU%6=t?#=st)AtNH+7cY#dk$XiT;*mf9eqS`Q`}72
zf!fXP4ZdOLmpfaz*0=l0(#OLQ(_pGmU)4WDjsL4od;T|`S+nB_u7+UYiw5lHtDg7a
zd#1<cF51(LrGf-duO3x^ss*zB31rY~vhQ(Ce5tIyOIs?C_BFptelWUZ)RG(PH;v?G
zg$QapQatRXysz`|`82)cGP515wEvIF)wR&6F7S+Jf*pGoe1zw>)Ra-i#cAu1NLvjD
z!ob0^RQ>d(C$|)5$Bl1>TpVP+uzVi>_z-f5n6hErScLQ0fBa*IFP%&AFD3DcBDvTY
zM9G~7^zQ??1ok^~&;dgnGWfDh-htgKd$Ljm7yyV2Fn?jlr>Zm#D5QyYl45$l(8dwC
z*hg)mB+rxUJxMh*EvDs))f(42nr8wOi$Ud2=evN-+nmyOhyYClMYg*wjCHPpOVzVF
zc=VXe?(Up1I(UMMJ`*u^v=7@@RdhoBWY+Mlm}j%TaHke2g5aA@#@El3Sj(OU7a2=c
zjEwh_pK@^)=3GB&n@P@6{&832@bx^#wD-^A{Oicw>uNby50OF^q{f<>CZ#mu{u-po
zO!axE8A4}kx#3)}*+VJx3s1mo&3e`O`I_#%0=HknnAV2D?QH1c;jV=?iRRZ*VU0}v
z;ciZZ=eGl=$+<UEIxsTSIynt5{{-L6o(zKdn@GOZDHdh@kiY|L1;|D5Bo6w90=dr8
z?dUEKb^{eddm~Y~I=xeRRYH~<bt@H^k-D+qx0zsc{7cqnOB-tHVDVf<*LO=;QzW50
zfZ@(h@H_*b9!FDTR{vGp*kJg~DZIH*35}JXBfM@U1X}XV=jR9O`i{wdRl4vI6I7SJ
zTiXZzmpzO@gEhJ|;?6VMmDL)c2@HTAd$n=X(gCwZh`8VKVA3WHWbT|SKJEio&c5@k
z_2|j2Nv89S5(TMs-ajryZp8Agx>%%tiJ4$JISo+4HfP<K8iz(U&>1UW*OJ+t_4%>6
z%sFwY;fkD3ea(7c2)AOw$4nDN59X2HTU4;`d^2QZt0j(0Cwb6_`LEEty$!_f;*@!B
zKfC+QM~K8Ky&n21`}M+lQQVDY%0srJuuV~NFD9QZhCp>zlBvJBO8sqK`Vb-455;Ml
zbyJzm;Rp(f_GLC;sIa4^kH)S)-}OvAbZ-&LP2<k3d`7B3f;He`REj%=7Q`d{+k@fM
zu~Wj*_8*!~c2I_#kz51B?u^~W#FRND*laN}B4(O6)Lt~Wgmw<Em^MALFT4TS@uSP8
zU4<ar4=|Cl<a?J?4DWX{%b2|P%ViP>tPxS2@R!(`jsd$gkk1IiUGeSQ5Ak}_gC7HZ
z-ZU|TMe3o%CxaU@3C`OJ<>X+6mhUEDXWo6)0>LGJ?zDXrw%($m8jt9aDJi92bUIh}
zHX+j0NQ#*+;Baop5y6n0s&Y1=L4IPyOo(pl?o;HpkWWjKjk-ej%d#bIa#+OG2Gvho
z-db!NB;Eu#1vN_~TJ$9B!V*4Fc%C_b1yQSy=EJSHeqJi^G3l}1IhYZ>WizV3d=zJ?
zOzfq-rm-0^g`$p8{tIF;LIzmx$EI_L{y5z|>&vo&+Z&ikh-v$xdWN6}d<yO_h{CPq
z-xaOO!xTruc=Q-f?U|WlR_}S!%c8QqSV_(unvh{W5%Q!@7<H#d5whl(Y>znQLpr(T
z`LaK^4NyUC#s28S0U{bn9Va5W3MO&un3-;zL+oKQyYIG0103CmW1HQ#`QB?Ori&!c
z#MG@^hR<v|B_#+YPSxc%O^2e6SPo8Ot&OT|z%aBcjvW-Iv4@$dZQA}X%bX3C`#dn+
z>B&_q9-QsYDW%j;Qn|AzpVXbv-&_^`*l}+DD~%6z_D4_(!}6^Ho2&6ajCnB~HO|{N
z<ePo&KaD3{S9`E?iV6{qN@rx|WlzCo>EC!5THEU$20|QBSst%lvM;V5UmPM~w&`>_
zJMv1wNAt2<&(Nf<WX1v;=7``iEDr`{t{Foe7DFcoa^YXj5{UFv(^O)Pb{%z4WIX%*
z;5oF=^ac-kPV2pAD+kH~Z87830fs6C{yV6KIg9osCluD^G@gr&(1w(McJ{%En9!E0
z5=@Dc;>T8g=hqlADB~^RC!)>l@vOEqFOm${i&R25crrXnjEOByEINM)M0KfyVKEYY
za_lbrPh%#N@MF0X{eGtwNKEth@7b7@X`>a9ZTT1oR>pa%_w0c_{nrsSkG=7qx`jOx
zhu&oHvmSl;q)#oP!Y&KIa7P)dB9Sjg>7*G1HA%vlEcj&!JKSxPC7kJ%uzj?z*Wfz#
z3&XO=XYCqaN}^6Eq^3`8PFbV-^{es<rtT7>06dL02qKUH<{95oDx9x6vJQ;MOQ{pi
zT=W`NGQ^V&6$#Pf_rH^D-Bm60W<g9k5N+rF12Xn~hg+%4&P`G%jqtJKMhjlW9$!VM
z21~uHTrDI+Y?Rj*b1tmQuQ1ImemqB|$K-31ciQcp7(Fr$Dmv0;En(;=;(tl11{_Bm
z`6&gVG|-0c5};aRFk=EFlN?b0Usp4jFD&ySPJ!#$j!g4QnG~$Smfqqt9f?)30#~K_
zpZ@CNk-v-X5ea>Y!3ekw&O7aH9zE{OYI<M~sm!6N7f>m|72Av)Ptp9?%RO7KHhgiS
zIX8+}iE5{#rKPFW=ew=h=P$1DCvd_NJqXZ*aty@{ETq0t*OQr11n(z*1D35h$l(Jz
zg<0_PPhO5cKTm|;6PBN)m)v`Z-YxJ|>*QF0oI-TE|D`=7_HrrOxm_UN0*>=K=Q>G1
z9a>W5dltPG;g%zoUw!<9O@MtFc%s+v*9!GI1lymB@M+m|?Lvh>B-2&Q3IlClt=aJ#
zK56rQo$TIK(6F1djT?Gt?Rp~={1W|lgQi!D@RVYC{O_FG&z7dEENJNW`e_vx4?)>+
zg=)5z4>Y0fIS&}=>rsN?$@PJURdpn~r41w~MNs8r!a`xqjspHh#Ch{zp*#=$gy=g=
zW$YI?CS0)$n}f{)U>Z1LH_n-6D19wQT%A<sz<k<9f>ph$E0b-?^7^8IFx6x6(pgL^
zYPD)7oz{m5;=K#2Q#SRexdDpBw<EKir(+zVnAOK|5%Ub2gY?|Lkj7sYOc#N#*m6(v
zAelxOTcgZ&2U(+FZRvDPci=-UNGPE6qqqoZ47q?*Ih=q#oVbQUfW<aNR+Z&=gqDf4
z>iO~P4m-EZ4Y|d@cX*yaOx_L`L$s3*dCffur#wa!J@f;!f_XzsT)HQ6zgSe1aTsQu
zJX*hD_n!f}E-%`2hnezc;d3DNO5VDvdRcP*eDG67i+r_shkmGcc(PkKYUo0M&olvD
zTsR6kE-29YW>^@wwyT}My@@}tea{E3tZeg&C7pBc9{0c94{c~Qyo-_Ej!t|X$<t2Z
zbHgP*iMlOKh07HEk+=L0`GS5i>K2u6qPsutZ_&&OIo0JX*`%?Bl-=+EG&FCLE;XM}
z^s4%{wCo(iO3Yc=F-4?J&KNo_prM-p9=&^(G0;}iMMr3|XCr@)xG7;MJcNp?tk^H^
zdh#l{J_0JW_9R*nS4DLkN=_FCuC)~^U<o$#q^5)t_|EXg9yIvQG!PJ!p+$qQos-s!
z!;Y_jVk>^$^wO3czci3S>qnvT>FL9}W^>?q%@EK73*yQH1-Omi0O~NYmDrk&?QUV?
z0eDuf86n(l0%ASxhhAV9=tFAkfl=e#T=nWSvQ7SJ2lz9Lu7ld*LpjevM*py9GbOzn
zW?hwIIpljsjO^ss<)NAG@RYL9lKrgCs;c=izH$!}&ExM3rj}wKEq(Lj(Lr2+43)tR
zr_7|1nNzk5$y^<QM=#vF9i{bn4=qJsZYwyRM9h|h%!P`ve{i~Mh3r#=rhdtJ`@tE9
z)2k{fcD&KH!$Fb!1SE=#bQ8xC{Oq@$y1E8)nq32CQ2@`!kDpX^+kE;Z4!65V=lL$g
zh_xf<rCz#-O<eD}Up#AxzlyWhSHWIVeCGbo53zi9&G=`*8xCbTvI_@`A>)5vj7bei
zOCv=ePRU?W$B~uZ&5;!>!VvXIdg!mNR&jt(`#OlZ3hXpTs^OX*s+zXIARt86T(d`E
z-bin&wSM;1fi>VHAA3dJih!%!U^-Wqr&Wp`y#FEaj8ynDiDu=O>>#8vuALu8^>8Z;
zsq9=s0T5(I++5BgAiet{zlV!J7l|WxcCqk)-8eTkT*FvSv{1B+i)4$}OGRfC6=-Dr
z0t3Ccr5>>I`srmwmNfFOcgWw?tuG(01B34Dr!LZV4pC+O9M0>Gu+^!ag*^OC<4$i*
zwv)`5dC*dKVRq=nb3D>Duq1H7^uDy3BT#DXz@jt2pc=!<;^42GdtL>#FE5k2YP-Lr
ztK?1YhZA8YS4{38h+}l3;K@R3b!DrCeeY^rIJG&Z_DiL4b@j)xT~mBld)oP+QRT2>
z1YdU@Q7VLdUc!HYTG|(hoq1k_p$?!!HvZ8eHNM8q>)8^XF*g|5s3lb6#26pR$6ai0
zG?)@a_#=y&(875DH|1o5VVg2Q?$=r{_#Mr<$R|jpgRw6h7qAA&?mr)u-e*beGS~9u
zy~)gvUT0tlFV()5%8qOm{iZy1QgaiN^UN}VAd2l}8-uHO7^QlQE(c5z`2zn7a7X60
z7c)<-UgUQj8Nd8=_2&V3ZU0SqL{0J6c?`hdXQkEx8t?X1)a{q+Q_9w?54v@SjMax4
z^S&oZvYwZ{EG}f18c(Ze_#va`s3md|;paOBfc=m2ec7!GpYLtUC=N2@oaL2i7e0d6
z7V^Hzxo9iy1(%Mh*Z7|O2oVWwjtnZE28f_-f+O-}Ymo;2NOXU*ceC^T0#(DYVr}GQ
z<g){UjZy=m%So1BHK-%i0SvMR0wM>E<F+-4Es(F472(y3mrELLu5d9KeqY19g*^HB
zzvYTOT<wTr3Pb)N1I%%z`%+n-AE)3-gTL{u-706Glo7vUro#uYfFqG!64`^?+IfQU
zaa*;Uq!#eq3gaX+2JzLMsnsuB)X&pPO+!J{jt|*1Pab;5ptRM85}5<7Sv+vr_hX)N
zyh!^n%CC!3(!Pk}Ov@rQ<s8Zt*Vz&lw7wMMBN8>&)6Q0NEAh2PYGnRCJS2iQBeu$V
zbfg42xB~iGQAgcH0{YxKE^xg@JVQ8p2RU!m(}xO-fc}}}tMKM*cFPaPh_>TGvfpw`
zuuf70iv$Ar534UZzTC$y^e!@cIK<sx+E<E<{d5N6C;P7iRzSn^%R|xU2l1j~)(yEK
zElH~?yBG1^P;xgWIqb>4y;03VAb<wS*_q#Gtnl;52_v0wAe)DJx?=0>8y~<hZK1>S
z*oTce7`N{<mEFv;_X~pMrVwo0$;>(ti5oQ$SwaQL{fKm8IEVqp+@!)$xaEETRv;A2
zq?WSJ56SLAu2p>5n-(2JT=O}s{?hnhDbIR#wY-~m>s)>8%;jsGxkqeTSBr|-lIUZ+
zPqgf!Z~p;&Pgd7cr6aa+FvfTZxjjSL=Nc3F3?oZnT+;;nikb#t&t0>`TfuvQthvCD
zm3q-G%VAGv^Yc$<%lE`}ew{vVKs^*t9u){SbemePbzL|w72%z#94t2#DL-Ufx=6Lp
z+B|QORvBH&>P4C%q*Ot@*=i!=->LK3qE9w74C;Zci6B}@TLpYtf2O()wm;3KUHqy$
zlFrkVq~Ayl3n62;?Y(}*y6Q~EKq2%yXXOlQUNdx&yY}2-!mU3XIHBq`7_s7%SY3k;
z0xhFpBiF{U<?r?OH@4exjAOYh;RD%3l%o7Fuv2erX1)R!0m(!9_E6nzoND6ZjRm|$
z@x`5CuFK`yA6SPCay~YIcq8I7>?d`H`&A{9aF66lkp|-8Bd}@0z1AbdF=F|>SqY9&
z*#@Tpw!eE@cMZXM16K6cW9ZOVGTVWh7X?bJw|6XBdTi79`hDKkQ)!<x3(+E&EGftA
zAKq|9UIiCPE48nhT#FV4!&KPb{p`08gkIr{y2bg~{bAs1Zj;%`DNB9G1AidcmLBxZ
zI)iUEkF*tCa3-gEo8K4;@ehTe+@gUs!%pFVLN8^HWj>dc;W{fOAGebM71KW<<n>zK
zj1{A-Fj(2me7+Y3di@dDL`nHDqI<YEU6JV3O;R+cuk3dXzwwS&(#@OD`lVf&E<2cM
zkbHx*&Gzr84OzZYwM_T-#0M_PX)>7^4}SjEC*S*cZvoE3^wPs8GgOsyVYuxm-2EAJ
z&Ce^w2$P7+p}an-XnZRSk5CL&DrJlE!Vs>^x5-$1t3)dW$3W)~_psW2_gzl7_gwGf
z%Lux#qc8c~l(`@U-}R6IFvkT%ioCV`!{T5F3ugO5#)ENXRbs;>Eua|tTeqwa8E2H!
z3n*f+do>&HU83^2;&4CImuC6C;z{t-ppZ+4jr|HA^82((_du)ivm02GR>1mBy<a7a
z{Oh7e=VEuB^PgS%{igzzKV)dtFdF2hN|+g=C?7e3FB0J&FYvw9$UcwV)jssIORY@n
zumj$ktWeH-rWsW+ya<YFgC#3dMe11-R-ADMDd3l|PSPs~XNT&>JF0OOKBoJT2rTWE
zlZ0f<dVeCw7hF=U4Ch&oAZ|gVCH(MYQgEb|c}WY$tTv-g`Y6ay7WN9+xnPxGx-s0v
zNRU}NHP}K8AaZ=#;OCdW9AW*J_q^+1=YD9$AMVkG0|`Af+&YU+^Qb;%g?t!Bjgk3f
z@uAd4Wc$!iBdViK7E&FGv(|r;1J^yCGU!;PY_2ck@Y`l<&69Fl@arPnEC!~W#`4kv
zHyB#!i`#$!(Ep4ZM{^3ZY@U`6?}Dgdvh5@3tu@86b)Qszs}wfdR~b-S?4ZpdgLo{&
z-Z8~gFU|zl>p;W^`71v@muY;{84u$$t^;F$Q;3Ol+RTz+wr{}lNpP*cbivpgbYz*;
zc52#>>oQd;@j_u^{YK=TBaN972AwUZ)SS^NGUP(EvgUb-qY;pS<9_ECCsujq^r}CL
zyYq@K3}r1qDp;pt<g_@qZqqc503ZBH;L=yqQqQ1@O^|+Sz)=IV%gqbpH1|{zC-8wk
z$ii}$ZqzU>^6Hb9#E~ji`cOl$Ib4(jBKVKm+B>_g<*=GPiWO}q*~t9VE$27+VYGz`
zh!aP7vcjQWyBS3jPelc8JsE(zaI(4C@GF7v1U1_8q8K#Moc`8LzB>v5&O%YsjijXr
zt`2X#H!HZvp`jI|Y#z5Qt82i{K>aN!C5i<Zlk$V4-M7xGAsep$hB5Z~DHxgi)*mJ1
z&(OMskVHmt=IuV>C@4F|q3+b{pU(btoVi$<*jf%294!bTGzg<M?Jp46ea1i$Pg}Is
zYU~$-jGIaCM$-kZR4fCmaccY%MLgRJdQ#^snZ*(h3^YRa@ND)%acHmSie}nW3y6x9
z6Gdq1sE1MTuXKft)ec8Nb`KU?VLv4;YB8DW!9&b-VBj|nktA`Y=<o@D*;jTr^2c@S
z?$cIWPg>2|B>(`a|E=v8S6~Oz62ApeKV~AZk*YX3Fef`#L8^7wRd+iOdPcdFQ9+rO
zina%rLo)|~q(u~^j}q{jbT-V_$iY~qq3!R%HKWGIwvGF~wKBVSo7RPIafLrlm{qsw
zbS)nGE|c0{tx9S$uh*{xlnJe=mzqzMs~V^}cBrhZ33Q(LXN|kPNInW5oFr<?#bp10
z^?n-Ys3!&dxeE<u_lg4wxFq0ph2yG!gOdHk(pQ(d9`rU2?dK&c$jfQ#p~+~IT@%kh
z#<`7jDt<%Nh*&6!=9@U-SGMV5L#VyVgE9rwz8FmPmF54CNVngXwGJ6DpZaP*f3D*I
zWew)ph8=6TtW_@k^LOA)AG|(8Yn)j;=aO&k?w>|E_sXDWD~)&^dWS;x3wLq=-nlpe
z`a6FNCkCD>4mvDD4<@1at3nhqP|LR__A5n$r5Pa<Cb5}uez)@QTEz@=&gKID5IUZf
z;h8hEGw;-u&D*#Aj$poHY+%gtkaOP6rT23QeV!NT4>7EM5CHd5$AQ;f2u;{nih=!e
zscIitAorZqkrU#X`pRRo;Ix0%jrT&{Ct)iL?<VTa8%1l}X%fN912icih5nxfxX!zG
zQXi;5U18vE_co3n=f^_)Egp8GoYtvJ`{m&DdJ1@L3)Y4x!UE1yekRl`6{@9(Xcp$=
zB0UKrZuIrJV(MjI-Sw@(Br$4r33D6(B6^agy#*pL^i}3@_K)cbvjPC7*k0Yzy6QP`
z4Mi;S5Bq=L-{vJoLVHrKW;+&PwjDQmjt*C6ULa^VDzsuOCvq0Vu7CGBo$$Fk>d4#h
z2s!R|lRO1*63NOhs!k?Ov@-1mtWtsL)q?kgBd1D#hw$WbCA8j#VUZr)g)}ZS-K@C7
z9-#s4eu(T8dXbLo<lP&&6;878A0>m&)8vybiL+uA`|spD&xTGKE1@?-4t#~AzNZ->
zk6->pV7uFUzhb>~k5!fBH5HiCe!VPq?Mf?EDe@b5xU^%#HtND5x7v;XbHM`48Fgx3
zhMrVljpRpEk)0m@-I)w;_Tl53*S5Q5NE<1B(l_vp4q*z1Q@{6}gt>{Qixq>4iY!Ew
z(m8c(ZEOU7P9P*Yr-|1umk2-cs;tOsS7=JvMKYQ8?`?4%8pR0I(@{TM*_uC6l!uq2
zC`QP}<?GTQmk%Pw32EqoMpq^=NZIu7h6VZW_FHp{!+8{LS`5p%BXNOKFtm3l37NsP
zU0}7oI0+taM$?FPRWN707G_-(W-hQqcDvDvun2J>)Fta-XZWwD-pnb{>%mkVB>vX9
z{;4=-W~-)=Nngy*f2-kjh<^<Er4R=1+d{@9KTBsuq+4?oHMTW-E~h0@%Vh^@0hHB@
z&E`3;?7&bt&%Dc1iU`hQ;rX-Uf%bO%hSNqSh%St--?<uY599Ctr{P?On?-Ngq+`*<
zFQQ;;Mlc5zNco+sHmOch@*wQCyePm+oC3}9t?k9YzBaexh8aMdxLPT;iN6gUu!f%q
zA9oY!vufFfhI41PqGVr0=(>q&5__Tz{rHGJUE-RYD0Cy@Lw3kkTQa8@D_Tz%hQhBu
zsKS?<`XG_Gr=JG|twEUCSCJ;-G_uCtlcO(S!9el~1AV$v<hOTiY}&YQ-@t36!b-9R
zL_78U+`%$CT1BaAGSJufO!x4m-+y+|3TdWU8D{)wF`H!WiQ~#r;~UktGp4gvtuSHT
zVFN<8c`zHf{NK>#h3Avj{WfC#5p%bu1SSTVG+2y#PloXtb(Z{B?)%-jkfp8RJUWCX
z%mjVjq4Oa*d<GUK85L(|Zxt2n=;-LPpy5c)6*BcMUh|dt5W6*dWkQSm=4K*HiX<&{
z_22mT_>}+{!*1<rnLj9R_WGmZn^0!e8R^w|YIbysQtu5k<Y3B*3vaBc6np{&t8#Ko
zv49l7c|*!dPHy-fmtN5?X#z1ZG4&&bW=Oyuk{!W8ISYOM^M%z`{585!sL2n)6xr>8
z4dMIbDQ+V|nZ4i*BHyj>oL6Lo=I*?EycjFZDyS9!aF$?qXYVf*V7P82R~xGr8sMIe
zgRG#=8PzqWV@`&&4eimQwi6IsmMCzUL8vA@q1R7JCyQv9t*<5S9i>BK|Jo2AV<{{r
z>5a`Frk|(B$?r-CXWl##n8?j5{2bRiI1K&M!RJK9f!rh6SNeA+m8Fm3M8a!qCu=hJ
zSklzv@TM%KM)ywA+1VL#W0kFzTdt3+QB3&0+gGJ;N4z&>R<yAyCMIU?EZso>0-1cz
zXSgwyzy(Z;ZEe~>5(U$hGIS3jQO=ph0f)BS&WWEyM~rAa3)(fii7l&XX!zaJqWSM7
z3>g<MH8ph&XUeOG$M+^}T>fb8P)jbxP>Am8&_=A*sCotW@%9OHgX#D({a5PsP$g#0
z{=?r%nQ=L<+yNQ)mJs&wgmCJqsxiy)V-hyo+e1O)V}jlf+ujQt_|glWxv6*glzqf?
z6Pw@q4I)^C$kBSc?r)AswA-9aIv|n#hd^SRH{<d`B;$o#6lJACbiACO9|nkt><jE-
zSHyC<QW#qankgvHB$n;iTdfvjC!V!juR3m*^|Ir77J+{Sb8dH~wcheph8RyX3AbCI
zcknwCT~-<O-v54Ih)+y^$j#V^$Loo6J~+uN6AH;2d#)5L?)j8h=flRxDB<qT!|7`N
zHZDOL_=zZD5*;Lc|5WfdM6OoWJZCU!OxPM7%#jCTPKo+tYpmd6P>^`9p{ZJ*#lP;R
zt&o#TIJPsMuJU+!!WyH3<BM|hsMR|)g`-v?Uk+OVkmW?K6z;BjDj&Z>hWQd6l+$z7
z2A)PQthMjj32ebmB94t*4eWtBS7U3;M}*&kb774k8f9p76k)gyYHQO~5IZ5*rTL8j
zEy9Gdm>~-t?Kcx)ngyx8z7HQF$hPGr2Oohv4_Y4dCT^x$p7mN<;z(d?SxCpA=oc&d
z_~jX6(*2A1-hIB#sB%HrIUyz;V4Yhb-wxl1e$BKe#r5RW_NrDs^$m0ma4e|dJt!|2
z+a2v(2l_|oEB1$iXpLgQ*TH=2Y3cUKu3Je|{lJ;N>yJkTEUapF?CW>JCcDSaWvcXk
zHU`@2VWE5u#?RfM-v+jQD73z_2XHG{WQ|&*O`%0VzVR5-G>R@Gx*?F1iD>{S#}5yy
z3`1pC*ZFXZm|f$9W83A+MV-vMRBX4mxb&hJUehH?fkj2Gu-IxbZ*R#?!%e^vA$=DW
z*}n8whZgn=)wd(aM(r?iDk`qj{$^)`5_BK>iEjrZ^^qM$jZaN4S9~AVjWqz77LdvR
z>TECnFT4e7vlucG#7InY%gV{AWF%>KhV_3mX8vxKo16Q}w3cXLVWFnY!+r@s`1Yzh
zLy+D$2yl=Z*{+EA_wip64C@i+hqkPuhqe`=BxRk&!hC-}_8Q0KOdgOLal|Z7R^v2t
z2Jhd!g{SyEdb3`L18mZiYdx8I*F%js{!V+50qnn>FQohH{>J{_>}&PWV)Qw=Lrp?l
zXlaT{(+oU8X6VM*sXw6}njOgTPa}YARKAKfGZRzDM`KFOcS5s!X0jJ$f;Ap&f3UQN
z(RE5FrX=Uoxq!?@W>GYRC*8={qA|rx<rma!g2yo)|3qI5uINrifx|26)a+VHM9Hz|
zNnrX=X4VT6Gofnq=OHlWx!@Thtz-nW37M})&v75Fqtj<PcRx$YSQZb$d;_`t&z96(
z7i~uFpJ78b1pbD6Z|A4R1sK1R4d2T*+44S!7XiHFLH-0;O1O#dikriH2?Ir~Hd?K=
z{?D|u$nP6H{Rfqd+v^Ohtie*$-M#%iG~6@(?QM@G55@{KmtqA#F<&=;kTQb*1vYmj
zjqj_WqvC`CP;%U=fqK2165g4BLwzrUUBihFwkZ0~pC-_z{b-=DmO-A&huH#gd*U$`
z;?VUgaLrh|;&8XIvLAEoX5RglZQ}w(&u^?wR-K<HF*-r7M(SaVsyemu^UOkZ@i_ex
ztoH8&mA@~vJSI9?S)bBB87*yFbF@h4b7lzSNhtI3s&{cQI^%t45(L?U#HMR-$d0)m
zaG~#(M2G=Dsa<Ey`)dV5oT}qoTYTeu<Mie;3V&FNoTZJ)XlwdoMNY;<b(*{D&V3Yt
zNP-R~@dbC@d#;K1F`{A$M{{yE*T=r2CxML?JzC|+M%ToSl_gFrK~>l-Ek++qPY>^J
zF+(wGf`zS-7}iDyT04*h5=$f{&FjWVW`AMF{MiT06i-?s`j06d9$qfLk-jh0Wu163
z9-#zX5}*;(W|0whbDPj5Ok=<9$(Rw7_IqJD@v-mP-b7_KxMfql7qAQC-hm%N4J~7u
z#l`=_6Yj;s*|}t|(fD!WRJLnKy~Z+RQT_MNwGvf11w@e8<IcYS+Ws?PW*EdF(v8sD
zLr&2K8w_=yV+EbX^?sROX^RPaN_{!bQX1)d<(p#(w}hYAuyC5Br?2Zcs7CmW4A2*i
zi1=O|gDOgcdF~4abW`;N(~j$8Qg)mwsdAll2=h``!gM`wQ6~RLY78x8aH=L8Yw4x^
zrX^$Ft=G2!s3O}3l9{QX6r03hdm2f;_cE&xHhw?jL?)2~$rPC#Bbas*xyXOjde->r
z6f!Q|$g~D?)j6x8$Zccc_&%W5yTw+uwNiL0pVR(l=*5@;bAN;Nt{($!1G71El}3#N
zpu=B$*YA{P4h<#O1(Xs$pU~ozohaimY4A|(JbnELJcP17KHdT_H)&H{{d#(8pHH;Z
zLRxqa&#UY_24{DmlJE#8_<eD4p-hRN|Dz*eqeovEPXlx2w<*We^k&R#a|`+e0w|{6
z?{ak#ip#v4u!m~kQA4hkhjseV;u+4mutUH$J!hnAV6h!A_^dVQt|6)7Xjx=GEWV{1
z$?5LJlRKRD)5oe%`=lDW`KGr~2nna>ttko+65uw6ec(y_oVIxv7b~S(oBwCR(wege
z3|b!zfIV$|r!%o1hk$-KSVb=X5;jPLa2}7B+nu@qs9KmNU<UmyflH|R!-#SH9nI^2
zsl1}%P=l9YJi%MI&chLw^KIEHYS=|#qkg%3c)R21_5G;L;dqu#?a7smH5u-9QGKPU
zSxq0kz&m>n<(&${UO*11*;K>ffBn1q;fntEj3G9pyL}B%gC*5B>_tg;KK18HEOEI~
zy1Y*9J;?O5eQ`YK%E+PDz7q6OU<nwNV;H%`Ls6OYX2KsrrKW&iGWqIXsgmLGnll_8
zox)edfT%Q_T{g?03f2O+YmdSD=H_PdLJKRaSz%GVQbXV8r*9E8jc)t$OW~b2YWu)8
zPy5~2u#A=%ByYY`Yx8HQxFz3fW7ZOAO`|7}$l~bG@Y3YSbC7{o#-RofG0AKYRw?og
zYY$o3*7+E!x3o++r1d%S*i!!DqDw<XCT46m_)PuR!td-xQ6x4VG2DjIW(@HD7|M$C
zJ!kRKf&@$AUI>rjqpM9`L&msU#b1Vm#bc4Y+p%5V*eV;B5S43j1a%Gd6vFpGEln*Z
z1lDYvn4bUAanWg337VGF;zR^IkomLKY>sGqF&p^U!<i{9%AqErha~3!FI2wYk{%yW
z2%<S)<W`cwjN~86Zwt03s(l2pY;CK-;{okjHb|xmrQ@UyY+-Rwtam!kr18~H=p|{G
z9|xkoKnM#Ci;X}OZKgAUpn#J(pw;S>`|0D|1s;mC^m|DU8%CyK9d#EMVdXUHf@Y#L
zY3e;6Kfj%icliu)R5huoR3X|dh^%8^-OUY7Kj{6Xw)+W7s)KfX5%Z2|H#>obLU6`x
z+b-tEFRhvNK*o8otVh99i<C<`dI7B*dt-3P1r!d_vo4qanY7TRd=mPD5qrz(Z9`0}
z*$1$}7}maDTuBp{gBZ9mWOBV7@Zb*hxVTd>Df3Q3jgv={nK}Xyr`Hzh=$v8{k&vel
z_<1iM)7GD4s`Yhl-5GT!ozSB1!S1K$9$F%s=27uJH(>iAXp7bHYU?D#^^N<sbll8o
zq0B)}K`LUb*v{$cU#xerx=1T*VxGgdEcD)QY%zau3mexf8)9L`9i0?(K+6<Uf*hN6
z#;(;6+gB<CR3O)8VxOvBIFGV!t_w68p8cbdc_2wZP6CYAVxfNW({-$Ic$f3ImoG1H
zKL1A>r-20YX-<4`vDRotblmc>)y3ef2$H7!c5Ou7i|2w!DG#e@dg|;0X)@oNS)8yz
z-R6qM^9z!SxKh@q%Sf4SyYp(;-x?1z9Ff$559ZA8=HmW5Vf#CKL5<3Q@Hn&u*U9UF
z@o!aK>=d=d13f@E;_Gm!fXFw-j(M=9>4G7D;*yW<#x_g4Yj%DV3i)2}wAs@|LRu#q
z)3vJqR!OabU44xJqC5-c*0VSiWZlapL7EKQj{yg&TVB@Hj=_y`>n52t#$3t)K;<<w
z<cMq+$wi&NAeZ}~9Rm{WKc7$Yp}UigTVDIeD8SqJ$Y7=X#F2=?0{$?K$)n)Jlzc8S
z!EC6}G|Y%TIABuO(hyfz1DYW=RjaHkX;qjbc2<5`^q;43{~4&sUs-^kaeA!TE?D!2
z)_+%4^F7u&oC8f36pb{2kSrD)UqV&AidFsz3B`BX@D62OFc16u?-_=8cdKQnMwE?k
zqZ-cs5W|D=e>`F~h<&1qP&!}j5M1iF^e&seuo;R7YCM|@n6Ed+^HXB~WH^!PbG>Ta
ziT<yXOaNP~{yx|o&FS4$CzB?gasXGEO%zSE74H)jgwMDlVJDMKW}1=TESh}MZWM*^
zM<Mm7^srsU)4gM?<kL+PF&L^Kd)Ip`3}5$qRIuN-SM@xBjP2U^cvx+9)RqH^2eyza
zg47UX|0qSBjVA3{ERLwL+}w|9*J7s<c(4NmMrbSg<v%f9L-~5PABX|7&L0Gi<Y$UB
z7;C2Devk*y9V&dTy-t&KluS8NN19>#`pV6IQr~eBl**>;I)6pqsPIT|85tN-AopqO
zE&Es*Uq2yY)$g8l3aDtn<X6u&Y!_P!?aXq}t7?jLwHMMb@_#7ia(nTdWM_o5tOdRT
z=tb>zr|&ApqiPIN5&UiPECdy3K&-9=0UUSXG6c{zgaa*qhbMuz|JtuRgJP7&H*jB1
z$)vvwEkqKFRkdaeniXs}{X>(w{Z@kJT5NS*Aeretv65{mk?Os&#ZZ1Tz+U}}W`V0i
zT!N+kTX|x@KAeN9?%aRjjP&Gw-|wd*nG!?*485+YziCcPv^evQ|4z6WS^o^Fxf#*4
z`ig=sXF0%HwiZWeganRaC?}W=$uDp}wwabibtD9QKwJs^FL(n=%sPp6n7?w=kqTY|
z;vb0$32*k$vpza&in;e-{5Ku5ShF*#FF!Jv-aO;Px1L*%>qc|oNj6>0R_0%4sCvfd
z2yFQ;3$(qv=lJvu-&~7poSyvc98Z5_PI?HSw(GGy6JnB7IBvA6ECGE~u7B7u!0V^r
zBbsgKs0n!UZyF$TwA>ar+u7768X)oG=nn|_M`7PvYc%;D>#4xo;SZWNfn$UbYbvJ(
z+Ig#OH5*gER5bp9S_HeCtVx1T+t0_Hjc2(>2i}wZdtbRtk{+mRwhL^(+Xt}3c8?TK
zVO&!1CZqpX2nV{;_V3j+-gG>hr=7BsITC<JQD+R&?7(euZNLhD8iO&auvB8d4z0D=
zG6deV_q~EFTTs>|6@4)7EDjeJ$Yhj{1t1+)Dqe#o(M{~z(vY%344lPIsOJlD2U=Tk
z0ELyLp9S$08>>u4zp441L&&FQ!W-{4UUbk!SKxj)Pg!80?nca1atuS1X9&v`fAq$9
zj-v({z)MEX;?=*rs#>DY1E`x#-?OVO65KjOiBBxGHwiCA*tWI_@)H66Ebh`!eNTBG
zKP>bho_-Cn9)R5UQ)HD^?9&J<`81#lZ^N<gxgR3W4oGwvhB}fo31<(wbqo#L1E;zD
z^&ed^ev*{HvMvJ~`T2o{d6-e%EF6dsXkRSx%8gJ=5^5z>4ynn(E=UXzEm|}xBOrR@
zZ_4Et24E97{}pJRV_)JhK({V#R>5@mc$*8M!x;#mRKBsp6J{S6aGOxZKPthjonX4!
zi;A)Hcdl!IAl>W0wE%LtCu(#bKZ&1pWcPn)1x;A#SStx;*^rP9LwO!sk&ysC+)0$f
zc_;jL*g!=YT*gp&%PWt9R!Ic5QEa;nXLAFcDDH$m5VmMf1T17@-XMYdt|L6-G1<T8
zB!$KyMqmZHZ|`z+Q$(g)Ll*V##2bP8yuh;dyw)ZoIs>QKU^e#nKxHZ&8Zh3tQ#H=`
z@|*LKxeTtgNJD*|4}GB529CaJT*h(8I-wy!_*vBEqcW08_UYOmO6QhR3EGE9LKeTT
zJwJM>kG=v*NNvM5G#{Ha769Pp90GzR9Bo|7<#=chUeY#20p=`8Mt<o>yp&3;m_Ogt
z@)skHPy=e`g#fGzSC=1&z#RLnG$2u=VzcM39cT4x+WDyuySyYiX3#cWAx2<Cl~&n8
za+l>Xz6-ec>s@vMw_qvkZ&JlA%tLzBhTy+ci#=_8&#zLU={2AuJZNkb#IYd?0<K~F
ztCaA!Z%J?P(&Tg_0s@*dU2L%VA?VJe3D!j~skcf@N>an@!#R+eby#jI!JO5E!o+U3
zwwQNuah*juux|^~$l>ShUZs~BPjwY7%)RD)C`MN{!00L-GlOK~zSR~p2pnH*Cj=Uq
z*4A3;mgDML<~kCGOmwd>Wxw0rRyo%>sS~v1pO^uyB9ug~&XPP=(X^fBlEE7th5zi>
zZh#~LOFh#v_(nLNx!hxS8D%AO{w>(Ti@i64g8))p>$9x&7ifVe6S!8>))1s&r{;$<
zO3$Y7vkBb$=-5hHrhljc%M)p7rhfmC|3$X7`b*UC^m7iKfWUWLl(eY@;xeGd!(jsM
zQUXUf@-ZE0-$4svDyBm*MG-+oHm$ed6#*VXs*)Ye?XVLQZqApjJ{r(3{|XRz!I4hc
zLRK4Ssg~l<{_C*#v&8}XUImbe+fQ#777TzU<Ee1`fnTMFiHRi=NH_4%3q|E3gl;@g
zruMmWu0D-zbJr-KyP77TCrqW&_~NwF^l2dHynkG5y=1+Y!*YaZx!w1+b}u90gjSgq
z90v{;ih84~ER^%(>r4->dlyLH6=V63oQfeHsv*uB-b=b5&Q~RFLAtCpl@&;!7LM_X
zq5uZM>Z;&syNZKPA9zWjB*;T9r@3ItcN%`OBFYsAjYq_Y>~R-1H>7d!pghp;u-rw0
zS!%$&*I(Zu+Vd=TPtSG7RErY_!Vlfy8ux+^(O1v$J2$pwx33L%FM<W2b5dn|dhj4@
z;@Uw7`dYnkUB$*GF4N}5L~_N(27z3u+dqCHW2oxQS%Zw<IVn&G`4xlQ6|WdWP2w&L
zj2>On@1~;ZjE`jxQ8&hH#J;89U~ho}BJ9TP2I4D2uC5RVvKl2kT*%BL(<D3mQCw2}
zVzQ7O-H+afhCRNK{EB{4%&<AD?YpFaSet#@nwq|9r;K}~7gnv0NdytI*1O*(n|1mc
z=cuEFOz0U)B>Jv5@CjS&;QZ@)@A)u$XV>sB>iYV6v-c&PzP|q7jSYA)F|n}7$T?SF
zl~$Q*nV%6VNJ~}iuv<5~+@!${;}y~?Pq^RkXNWbe*vgsc#)=XvdnDf;z`8yV#X>t7
z4H2Rw2N??;s`4Qe6$#ckbdZiFih&%swGdn2TBSIf(UAwdV$cQ{vmPD6UYWV@W!r5c
zp?jgn8BlQhu=12M4|mJVi|RiAYS*+{NgaH>TJDh$*8#=RZc9&eYiUe(D6S}G5*5AY
z;EzeT^+KD)!AWH-q#DcOuF<8rlmpb>A$4}+x8!Rjv)o{t%3qzEa5%S5?LZ!P*H+2)
zwawdZse9qa9Oc@XP~i!ZM9g<!lT5k|Fex0e?11P}>_1cc9c}D{5=+vq=F<ZyAFi93
zdhO~h$*zB+bj?lKCEJRKf|=<E$!tTm|1k<67(h(;;@5~rBNID;YU3{AcjtsgCWz<%
zc=Kl>@1u#04YHh^92zMv8t_i#Zt!a)&DUP7&CPeg++v;Nr9YMArF6EZ=)^~q#}8lL
z&Q5526q*T#ME4tm=U=DX)4Kyw2B4u@mUsDlu0f+D?d@QV4W8s9=(T|+(2gEU%g!tg
zWJsSXJfLhH|KP#1yD0l)&vS8-uWIlWNuD4XnVur$=&eD5LMrT9Q``gX4B1}CACg?}
zck{=VRat{p%3|+pp@KKs?8c^+?bfr}3}>elWah=z{*G^YG<e+2e*#BaP5NkgVy2}~
zM{(X(TaRb?>YL>?W8vI8aY8&&d&z=nHOh9kHv*_gKSaQTX@N?VVe^#00)y(GX~gI=
ztvN~5MW2gG8g;R=g&KYV_%*_Ke^&3~rA<&7E7aKFM+gXsYYz}{v(aabt?%YUm_ftV
z*4u4SvIrD{MjJS^?{+`4JcICf70Ba4>z{wGF9fdN<^=X6h&_LeBjqzaoUN>BY>a?F
zcp4p6P)JELeOB9jJyQTBf%Qyz*3tLxKDj%zu^(_sM-e}GrUP$hA?v>^?k^oy75%RE
zYfw@UuK2~lP;t7Dko~Dr-&Q-lYBf-PZ%(c8DS@3Lvf=7d*&+)m$44+4eF=rvj`_#L
zHIQT19iQ^BmONZ9ir9b7Aw-sjB$78~PoU~975m5ZG@JR{g7MdM65=)=_x+!f;T*-9
zlasL~dg{pNy=o)1QPoohZwnE77Ht7F4bZv%NIn32(c2{*Q6m}r^TnM?f%UwSf&*M0
z#<^oGqP&@Z)WNr<uZpJB)au(E0!L@ClkD^JmBvVhTS(IHFv$*I0++rHhwLui1KJ5r
z;(yAI<ByE7BpP}IRh?$tJHC8+Z~pO>XAgsMf=1Ikj4i$YB^XbqcM_p>(tHbc{Yt&e
zfv-NkdKL8Qi<E?VU|4_Mm$&+Sm9uPebX_JL79!O|FG2w%qVJfss{GK#NPHe|j`bDx
z(K?6M%RB+mBbNKh*BaiXUK-0evGHX?r5p_X$cgy^Ww|Oz8uzNIfeZ~x2C&G0;oG>a
zcQfBX48!N7HpW4g1s(zM?RB-}U=62>hf5Q8e7wZAL#V33&0)zRZ*s#wY8?R9#;sDz
z&a8{qb>Q*y<r<>&#h|V>b9)nVenrIx_pYTlz93jdV1C-?tu<5aVHXh{R4pBc=@|jI
zKpQSI?u(#29_1a+XA=byh4#2i!JdYoPg<hW8k&UjLn!&m8hJ7r#HgY$7ZK%Q^ffKx
zJ?}zd(I#k(<#m~jtR_FOyp+j)Ix2o_F!*RgVoN??{OP9BKtS3!toe&0_eKDO5ZE$j
zl<QmX$6Fwo!=<N(24a7wQ+eqwq9#p-GW#Y|vwLG^l8(lX*TeV2#cs|)u<qYh8z%$K
za}Mn#QG1pE*gid2ryh})m$wE2xd#4<RHDw>+1o=0Fz<wNw)@sTw-{*<&Td?0#Ug^B
zDVHs<?8nDNgGJA-lc|o^J@3c)fkrfod#KG1?8Rm)Nt(+FuubHiqq4dEzw%3=X3t$|
zDX)}&UFv81KB0<^=7m$m^y@R?v_k|dectDM1fJ2tYF|vstC<}HXWwvM=m_-XN;3KP
zJ4waAnp<xiq!x>4&sK$62I*=dQ=dG*JT-k5EtTMvrqpdqH8xBlKy_vQoF!2<3?PnX
zfQXLf-U$dtYxTcWnArO{ZiWmRi7a*61_n?Sjx8lVYAIa~q8JE<b-i^?dIm&Elg9Rj
zrOzY%G|ub5U9sIA(tE8&p0KXN{d6*nf7qFnP7}9(A;RnJ9)2OPOdzwt0+Z!j63V>X
zpf=hs6(iKCH8wU1U3V?M9uR)+vuLeiR_IigL>9ryae3W6*nOa%Vqfv9Qng-QL(}**
z#Es$(oOEsLVQc=(M?PjEk+Q($)oU_}0`!E6fCe_}rI6j8J`Zr1fwb{j(9UME!f!LI
zI+4P^&@e2HP~gu8PrjMgJmZxGwma7W?fLZAzK5M*S&OZdCtXdVH4S?jt5|iG=>8Ou
z1kVwLYDmrw!|&g(%%cF3+&_~@i2*i@Q^Eu^-S)^;r<t*tkGrNXU?Y?3(YA!{3|R3w
zt}edLup7lSL*34SCL8))d*T2I$mzkQ@o}fmI4*8Jc!}!7>6dGN9&sX%28cd#dCiEI
z{M!h`I$$G+k;a~rvG9`?wdYmE&LllIW5z4w+UM`swC|qxS$Gx=Az_j*S_V;<)m0{K
zARj2ib#Sm$A;b9(;gw1~pYb#X0qj*!u^1w#HC2LaM{i@|S5%Gn8xTEUh)svVkb_UO
zY+22VUz7H<Gh}&Qr>7@T;V4KNt~OZq>Usy;s~#T~38;s<_*7wlqil^w$N%kkyF~T7
z)6Z$WoIGOh^t05*9ZpU{ybb8BGdfMzqeu5p{AKd9JL+Az2DLBVrz2qgt!x}8Za5;x
z5g3?m36`2({4)D7LKx_@SxJ8Es>|d;1B&8Y<koU7wL-R<B5xL%zU}Q&muPXtJ1V=M
zHwwM9GYFNz5SOU_{sd}J6^DfYT&G9~&&%mSPloP}(NxxW^`J{;k-QKlkaP_-xI%I@
zeH?w=lg}Ky#bsLi#6(~ndDWkQCi<*QZfs*zKm~2-vR|)+?E8@4+uY{N#ge?&p9cB@
z(C@!0QNFDE4+Nf~E^JXy>hWVttsGLF^CJn;mH)XO+8f~p#(yWDSJ2`s-z!UkJGrH7
z%YbbMq}12+msww89eDm#9+DC9oxmP)aBt7zwBBqNyP9W3S=f?jLU2aMK*p?4qb?};
z=tpH`Wn70p=v6B~(!!;ke9Iy9Mf=n^-hJBXr*(e6n^RB~c$Y`f=tvQtl~o2@f`U*l
z(0U@Qo9%p3u-HDM+F6$&FzRT4YJ8lmdw?W8dwqr7o}CU;JGDANJH2kO^{Os8SF0|m
zh`99;+$~vEG9o|MY+B10`fHApQ1HQ4EV|b-m*1La4<tv`X@C6Lx~x4-tn)ymn5vYO
z>|X4{AU%ke)CVC%NqFgP4Xebz65U|oZB{f~;2N3qc|XT#e*#6jWv8L{D)|j^lfOQe
z*TTP-47a})^!(ZLaSQb&bT|9chktvB3(Ajq6(jr0pnfBxYMZtu3OjsK0P)1F`cjYC
z+ZC?hzhkT|cAP12PLVcEhna%ECOA^mMk%)OL3Tqak6{K8=Y=)*sZn#+(s$e9(_+!C
z{%QvbM@hELfjgYAMXZQn-@GupQ0H*XEelKd){*moOaR<{8avNY9hIX*qbZZMr`1GV
z)($=OGJnjwVbNnGyTEp2LHfv`e|l~5Z;p7%hsR7GeQKZWrZInd5FyM;Nhh3MMt|FO
z*Vdk9i#!l?)DiG*HftNm9au~cPjYtqlhry|PXjn6z3c9b$jJWspigsp4w+0ym`4c_
zfZT?F!07J*R4l^~QKK3K+%)rJ{jLH?NlIPeeQbBRA<K^Xt|khsmqy2~wzPeL&$ie9
z<LD}b+G?99?ykkH#VIc?#a#-;2@XXHq<C?M0>z<Naf%cR5G1%$thfb-;_mL>?KhJj
z;Z9~q?zy{r_N+XorXLD;UZx+?r`OtY?_^fRei6-wDhr3laB$d%@}R(n8LIQlPM&Zr
zMou<E6gN+ZzN%C${=J<3$QCCW6f?x3vHuq{D=K(<)Vf6Oy3y5Kp>4K~LQ*NI&VsrU
z7b^AmXM$h>v=4hSlRcd=@*giy#LqsSsV%nI_+!U9(ux+#|2LBobm3OnG<Vey+MFeD
zr^}tVwWTUE#Lhi|vZ8H^S;|OF=}q7Gg?u37Faa220!DjeH1nx`7d5Q0)&1To#5{cu
zgPfBXiW;ld`urpW`PR=6fBovXT(k4FfxhWr@$w;=6-<9r9B+hTC)(xENtIBUiFxnn
zTq{|-WTW*UKTF*}^dCdOFtDHVu}4WY?}7O8lMrnbE+5wat;uz5<AgX(f9|KnKPp*S
zWW9^FOoS@q!BvF{8>dlq*+~#sf^&D?k@DGF9G&im;iie=JFK?*M@xVfYd?*xvOHZ~
zWN~*q<|}KIgC#qvW08%nLcmws<NW=-`1;}D)7NMtS1<V@&|idVJ%<b@D1xYVS3woC
zQ;&&GD+_rUcTd;nQrz#<nm<&EUT9I|u4(=huW#;5^>=U=IBKa@+3$d@2cMcc%P*k|
z>PFIWN?)hFye65kF~}2dqwJ>i_grN<_ryR^@6DS$5WKy;00IKzp%}YKNRT#9XX&eC
zR5)kmuhj*E6M^D@C%vMv8)O3h>jwpChl^e5+nWyGT~t^z?X^iDipjgv=zpAd^EnQm
z3CwGf%SQ?y^NHk45)Vr)0e1|)8BZq7<GjK9ht$cTv}Op$?YZBr6{l2Bzb_UG%04y|
zIU;wRXbtnI{awvYesCV&R7L=uA=W%3Q6ZGy<k#yF?q~+g*6FvJ^;u_aQd`@EQVf+l
z$e3>w5Me+|4COp=vD^tC9B6U*9g^Swvo^1;r)MFiJnf3Szs(y^sa!X@?N!xLsB6oE
zVW`B=DIZ`u{~Z)ah}7=Q9fp7KoLn6}gq4ZpT?6jTa=f!$qtu2U-t?E3rDm+E*6C=x
z=gFQA1`VGydijh6Cy7kbOtcPL|A7e-*jM|vc7yim*iDIc7JqAHr~J>kj60eorNSH_
zAWD-O1)($Kmi!y}v+hRMdhItEpP-W|2lqjp4lN6Inx%shH-M#aK7G{KawR9#cgmmS
zAeh<dp?y-v1~;^V(M0ZE1GN@i{JGW$T&aEd+0|c8hn6k0iMYs)U-O2v!h%=6q4X7%
z9gio9Y$xpxjzY1+W6x_ftQCA^%vp_pT~5oYowgar-(vu`+j$F>AZ?{DHs)^p#;dAM
zSrj}!kaDXJ^tbU<Sm)LI{*p#@+$;H(;cv@~A^`ZQ;M6}x*LStN^kzJeqj!|TPAow(
zpD#Jbfwc;!#aFZZOJBxTZT~N1SKq~d%Ct#k1<sMXnlBDCifELJ#OOx`SUj$DrVYbZ
zGqxZ8JX~Ssy27lKBhoy#qT)!w9}4dXd^rk7T5t;O=$4A+2EX`U?e8jBsHJQZT(jDB
zt%U;*RPx}Xr#Oxv3DBY`tqtAwcP8lbdlU=sZOH6$7R(>x1D!u*&hg#xy}w<JezkI7
z7vq28G;^6MQlepVaAc)HK4%*U*7+UwbNI<k=XYR`p*a&_y&&7Xg+6(SUOcQMx80X>
zlZPHWY%NqZE8%%I_ToM5x?gUZ5=qrBPNuB7%Cq(f$dWKjBt0h3PcH3<MxUQfXkT6R
z?11<zS?`~3#4mRzkYAqGI|yCx;am#q@gJ3?a%5$?JwL5)L`=hq$JzDh{D5ZPe9TWk
zSHT|J2y(1sv#ifviA5qu6?OuySI=f1^UL|0@$;qB+z296V4}XB3mSWXD9Vv7g~h`f
zF8jWnDA4V*zm9{)w`Zir>N`}gwE_ErZo}l9ula8?^)m%x#B1$PC5$9#Br9nms=*5D
z#juUjyZcfvn<*@yF|1oVQ=h4}+Ul1U>2b~+VuygXi}jY3@NmQLYLURT&Wxh_sMTW_
z3}#Y=4{v`wA0ja^hgWsg?3Q$yt##hg@!UNG!(JNfHh`4}U^~1WTCPyhZ@~13R1)#u
z8v-~ZP%yFE6%LhlSYmmJ*l>Gb+*r3tUdoF8p6SN$B|V7HKc@=_B9=XARX-USsI5i1
zVv&qeZzz*V3qu$Ak@pM8U{F0^q_>Pnf>B&Xt%5Cd<=7fvUXf&F*Id+^P6>bFBY=7O
zKTl565}pq+Cx9FM{TtD)IaOT#9disBAham2KA)&qCR_vf=s5il$0^MLPPmI?8XGHp
zdRn=7AYjFl%M&J;<vZ@=d5cy2@uM?4Gg`4_z6+Z>RtzdQryDb!*$7Q7R><$p@y|no
z94b|vq*^oBAydlmh_~du5M;2X2gi)8Z6_L7>sN1rUB(40-zEtCDEv9{t-V0Wm21kL
z1BW~hHS>MrE7E@rjtnwmX@x*Tj*zO-gKZn>Th5nP>%A{uKc8X88?<i98-vbxo*M$#
zyNlc<jHDS}5B_Auc!#Xug~RUiZj;covHl}(-0&UoVsU&QoUI@+$%k|>SP$b}2To;#
zARM)383^v+tFDEe+`#8KqTO%7PygL7W>|$fbsR^_O9qDaq)M(sx8mo{`^OjhxqiGW
z)C6rz(bS6>qQSV4$K{!>w8bIS9_j$eVdtyJ_$;(#H*3b7_w?MgS{-m0__r-kOFH=E
z&=8oYnd!JJjcmLMpsb<j(Mad&4*f1yGD-J=b$Y<*r;08DFx$*p5gt-YtAP(^Cz5FW
zU|WXE@7?(>R~@>$^^ZFj9b7BJkV!lpRBNShi$7}o^{KwT8-;K1GzI3;4?VX95YHQ~
zOk;u<S=52n(vYf`8<zlCsfR~Nx{uFwxh`k7L{=-y+C}9*5Al&D<>P6^|Fbzi0Sbx$
zo>Fj!IY|`3elIhokPMH#FZUe3l>W=pUdKU>Chd{Z{)jAiGW5P(QjG<&wfh`CCfpt!
z64aCzjfMM;ZazJMn{wJ?=;!PqCWK(a-_yI?VnjkWup!~VfMT~MuzJEm&CKd(zT#jQ
zYcgk{4y&F6Z5M^#e^gX}LPr|$btMPA(V6|x%aFc@VrdUc$#6@^wCZ(ZvpuiJ$g5~y
z@@x&Z23h%qlakaG6qOnVEU{wL8WRAsa`)f`c!d#Nbcxz+07Bdc+PI>Qfarpx@E-r=
zDi|>B^24d44*)ez9+2A8w*RZ9#jwsj0NQ=YQwEV<!KTNI{uM<1$(q4SX?Z*+_Zvxu
z!i(Zy`pTo+Z$TS+->yMug3k!a$`N@=Vytjf`!_;6>yLkeVPiLsXR@rH{P3^RvrC3a
z3jkFPOP-8fM5HV^j1~Vn-2P4&fKkRyfTRpn77$Z_AZ4xev}qut?V#%h*!0-8BHcCI
zRIcGe6$bb%Bt_V4(CZ6>s41|fO#-C4C^4}w`Eob53Ty*f)fM--?95RE#JIp$Z<JXM
zK4phHMNgrE!8SPm;5)rGYAa_Xs_ccs%pTQ>`KqhSAGK)2L*%esborZ_VF}w@8HWCf
zb+0TgC#&4y2H?<vjKfo{P#@n(o{5B~M}y4JjK`rgsjdCWX;YtTVpcq?PT_WB1BC>O
zox(f}*Tq4Hq|g6d<0^f{L;>ZP=c-y7;@StI?pHbe&@JmO9&L%iv%kNFXySbGAcQe-
zbl8%W%=pYu`2?mpO(By`%9dC$X%@9csO;J36h6g8)vao#G?EgS$ij9hM{}0&0cDQ{
zz>(uh9^QTn6#vE~U#KPh9D->ApAmBJm<|lcAxC!?=r|9}bk~k_E3A-GzU+IU0Sub5
z#Je3^s{m4a1BB4;4=>}?pti8p2CP``nY;#jMoTC0=q%rNdGAFpe^7<O-k~ePyB8*;
z{q3dS1DO12V(N6rF~A?Eyzgp@KR~4VF1f49T87&jd1zTjt~u`?KR*%%vu|h-I<RU+
z5kLjY7!BQt`(8ilP^k^IdrIwOH1YbmmAnPjHqdHQMf%<>d$#P|zxPXB<aE$nj)__B
zP7TT6yil@n;GQ^)mfU5FGWwUNGYcXSRmr+8&;Nb0J4X~>K%L$+Ye!+PQrdAzF}_8L
z3Jsy8+Yfon)6G*MMe}Dat#w#LSPVf#djlr$RL8#=ad20I70T!`DWf6+yTbhE^Y(hN
zfOBAS;jv(f5<3T>S5X{8U!E(SSB+r6`3@<{*uf<mQqwM9jpy*FsHlvLj25>5Rt6t9
zaXQHqrk>r2^~0II>{_rGqH}S6jBkWK>DwmrU3F7VnzYP19c&64F<s!#4j}Pc^S*=u
zg+zW7IN4?SAd<=T1-hto1siCnogYR9_qYnw=1$&oySo~r;tUIbr4r~+sibV@L6)mL
zF7D}o8d0sq?0%=Ax;B)#24=hh@bk5QkF>s7K)z>afdr_<e*vhzuXyid>%03iyQdyF
za#<C9I>h?S2AN2YIG*;<8t}+1K4>#sbc`Z<vxkOJ{sGt{$UpRCCrXTS?%tywxfrAf
zy&ms%3}qM`5o~N#JZ_}@Rn=DSCW@HGGA^wpUtVCpGj%0IkDs*j_as6;0|%~!MQ7%t
z_Lh~01Egwtt#DxOaE7g+m^1V6E@cdXrc)4|l@z(?BMCEVXJ4O9Ccvw-O!90R+>_L$
z_)viA{0WabH)LkG_WE<Sx9bhi$o5iN)P9$M{;UeP6P#d}fmy3*EsChGMzndw=C*N+
z-;D^6qVs>gzp@pClzs>dttsRge?5kr+e~4d-V#n6V$XDDhbO*|M6|>h&QA{i`|8N_
zL|~HI)Rr2~3^|!7=pUdJ_xXE6h@627jwIii?Os5q^UJF>=Sth#&JTm!UUKOhVu91s
zJ@oellYz-XPW{h^lQid7OwvPJHZ77BB2c|Uo=YB(HZ@6*$Q8Sl-E(+$!Ee^h_b<OM
zA7+=XiG#em#TcOOG}yn;Ncr#YLznS0asD56)%vf${a8Y(MTFhJ$AHK@NY)V~mie;(
zWU{s*(OdxLDb}R*Kp|=nfL2#m*8_ZK$rP&RiK+_pW6J-_`R@>&>~<2*We+508s{Cf
zB1B|qwsF)>(@Cy^byN3|%Q<H}v$3WvMt|@%+E7fpEOT>(!v@V-zpl0A^yO6f3R1y=
zofpBXwN+(dqhBJ}zUD6|W#BwG(V9qI%L|iUnABPv>BL~O)a-!K|LfTcj6F7}O@|)E
z=c2{DEUfdre>jM+>B$%l6!E#-4L(5+FpM4Uxlfg@vSZ+2w%jO6?apAe>@QM`U0ufC
zjf8B~SB4_$(!El5LeVYb{T#T!{lbH-0fu~0te(ZlhW;`k8)^9j_L@c3p0#{<vQ|32
zBmCwqL!DCG{UQRRo|ZUIkkx^_IL!z$4ix77suHsO!4I5)?6AE+$Q8nOH%Wf*WK?r$
z=0lg+a;BRNB|E7{2tN4L<@tp3d8zTNE;e?A(SImUNa+256At`ZZ3fp4z3=5)Xlf7C
zao!nXc-44xq^Jz2aa|R75bJ{sRazxvuKhaQR+D!hRG)f*MlSU#n#lRp%kJR2)$W@C
zeiZ74kQWz@TiTo`s)%2Ix6ddr#6*}*uG`HB%!QB|t{-DM+d8BkPN?c7KVIj}LJ#|M
zPBZK${6MvoSZ_z9?`?BDpv*v8n<(I0F4}v4yzyme09XsU_e0e<L-zZ%`?Ou0B~_R}
zODVceJ|8M@?J7=y7<fY8bd|f<U+hM_m>yK1!yoGsNYmN}%Zs3?In@WQ4pv-KS3izX
zkaHYo3KKK+7i+aBckSjT|5~ScEa(0rhS#uV_Zxn3uL}VA?&cqCNRy`VKg~zK8n_<i
z@%BU(70BrvCjQ$ZqVl+%7O`W9VE^Krx}GW*I5}pLjx$DQYT*hZKJYp*SFsm_*86Xa
zlXV%!ji6t>IL$}jcR6mUidr14%wxi`@qi%<cjw+H($(P{ajIs&z0Lhr+(5r#a(LX>
zlL-r?g6fWjIfnA9Zh3gmgbSOo$?QyR)k#fj#A0l{cn0{0ZucuJ%P1FU(s<j0`lnEq
zHFnud-0d_|w7?#H8((_3x9A+WyMKrCtG*l?7(G5^!d`4<Ulx!+wfL2_S-x=^Iz~tO
zs-APEJHO33_vRu;;vv00<<Gfo7kJ?H=Z)K@g=bNRnYf@9Lwyt58GEBoE>26nP!gd=
zQdIJ&g#UU7DDoNUu^6?(k&rN%4%>Q6F?~0m9*~KMcrki3Q+DpeGKQA7j(wXR+RvXM
zD5{?%>@JgEgN9lQY{pE|l==4gAt`sca%b4?$>>>f@_$Qt6QQZDt3O9@%l0O9L8|KT
zHMTDTY&TUGDjwtC0>06E1gXEOCKgH|{Y1r33qfHU95kOxXPn$+|CoK0ki#wC6g8=`
z$*z|4mg!79@&hp@I5L0Hl(fb1m;laxg_*qafSi7}r=?aSf`8Rz{M3_)T;E2Vn4a{6
zX)8f=F;?;0V|BDi)=7EyDP3>0568Dn2+!W%k&f){j+Slj1Q)X0bgNHp;lO{ce%{+m
z^Q7JyecAni(SmE-h6x{jeKKd?;jmcWn<?a^;A_<4!L>>L9Bb#Qy#@`Wz#kWjbCfGg
zdCOSwh46eFCntQ?<%6s;0$gu69Z{sIbgpjCX>-RH=^GhzTBo=b{zJe)!n#6hx>YxK
zgHID!mQ2j)rSYq61E1vUlI_X!*NMb1F`?a=k&UnBN3cCZG2thn6ZboZu(zEHG^!F#
zOXVL(uIhQEiMi;`d3C;Xa)+qs@3+<{+?1%)O|P{CZGSiCx`S7?=wgz^uG3dAfi@bV
zI<>3hIl$Myj0d9BCOl5~OL`r<-6G_b#Lo2f{*0C?fkcSTE&?l~9>C@*-Q9=*^7`$=
zV802fJVLQ@T*|Ld*lO2F{E0Ui)LeLdiB|b%CFz&L>)}y<r}ZhhZo@j;IZoGAE>ei@
zJ~3;<tC+*fSuOJMkwyN?5z=Atc8qlSqFnQBrkWPatyfl4E=-=NPJ=fGJd(2j1YavD
z+j+(b?(RMiC9P6{_@)jsYWk)rW09UD7p7}B)|c~oHxn5xMrK{P@Zs=E(6cLGQ4eI?
zrZLyd+}!aUFZQMB9$xdS4p9riy5?KfXFl<QLIP`RA_BA}c9q%jr4{b;9!D9`MhzYz
z?^jsN@9%xH5iZMApabjLa4g`<xA%KVfG+GpVLNuZ%7SA56^KxW#;sGMtmw*@JTb@#
z(?s;l;GWiMtanjbzv!S)RVgITpncVxT~AqKw{@Tn6`S>U_>%$OSMM=&580w<zc3HT
zFY(l<FJPZ=<rubQX(p(>&KDhYl{5>pksK^~S3h^k;bRgEi|S0mB}FWz<Uk(#Hmp#p
zTr1ff1{)^ft>DYsb_qn>#gZj>_bEs&I`<vI-KP#DmO^s;xiWDH#ZIK}2++HyGx3kP
zV!NhX^*5XnYOf){a{Qi*;;3n;Ug?Lt?p=;eURq_Lx60K6+BwhLL27PHysu%ccUE+T
z;4e!|XQ;0IV#D%TU*Dp}DZA{tJ)9Z^!*bt`MTvzgR$~ITU}t6$x@3v0p_CpfGZi*4
zOB-)|mHRt%Va+Mg_xuw{#&hV$el=G9XDSgEG{%$7v5yTF;^_=T@NPQCip}nY$w2ZP
zqdMD(LsV=sP;|{ZpNJ_v?o9lqQth7&)`Wm2CQ#2bGeyXQIJV}s_X>adiy&urYx)#D
zix4be>Q{$+UpXwp-QoLImY#e?t9#sgasj8AE%BFFbnrZ_sTgSJOsRCx4@(ax4E=Lc
zuzsiWgcP)b(sYqdCb_m*Dnz=APacJ$LIJ`14bosafdh=N>BDs$o5S0OPA%g(JCG&I
z^87$Q4)vz+;|Z~HTS^U$!`^QJWq4pG=eid8N4RM<G1tzSN#`M6jWi8L2z?DCo<*lm
zqvaQ*O^g&o=w(wj_d60NBCrvvm*HA0WvGGODA*>e1a`8^d?*;~P_tGoetv@jehwU>
z=XzJHn$-XBDwp|BO$f3)ZQ#$bMD;Gi=qs7$at^Kj$1PLP%eIQolHL;v4_*45mF{|G
zOLyLN8*Eb;w%h%2Kx3?fRD<cu%zxeMH3J*aXq#5@yz3)t++8DTsisx7wO8e~{yO2N
z^74O0<Rr8dsyCRE8;|8mi@zs4RBp~YlI*I>A6L_T-I$3Bj1Qk91-#isx{4tOL>F=Q
zjYz;loQgLNDOm&F$CcH<ZTkwdPVZmM-+RIYpST<<$A-Y<=4)Ad32C_og@tve%_th+
zU>JWU!=W7ZQJI|TDqLjJ<TYf=>u~`MJSKi;&eg>HAW}A!-5K|Dyw^HJB?;GXzbJ-x
z@u)<MakU5~bYE`B4#~~^&+=KW(mw7B!>mt`)L<;cceN)bpat7;9GdYOOo6yC3cZ&>
zf{4Gt2>CX<K&^TDSVK^#TP&&I-e;-PZ>Rv>CD93ACP4%jd#Z{x;B;`8X&rJjb#5o-
z%`ud;(Z9^wX>1s7=bRuIMt7$MdO`^x|4fB(Fe5ux`1|+7cTStW`1Vb%t4u?yMw=oe
zx7qth5Ev+N(Zeb^)l*E}`m<GLw!d4ajrSSxZ$B#!Ww|Pi=v&^%MNW_Wc7gvxv3Bg9
z*zdx^c-|HSL#Lf(z~pSydoQG*7^DgOT*gIG8K|Derw}C#@O$G}Q2CR$M6qYr&G2y^
zUeXb-L!bqVp<WF!XApG+9q?!!)0+PL)bfcfr?m2SMQpUQTaS$Ka_cwz-(($=;~>Zi
zA>?d^AGb`U&bCqoy1=MqH4rEP8NuCO>p}-dE^X=ZY)e*CB>$@HHk{vRGYR3ZWaugD
z==96BZ8|4bYg_BcAQ>`vw0;NtCvyd%10;xi!|f(l`K{f%=Sk+B+o4R=MWgPmkvJ4-
zg0nOs^kPa@U7a@|=UeUoOI_OA7kj?8#jb@?V=LQ$iM5fmkAV^TuY~r(H&e9&I0*SX
zHPS4&JVp_8e)u7dV{GmR0QMguIC8x3J25#XtKwoc5Om>6j0+CVFbRjL_#+kFd}6Al
z*KUqOA3I8Dc-|4x4n0a-WBGO$Zz!XQ=Jy?EE!RHGmf2+gh*|8<M)1Pf-;a?8Io@}V
z6(N*A%fl(IeHi0=UyD5gxBY#FX?(ZgUak0%4(z!k-jJCRP6Y3KnLKVL11-91Hj7Ny
z+vtX%62G72#tfl<AOBWz=T{9;gU}OpY>JzU)!k}it2YDwZ+?EVhw^f633e`s?i)i1
zh<Xi)FQ<TaPH2;cUg{p<XZ7MS{^F@mH8o<qhKO;Nz@MCPzyTqW;qJp}wpP~p)$GOf
z?ZRYNz18OOnqhrV8BhNP^H_R}kZg0!g;Wi%on4j;pDF8i-;WPBhSa_1vA{Pi1huK-
zhKkG~Egkt9H6GBuZQFh}?Z3j-SW9VddoQ+z)_}KJo152!DAK}e*=2kD{-WQ9$FNz!
zx`Q|48i_I68H^qdaBP55IY#SZ3(tTEo%hX3N4aODD@Cs)BCtQln`${v9WmqhIbqJb
z#lFc7uT3`DK%IdtOCs<ixuCa`V1k3A0}t-MY8wZCKC(RV9L^Z>Pwda3`%+=_|KKtF
z@l_39cVV<;G>-I2Wwki|=kj*N)Sb`|rx$d5hNIX&P~swjS2c3P3mp)dIyMduE-c>M
zF7aXy<?N^$pGeCL8%1kxG&JGm2TJWmd~GF%Ui1F70pL0-h(&_xd3lQcu}q7ud#xCj
zx*5XPlKI4c^Sto07!%JQq39}TxdMgdY1er}o3zT28sht_naGiy!^OV`iQ3>=NWCf@
zJ$t!4uecHKXP1J=+L{raaeJ!{JLur_Rg`$ZTDPG}8FvXkCGh&Ow^A|~5V!vsU&D@n
zsTe&!%Yy#DaNSb8zs?y8-x>BfG|8N`G<4mxAy#Z$hl2m`|9V~>IspK-k)G#SfA$7d
z3~)gRDcf*VkSh3T=I_w5SxE2MpHA6>HPJvp>f-m(27Y4fQ&UFf4*NRDA@mpkj>g@i
zx#$RmOQaqVsp!T^L>kjbA9VH6a*W|@^lD8`gJG~K9e>uO!Ex6wB)l1q-$r{&OV#B|
zBZ$5W#n~G@&mur`uOeO`&x{sFTYr?7bG&%{bD2JEP2Xr6)bbGGf~&4taKS0}DC{vE
z(vC4-+;@3vcoTg6EXI%*7o-QU&TmnqUkEKX6}w(LLl8<_MqZzK%55u;ig}EbbbeLz
zCL+d?xj5$;zr8d<7m(4%9m*P!r=5z`=U&AIE!ucjN0?W<iQ{^KThW$SXWi1qx3X*m
zuj(+kxvb)xl)oF_M-n)BH9d`n7$wa`gZ>%J#OeNZAJS9``3=)Ee^+zpL~ZnpzYpG{
zmLi;)c`&!AZZ?9V<>^=V>Mm!Xi<Wrjg|0{V<W1T_F|g(Do-+Sk*hd#Vb$3TdQ3%!l
z`i`A~MA}@n2DODAX@>2C=5`eWhW*MP(v*zyV^8$yTk|7Yv$>@He<tNPZdDHRgX%@#
zlt2Gh@ZibNMPJOm{LJ#~N^L>z(dC^%-T22a=sS@qt#D_UK!lz(*X`a?)3??Dn)pv6
zGSCHPo!>uB%`1Mt7-JU#DN6OpV0c*?3yZtxTkesymdV#GpQj@F=G-^X_-UxWN*$H8
zWrJ8%L82ssM$D(C{Ua}!^9$HsLQ?f`nc%A)Jsbi|`+z{d_;E|4-j)+ABF!IiiH=0<
z?6URGZ#G9C_u4{WpEsx&<AvgFR+ymhz2BkhuA94Mmts)1gap#<7tHV#H&qUf{^eP0
z`4Gz4lHjBSL-v)nbRDg*&Lx$zlQcb<(PQ{K#D9=wE`64xowaj1xnZW#nJ^?~;C6Bc
z#&oiU3Z$HxgUZOPctg-X#UTc+C%)jU94Ja$oL=rZdYLU~tXH13v_#yWkbc06vvpli
zTo*okPTXkRVTn5kwxC|EO|pM{``*2rWA&=8LVVg_Gwd#!Gv)yBnzN*2>jO0%KU)Hk
z5fn|0N;5M2$0rRJ-he{a_7DXc1RfV}klZgXLNe3JHR8u#bBKe&+xu!UxEaDK{`;dO
ztUhvMuALtLNA5Z&%tss%e25aQno?~ufX`GQJjwb5L@5`ck}V<$w%S(qvr$J4yUVvE
zy<Ao-2DIkAMyDU)-w*i-9K56oC!E-R0X|V~k1fqLEldNCaa;#E#l>deY(kDLJEWWZ
zlg3|fBsTSk#7&=O`<7HVNM3D(`<-u&A>77(vC_1+>EQ;IUTtxL=P|YXpi{qPdz1v-
z{(aBUw<j<?k$$`!{LY)zb&27Yz-2zR5moY{9y9AK6a=zdDv0vmP5UpdU?o&ae$L)1
zl|)I1q4&Rpg8H?mU>H@gJnbjPELHq&N})6J%r7+ff65cK?892GIxab(4wNCo0|_5A
zE@?9ryLBV;`UE<xYTpL-q3IuZqWw#Jbo{aaG@n^U0m_Zr<W4%uU**_Ed9fh;^EVR9
zn6lSjA<|Ll^8wZ>8LQOzpyumK_?N~KoUJ*hqxiVPy{<K-Gtltt*o8>OK8=R16>0~z
z5o)lSJ1Wjig}l543W7keMBd5@l_)M4!DlAJBtX;B5AkSZu?LlVnVNpT?YH7~#oLKA
z)}mz@>*N5{h|p6ihl`{LqVpyE5YkVN8T1(WEl|D23p!5P1%3aX-_I1P;a8!L3GE4V
zljPA6*A>QMg;hK27P$^u8XCJ7k(GsyOo>W?e+CAO6B83Lf%i?XiAwj=%mM~k5|t8p
zd3hVq@o68qgG>Rk&1)<GVV<{lFv*x<)z}*}aSqj+E?%P0PqA&U&?T!Ffr*K*9nSsg
z%8&8zyXZs?4@Zt$ZMQD;co2LFY7bc7ul*zvEx_N&9)->^O1<Y;oUrSR5s4R(u<t`V
z_PESYRT)>Yun=2j<@&WOC+7xHyv;HrAi)0}CB6eoaXR_ok$jUR6F`f!wqJy`SZN(@
zbdo!!0sgF++%}F9Ev?|)iJ6H1JqsM|wRjgDEb!8yq%=fIck?}ME7%7g=?a+3LF%Jt
zk(BY7wH@HtWUchMfqJORe`yG=%cG6>$9AkerV>)pIG11bPWrae8m(+w3|M{jM=H1(
z&rkpI>OMXJ3!as)(|k#>W9Hqe{f}5WZx`)K)Ps)~+uf9?ypD+8-rd2j-&z+iu4o~Q
z+t=h2G*#k^xLeznaVcu+B4(6fb=rWiQjbnWLb8}bma!*i9vVvRxp$ZfTCoVzk6W$d
z-TODXt`QT^rW?1R4~m68Z|zXI`49*Z{1S;jBIG6+t$BYD4{@ZHZ*Jhrpt3~FBC=mF
z)%T<|Fu)XZ`!c=ialG_Bk*3pdRe|oo(mkhs-<adfy)kv?#EOJsy-iYZZbK@kBT3VD
z2+s@hiI!GkmS5OQ8a1^0&-FOM)CrP`nVD>L1QBoc4dbW{`eZJxymxD_2|`;7GWdr4
zDcqf@{V!sMu#s4y*}`{=Cz}99p239r1UW|eB&FA1tbm6F$G~8|7f3d=Jwi|utR$fV
zHnH=lpmGL`kP=nc6Aad0QdzhmCdWKPGd|0$F*Aicn`&z-Wokk*p?qdr_6M2c`7Q5~
zI#bU98YP&+V)vHde19Jlc*c0!pgl8NOfxZcuu2GtjMAQRb&X=d2vIUPKiDyzQ!&1w
z!h(><Ki?ChgNsc642TI(ovETn>(1=Xs(;b&$wzXRSUnG_7=57HEM7S>7BdRscJ<&6
z@PvAJMcZ0)aNost8Wu?eW9`QeC|`bejKPXZaP$8#hP0SUm>YB?Ugx_8E<_SQ?)d3N
z8(1{;&_P8Nxzd2&<_2n^U~aBoGb3X@!JDiEuO~N<f5b)|%G%_yM9C>W{N3`GUkJ<U
z*)4-g<9WZevsOUp4T6D({l^rTVlbD%b=_tEKX-9M)7RxfSE`){{{_XBHQ7=}m_-yu
z^g{W|6QqHli6DlsL>5vfsEtVPtS)XCIy^Gs0Ljc;<Ps7RO8YdH)0Fw+2Y<q#70K4`
zAX3Y3oHxYZU@Kj<Ry)KP=Ye><={P`%2Oj+(xYtFN{7Y#Wd*EFo8gR(vySl8lXy;>m
zt%w9>gwL`M@Im}1zj+pR;xiTw4qs(TCGe*#vp^b;QuYZgbg2_EP(dxggW+-nD8bYb
zF97x0N3082kJFBoxqAeR8%fgnsKXr_fGa^?Kf+Q9XfW5+j0)PRxBXm#9?{dqfQ&p)
zUT)dDHx&Z?RUCor<0EJiEa0Hnf0=3~I32){1{`+Mn4QczqZ$I!;<hH4bClm~A7sQ{
z|MlzB7hy!5uNB)}l(X!zX^buZmAZ|Sony_jcre_=2Ro6&uQ`dQ#_A4%-Fg6qDk^51
z5lg8)el>KNS0zULPD9RC3V}%VH@&7sk_nX4IFI3s{6lSS{&Kaor?J8J@BYuKQgJ4%
zmHM<C+uW6s+PqO0o}ZOC3F$WUf1Jr^m<)Z9b+dE_Uo&DuSha&c*#{&$9K;)t)g0$a
zjjlO)L$|>f9JIG;y|OQR|J*((LpJ*1;&5)1&Hf!aRx2J~&ODYW3j%c_g3UT-3LQM)
zpj2dKX67m{Gt;P|yqsfcX-W7)t^{hB3}X6w1>?^o8TMG6aY8$YMi~#*{P60v`)O1w
z-hUfGoZa2G(l4fp8+~3RrX3uNhDYBT^}q#{mf_b|nq`>kOKs6TB;t^Cfims9KA3gS
zgDyAK<cDM8Y)p3h*%k!*M~|R`cM%lXQ>fOs#&ZX|CwcA9&DT)a#l9{r!~|9=YiY?e
znk$Kqii)aHs>3fJWO-Mr4dB`T5f`^)sePFio}n8X6R`b~6;@;R)Gh_gPu=mFQE_Jr
z58HM8q0K7X#q7>VB2EIbsS$b(m89xvLP&}aTfww81^3P~CjywTVN6*7lY}`F1JG0c
zTnj`IxhHCl9#hx7DW-qeHrO1ddDb)M`qY!VE<Js_D1`kvJH~S8eUxlY-*;NndPvD^
zuK6B~k%}_mu$fvC<#f!WB12K3(*9FFX_`gW4D1GJ8pA|Dn58#bY&3XQV3o3PgqJT|
z*-Kb!sL)q})G7i)+$iaZ8>_#xSAvYNnChGDAGt!iOT~r36YqUP9}(;-?aybOc1XtY
zF{zZ(Vl(~pM>!##ya3TMni1GTtf=;oEatZ+=Y6dI`BOBK4z6&SkY7JOG7{T^Z=|lS
zPM<UgyiRX!oDf&S*>%Ex(67$E8d1Xq(wBd8L4YYTF)<;6+}z#6hNg;z15aoH5M9n!
z+Bkq*J_8R=@=yYb9j*9`f8HaJL^-M#^GIEsijNKmn1=}u!PuW6q_Q2ao+BqQLJ|@a
z(-j#Lg_nb2U7^-gR@T;vT@1$uZ-XgQ&_LFH3?pY{`v+982pAAg#XyVsMW_hCHv<6*
zIIUzrO!AWP$^#IH^SlmH6Pi6V%mSID34V9<v{UezZG&?GNTri2GH=k;si>SSDq;Xi
z@m;!o$r8F<6!Z6u>;h%e7)?xFme?NBTJ)sG$%N5s=!`FcIr@l{qp8LYOZDSNEAhtA
zER%C5GWceHlz900JEm3P|I5s^=|P9@_o8!bBzaNXLf?-eEdF8`C~SK~Q9BvW={MU;
zF1rqDSGzx)bQL5M$!HbIQ`jx*;^t75BjcoM<F;+plzK3Hpsp7Y>EsY7n3`pU#h}_J
zFy)(?N?U(X)$j|RB{YqUd#z7uwaxr(c}3hWUZXUwZj$Kh>($_=tuALx8hCX^J(z&;
za{K3W?N<7c_qvco5LJY5nn-pCjQrCqZxbfQ76lSiP;OeRq_lKCQ;yMrIZ^3G`883j
z9AnXUrNS>nk;(5F6GH;-w#buy%0{TKY0rFI423^E+;~H;PuF_Lgm}x5bjgGgycO|B
zVsT3<E4M3TnUl^o2Z<TXYn@#~nk%^Y4-XvyUYu18d)gu}AXg1|QejtG1iA~C#6_{^
z<2^67JHPrGb*W0dT9~~eE`@a(I_o1iY@T)@RaskGJB6q`6b(Ub(#|XR`+cR%R*S`L
zOZWFIc3@x-yevmoPhVD15gizn3eC=@S(1^V2Y8jh&ZtEPhKBacR1c#66E?PWM^1~>
z^?`~D;3onV@qV9y4aYscK!7;S`t3i{d2MLwi!J)2&1tE<XtC%Oy=53D0XEpU9K$T0
znhnb*N+)^!W1{~9l51MbiMM&Cgw*G$3#|tVC)9sM9i3MJm^O`(mzLkZe_PTX@>Q^2
zWQ~T*w&!;4(SZCch+>cwJh9-Wzvh+OUY>IBPDo1#o9(~7C3*W!#*(a^N9kc|38f)4
zG*QENq6ln7M;y)*9wBX8*(DNDz>3!%5`v(%=}WC}Jms$hU5wO!yH9k(fCbl5IX`9Z
zLb>)04C=|r{VlUlATGIaRpC7l*lhH-DSHb_fnWcE@KEuz=Hc}^Czk@w2EuMGP52!K
zYdu8>05P471#a}mzr0sa=nI!)oKdDQGUW%uIj^pRw)Xe2z+f=#R|-nX{H7)f+%dZR
zFRP5LhQervuhAx_rclj~CJGc~9=snf+4w&@{Imdrr3g@5_Me|DfNA5oqDFbnJcl2*
z;&q;n!BVQ$$zD-8*fVK(U^U_0#X6hKS;>Gy7yAwm)am-SnOMbC<*2E#uOz;r)|N~F
z8r(a=&_XTv<z<b0SL&amMUeY8&gRSvVMam_u)550x!JwZ|3R?s^JlNJ%n}FPt4rv~
zuyWd6jaiyIioKXQ)fLmImRbg&r&Tt$;A8n)uQ&i_&FG^z9DoqXZM%oavweP$7J|ND
zfB|;AFaD4x_7T4ZTf14XDWy7b?<nqYDr(^F6KKqxM@fzN&bwEAXq6Ijwv_*YB*9=H
z+2?&tmRi@6aN`5k;=Ne{>ERV--b#&#0=oy+|6Oy_YqK(cGyJQ-6R9J<r-FRd)WX6W
z*1Xusj!4U~<uhK6s-f9FE)l%w&oC+5%C&g_U~`@UR-d9U;mqvTJg+{t5uiS!rOE6k
z7T*;B4iskpgC(<2f3oK8!A?YbDDVB7D;YhT@a{2=ek|e%{_HFXUstGjJI^ctkvDXR
z+w3-sdXNnOZAkw~V32K3OH3R*_><M<vZ25*;B)#H5eFC7n_dqD`nG+jlYDISHBWv6
z0fB*mq4lOzhaK>fIGTSwpI5|f=N7bp8>lYn^`GG~oQx`MbiFIR>nG|d?@F{3hwksD
zY)4h1NH~~8h|ZAip%(Wv{7U<IPFH|RncVAfE>UJ^T5wDzF@h*cJo)tD#~RWJ#j$Wp
z8DPIOZ>A>B?6peG0AKAU*9AvYQ_Cq&THnQZ^X3i2r~$9|Lv9}#F!WDe(k$v>*726;
zUulw2pv1*tqsH6$TlB;G#a?S@Y5^0i&%zf9_#c1#+1|NKj5p-3+XH4qw#w@;+*iz$
z(LV#owzf;zUH(*OVW@MmPTAUvI;{P(9OpFT$F-nlwAubp(esZv@eZvGC}SoBJWgpP
z_y#!Kkk;e!=6;-8$p@I&AxR0vEpC|XZ`!@-yj$DLnRkyXT?+(!6B?G}BfElmxE=m9
z_G89t=@}~(2kTh`vAxqnuRN70GLIa)a<4I(s_R*!8l=5BVHF7+bkN?_#n3{<G9_1u
zm}x1?uSJDxmGN{-Os_s#a8>_@Ird(^8$i2}ni}y_3Ij&txzI-k&%FP3YyP?!<3L~t
zi(<D~=@@`1C(_<lO+!=9KN|^?!}A@uk-j;?KpcRohl&~|@tTOO^4*$B1Rf1h2!!QB
zPUq4RHNc`KCMIk@wkqtk%X^79kx&|tI(vAarN0l)&dyd++E|!*xcO=E$uo@}W4$nY
z`2?_E(8H|o0RCR|7L%l67no+^;^XDfdl$>S;)W1(uxhx!$A;wx&H(~X3w`dK$dq$F
zVBY4#J!!mCCE=_0vDt1Y^#<qtVnc6xGQ2OH*>qro>&ZL;pheFMX2H*MLGA}|i<9Rk
z&{DIpDGr3qbfVjDzDguJ42D``W;vE>&GdzuM$sh+@0<|_wLNCWF3z^>t(3MqBBjB+
zEo4AS){ar7O$Q}&qg`w(TT^qH;HR4k0zAKhH9MeFcf3If7wn*7WTrDN$S8E8d&AuR
zUB${rQuaD5bihEY@`9^)NsfGv)9dH6x_N9Sm*J_5$^K?&%sIPNlL3>{1@stkvED2(
z{rf5Aua%Jb2&Y|s2<j(^W9N=`gY;Xt)J7ZfKXEH?sb#sqUpi1|x@ThN*!hF{!S$6F
zfojj{Hu--iHKKxGJB!*>vK%z@f;bBL>wf38@*yNFBghq=m9JU&P`Q4qe^zZx_!Ngc
z11NedJ~;ZC^Y`*1>aSJrLCNMfora}pyjZzM$WPbCax1wE0+21mW2~)i!vO~Y2~c#?
z)IRFFnUU90IJ9CQ)`E+{B$odK1^>Yb&}vHLoHO$ZW<FA8W@do=G`j7?$$_RkorA(F
zj{Jd#B=+H^xO8#h<4DZfKW&6%HirBiuyto~aJ`SG*TOfmMzAh-UJ=`#NiptG)A(ao
zy?bEK<Gtf>0#$^pFWE*@dcIPJ>(W#9Z3?%C!_vU&_huY$>IBU%R=Vlg)j7O6FZRru
z%D3D$4giM+wR-UY4XF{m2eTJaY9)P!<qp~_p`(CsnEHXX{iQj2=)@T0yKc#K8y3SO
zr>*u=iYsrQguF|SRsucqpt~v-$SXctCF?UBH(`eeKFv?!f0_3x+#>z5FWo=vdLRZl
zV_`%YlMcA=QU4SlrIWF{HXzs@oR$5;=y@L$XECw>x)eb@Xnh9)!_MCoBqXu=n~e<*
z<80DA7aMh^mJ3q-EA|KN#|i>FRryOaky(I4%8b_on6RV%8-ASh#r&sx={19*#E#wC
zCt(@)>*o~1ZI);bfq`E)H$5LjUz4P*DI~mOenltGJpuz2x<{cKWWwsqZ*O@hIljLR
z(eX9si1a~dQ;bKsE>IAOK<C~>G3QEE?vJK&E83S`AcVMZeHGKS2bKR>Ro&>$xG8lg
zfka7L>*8p+J~<^R6?OrlRDBCnfidy)q~irkicDXZDQOT2g-SgUgJ~gKC=b}b%jXvt
zqr(Ks3YY+Xl?CWT>MI>D#Q@!c4-Co#D4Fe+jvf*H%SSBdF&qW$BoE@r-~e+bT{IgY
z?1_*%>DGh3vf4yh{flcWziV9`YWGEp_B9b^PdFZ0q@4ZRrlaV$NQ);l>|m?&I}c^V
zk;f{})09(Cjq4kDrAhQ%rjRV4W2k<}`C3!y=&J$N1Gv_&iUZNo64+DVUg1x}*{rNz
z7ipK@uzuAe3o=b_-xUb<({VOSzthlO(?QE^dQX6oXkcpH|8lAl7cKu7y`!Xj>}PD?
z{<qN)(WnhQ*#3o(HF8SM!@@QGeN?)L_ke4AMAp<pFEgvvUJf}fm{9M88tzs7`M4#~
zfYtg@Er7vw401>d-J^L#(RI?%HCnX;xkZa}xa1BNaSk^Y->m$r(V@MmQe=!bxhstZ
zNj=2+VL#*w_XuV%RMQ%M8s_H1_09dUwg_JII<sZsJ|aedj2Ifuxj%`rmw`%@J-=hk
zY0=Ut*m?7K7`L(4Re`S$P|RZ!sgUR@(#5gB&kKAAjVji$vG^Q0WtHo&LPL*ruOZ`K
zKPQCUj&qyD5$%nqrlvNeQ&Un>5E7~@9M8<THiKh3eev+{K3a@ipIO?@%{Ku=*><T#
z=mQXY!N2gs04WpN1_k10y|rs#WsS`#Pm5Hp8~4htS;SiMzKRu!DXB=_ck_yARf>C-
z=ia6C4JpRNJob)xoNdC)12eJ6a$IK_hah76Cpz*@v5$P8cU!!Mkg_yR?uKcAPgu}a
zQ{22-jee)+SOo=C3Xdc6iqbZf`uio3fBJ<iczEG^DEdFC@<_ibN^1sG=HsIQ>Y&C(
z3tYC-RSTGF0P)yuR+PVe8+g{UKw7Mbfz5mJpH0QEQJ6Nxmu<!yv0C;rejj@z_V<GO
zf)JR2lTN$o*GGOTtK^icx!36w<k1jcn*oVxY>{Y%hU63BHnT5*<6g5jX#ek*(hig{
zt!qoJT*KNlUR>rfe@JGy|D_|asvepFl=tNL?1*m4Pp9wO(Ehn*a??olj|QHr>UrEd
z;Stx3G}JNUOChvWH^0BTz6!rvcPht5QbslgSCzS_?L7PQ3+NPxZnewhv176n)HBlQ
zpDYtM<%Z63cQ3CyM;p*e+bgqC1Koj><6v<l@O*sz`rZT&!g>)e9!uTcO4k*TXu3XX
zMDIG^(xc&14C}i~E7-GU3b{cBuE@CzU;jnh`oOEy>>Z8{R!3`Y-8xz>J{mb2BraK;
z_a+9Cp_&FWzlBk>WNmQX^@)<O@$$GeNc-u5Jj+CcNa4>Ejf9HE!_}-=M@nL1X<9A^
zde6|JCfQGxv!VI_iwsO~3vN88Ct^T^JO<L~Llo7Qdgc?dQs6zS>up8@qzJtvr)0y3
zceB<dI^we65B^?StC#KSJ^XUHCdE~DE>nm*;vB|dJZDc5CE4PR4J63WwObbmu#PwS
zLsn;5EpR+e@csdxuH$Oocg)b1Lo^ef?fztr(a~r*cVUbGyWl^p;)Kv&A>YXrMYewK
z=w0M`+E`zGr$zobNi=<rb0}>Nt~Si2(;zE~Sy~FB%@yV=U`*I!YNqt_xIehT`hV*5
z-M3);fq*x<h$AY)(yR4=A|Kr*k_&u3xZ()O7&&-DbmPrC{?zt=&5Bv`Cu97JiWGt)
zIy#eZ=6r!=w%%yC|NB=Y)R(6tunI<o*m2{~_KX9l@<EN#zyhQwjKjlYfQ?<o(i^F4
zin=pOz%KoE<Gp6~Jprz@%K$rPr!^Q{{V)f7u)hJnQ|$w(qfgnl==czTTc3*Zk@hky
zEQi3Ti;tXjsn8UAyAak3dGQ!U`s_2kp}%}|PyzAp2O~H4D{_gzjA>~7ZPgjDd7DV-
zHIdCwESc9>cejjH8!V{2*c)o&ZG;YxF*GzZXBU@53~*&-rLd*b%XfMVnI5=DQHy7^
zXDR2pAnoeHq&28koTudo7Qeq9KY`l(LynOFe(_zWrivfh2eTtq)MaC3z1+is0P^K|
zTCePb=pg>yP~x1>=gqXaRu?v%t1Buw={YhkF39wF&|?%SXeq;)zNS7S$MjFCiBU6-
zz42nJUwb<%$agw}#*oaTpciRI^UxPX8ULDLBH)Ae!@+lLZKkOt{QmEA+TwWNN4*W9
zS4Eok14Cy=iMN80^!@LBU(936YYcD{9AlEcblMcIxVw+c-VvK$<;icOxhv~pCycwL
zQPN!JBEY(A$k)<yuJ!un#oy4XRFd7^0i8=heNK}0j%gVGLMBvR6}#_44!sx;;qasu
z|FkYcRUwK+WaNK-kFShG=K=sObxe^h6VwaLU1UjdGX2mm+jy=&(LBF5Of#>TJ3w%f
zRR1HXOjFyp#wwsa?RjQ?w4f}1I3XHq)*rWq2#4%#oE?r5W{EUnQR$ENU9wp=ttrY}
zFILIASRLdx23o)2PucEXTVRiQsHpG>&Ckytn1e;!i;98x3hNO5EoKr$5zyDyx1C?)
z148Wd$+Gr0FY95dswI8>794QXhnsWne4Vj?I)5qb9>*(T2-h=M%*x7&*_{lYig)tR
z@HpO%n!QI;?>JG%JmXPOpmTMZmtP!_Qv6|KmCFdacWzw`n*lB|&JO2{E6?r-3AbA%
zo9l-v*Vtvi^?qi+J-hFYB3lf2KcwO}g?KG4w|44lLKXhSPEFkfZTvw<KL510|Fc4H
zEV?6ifV4p}?|F?_g66XgNgkxtYO_x`pZ>2{RJMNp@W)+WR0sJFLX5SIP)l<rx?{t`
zg)sMA`f~ImU~6-+^axOqpS#ww7)E-G_j_y$sWEMi0GhgZ^~CBs)6>Q*=;*j=2pm6f
z*y6bm&b>@i%U&fHA@K)Lc`7%_j_+ggwS5Y|O<?(k?;SFog|oDJjf`KH&neUZrgVx8
zpA_a#?)zC86yCf<KfQ(abNHmO^D)hQ8Sb;cr<tx!+6QYY1C53WJh-*Y_m6RqpCZrc
z;!Yg@{+RK0^06xDObL}O&Nt!Zz2@eU-^UxVmG)oi+3a&WQ}YxgSg6csB*}*+7$>@X
zQp`yf_V(<gB~8uE>-C|s3gEps2MO*Ht!jBiD6_dl8I@$8mjFIdBno$?B@nW`9UpjH
zZ_Nk({9)JY`+@56GlmqL1KeEA$NfGb-N;nxV^^Dm91&@Pua5}<i%rL)qYHfk7xE!<
zIaESW88x*MeAW)O)kd;b^HU)$>5T4^P;=M69|}c|<&LM?Kw^(Z&o?5)f+KbT&JO4@
z**Y5fYu}<i^Cgde5kYbx@#`e}RGXBv?w3av8=#iO{_uT&*Ntq3Ct2LUIwe^A?k{Jo
z=&hc)+PJPL0co8Yt5UU;o=ab*?h@8TLeeSqUDvGUAuu`t-_TS(z8DRv81|vAsmT}R
zWX&pv!7e)MZRmMb*d>DX@IfSe5Y@5;?eN?ETb9S=6}BH&P5!Ss3{1M3i}e~$|6t=q
zR)6DS_vP3~2WjC&f772kRiZ<7JlyBcJIf3i-SaSaZ&LjG8Qe0P1{p?K^IuI6)P1k1
z_g?^4AAuUI2+80Hw@4Z3!YuLzQTX^Sy&-<og9oFv#)66*zJw3C1R|J7x7y=Hn<vtH
z7uX-e3Qj4L^T)^cgrBaTN093uZceZ}Q)AUsWu)UKUB$#(u>nZq;^MS=GR_JV<$-{<
z@8RKFDbX5TW2+M1Wtg6(f~7Sr@$$+dR-G}CUQ!=VeyzFW+vEu$=pAf_J3;9+^=d0?
z61KJXvHsutG-G6b0pG>JKhMY2et1zxU%J$xoy{(*uJG8W`er`ode>=k4KrR66}NzO
zuEkdCFr`<ERRv7Sx;-m=l)*$TBsfoGpM*w(#wt=|id09dXt<${!%5nJa8vR@SJ7?4
zI=Rn;fadlO`e$W)(#(wLw*^hRyk(X!VNNuPlxpU~!}Zo2?Sd#iQQg-!YM_}RHr7ay
z$kxwvKz7r9H&{?eB2vnosK_V#b4)W?m`gr=3q$9-Z%4L=Zr>_n+L;os6<G@7$-t62
zvXKqW5%K4%AQ8F4-H#s;O&}SsWyN3g@*p=yWUxasMQ!R!ceF6tuRC_7O6(PW<(9XM
zOr&X#be2D3$(}u}wHpv(SEoP6F^;Q}-%x*X?s=rVUOl9EbM*HJ+~^p93tS`E^~OG{
zUP0Qq*qk;)%EoRTRhJhzvY`U~&MatujfG2USE3vkr?txD;1+U&*xD$pX8w?Nzwr(g
z967p3*3h+3MnpkD0Vaz4ipyc6`ljp)%D>{I(wDj3Pyrem8pJuD`%AX>@81&yNaJ4X
z3%J}Io0LkA%*>E_(n;F<(}!C<Kga{L*NTPXclawzIxvK1Uo~IDj3}&c^2hnYXUS=s
zho7Q@%EK<@!YST#wCB|xZ@;aXLPhuj`u%IPfVQ@~M+A~hmWy_jPxXULDqwsu{by7o
zBFy^NMAQl~uRf|WR@A*oG#3JqwNsJ({k@c^C7UssmHXGvMFQ)8Bwce{o$vdvmThZk
zxz)n5jn&f0=E+)E*0OEuWLwKNmll?7{hrVF_j>iuslPhcb3gZWy>(@u9(bS4NCxT{
zFNb)CcoR&@z<!B)mB65IXF#59QXoM+MmdgKIsy~8PO{lmV=wPFddnXt@U0qHqCTUi
zO%a4osaeA{NjwWGMj379v7hj(Ni#MLNYH@pEm1+Tk%RofT+j;>?ZS*=n)&qG@J`nO
zo2g@Jq`%Edf+^XqSdm}86+B!LCu+rr(-v)#_%-PphLHSNR^_yxi=7;(glqE-s5~1i
z-|IZXE?o((#BTpqk@|}~w64oD6fQSX0VBXm8yR~uu8mk-8L{AkV0l+2B=YQyJh1+*
z_<gsq=lZH<dw|@(k?992?4MApDcH%WA;WHEw&{Z-oFEQ~VB^IOjGp7&bFnp!OmhIO
z9#y>`|J%3vWg%&x5^c5CX8VRbkgIKidqco`cNpvA7T_bo%3hxjDC(*jE<S~+0>D|g
zHO<zRd7!feh8QxH=Eh)P5@p?JmNIL&sO4U&pMI<6J}A0i_hK6IKFLCXUDX)R5|p+4
zToHes*Yy?qb|9{F3`5d3na#TXXKy$s7O^tHYb8u?)S3?TM6yJAQ$kWBP`eBF<(jvq
zx;kfDGgIsHIGKH*v=EtY!<AScV`xPqW8d{<9uof$aG!+trGP#2c4fO&=g$%&+a(n)
zXfs9EZO}t%1!7ci3tQJ<-R47LW3rFM1m2IHGFMS=e<EpPYmZ?(8s2hFCu=?J#i?0r
zcVV`e8Rx3L9f5hzdtZA$Ma+#ZakGEMxI+e_cG1EdqZ_>vY8qh>h|KOFAGNRqL9jl8
z%1#IBfA3_Y8};VgC?a!utw)!}qs%&dtQVw~HXX8@u15KqJH}W4W$(9R%T-#+=YXH6
z1?RfG`O<XD2ZvCnm<G$gC8<7tLMSsk`N1tETZHGHj2)xXOTK(RPnw_*U68WB$^&ot
za<}}P-&5~UFxd(e_U~Z8AG6VTa^y_sn)<Hc{Zn)=AF;Xu>``rXZgR*Ysn}D&A7hg4
zgCMqJT*!<f_xctCxV)mSwT9dD7jym}wmU?K72`zG|5{TA_W8iTEZb1IbnkXl6#~tr
zeZUQZ#tH$@BdV98+UZ)25?=o~wV@A<blf;*K7B(5XO&L7Cg(^`HQsl_5ni8G;nX(Z
zLi@4u4Y>R3vU2qCzLZ2`EvH<ubqB4+$xOP{)ujNv)EQ7d;N^bTANp=8O{E7YU1}2I
zYG;#({`EVXDG@=9smeQ^&k_rCwZgG~Tl3LN>i)V*J&SPOh7l3kWYhg~=UY|?mn4hg
z6hPn^Jx3ZL*6`8a(P7>XeDi7fkWumy864Ox#qi1vVt?9l5QCnc9`_tRyV%b^=71)K
zB2Jep!}h&(T?+rp+MQBEH(xRT%=Gz7PKRcKm$?t0Q@nwnY_o)Dj|Xn6o#bI4FMU0!
zKXM=&AM^Q)%2MEZeMMnt<9Ot^o&~gm16UWN`EmWxuu~A`AhSr$TE3UBk0h^uT(Wkm
zb56kRxAUE86oP+2a9c)V%=!m=-M+E}wJwny%Hlcl#~aA0VRge>+_X%>SKP^#S%+94
z)i0kV%ph7BL-donpU+siL}^@B05O#&ABr+@RUqm49Q_qP(*AY-uf{+AP^aAzA2!aQ
zEg@@j44`YlPQE@pS9Qq>63#FQD!3~S(UPbk=L%|oSP}cCuFLz`AonaiBqT%z(Thql
z4ISufL43SOEY}wo50d?hcLKtYKklYcv-H~!Ty7miM|Fa!5X29Oo)oxw<z>J7zg<Vf
z=xOP!kT32}W(UpwT7wDHN_m%qT0TOd3i8xm)mx*lp&%kkyV~@5J|zKMaU;`HDGo*x
zH!U6RAWz3-&Gi(Ag9c~;S4DL(4uAS~8__%7b}J26hS#Rw86vZ6NvI`ypOxQmlH!_`
z2foG(wg_u8yXlA4Xy7?h`?dRsM;hvi0bdM8g>+Hr9mQo1R8#!2^G<K^S6rgKz4Haw
z6!p}=lN;sT!B#&ayGWRKXL_g2K<ttM`o^?h-!sC7nTN440?T9#?P3qVlH6?N<oH!&
zm=m<+%h&A3IVk3%xCB;kp?5p<HYy9RM@0o$coOHM$Zw3X%P`<jthuevy=93K=e5Fj
zaxLX^wpDVQ4OcJ$Eo4zxz<|q_wW#3piM`;MyOCc(T=;>J9O>xT=jVUTZX*J?fYI?+
zOLK#2E<8O|uOrIiO0W8o_5#-@;H#28JpjBV6Rf@IJgzCq9vHT^r%D5bjXVX?F+s_#
z?d|UcMiwO#7+?UHZ#lLOL&icvFvdacNJ1HXN&JLK@l4^T4*&pFr)(QlXxGZK=(^?c
zHY!<nut`SELGYXxljM19eh|oszEzC4&w~X?OD^8wPqCAfnw|rhnijV0$A#{ufkwS{
zMy^sljyZ9-!1eLykIsAnjECPN)RpndLIxjrEAI%(vFUl^?{rd}`f_}|H5v>Vl1}2Y
zU-z<dE+2%U!AVBofoyT_Cq&MY8%e!E*cvD9yhIPUN6Bxodg*sLA-`-snT*sl9eJ5{
zI=#c{{;AnQJz(`uk9(J)!F}byn@HV(`C0_OP5cMm>xI?$F2OeSq(SQBY3$T>g8_op
z^%2C;zwuWW5NA8Ce(ANaQK{;A<lzZk{J_b%&?z>veLhnv0~HQSJnY*filvAUc7IR3
z=!pR0o736Y{6=YDf=Fx)qa#3j+XcKWL>_aWd(}SyP6p;{Wt~Q4DJgT!=f~T=ZLWZ8
z=g|+G8pQ>*9Avk&j-_njQe<Bsonpaz*CmK27Rxn8?ldq>d?xtZ8tSJht*xyL*2^np
z`X$7Bo1A%xj;HVo^zUb?W3c#vy0o7$r2ZHqnfZ7!m1sPaN6`qqHoinr2)_ZHk?H2!
zSdE+y{MEx#K)BLpW&ebY<hyX~sL04jIg4nc%Nig4)?9T`H&y2O-R|jMSO~Hqa!vvu
z)%i9WF35`DYyzXDswYTQ$`wM_VyEZ_Ki|4o{}=UG;<TRo+D<^^??tr%nXlGoyQs9~
zzZmD?(@E!o5Ost|Jg=7%h`OcHM+t3{BM~)=NlA|?;_$1oVJ0LosYl-uB+s*8*L+di
zQ%X}0p$DKwWv}WQ{`|eZu1NnW0N+VIr>BIpBk6y|v5vgeA7Y<z#Dia%#I0M<4;?r&
zY3R-SfeiK~ImLH}x8~3K2W(dwN4B|-RNPWMt<T5+e>jFF{_24)!c;06C-QfqEPxUJ
zln$HXL^|s3tN(5Km>|^j^zfa8bC$M+|7m3V>L|k*g2tIuR)KIrT%0V<$)=#%f1?JX
zVk0d~p4>uNRltY?etWP)5)ek<f-<kGrx)k#6k591rd}@ZYkr<KWptW`;bU^H*8}Nl
z^R_2CHCL4^v>W>xqQ6IG5!a6Gq^n+jp?$jcEr_m7<V+YiK=)>*rg9#F1N#b6|B<XS
zF0e)u2T;fz(LI~SY{G^A2_eA!p%@gaD^tl7v-a%(C=22_BN<sKt)7$!|3JeZ#S0W^
zrWGJ;($?qB9YGa}ZHP*Zfqq;mX^U!~4hQN@hHrs^;DqqC?}^!)ulzJ)wOS{`Nl95{
z9R1J(u7nZ`;4Zs1d-hidh>UjvN3SNsgSloFNp26RRgxMB_gX`hGwl)0<382N&26@i
zaDVwk;_+O9*e0}K?t6r?iZjudFwq8U4eui^I(F%Mo;xnIf}u%$X6)Nz#_ZXI(SOc{
zi)5a!@X95raQ!HE)7kNs)wep?UJf(W)47P?iMyEEsuCb3;sze8<iKadhFFt~uIu;+
zc#+}xeV(j+Gn7X36k;^cgHaR40bzX9hO#VW^Mu()VR0unK$|kDz=YJBv*$i!r92&>
z0w1?LZ16fbH9}#+HyhI&$k+jqWEk)*<GtkG9^4?wT<kv^QGf&5UNlR`P~e$H)eM!w
z9hI?<oId-${S@$dX;}j-7?xz~*)0v4i|fl?_*GyG>w)s?*m7P9k9*Fq5KF+)S}`{4
z<%m8Ynxb-}i$oOdg$eHbFv5yZK?sMTq$Tyj9wC?Te1(%2_DCY&ejx+AYT@K`2+A8_
zdp0Gi?yYbib0qVYuxK_mBS6PwzuKxZ1x$xydF$%xgk27<Co8iGT}%({m*0kB;=O7+
zzhYCO$7bt25>!ZeL*EvO*S-|;?JgA6FIXs1F-bHFt*BS5)!<t+l1P#>x}xO;_OJ}h
zY^3-3SlSe#8HIc0fSKW2GoM=}5B2SLjSNVuZ#OEyydL?_`1rU2|7ajs*oiIY${Flv
zkW3c(u{jB&ZNXjq&`wn@)-Nn@t$fe1;=GLNUS&ajoE<XUudt@^#tm}FqTakk^10@C
z9Pe4A&emGAFU~tgNn8FAM&`?JJEZ#pf1-Qu-eu6tcE$ztU9RFStatd~xWt^%Sb53q
zy@0F-ll$A-7Ee=Jh}!$0_`spV_snnvxi1a}Jp#JI#ZZmT(tL1WUN|e5sk?mC|Atln
zG=e|GC8zT+;N6t~%wn0`!&O+d&Ne9Sz{sN%i|L<_np=0E9wU`CPmM9?Y2}P-DByV)
z)zs0J@hGi)iU0`a6@MVjXpdI|&dpf=?f{`m7DtNuY6b3+9lXJK!9@_M3RKEr4hW4U
z^@REFP^-B3@aPNRjuI=D@zp=NkEAtTcsyX(e6Z+YHH0ta<V~Hk$Zg9bY+RYr`TZ*;
z1ruDKK=4igJO%?UB)j$0qD3SAav6&<MPqp151o+I($^Uf=x-h+tWMvKuu-M2MZ$b=
z0MHW!)p9kVfBR2#MnwIC|3GeHEukqWON*6g@dcwB6G86HlL^z;9*okmQjP?*B8L`b
zj}Nv?4Ew;Hq}YCak74lZgkT8(0<AFajNUJT-GBP{$~j-EyG&L2k%>p|Cf&=pd5R~9
z(k@pQcQ4f>vlYJ^D_Q9RNqFwZ!6BU3)*Kf8Nu5Y$9>nylpQU`_NSx$MHZovC8|s{v
zLn?y+j>Dby$Oq;NJJ6vtj+L)QnEvH)({&t>yciE3%!0+RoT<#kb%$dTKsOAZ(|)nx
zX<t*On}l(a4AoQ?^WNZvth6+{6F3Pd^&i{_w47ut=cSS9LM2@f6$Lax;*EQ;<rr9m
zf3?)waHTbEaR$R6ynliP3#cBVOeaA%CyC5MQ@*OLc@YaY1vM0E`wvi3Z|tXnK+eK7
zqtyw<qb|U)(g6;3?|+B;xtV$EHrp<cOC8spTy)%95&+eV*IOJxb*4z@WPGr|0#POa
z_m=niUvcApPW5n24}9$WbG83q5gMZ%JOQzWW)(#lnfXvsORO%t_@6WewPXB46YBjO
zRQjdB-e(D0`J$1|hSAjLOY=}|3F&X2OXl#R47$5q)|Pns>6n=VRW;)oq2zBeWIUJQ
zZCZVnz{nuT&6<$V-V-!5c`;{tx`*j5<9#A-*_vq0U)25Ub?;uXp7<b}X_uj_j&}=T
zRV=^SQyzOC+Uh(ND)hx<asg74THkIV{=wYViW-f(ozE|5oXWp*TabQNxb}X{bf_^I
zp6qap>3$xh3(tI^pZ9n@f1N;#n!)rsQMB6Zf-^jZ+MhL3PT(bhWKPhJ@dxj~P~+nA
zQCHKnEDSuEN4yrN)Nf&XOF%LIjHl1pf_Re@<|_~)yetAqgMKqItcRXFam)Es4|~7=
zipoLJqe^G~wDqfGn>5TmW{vcue;+hdh)1i<iEv>DR>HPzdLICj<ppw|9aE3lJ58BL
z<piDh`*1kA5ep!=PhtlIQ>|0Wb-%qTkzCEUOjpAYxUvlV3vr-IMGkM1ef#fF+7#sf
z^n`;SBT<*G;|(WD_?>?s>HQ#KyE_};H5KNM+(lqXD<6q2KRG$E`ThGhCH+73`u27&
zRYSwvI$+OPcy>S|a7|VrA|kdN93IZx@X-X}P*B9Iub-HsJV6}TYv33a(Pe3?ph~dN
z23+RNTk|+ak<Bh+prL@qI<}#bNbhW48o}y}fgvYj=CFC<p9?zRyXqZFncyQQ&wY4Y
za6B3dUSN4*p%GHH@o)6Y$UWE<8S4MQBPb|ZG@~7<6jLy3smfom;cB{b1Zixhw@`;B
zTq`Pj958mhHAXs{ChW<>h%j;~c(ve89L&!XKtkJ-1%L<p+I3B_94#!TuA&LG^bm8^
zeO8wx5PPCdN5eiyT<QK3^JOqs1orKQ4yXcAkM*tv%<=wnsD>`;R#beIt#l$ay!@o7
zbbKYSuA`oQl1D^zn|c?o`^4$Ea(>qMtHcRz0j#%E7;*!qG3jw#`97()@`=x1dAY4L
zJhXNRgMU(jJtIr-%cnn}$8sooZiYxc-@Lv2fH5Ik5m?eQp0bLIy5omyWMhK_Y!=bF
z&sr&i8($L)9Sw!t^!V7Y7DsVxA7O6Lw4o<k%FKx16gP%eMYY*_+>v8_+TbQ7w1UyM
z8p)N<V~SHO)^?&lRLcf%VOSj;Q^95Bpe%vyS#*76%MANz=bln;#`m9)@grt5(5ct1
zX}&2l<ZptltExm-6iL(sy~2n$Wt3JN|I&WT7DziiIf;xOpP8u@_X1)HyQ89_uA$IN
z%9?P|@J333@BkyF90sfw;63eLoGn7mMA{g&S87Kur7<8cAiKV{?Pl)M>KW0ZCHxau
zjwn?^a!DB>6_}kv;UXZAdwe<}>MXd--p8fFNM-l&FpmmZoMnrg0D%kx<Da{G4-ID`
z#quaKHI>ZwGB7)CcXkk$-Y6C{q3ZPfi-Nvhr!owL786#KGWd!GIJw#HUr3m~1R=vL
z5ey)fTMJnmHZH<iho?6bv;U-Qv-r>x&856291YnCI9q@k^I^U8)))@B|3W?QTlf&U
zs9W?71#z`8^GMI?%Et2Ot?^-D!{UIMvk~&w_P`??mmz#YJLiDRIKvE_c{RTW-(wH*
zaTJNz)*f)GeS6IEU;TEF+^=9pteaHgf;O*xI`S4)qnQp}gmPqTR7o=+Y3MV;Fpg^z
z>|(1+hB2@73T2vwgJE@AnH)fOUn%fS(JWDD9is{x0X$Wh_6cRlU_&L>p^U@#l@^y?
z*Lu>x7YQwlR}l&TNm<-k^*_b!`ygc&OF@amF%mr<vo)^3S6bXpob{}(YC~3*mp=pH
z%U@_JO>Aw^`1#w@xGwj<XtCR7eY_&ll;ek~I!h<=eyWN=n5UvHamM4S`g3)+->YeB
zLS3G49yU2%c%0wl2fbGFdE+TWRCH@Ig(%C%ApLJ?IQx4TnYf$zkaEzdjv8Qtx6Kx|
zzJ5_j*^UDxU0|vsVW^NhXtyNvsH%ff$@`4aL<#5S=TF)}dV&Vb5G%{ViyrnFg@}RN
z`6gF~8Zl=8W8jZ0|Cxx8y;lKOFj`jV$YiU^s9aUOus@3mb3y7y?e`3IqW$g)yM;t4
z0U>E%jP6MFC3QlHZwL0FKo85d(F*Z5e1>Zj`miZ(cpN-FYdnL5{RmG13*jpH8L}Sl
zaCl^f_q&JpDOWAl=pPTMD3KC{AO!FVA99q+$}s~}$Wffg`wye${IdupH3n8M@M)n0
zgEc(k9BeMr&b*X>YWBv*%+@lcf%-rvv9Z%c3!{{M-nbeKz&=5Loc+#q@Nl1`OaoQ<
zQDi{zP&CTIJTo1_?RUvvuSE(GJj9&mwq#)j`KD1r=^nG?)#lpTl~3I69U~k17q>Na
zWfT!q&iJf>@W@=CjMLrR+|~;H8dq%KCBNkkJ2aS2WQ1@rdK2H8d|$YE+#cl=$VAWw
zUXC)%%o5IAI42<SZLzA>E-0wKeoz}vyFDVJpn@4|+x&v=cs?JNkR6&E-p5|CQG5WN
zLjn`nli?wmKzWXUEqB8L8wZGqiC%_Oa4fzC;)yd@B@CkhTzP2`<!1x_NRFHj6E>^2
zup4N7xzjp^EV+22d@X6b=1`fzxl#Q{(s~_-^ly%a`?KwWR(Ktx!H}Qn%lBzocBS|K
zUN@k1?DS)Y|4uO7y^9z|iP(l@O8odY*6>{8^J<@h+!|u$@v|WpKmByYO!;^?>nH!y
zwlDTPFk${qaGB9s{FY$6sW=o60d{!X8pl^xu;K`asTLWf#oN_e5@}0L2g!K(Sn}l$
zkE#4?!oX@y3D+HZ+4^bI`BN4Vm}^{mQ+FFmVD$0m?<f0ur~LDo^q?B?!FHT*OigCK
z)vkBpfm{dC`-4A&0fyU%$zU7%Yn0;8YhxThGSC|isMB2idos0*cBx>&z=`U84GE($
zI}HF*s*<A(Ck6-iDKt=N6Y<2+|3>RM%`<d(m?^S875H;8M%`&cE%x=nCUU(eCML6q
zdcz$#d8;JcAvS8+SwduXypdcU7kS)o0R<!A1!tzBwvhJ{SYQts3s&m@;Xs?AKv~bO
z2a5n<7|0r#0w1vl0mu|+J$GgN8Z+;PzT=p1rjm(smq*Ux$bF{2R+03`g|Fn$y~f}U
zj2}V(qfe+GRPuX?J0IESvHR5dk>EO_=hT`E3lMdF?Qe#x4QLc#Pzqb-FRz*r?Wxm;
zwcl*?YKw-q{=33AleAPiyzPb3VNk6Y^3oy(bg+&+_P>U`Z)g1fGmR`(6S#V;Yh$CN
z8s7^qxi0zQFYbg(RxI!Y3Tz-jZ29kaFsjxuUZKA&tXOh#OQa5JbEXjjuMxY92vtXp
zm#McXwTvkGTbqmzPML0v&cRIs9e;$n;Q4{Q;?c)Tj^l}|R|3p3_>dHQi%BrraCF|h
zSe#*>eBKzK-EZqlrU|tC!sS?VCu0oLyI)}<;jfVwpB)=Jvkr<H49DHp-@tg4>?1xM
zW|75on*?&}5^!s{ySX<U==mod1b)1{P&apafC@&q)+FAa7lvTKNvGT4#N_BshLkP>
zg4={dNV2}Siolu@TOpx<OY4BD>DMeP-vM)Fm|#BugJ^8+DjoAm)0dq~U{s32`2C;O
z91y725A>zCd3Fu|H6rviz$yz35K&Z<I?9_rphWJBq3pFI0E!p;_d?hWHF&AGymd5j
zV}T@n&L*;0SCZ50Ohk3x4Y;prjOo)l+&c@O8UCE<rJV+g*~7H557E$3sfDn5RU1|^
z%Sno@m8npmLb!^2qBG;^YY&d_y_&|hjIba0^V4o(kQZUTSGE_G3r1_;wA<&Lq`otk
zD!OWay6bRjOYLw~e%@Pm`g&#`$Q)DP+h?{ZL8H4IQMaZov#2IDGjV;vcS&Ged0)VJ
z1J6NzhR=)fU_HKndQdiNy75kNp7G1<xmip}1*_z|!PLh*2^aaUB(i9}xtExi9N{U+
zx%`&zmD!%Y8_n%R%YhiUk!IAuv-#Y-nYajG?EYY6+y<U-n96wPAFFDO#dJm(YR=9X
zJ=+Ad*o*P^`Zy>?K>Vczq_UDnZX5m;kR#`F_nHy{9#<ssPY3L_45bZL_NepBmcBjy
zZ}ti5yPE|<?#lJi;qh2-nrg&oQXfA~Utai0I@Cyj<e3=!qeBtwy4|52pE(NV?0@XH
zSpP)}ts~0!vI>{~e9@@MloBg24R{u6fg4B_27(t6_#b2&Ub-gZCg2A;ZtC-90TTCp
zWamwZ+@1*tzq$$V(2HWiW{6(yW%*`WS>J#9jF0@{E0Onu&D1R7N0b@<LEftGuGa^!
zI@_lRd;X-(yFmZOeO#D@v}+nu-{c++OQn?U{*xrq9b_C~WMz2<hJY2OR=eJG8m{lB
z3ls0m5ZfCK0x$i)QPEwlAbuD3CO@iukDp2?HVjIVTzmM~u8BQOcsAnn=!>)GwpI})
z;FLlKlXqP}+_aNegm?avi3on{I+C*i2^N=!Pyv!Mx}XLA1q6zh%60~Y$C`AQ7)fT^
zJbs+a3&4{Wty(g3tTF!tsEfAai|MBsKk*lo6=El8kQ=T%B2G*-`m@t_IuN+3l$FLz
zU?PEAN!a?Isz3uLKr~-e0Pg7OcR)@2xy+!>n7&t?eYXOb^UY@3WMcRbntv_O3c^`^
zjPpWv&S%SupPBV2W$ksi38kpU$EsDv)lCZu-Yzb&kVjpOAiy?a`OH$uqR&DpLJIM4
zxm(uOi@g-9+5f>T*|JiB?7AWw1wx|KSSp7U$vXrlFR({St4WiTX$%nBRY$Yy>XVtY
zbO;RsGR-_HISdA+asf~U@axIwBFjs)M)<iZ25UvS03M%57ES^K+h8t^r1S0GN#^RR
zvoo4xf<}zs4OnCt1Zwesh)*f9;+6M5&Slrigoc?Ja6K}M6izXa7t>V{aq-qYsLzxE
zBWw+7deray@t9nwvqrn9xj(UR#`jse+Lx0@1-C&~Av(WgQ|U#|0X~PZ)Z5#LmUK1g
z--Xb^&eaWnHzwQ^t3Mg5ZXED`0%~09m;D|5A4j6Srf>(|2^TRttd^-dO^c}tSZa$8
z9W*C|-W;TR(8@Ez+@iKsMiG02`E+ZT3q<gxa_mt2YVyWr0Z;kKzhT{|;LMDgCHm8k
z7{Otqt50JX1FfRhJk}roYYiEWQ6{F$G*3N_k<9|H(gMSZzM7pD0s)?U42HJBA}1d0
zrXOO4Zyg2Uz?UkY^ig~WP&Ir}S*OMGw?<pk)&DLkCEOg4l1=Dne(PvUUMQM`C(?M;
zn(?e|iPG0X<+%Ez?!hDaR{u(W#ap;Z9Ft4~{kvQzsZmYkoK3h4U3#eEb~X{cEYju!
zw}0dUY9On>wre<@H3ut7pLVYjXNdRG4tx~XG$!+A+<U{CplH3G%0I>2=?oG5-*jQe
z9QA)x&R5Pmp}5T#zp%@~LsO7KxC&o?jeozC1mz55ALIW5b-xje&^}Tym(t=E{b+@%
z;tYc`cdUBXQYJCw$N4tbFOi)>MtxIRVO_7piY<qD!QYI@uJKGG6hYhjpTs_&foU7S
zlJdOI|8x_78rL>#q(9{avBOi{8{oO^ef`NDFlU48CLnp@SR>9VFAyERGz6urlC)kI
zb5XC;B(7S2?hG*F9d4=!8pU2^RoToNXr2sGq?VUD;@_1rP!iPx12kfBxO*Y97JSAD
zsPn+Av?#L;uSd<GGX2r`V`YgUi-7h_Cz&C|(?t>&@q|R?aXcyEa9|A;w+=Jpj}=^d
zhQ9u1G!&c?h$CMDmK<QOTGZAU6uf#liI?d2GUFuMb<Yx$+_l|pugJeh!;U{c7XvH?
zg+Z1Emy-hAW{)c-huEV|HUC{sT%7Teo#$`6>GM(RI!Al|J_5OuJ#|mmf6>1L!2X?6
zP)Ty=+A~KNVtmjqfcvU`$1<u7>E-L4zshwMoG~u%IY%I`*`wKr%@j>HzVvb7_$A18
z_cQ%__v4mdC6z@t(8y(Nb+^G$-}fy6@`{_lAg+{u;(v%UqOno%+nL@iL~Vb)>J}!3
zP4Wrt7~L-dT>MNooFU_&HO1&*GyhNYAOBN{(7UXK=8j#%-T6Aci;<S3H@1kFOem+H
z&^x`;-8K6ifM?XK=r6zW{m(7Uxj^WbH4Ou75VUac&yQe^0s;o=G3=zdx6+Q}TF5|f
zonu3J3S7ZdNuytART-VQbwdF4WZN2D)x7)c?<&ojH;#yR*B-d=uLCD7z^SkXPKDt6
z%Y?DA*u&62rQeZT*#TVL!z}19$`iS|??8$81arO9(B5c1*lAcw*j0f*1r7Mqwgv{3
zomx^73JIAY5d}EJwWAQ9nY&0Nq{JTC8<~AUa~%GPq9r0l1SE_*stq@SDKsMcW`xW^
z;uboF-bmJ=T3;^cIEFg+haC(E?~h-bXxb~~U9?RIjV5ged~nt~klOD85Uxa`g4Rhj
z%7+H3hhIGt>%)r&&Jo&|#*5{~3<<F0sE%}UX?qJNcI{%+&DVyN)9nOxU&v*3yJ_xT
z_(K~<mrw@C4b&IA|2sn^H)8s=55^FzRyLz89*B<e6}>Uf?4|=hq}g^x!Lxa2uQn(e
z&c9Xm-AdiIDD=Vk`FQfN866B5JMsSsC}Wj<TKJ+#3}U+dE|uKx1`Vp`ZHCs&Zfgqi
z-2L>CO;~jI%|6xOgUx=f(6?>?!q4#f09o9*io>^X5I^Tz9>VPrDu!CTM3dof#ku+N
zjOk`hA;wyY+_P#WXaYc0olFfknMv*-)t1De_jDfxP10Xv^+1v?LokU;LM}-n=^Q?S
zOci^<H<Tj=kQaIFq?F+c5pI7>-k`P$f9WW}9=dBx48ebkEjn@!4nASc16}nv6;+cw
z6c?ADB@`m3Gh(#taG?P0Rm@=t^CvSNE*=MKX91m2^PpqO-maoet;`8@B`e4mx#dF}
z0Hs<Ic(W{Qdj%H9iR9*<=+JL&j6_I-qqO8LF~Hx*4NkE@;Bs~>B<tG&sZyrT5~@)Q
zM-h?Ac-|7b6XR$SaHW=2GomIh1}rPZaNGus@5bgDYAZj4ndTEP77=l~9+1;KK4LdB
z#4O(`8C6am=+t_13;%9uOkM@6(%j*D<9pTWC>w9_;Iht03*+^iN(==Qh_=03fp7?_
zlYwZ^CC%mzpi^-C_YE4vRC0Vr4>1$Q4QdQcY3^gCs$=19rVKt-V)`3_v9HVBk{Y5a
zoXf3MvQ{$~-PNNbypW+=U}2lAW%r{~B~t|wS&v&b4=c&Y)w{*PD;<xbn#k19+5!WI
zjJ?nT`?eJJTpbZuL%q1TIL05q1>|Q}!i;L8^0wMW(whk)f$eV8HBQ%a_bJ@yEXDeu
zu#}T1chS)h{q)>hWR#gIs|H!v*iu76e;|U@h)>fAl{4TlCv=Ay%TD^gQ(?%d&yyfZ
zcKWycEz6wR=5!>MGf~dk_q(DuF>T3_G8>dvQ^VUj$vT{NB73#TIosMt`SE;hh(;N!
z_wXS(M+n&iEh>I7wXx-{Ciy|G*&>mvDJ*uao~~Y9C}vMS7IFRKT}ahf_e_2VUIoAz
zduvYbzkedQ_GTX;+FPjbGX6g1%c~8wj0|HMtCh&ep3o4`w4DW`qqK31(e>5Ni^=FH
zypztVsHg@xd(HN%2YL0YsGqib^ta|AvF}3xyR*oVJ}nQzXyB^De10<l`Douyw+n6!
z&Vj|e6o)FHh<pg<@;mjFihE&U^S}lEUI3nn^56~=(LnS^3sH-!6Jj2`nnRv8H1M8~
z^~4_AH%HOwx-ZVI{(XC@r@E=FWUXQq<lXU*J_cR%zrI=ZTJoe2vbx$@Ex<pdrK59h
za{#Zn^I>xofWPjC7k;cE5t>tQLel0AeUYHmB_wL-r|SUG9uj!Q!{akDIzEC0+Nmyt
z)!2|FmZIkSSeJ!Wdo;58JjHUM4EeGIQYPU^e9I>`TDH=ryxOY9CXx)CtW)hmJ8tsO
z2_IRWq7gju+RTmILSd-es352sB0jbrW3;GzAh#-nVm>)rO<FS1C#FYRTq}a4p|uy+
zRYAPQSfX0m*GK<F@w75vHIoT3DlhR$B&wPdaY+~hXjiYwN9_oP6+0M9t2}UqG13FZ
zXQ{$2?eL5$Hi;m3baAx5E4^Pu`?OV$c!pWA4D6^mcuIA=0X}x{oV%LfzUM2UtPHcm
z^S8iN%;#1aJe=xcyo=qep4HvC2snOh(yXumKY99s%_DpWo)`Vczi-@mS7dR}-{8h@
z)zw0qH3OGX!|iV)5^$}uUuS!OunjBCUh~)wd|xyVm~`vnV72pg^Js?@X@Q>Q3D}>N
zBAB~@Rg_BBP+zY@1qV6B3gW6087%hr{hu^0r&JLG_CVq)3PVs|u}sh~O<F<#2TuPE
zHADs!!9b5$QJ6Ms83r@<@5U4>mktG!)Tae`G8rz34xzH7K<ozQQ`e3@rRwTD>ggww
z4oCq3cQY$^+J$J(L@t48x5|0g2L5Wa8_Tb88I?%CcWvP4Xy&D+N%}c*E9wXM6G&R4
zZbe#CP0sd{22bt0X2H`XyPD*Yi@S+@P@{(Y%~uV*vjV<qE;wy@<twfhng91)G1VD+
znJ3TV=$JdwA$va|L6dy>Ny{<1veV4MByILD{s#;g5FKOhEaH3D9BI2Q!h|hdd93f*
ziH8HM6s#*|`-9M0#SOwAAz$iu6&c16yk{c$b#<X-_eOOLyG|Ssi6Sr55>6jc9{Z0w
zH<U$v13lQ3*MR4rZl<iW5prw2+DUv{)1lpi#2KRO6?bzjYkzC-i_y3PGuIeEI=&3L
zpEneaYa7^Yb|T9hv@9vA+KTfN8$SU1B(Gk^6ciO}ecyeUwd!C2<>AopFdTNz8%u)#
z%0#4qhemZRoZ;mT0(KtA&=ExP+?&xIjsBBxd3J8)=&GQ~mg_fE2rVu_#1F68!*6R0
zV8#E~hUUP=s24*xOb10`xcUn##ZU#=kD&^_=tUvl!1=SgxsUF<^0cp_MDU^sb!D8q
z|KMJ-ixtR!7j~p86wK}#zIgIkoS)Vr%08(W`l3a3*6xg7b^u2so?>xQg%xqbJ)ML^
z%WJ<t9^X@y5l)F11TG^hQLuk)ypI&FFJ=sJ%A`c3ics&&yzgPK4YQIf=#=Wn|9OCo
z_U||txYU8pSOLLN!K}zInA!cfM&p!6;e<VjqfrP10xNw~)-`0_Ak)@>uZVpVgktKZ
z5*RuVMzFRrGpj*-s$V-er^!>5GTiXxuNC>;p)KWsXX<j_?W#;7sv&7<$4dB72$;Gm
zFPo>Y>-i?I8plQEIX<WmKSC|YMwco%Njz3Wz)Ve1-M@;3r;l}o{krj5*H{1h84M0x
zq$5TpuyM4^Rq?fd9mx*n!mFWj?TyZJ_z&r@;(r1VYGagnjkR2}Wj)ZCX3Gn`{og&~
zH#48~ko-h0Jm4mg)RoEL|G_HseDVbo_TwY~rnukqy`^%!6AH%YE}6J4ViOLD!zP^3
z9}C|QgR@VeD$?ajRJ~9aEgN*Gl3zE_7jM@3)3q+_{r{`idMX#!T#h&wMGUIiEXgvY
zlm}Dp=|jDpdo+srEQ#9xKJSX6C2HaX-XBKo(I27x7Tm0!_Q@HdC#e7cn%x*uqbopk
z{%0(JmUps>?Hs%GR1YdSkw{^-KV6O(Kmf2=y33;3QwPD;6c#t&W5sozg8XvIy%{nZ
z{qK^*g1EI;)Umk@utdQ{G8Xu9TFw(d=rNur4uD9rXr(c+h?@PIZAQ0Qk+h=FTi4d9
z^M5$TN+UoPf5-X*kDt)v_{%uty~J>WXQf6uQBpS7Qvh@>i~-)+S<pY&?*a-2b|>5(
zZ_*CPizyRxNP2r{>A9}w9@5#>Rl|a?uq#afkdDOnABe*JjOF?Oo}@NF$ZAc{(1joV
z`$#*~RuCS%_mN<&DU2trN0{L4>9{%vaGK)LV2=byPz}V%6n@7JQ{x9oHMwv98~Mub
zO(d|Vu9Mh^mNF#+QyZjCfYov%7Fv_sc#53mtF;`qmT#yyGC67I-_*nnk48*`Gz)uD
z@8eyby{Ymy%ic24*!)|sHu_&DzW0YEV0Qock89Cs)gQN08j$U4;;Pu&et2hhNEeRT
z4lQ?bvqyj2`<)`qBE!~F<92viD#EffBP!?lfduase&<)KLb>C=L`$H!^}uJb;46~}
z7L3-+{=vWL|NZ?b@Eiysj~n|fAj#-D9)EjmFj}pTR@J&LNb4|1dzLVDTvxa6rc?^!
z#$yzvIn$OdnhgGPk9SrV)b0BuX!N?fzRdd}Hn$7UF+!RO2#ckOo1zwVWdHu5NL_lF
z9+7m$%y5jpLIlosZq4>6+nj0Nol$5RXw}48yJb`w->qXrB38!AelaOL#55!s_i;KH
zH&3l_SVlig(O3K?45fXyQU*4`WG}mO1%3vWvskN^5d-lb(NRTS8==SkX|`y8Fs3AA
z|G5Gy5rIrF9GkL4GRoA~!y2-0cx#>kLh9M!Ur8j@27mpMgg{o-cbdL@rNu-@GQ8k-
z*;5lq3p8(cHI$Bsu{94hNJ6#B4yT1+PUyir$8fF7V#4MDsV+Ji8g3L}5{#5_GXI7(
zBC`hBAHCKjWhs+uHE?Q~*xV4o3|`g3dj|N`F5-zKF7IWkC5tZ?{TSZ^iI=*bpHQZ=
z8-j@UBn*siVN3tyO~5iqb;sE=k3ru&8H!GDuwRm3QJO6!)R<$F3u)5RMJsg=mz3Xb
zbNcA@W2ldh+K&Pppz@*9#DCRg6(q+46d7F2gEepzwXw2=v%BH{NjXBs%*cx0;vM^4
zwef&UF+rJ^G(WPJcMNIEVfAig`v!)^g$lP!jagIKucJd?sxQ0Yb(SG&T6`-R?jHxl
z3Ife^g3rjWybR2T#%y?|9_3t#&*X%oOC#GTZp?e69FVSGs)X-aCz;UNwa)OIzbA>H
zd?FGkLLM4%u=p*Yz8gHr39jtX=;EV*S$c}sK3*hAGIVkQo%MMvW^>cU2aTmCnP^((
zYB6msIEcaf8g-935hqF5z`3su<9$nnpi|dIn5VJuU!{N{Uw!oi-0G$c(eq0GRf8Xs
z)LktKC$%(1C4CW2h)R_#r5({zqTBMeZ-lh-re3*Jy?D%gl3R~y9==TLY9&p{&}ord
zBupxp%R8cFkz7{Q<w-CP9bA9knBSd=6^>F6+bof$p{A7+j94C+W7s8Zt0=6UUzLY$
z#MNKC)dn^ZGK?5*6skQPA6ylYB{eV?>G^kece`i+-Sw;paW`6Al5GqB53lAwx$L2K
zX%}o`tNFBYT5C(dy1bMu|Ay-KB@FN98+cL72aheDUmhFSb}lh*-<pjk_?^U`?+o22
z8p_SF@NPp9WBKNQnv;{UfTc>DSE0B2-Cp~VS1z?nl{BSn-|9R!8;s!ABb-Jam!JgS
zH(y(-NBnVAV?gmg75huLzFRqcMoX&r<GZ&cMHW-mfl^k?kDfxIB+lW?Y3<CD&$veq
zV&~bmtU{M$#FN*k9_$N7@kl0F$G1q{a)v{a(p0&hFCNo)K4E3lCkDbrvjy6InIsRc
z<X7pei_OL^cf*G?hBn;cS5q#Pjj-0!qXi3j(|*v|nLxi+#df}`?9rZx$N~CGy|-Mw
zJS{V#?|8vnR}?GMP$sXQ?BC^(H+7UFm=r?d-b?LrO7b=xXmG<Q){@ArDQr5lJw5Q?
zk4`+9a+{XV7~|!bX!Pf%Gnpe>YT<=5Q<32s8CuE(kg7t>DIaG();!==!C-LtkADl9
zVQeW=3QW1v2oj*7=DG6ksc)vzpkLF<dA6wx=laSBrRo@hvgPqByrErWRgaTa2T^b=
zgQPro|Myd0sT(=AI;RKeXVWjJxT`~2Bg4b)Kk(;U=)|ddZR6r)Fe7w|kh*Ef+C>8=
zV}o(|yquY!L2E!s;jExeE7+clH%F1&jT+Etv*iqzZToxP4E!h&$J04FiY7D)op_9F
ziR<#&kOx0=pr-izyR_z)qz8k4_omyra9ST72Q%{t8+;#M75PHU()ou2o~@B5j4#%A
z`ub3FXF<V-l^ZD|z4%bzswjS=$DFp)f5H<Q=k>p0<J}_QH3A1cBV@GJP5-G?Tg9Hz
z&GL1)b^ngv;yfvDBHZ&st${t|!Rjj!OqI+#0&(VRaWQYfV5Ai}pADhKzZ#>=&7pU?
zn#nH})R{ZKmPlQ$tA&I`htWor8l+sGO#b7Vom#j+F37;oD2x))`ZBFPqjK}-AgUx{
zYFKM$1jXoQu!yWQz#N&*fwR(YQX9CijTF<H)czyA<mM$irO$cLZCX7<jdvDdge^g1
zEa-7Zo}RSpM_8aQ7bM}&4T>^MOulSJ6TDA`F_{J8LGF#*L21zxwid4kMiVT7bXPCB
z2_~D!rKcXoAr0t>+e^G!gg)MQh*4!Qcfz-2guXV&>w4&Ul*%}efA}D#OEt0Lzxsvk
zq+;ng(BH4ud_cG*9*Bc9L+MEP@D@uk_7!GUxy+@&RGue88cGFSwIH<4Sks-({KMhv
zM2Cg1vp5$c0NX7c*(t#!h6zFl>zLk~j*}<q{xJeUIae13akY0Hn7_;_=OkW^BFM}G
zg}B-Z=6xPj1;0RpNQ8d2<j}}ud`=INFOP`5bdQO>$gTAzw(rzLKPol-*URd{5Gl6r
zGSboaqd|3H7|zdN6GIT^CIqpCm>PW%H6Rdf)xhBtlAsD~nu6$&>STSG4i!d^&|Ki%
z&1}x!5YcrbJ9VBHqYEafcUz83{JAc-82GFW+}Bab$E6nGPaiT`#;V$0?@n?@*jm?@
zKAnw90i>5r7YSSaE8+ZaRr96<)e%L<?SV{2{5F$`*27!%+Fext++|&ZI73a@If4hL
zZug(XW;PS!`HwMNjvGCjJ8#4w8kSN=mVv*uH)Lp6F#JJ{{}E@hOZ@QN3Iy{WzSkko
zLHd}_k7$P+6l;;+Jb<W1C|L<nHD<^jfgn)r;uQ5hZWpT<=!`<<ksoF%;}_)o-AidZ
zL$?a0m%illg96%&UDW*~X9%kYvwW5aLZ=s=@D^r<{~GZqIg58H>V0>TQ}Ft53Sv{^
zV0czhbe*|-Q8qJ5BNxS==BQ;HmqXpxvVe?Af72-@nP}fAQaT)u@t?bU1i6&_$jnkY
zAMV1xetBb_Hhi<NQD-(oFjzr{&k&s)P^I+>()%#gSDnZGy~e^yy-x7xDo{CVH>l1p
zA%LYA=3Ar9LETjB1m#i<5iUHym9Z-l1R{)SxWY|`V8mg$+dfV;u>zdHqJfXGiAlYn
zSA=1~4+9n;k?;8Z&(a>O=vGFx&`?KOx6$KE*m9FKJSwXlOn>J<XWH9Kp$uDG^)??l
zglwfg*DM>O$nf#8ez~feEuKLlt?%}D*+U$qNCj8a^-FTyd!YRnGf|XlYlEIejDJk%
zi*_wvjgET-m6uy!k2T(+T$$bi`UZ=Xd4G`N8rav?&@ocaGjcfLiegH*X7<Xx`Nw#A
zyyO*Mm!_z->DDtSR_&I;F}&9BGAtz0Y5vzNP_QRlYUaIwOmI1Zl>k+z&e!|$XM3M@
zJ{tr@pOJ+Y{!}BW6ef!yW$XvLu8=#?UjQq0dTMxz37&enVjY4sYTu?U+)gYM51fGB
z*pk@Ok4ND|D)X3$iu4(6UyrjZwm}i)bWlJ5@xatOdwzW`KF|{E@Vxm)ax~o>Y5x;A
z^kccS9&&UT|E$(ccm=GjC*u@9vC!OQ^sTAUNc@)c<T<!2eg7*W7Hn60u*n4MHrkvP
zAHj8!A;59Z(VrYVk7jzmt|=yUmpu8Z#I5dYl6wc_71Wq@oV7^ln-jwu=uN85&XenX
zNEm?yepomVv8ok%5jmg}?56YMC67NYJW^JFbIBi5`7FRnJ$ubJtBT{Xmi&qDsyE$_
z#GU8;r*f91$PSZ0S0n3&3oeyi*Ulj1QpY>*3nP*3*)nolwBdSf3CB^|{aO=J`_X7L
zJMkDGdNN}lZt((Bv;#NUdyYXKpKoGMo$ru>)Qh#^M|s@ZNWdct-l(aoTg}OJ7l&G;
zQff8}iXSm0w;@{>(zLOR`3f5IZKCk@yoV9ROyzgx1fg=U5@&~I=2LP1`v-(E$+PM9
za7s!FxVDZiHTo%hn0^inZEU}p-f?4{e$W`OT|zV1%&*AKZaF#(!)dNEyq+Zjl8H1S
zEJT-ZZnj$C*W5pP{zPNr?jB+i+&6ki{MOF{H4P7|v(%W@M7;+{BapFk7byNUi(J3U
zz_h~U;0>szw_CV9Fv-4pu9;fK@EWb`mns_B4mkk%j#kLZ0*}`h{*agNl!gs@dL%$!
z81Hw^A5s_DY2l;tLnO-El;LX<F1m=Mb0gC7<xhj7ud4HSA^FV0_zNSG^tZgj&)-Yh
zE4E+AoYn{uF&43tQB_V*a|d3(AYP7{dQ_{v3KV9)&?H@A!ZbagkX5)25CIvH?&3X*
zC|U#gC{PCkf<WGUWu!-$s>t62i9`1PE*Rt-nm{1MQ>=d7>m+miFXzAqqq=wCo%5ge
zr9TlW?tmc9z)wFNyop$f)>R36-mn|pU0`(?+gg{1V9igC3RiDxPvT$}p|om^VWT@1
z)wpk~)35J;<g$>g;p>>ZJ_TWh>arGQ1Gri~mPTf@CctLfqq{-wcKmS^6xZBy!ykGj
zqo+1)*Dw!QtbcKa3d(pF(zFP<<~c@GBsu*WpfowLr*@_lU3rKLgww}J{<uBer{b`}
zgQc-Hh|<C1RLXp^pVQm<Xu)qr@}^BE3|@qQR%b|tHCuwHxR6Kf1beRKc|KcAl8&c+
zK}eue-04k^IaR5x!MCoLwn4r7*ZT^L)pRjQ+g}A{Lx3koLl<zmlrnrTQ|9Cvc)|Jf
z`Pz?h=YxG-X5Lh}Jm*`~1L0dA2adD%+}t)M0fI9h*|!~&x|VZ>w6x%pw)`->xe&P^
z&W|Lk7|6%(!TDtji4zkCfG2g`<nvoGkm?^D-dDeC3WPZIFj4=_NhawxWP69hxKZce
zwfaKS7s;wwL~!91p8uAcA2=wSLKvzj%Y&3s!E1SA5|sZY5}o~i4qcgh7oZawMJ!Z#
zn0y{Y2!Pkjw6Fdv{{cfQsNu~}5Hrv%fr1_7CQfX9VD<at#+RHqG7va7i{J!9+aes;
z!{E>6=6|o^&*uD3)wNWI7}19pSWM&i$3Be=W_6t+uEP<RBYH|A@01RA)mC)9BS+hK
ziS_hUw|m-<x6Ge~&6tT}bd--dTSsa0&0NmC5EO1JxRCnPkAMWmYc0=$CE-5l)3~Lt
z=~QTcR}y9E%nWY-h~jzj)A*`jz-N&zC*j>gndH(iPI&~~*$V+sh$Gc&u)tmRYf}28
zz_FXr|Dwea)dl^rReoMOqN2J&;p<4g&xg4<4fb`<EhhL{$`#=Yb#-0eYs#UbVn~ON
zD*+&f1853#IKja#P@TQon57dsp;zuqdA|eP;4HoBjfa1<P(n%ewVb3fQ&m^@Fm;}~
zn-@carN1O<CI==NMvYnu77Fr4MwW!eJvm_P*l6q45lu}M)D&WJW1wzZIT2QA9Kg7C
zbht@Muj>JEG8XjI)T(Ug^S}=0sIY>N3;ii_9$YDsL8SSJjOS<Njpu&&v8~xi!K{!*
z-Z=}dv5}G9nLfnKHu&tJq45WNU>u_S^eGgJS_)XN5X9OQ>NfmG&)CTJFsC2TgutUd
zR9T0FBjacD(P9rLmd^9b?eBXfjZfS&rl)x{`}$VbvYS)z1xXH}Z~HTuF<sWaaB1w#
zv=Eep^^0nmp;y}<+$DsXq(r{dIp+>qfbkW2vvrnI066A19-g<}pXq5Kwc}5Kf<lAY
zO!ytncdx=Y9{{Qd$fIslieFL}@aym7&t%&_Zmcf>{Sq$$ne^97{bRJ>R?pj0Ktr8;
ziF`=>j!O*-M*Vv}aLZ~k6q|9(sqwZ*rd+|-E(JCJP)QXQkiV5Ye+@GwP7hFZX9?c9
z?WHLZFSIkjZp?6}?%%J1vHihyztySZd@RxHsv+=mHW=Yq(Rs^O_AR9uGza_f$!*{@
zx*yh5<0CaG#EZzCNW0zHf#dNf==VCQHj#YQQ(i5%KoWh9W?JVdK=``dtt#~^+K7?@
zQK$EW>x7Rn5|&K|{DF;rYRBaK1ntv!J0?5fsg!>*u5&^g^?X>)j(78&Am5jN`Mf^K
zPM#f0`o+FN2R+RyiE9ISYF~GZmW-%?e0#jAr$5p;s&gK>O@2=mBHrV5b^L}LY4nUg
zKeG2{Q!MY;+y|tkz|bWi;UBx`AeHP3l`3?GkB1)>M_#QO&AOn=lz8m^-rM)nQt|J&
za{9f$_mP_oV{c)>5~2XdA3_Bi;n>u!tV$Saj33eLgB39_!pI^Clc4ouuBS(qw3JLo
z2;W+MXzM(z-@$Z+aQP&QUTt{^0NK`c`8A*x7h?>j@j!u@nWSgLdLsX6UV;33z6qpo
z{-sMp+lPy7N<^4Ip9iU(2O#5{On#_oUibN}eaAPNVn_%FXQsy7u4<UfOOkN`G|$IB
zV*28}i@0cI#qwflSjoEfYOdJy$vVxylnGf{ycaAVK>3Td`|X?CNVNgC8{T|N)6bnL
za=<-3jPzz8Zlz$WC;Hji*;^&!R3C1u9^Xv<b5h!w@9;hVoiQfSX`0@6BI^aem?R<Z
z4H5rcQnduG!Wk_2G>QMHw|$|(DS(aUHJ3$J2G}^)<K7vy)dsoK#lBVqR9|Kuv<&RA
z@VubwfdWUUP@z+rbL_7BdaY;tmjyCVg{v|i3RrQ0uJqTmWXLglAwLuKiVu%*<qyi`
zN0%^Q)1qLv1UrDKnP%xk))Ayr*(cT!ga-WnL(jlJ^wDnPTUNNv7`+Ac`<{IkOjAHl
z+%WU6BSKhbaphB<jv>R!#RCM>#Ci!I4bi;+-fvuKzHUek`ZO7LrETV<pW)*?syF#c
zi<0pHZIy0JR%kcKwF!BN+C~_W;NKsKZ<*bmWSh6|UCzOZ&v)=2c@(UbpWmL)LDJpH
z`CNn~&!nzF96}UB$oQQ0HZNq4k1S^j8b>T;ek=pW+^Gt5$jINP*9AljeO-&*sS5Is
z@;IG$RpI}73M7OT2EeGz&r_B(;9e@w?W8Ht5a8zKl_5m|(s#KU3A04<?-Udw@qx(8
zTD_%UOA%uqA$xCgNx0GSa?B}H<M-ac%)8jT=hEJqWgep1)p|@fBY5LRi;o&!_%KSt
zVSt3f8>iNB9}&nhQ6Lf|GzocGwE{iAjoHss8wfuvli?5!A$5=B8+7~pTdJlIdheik
z@_nZLKaQ?BD)P6BXJc!#+sv)awON~8lg-(*+1jvivu)e1O`B_*Y}?lR{k`W@XJ$I{
zN6mfibMe7o<cs#!LO0tYJsu?5J~iB+)6@9RMK%Y&gB#hF$32kB;vj-X7Tj+DJk=FV
zvQQu8JLiAOHdDU$ZKyUKpr+jH&&C4;Rag%s2!+4#H^?np{NFnhE;wRZ;O&8>$8SRg
zZ(AHrhM)NPK)u~|Bs7@#y!2n>ygNLoz411WvgRA6{8TXhZ`j8iA|hqc+EZNwxZj+{
zp&F>4>Nd0r)M&oH0Q@1?k`hG@5y_vdaU==u-F<l^F<PnX?Z`gq%e=PM)NtTMBGkw)
zN~3ZeD%8C?UAvyZxX%B^N~f6i&k2rA@&ETBy%FcJiLZL$dzT(1NcwB0JxR$_Z4dSq
z+Q<Mj<!QsHQph&tC)!jW2Fw+%C(c62=VFQ`inGeTG|NE6Nrs=$`LU{fIM3RCLW@_~
zh+Nvs-HvZh=r@P60Hf%@gWHKZOl_1VaLG)~1<u^9qGkvW&otmslv0_Bvna2wsag3x
zH5^5pEmb}NPcSYobKQ2wGBjYsEU)aSW~wXg=-Y5<#bbVd-et8xESk4Z`G}AZ+ue0g
zX}2)FkPyZ7;%W|sS#lB#6z?tW24@WvRB3Q98zveKXufA2zv%6a?c#Qzq}H}<p<p`5
z(fZY0!fIj%ny4FKZR~e`tlgc&0`YqA0y1M&6HDt1pm<__-_f1`*yLo%BQ49$4!j}K
zep~R~2^p`$#?`NF>55VGu2?O+(jk?Vo8&)^lkRyb)OHwc4Sskpk@LC#<WfzI{Un+F
z8Gxy@cP{8I+bAlz=zB|iHIXxagy`VvtenL?P6;3~7BL|H6kKmY&;1>tFbr4R!V#A_
zs}0}shUp!C5@j}g>XPVKsc@v1TCZx)e>%n)J)P2-QK2eLHom{~x&H-&;7#3(NQf&I
zc+QfIJPnL~m|EDsOXaHlO&kdV=16`RUE=B5lk0Z?mEafl@XO|L<Kk17$6QwM5up0s
zW=Tigr$e<|K;u+GTI0yFKh3_AW+2&hh%2FNul`R*pE$|odlk6!KA5%tKY&+U^Gisi
zmR)8#&gfs24;0JRMoc${5gF=gr9%1in^G|?l5!^h27D0&z~hJ|Rkyh1w1XDwBA(V=
z3zuP^<pX6l7RcbaBXWdeK{u{#B-D83eY{5UF{JIL1$hrm`l+$xKg+mftgAkFzg~?d
z^Ez3eoUI%B*VJ$g4=)7z`zN+IS+XW13~r8oenx>^{?lu+n#DMIM$y_(*ME$kkQiOt
zhVn`Dw0N`|wO2##WXX-55k=Hj=wpTa$dQgDSt0z1EMWhMwWj4nKB0oRh(TOJhl9hr
zjs6lG8X6=47;j}$8MionvciA!Up-ql>U82fxsMF^@8Pn|1mm`&<*^k(72&UCrVw%a
zU5A588}`gXaYwHK2j25cr0dF$7w0?13tu+Z6?@ZOQN{yS)@D~Ub-yFf1XiD|=$*9;
zdg>+cp6zzo7;o)mCl?XBzsI<H>H#5=nySA6faR5H2H^|cXH`xJemEV&xAjERkb`cQ
z@!KDb!K*Fy0&sP!erUfRx`LYeq_~5wFe5~(Y&0&;u7}_pD5D1`@|lk`Q-N90fqV3|
zpwSIgCb3_UF~?8er%i{?XUDKo!nmvMLJ(<SRwxI2C)^-#uU}<u6v~s~OzIC!87nqy
z;D?*gq#)b0$XxgYshtR-4(m_A2sT0AuJKU!5s64@)CGWym>j+a6REKX&9WLBXj~i|
z%$rHqBsn?B>>F2hpz!_T5x@km$WJe9lQv2I1w1TRIY=}DKDNVyfuBGR)|-hrgPW%R
zsm;<-FPb%P##M&I>0P~?EV!|Gad!iG+dYQt{#gF<ejp%u{{1=!^1kKnJ@-yb=J5Kk
z{SIKsFmG?4q38n#mZAy@qL9#Sp_`VLI-zh>44P1vbY`cT?a#SE$E&D++74lIXuWi?
zVzxdNw7Ifga-y|$e4{SGB2r^twrcnW0y~CAiy2dr0+n?Q_8+*m;x#cL4)lQm1F<tD
zUjb8LO3{(47;Efu8aVjJg^-^;+|+PNpQtXs(ju(P>$5*kDSwUm6>xPpOCYF+$F9Tj
zH#Oo2j=-LXvY_OVEIX2E)a=se97OVB3YFpd&RS5B`EV?~U`vh)+&+%>LvUjR?4@!w
zkR=<rc;LLxv7uQuo=dYt0eQ&R>s3M=yF!0=pdvN3)i02%S5v8rrN+V`ivr1H<hL)a
z-tf}nkP<yc`>$jOqJ!t@xry=j^D$9}IfI|C^?umfD5q{UT-SB6xZ=iILj<h$ZfF57
z`1+$q_d5CWY6nD3;xMfnF5^Ct*~Y^-ZFRjdb3nexwc|)JCSpzY855(`073&uDIhy+
zewwqA)<|Ku^cuF^$UCloaH~CmJ{t>;3AZPms3h%h;OBSA#!dKtAe*3BGe#^3(cj2r
zUwEm5Plv{+H3N$$aL-j10-#y3;PH{Tvp$`X_|9SX)kmX?v6;B4QgG!UT4u~x9w&o(
z$Cm`Q=-jn@t>gffVhYVjri5R63BCZVjy*ym*;HoCO_VK2#H4G-WEj&b-HT-5q@Sl_
zniVnfh5kQ+SnW0!dPZ2omucIWI60<^;~+m^AOx}Bng6;##J;6lP-G{jJjF=zl@~e)
z(T`<jm(O|zO0R=H^xr>)iyKgQb=MIcK|dsop>0hRlRcP5RlhxA4f1eugI1d(WhFnL
zJ@04&jY=`K@`C#J?^z=?F*OoiQKfuqaA4p!b@hXQ{zus@-?6W>V$<Js;^P*bSsa~A
z9b{$a$`f!pWMxEEMWL}%<Q)v%=2RoXYwTue<%tCn5X~tqi#LycXj6jfSMHcPq7}t@
zkoi`0gwSY@rBHg8Vzps6SJM11+}9-{N%-L=F|$G^H|1KIH!4Ou;Vt!7T=nFy_`H$z
zuGKr#hkedR{t~Yvh4UZ~!+&Icd8#8wC;(tfPS53ArjW5QyK5SPjt4j}41RwuX1XYY
z83(;AP~2XLKWRHrj!J6PR7%zDdwhi~qLB{pDZf}EC1JcrBAPM!y#}t(d2RSOF(|T-
zM-PZU>g9?*tLSXfmop~)kl=My{E&8lRra{@zyVxGpQ~GAHg6HQ&{D;O&3S$fMyQ}>
zYkKxsSS0|<Wp{&XHz&gP^sepKYeFqJ9icfIf@r&BWKXRc%#3L>NY-O@djh<t9l&iN
ziXX-{j+&K+XNs=Q<L-oCKq1e<gK4yRE;o8ymvA%wPm1^PrhS<4?>PXTwwX2uG2PHA
zZ@g30)fJStWGA04?tW^EYa>)QXL+(h*)GD7rb-c|;5@@GNZt)6jR$D{DF})Ojz&)5
z>T$9vr{RJ*_Q%tvK7G7*qCB?mZ%-08XY+ZHx99JC2B8(bOO5@7(Q3~p^+HoqDQK3(
ze(+u*cCUy<oPMQM+Hf40sN-|gVnp-a1o6~jc=JR=!$$Qt%JJR!T&ZOx3@bs5cd(q?
zXR$WVJxF}?svZ_AzKT~0vQI(UD$rFLb91?MMF=mWZ6+EnE-4q!=f7hqDG&5?v3nmS
zh5Kc!Nml;(hR#pRxI3DlOfWzE!mr<}0mDSU@*%k{4{n|9tsB)ka^7g64;{94U-XQN
z7?S{13k;c!KX41Mto-t>%nUvBuq4RkkNy%okW-*FpiI;T4_^D*SZgQ!nov>{hm98b
zh>aE~+^ged6yfv``TPzjo-Y0;PfyeTl*^_r{fPp{t2Aj>Xff!)OZS6K8(wLQYs0`d
z!3Bg{8gX6Y%JY0Ywt~BlhtcK)F&pdlD*vJo<et!!t$*;o8ZDrbo;wEUf!cQkD4z;W
ze^YR@>EZH7owD5~JIr2`mae!&>yA9N{;V)TqUHK+{YiZQ6i`RzC}miG&pdnz;Q!Kx
zJp47lZjItDmE1Aa(_SrPWn}sv;kb@)711?NE0BCjsjaO4ugnbZe9bB!_k9OZ;Rvth
zKR`$XUwC9)c=TLH987{_sk4rGISK)lYxV#@QZz7L>EJM#Xol&H6hgB25GKD&?N|Xj
zdj@EW{%1)5J~<>qY|Oa{74*$8*4~PctiBhz1G?%-OSBDWK$tsU^pnqA;Z9)p+Y|g%
z1TY-IBxDyW1G@@8;rh-zX)*p+!hWK$Oi-_Z*Mp{5w_9X@IxbuiqH#h{Tv?x}N42v|
zLcSTl^C&9V-VER|{_=&TGOuZzG#GTM9oE75Q6<@8Yv31y`wye9B#A@)lIAdhlky+G
zvDK`7K?ng$1$NlL$wQ+4td4hYI+mC1wd}i%W%Hr|vf`{3HgU!P{}6(!Xv9uG2{^3n
z3YA?ajE%c}gJGj#yu~1|kn|4ZLiPhp`|AG_sAs$mbwNWiD3gq1#aI=C26BPPK-gp^
z|I4R8%7O4UO+Oj;vVEsiFEoLxz|K9&%VX3{tRe2L=Pw@5!G|`L;RHRq$R*MEY&l@x
zTtwDRb=-ZvNAV!U-_u%Ei{NA#Jvig>@nT^AbpcMag9529m;y;Hkb<`O*-&O<^rv~B
zXfCGLWMENMk51IIB=kZV<}4tNreHo;;#m|_COxlWT0~P&GM5VG(a<#rXt;!#>C;h}
znqyT+SX`V05S;+MB&ByYR)b!D&j?V8D}$wTuB-K`IbcOGCj{tq&!W9VOqLN3f8Q?q
zvBoHLR&wP>2EgQ!C!SP2dx<&Ara4LK8R$o&BZ8jZMFAiGw0+MHPk9)yyYnN12&FG%
zBZAhwUp?kIM0GW|&)yMVZ$8e@B*4hBm~Kv~p?GE{0A^9Z2C}5&MSJRW#Dk+|u!=y}
zV?gd5Z{F@Hb#ga5<_E!jQ_+B+sHzRp%$2H&ivB<;(5Kq+R2Ee!=I9N5YTX2k!<oOJ
zs;7Nd{;wSHo0J$MnAH@Sp9VEjnV-reV`DG75Sy?M8_}&vvRs=-n7f;4(eVY4f>~_N
zMxZ&p0KBh-#ho`h_%ho_p>G|q&x;1mEvkNDw*cHvRr^FS86)L`sxaU@o6H@2t`vCt
zM8JwYeDI6b>7QM;Ex%PsOg2wtuTnaM`?bN^c6%}%($Hnl|L8H=7Lv_fx#^IMzE(C>
zbKbYOm+ki^+7_zREi~Rd$w)zU!MMP_^TZfFQ@~1tN6&&6SV<H=YQ_2m`y9pgi)2)A
z(}iot>1QrTicNsRxv@FROxfs1S`PUxY5&TLf#zYw=GZS(jW9HhX{wfyNmArVzj52H
zV9Oi1bx&Gn;_)wxPF+qY3KA`3$Epet6oHS6w$wNEUyf#61Ynxy`Ld9aj}i7NzgmI_
zOj)0Mjcnw^M0lVS;<N<>vC>cZ#*MU!DWbp%QQ4?%0_mOz5Z;U~l7RW!patxKAP_A2
z+di0}pQ)dPpJ<f}pGctu=`4h=8wFYiBJPqflc6H(BxP_xRq!k*(Y7xB0Jg^pZ0x`4
zMn0MB{U-UTqSlmNQU9t3pq$hDvOwU*(KTQetL93Tg7-4Ne8x2gW{wO-<EfaC8DW5U
zW^TKH@3b3wGmtqu3dAcQ)CuCbW2zv3-sNLB?h@R4$7YK_{g9sei=5|skN@p4%@St0
z*7mVz&`&b@PA{y7y?P;n3lDPd)oPxnTWnwV+v8<Kp(bgS+l!wD$wsFaIshH|d4rJ`
zeQPz>g>`<QPbaarHOY^B{eT_Vf(u4g1Xd+$4V#4IPqn*ELZ$Nrbd;<PGqWVI+OZ0w
zRQ!G<?b8`YjazUp4HVl4$XG-(<^x)*N?JR;IzXKz@z-XAbud!e9u5Nd+qs}Fm|PPA
z46SRaXcpdn?UQ{nZ<lQVIS0$~E|T5l<B2o%bZH(U<bg%cX;+kc24kBK9FB*RDQfTT
zSDxW2f{^U_D2aD{(~H(6382TfMjk4k<Gwqi1RZNp)l@vzTa5g2Gb<Az{*$tikmb+S
zd|)M?$zQ9PvtP`N{8{mh5(ylmh?4lS;lO(#*sTNgFN<EG?}N7JLxgKLJt2euC$#EH
z)FrZ)lRHRt)j%IiA0e$~?kTCUC7$3}iWHdE9M0r#Fw>KkmzpYI7zlm+u|noSSFpm*
z?~&4H)7{4u!0G@Wk8;Wdm+Sc3+h=Q`cG?k%kb$X5Q+E1qlZp}y5y1>)Wu$>iJWhK#
z_wR2*UST(<G^^DkYn@0pHfoE!vRCnP?Fo7g7VV&evioiZJjhX}Gj-3>V-q!ODA)+F
z4|HcCAS))K)(`C|w&c}m8sv2zk}V)@1*3n=#wVqNk~lqM2Z0Yg*<cnIXOeM7l>8Qq
z?}Iv+9VI=qt-ewDi1a{+33u~W-D~;g;f+{;a)wf=uIz}Q^dZFGmL331p`J?!N^lf1
zU4GC?@wcqq_v|1e@uOV%hv7@#F&y3BtHs0i^49lGT@lsR{-M*;MM?YFHq59wXj&Zc
z>h1kPTi4aY-2g*VCwnJAYdt@n-E2{LjPQwTr~8y?=8fQ*)Ym{5yK_#rNu?(3Q^vQc
z8%ZT#@g1Br7fnb@$vhPG{+Om^prf-4Yd5tNf{?-IR@c(m*5nEKM(I-db*U5mUs^iW
zxjdHY+}$`iO-;7nd+Og~NdJCU#}WqQq`e=B3$0(fg5XDKSPEC$#Y+B`Kd*v;ymx4g
zRAJXfgf`PN9C(XW4DC_L6|FUe(7AClxK%ZV9-KPS&RYmnGrMby04eu1$?8Q{_Ud?W
zu!y#z&0Pg)457-<koTMD<`M;bFc=mWC$ihH7N)cNt!>DcPbew--{VdoQ`y#PYLSlB
zU-l1`6&~TCTuHS?fSdw~u0k|E(ci6UWxSXfJ^rIBG38|Zz$*#`QOR*N!Xf6!sa^#b
z06C@N5qE56j#rr5b3Y0g3Ie!@UJN-Shh5%@6a5&|^tXY-&f^@fO@b^TM=2c!xsowy
z#}2%sj&3|;@GjOCI5KfJ^CjnBW5x`@bd^F;{D+FpXj1=%8E0fiV?H)7hWkPPN*2u%
zw}sH^An+IiAXU^SJU|j)eZP?@F*utNUxT?01>0?Ge?vg>$yL_yXLA7#Fq~z-o34Au
zsUUT)ikj?x$kUzd7bm7g?I7dmK!=bBdjD22fY0=oemLvXBP$uHAd7|%62eEdK0U4O
zHQZcYHFaDytqW5nUBAPrC~P*=G~{+Ee=vG#%9;jvs5~p#kJ*j&L6GgCRYkTM*Jh^&
zFNg%CTS?iAy;x6@O)DZYAOf(zB1@?}tH-5j^lU7SNOiF(V~`CNikZXhg@diLb<++Q
zU?b=^IVi3pur=nF%tBl?$rnse-YfrsJ#{kPorz;N^+5<!{s;#)S^aG$Z4J9r7~II6
z-S{KK+1JrKH6wYx#Mq8iM@CIKY`aRpYBWiuv-_z`+WgG`E&!jY$OQmMWdBA2H%`n;
zSpHlxz->oQ_Y9`08Pg*+#|qpwOy8zrPUPXr8B@|XI(a3}jzjs!%Ew2g5dN0i>S*bS
zHe*0|-{<%!gdM?X|LlZwa+ZQbCx}y+o6)7vqE+JN2N-MoaxG38^i{4&GQ3fD_IG0!
zM}hzqMme>?@_ee&8gE4>CSHog^5a75%#Q<!wSM=Z-FIXV>afC}yuwlUN$#shbly5k
z=(kJ`j5=YtdGedX%0vQz6U4Fj_<^PYQ#QwcO2BI4OAz9=q~|9KqO)y4Y$mESg`P**
z=G%62FsxAj>T@5wBXN4yF+h^CI*Xt2)s}htUJh$vkuOOYAsX#k&l{$H{QmP~@|CaC
z^LEQ&Xy@3zt2YjpY2)B%sql&vd9iep;d4W+s&B}L8rw%poKMS*nKs!*7wV32${9-=
zy>*gg5b4LcdfKisM4i*Uvv$E=)Cz*Xm4W`K!}s=%?RY|3qL)tQ1;R^FpyNy{OdHiU
zQL0Cy%EyltF3J>IM`#iZD>=5l;9V5!7}E<#<-nF+7VLbr(stGTz;8-{b%~9WF7_{(
zqi|eb>98O+@{K*#cJr=`zg9N6Pg(l4Th?^MCBI~=uR*zvt-3basx#`7gWq#4>{yAD
zVx=v1a77aa*dhc}=$i@P1Nz&MZ8}9Xj#-prs;S!DjhJR+86~+xs?qeBp}s#JV*VlX
zbJ^>_M1aVqY<*#6!or?aqOKX(*Ou$(nwUluwo>M}A&xGHTVWlVrb$TH+5y83uRI@j
z!Z-S@>grfkE_dL<i5lHM3CDi))~~t2R={`6!oS>FV_%^=hus~MP07l@d>)nCkTHM_
zS>?{%f6$ogzC6{+Hl9M#_I9->5*b@;5%xR6E+Nh0Ady3O!_*z}{k2zQ03)KI{ptcR
zdMu`ma?K+P20l?59p4_O2wTEPr?r~22Ex2-ZSiXm@K7_%louX$2$88_nvA?0{^zF+
z4E)>iBc+B950M0(L!l~K85IIwn;dyL?Wutd5U@ue`bMqV0tl0CT53wuHaod+H@F;8
z8se4E5s5b)FcW|8bhUlbw6)!>)T+wRcRf<ySfP?WV%9(7sog3u>f#Ok^ZXq9!|(If
zcU}I=KkzG?%)(AZj%(BTlDZ9z3Qbnv>}Aj0zj%@#KPF;G1pS1#H~NzPLM7*_&|s&Z
z7l3I{&z8Gr=I>F1<ek|KGUdCF!lpNeH#ZEiD~pPLtze+vxzs#a6^MTyj3vIo#lw8W
z_z~3A*PJbbQE@sO;XkJJ%H}eqmBPCr_Y%`xh$2d1RG4tIv<6?o-pNeZz}yI+i&|F*
zxHPo@S9AD(Ob+fA)XoZJai=P{mdVO^4s|{qBId34q6V^_>=z1Bk{Y5)397>ruBV>F
zjQ0k-?L|t-p5q35RrI+zRhSFCPRi$^IbXh4{=8Gu1hgMCcEZVHYJRRu^yx$h05~Mq
z5gPfF?zFq!zBHMQ^9$LQ;NN3IVGLo1KcLr>Jw`yME)ShQx%yL*&Tx%?Su2Bt#LLLn
zadVRko;H0nT)4wn^5I2J+x1QP(XE$#Ujd8kBw#5(=!-yH^IgOcj<=Bprv}_DWq!*8
znBXvsVTp~VJpK@as!@<eTo3=I9&Z+JF&?PkQ1j2W_-kLM{*t+68q5I=6%~gLAg-Eq
z*0k<o+GyGPexUw!fgQu{Z~R7$6U@XUNu=5j>J^aC)8$mIcrgY5SwKCj@8q5~YS|DP
zxwWm4YW-KWN3UV?Enm57HLuXTQ(F#IPuG15ZU+Z9R|+ES<U<1}-S&7pM$dn#<-H^H
zHs}rn&?7}m42|E5E5{cBOBa@<rHWOY@B)4?AuviJN=jM>+RI<N9Akb!*Rl&-7Ff}A
z%2+fY?oT7zFs|=h*y+WXA*VF(yoLsSs`|Vrz|+C}h<B9Lf5sNat=8@1=4)k6o-hyu
zdisQ>sypF8iiH(oi;=0fn&*2h==RI~4=2R$RFIe#Xf*`iU~OT)C_sODU~d}M!Q}5}
zUK;7G#j4sso|4lS<eA>IqaP~fJaFKm)}~uj+rJzl<NBwHK{`>Tcs8X=8TotaHVbn7
zy37dLIcd(nCO2tCo9k^<TC<OK?o89Q4LXa9Z4B9|nw?Q*BGsQZ2JeIxZl(93Y!5Fc
zYi$1Ecg#0)&C!r+6`?MO`hBXG&}$A+<t*}DXZco!dKC0!c~ZsfLKtV|0b4TRJ$LNM
z>0jsBwWe_;zf;x26)D50WZ!=kw%L)+FH?e~+n0QYP(T3&{&p9qMS^_bc+Bz}6U*t1
zkI{$i$lUw=PM#d@mtGj^goez}wcS@h4jE%U3EBLIV#-_ozu!%kCnCI=X)$^G;V{pQ
zUpa|95toUoi}Bx3G^1Kl8YQ7Z<j}#T@KncT$6YpihMMDKD=TS^!}a8$=#}T;JW|rq
z(nnHf9s_&~Fv3lyBl8d0)0guW_B(ANuhEJFkEwMqPIIg1ro(-gds0Em&_?>Y?(w|?
zuIGeu0{Hfj8P7gU8^B`bA~}r+2pjhI0~G*6yTLgZMCe04GO3u)$$|rAbg~7*Cn*UC
zX_&kYL|AplbRr;Z8L?yo&OE0RnWEW7l~h_*9V0&p@S_r_<fOKLzf`xld9b`NCv1SL
z;1VTGYdoHeVw=ndKdcBmVt%dq9I`sX$J_j*^*!x@MNDBnDZ!(h`FM=|n>qwiU2Ugt
zi~2tP!xmyh3EFPXkC%ZlbXU2XO@4jgkX_9!yWkR#pHGqOMz5;1Zev&0cpxf6G1Qv2
zN31hk6-(^bP+!*D#ci%^ocg;TS}_Rn;iQdM*>}x%a<K3%Y#UTZ<+9KzY3dALYF~n8
z>%LM0^WR0~QP?I(ufPE4(14+UBz~JooY=h@#78nZx3FKxCz;wR3g^h6QRWG;fOU~l
z<MAD%{eKPpsEGZqWnZuK?sNaB5zaS9?|1IsomhwJ<A3@4N2vq1l`#_`zv#h$p8JhF
zZr(2jV9)%~`5W>^U;hR(F4MW@{TSVlJ#arg#><EY2_%HWPPvOqx05D+wepVw4?>$>
zBsjuEzLY4gq6T=#JPf()dqIO`1GM0xS<)`cq>WEkPHDtyxGjgZu%T^_OGI1hz}yGw
z@U_q5j%&ek=|W&N$We1n>7z7*0FiTw(FW!RQJCGYY28*f_wIW0WPML}XTidLuNYqM
zw8qsh=L<romSg0%f?dys>#p!Y&zoiS9K%9Fq&f~Iox+o9xIXv>Sd*EoZLNd=x0a#n
z{mI3`qd}L<Z!GP-wv<;mAAKQEej=%LXppviwNux3VsUXPQcB>3x6jW>;I<;<bH`yI
zMFpX9L278T6}Z|4^FLRki_p3+n16mmL_kBSsHn8$`5<#~aY6aRK0S4~XlC$HHN;c`
zZfZd1K!+5l-05U_K?jO2gXnZ;p3+U==67NH*ZVk0Z>~K3x_udiC=$?fZdSeAI;~Fl
z`Xc@%x<_~p^2)z??}(95j>m&oyfXjRC|ggH5x1lJEPZXh_<$;S(|4=9@4W4)mB2yi
zG}k&%bV&7D$o(lhdr<!`p19<Ib+f+yc;D4lb`qd=y5pHG6}>NGCahtNe)2swZ#Hig
zb!=SenVwOxy(I68ZDIJ|8$S$^2U92jvCCb4SDmFg|3j6fFr@LsveUsKz)VD!;|{#C
z#)F}vN&J&+uM|VTo!xGT`*pc;dxFJxl@ETj{BxY9Oi06BQd_6+QNNcPa^H-PXMkr1
zW;DxbL}$IOypK6~O6EZjwVNo?7_({k*P#c!kH2d0i0-LoWa|f_Rb*wLnFB3+oqGlw
zpErrIXq(U?!!8-i{}{Z>0VaT1mQpCmV#sVKSfB`(m0!@7!RfV=&yT3kyt>z;TD<Ij
z%x5IJAs5dq0q4`u_yQ~M{Y<u`XfqKpd0mbobVjGt{w{d}c>la{HPrcf>R+#xt1Rc~
z)6*xlxOuWa3mhDioL#?PcXigD+Y@%!*goQv3!(~X@mvPJWZu1C3<%3S)EVkNjOFIr
zgpH3LPtAPH;)uwP+LXG7OO%2I<SRphV5MVagS(0?_02nClr>A<9r^UEG!_ijrw22&
zs%-#b6G>zJ_UShJD*od%?FuV=<KMl#Ys|ECOv@qFiN*-a*?3hAuLZI?2-xO|LLLxd
zGT7V%<W>7l7VFuqXQ)qB+wq~;fc&<`AEB7xPk*oswxUOY*Z}e$2^AGmK7m{eZ%OE{
z-@iZ0IKQ3;xhuPxjGKMsSU@*i#obLy_Z`|htYbM>AZEs4>vBG@JO=cjA=Lnm*95ra
znts^Fl?HVId<b0uRSNMV?PQ}UQK{AZV_89HuyxENIr~3tR7pubXsY-*|04dH?eQLy
z-?7^safsHn5P{!kp4jN<x4e#9hG*Ov5WnNZ#A0hJ8=Jd{k`m7a7UfaPPaHyUsl6D(
z_32?S&t3Emr!7WjYpJ&DQ9%(>TQ^JVj@HMVpbVXm8pKc)vfR+C<mCaOF^zXhQNZDn
znQ#p=vSA0Xi?kh7FYPIvIpp{=PCUh+ysfi!1zmy}zs8kzn}^TI<5nS(rL&5dD#S9C
zq{ZBp>-r-gMgkOH<YonGnwJKgzUwiyM9kK}rQKSV;tFf5Ig4X|ViHOp4v!>Wtg9)S
z293hrJMDUxOv@`DE>Flm31GhPZ4uK?l0cL9`+W0u#Ymj)%hXa0a_0Zpc#_kk16DtO
z#WsOREK)!j{__6JV2`8Mr-{PC<0^m*bmi?gx6{Rq%l#YVUH%bE)Rab7yFpwA*EcTt
z>^XB(9G(Qom+}^&NyJW=F^64Whx2Bvl-s@V!_^sC`T25blPT*?)i;p&^isG8M%M0g
zuTKbp00P3bKfzuY^B|zah#-eIye~MrsO1AJYVQmw0#9Kem+dK<O3j_$-I+kyuai^Q
z2awyU{_&Eli;FF|8X9-Bs?!Y`p129_q!WsflsOCz4qIJfAkaiygh5rJfcl1U2JW!)
z{`^^*!fd9u=FH1?FJqrRHC^T#EeCm)*SVAB+44|u%HsAAls~C}tI^fYh&y2Q^X2O5
zTaK>dQ-gAaEuSB^^>ZrKTSx76TrRBWhd)9B?EwO}4Tcx?_85&$mMeFQi|Eu{>qsU8
z+4`n3gfYn7Cbx#Gwco9@0#JwQax-gfb|x3tx-d1--ed3I!sim!{o=SFPiISWnG|7J
z0NE7_E`Y1wa}*BTfc)xF+tgSIDzD>NyKPivYMdE}eMLEZQ3gksl-ygDjEQ;#3L<}(
z`K*}JRfqK1@C(IJEoWMWwuQ#r)W5CpGEFz15RWYmaoj^`Ps&$iw}4^ZSJW?r`mv`F
zQF@4G)CLK0I_*84r`YExPU+Zgs|x)!p;#|(573?TQ*pX28AVpIB>ws-;W{*~P$pJ;
zfl_)7gk;3aGncyq_Q-U=E#hhAAk4+I;GEV#xQU~W%uT`$Pwn75S^YOH7C56(Jo8VN
z(q}5Ax5=RKJ}>%=zI#d`r8ZoVF)H$Arl}{6oy+HF;|Eh`OtjNkTyZbg&B1@MK{d9s
z2)thI$clZ&m*xw3%*uG9657lkX-=5vZ}@(RWyjNBd>!Tyl_#Zg-Vf8GwK=H>s99^4
zc-i4(sL>?r^hafQrPHbWlXmd!;R}lVq#(?FyY~V-V^F|2qFWFJ(#zU0;zLFe(!k8D
z6F9hP+`8rmFFz-)cK6N+a}(-K^d!^IP(cdOaen%+bQXTsb26giGAuWb*s1xAYCcr1
zLij1)my~CMwr*i-KVQ-4mZ~l+bud_&5G`Y=>V@^<Oy+F=_eY1)iTk~2j;*R*#KRkM
zb->B+CnY#OiwuuP;fpdC8x&N9UMqGyol;0*BJNiZvvP_0n2-Y$@kBO03Ky=APlc8?
z)lLT_IQ>?ayI~YjWxvZ@TwtD={I37#T$KvR<Z+4>ap{Y0432m^sByQI#@IF|P8G;-
zVHlYL`!1&o(1>*C3CIvdrDya^eurA_`f*TuY4a<%_HL)6?Av#hQXCRqHsbG1bb#$b
zvSm&cFSJH0dr5iuK)F_v3Hfq@b$YChdhTZ~J5}MW>$w5309sB(XXzwy%d0C@J5n85
zWUCjds{&RGFy`dj`09`otRn5_<5zWWMUNST8eB@cXAH&}ygbTUc-7zu{hqZMSfP5a
zAi?AL>OdW*j_gHZA(T$6x>Cd|GB+&$C7;e{+oxz-f_ZqXa|wKR^vE+hEU+khH&rQx
zn!KA8t6fJn&BqHp7h>ef<5|a*2YZq!ok*%SR7Z#&Gy+Eao1eVYMSA4@NVF=cp=X6|
zU1-`W8rl*Yf%sEg04*bT1qjVmOm!56B0FdV)p3YzdSQWr4XG<ZfzIa~#QOZF>hQ6@
zSH__uhZzryd>%z(%3?!_uNpFWmRnI)EMJopC(y7Hem(N-?Rh&c32!E443iiK-`w@+
z+s4S7%qM*Hd-gTzAMCe{ANd9XgJ6ZjGWCAP{p~|-qC?iw^6_rDm}&8-$ASvaU&S)z
z483__52;rnIYfZs_1;%By*8Eq`t{p$z56a2V=&B7p&YI{ZM}b!oj!Y_Sa0HK`KI4B
z!HiENpPZH8RGE<XIA_vdvyjW7tmFA@2}(IhLvkj?Y=mIh0W@@UPHt{7QBi0hrUoCc
z_Z=^LVKE>WWPdCK1!JF;)z=yRpk=OO!-*ao960Oo7dW*RT(8$r>f13zolo!k5rJi8
zWiyj7PO;x`L8FGkMbFiz0ga-%O=z@8fe+SW1nFJEt|0^Ket+S>mh|1*&Dm`^YSLTK
zn8P}ujr5)}xN3f%-QxVCd`$-isOSaS(F>n7^PKl#67150uoF}1SGhy$n-1RQ=;v1g
zu0}Jq+IAsryj^}t)D8i%g*{Ua#2Fa}7gwJCp_reyPZsA?1*1L9tb2Nwn=u73EcS)X
zgGKdP+}kM*Z`clVAta&gRI^P?_~4OA-I}|tqa<$Q@kwtMH*(B|k=3fjbGi+uIziQN
zz&<^kS{NhPkn?iUf}+FnCglER?ILr!U4bn^mz_Z7xhVF`bn*>%ZPv?)YO#PAgekDq
zlQ)s`I@@**SyB<+>Uj|b3GdM{lg<$SjrT)f;+Hx&ACP^}Ej!VXxMHn6$7EVPF8^(M
z=Lv_Ar3*L5lAfEF_leW>+z|D(UG2><=Tv6FfO;>&@D#ASMJ+2%3aY#0kvE(pPl)O^
zo|&K|aP%cXSV>!Z`o0u(_+Tpgx%BrSv0BJGhTA*T*`M^lpNKoctQ>1`J(`Jc(Knf+
z*DEpIH~X@BKRYSZU*g<zyL42|AbYSB%Ij0)43fL_QO;70lc?%m!s3<t`l|mreEuv#
za9j*9j~<peJA8jnT|9}3^&?XG_#ceKG(Oc$%K)Q<h{1c0LVl;5ZzYn%^gYsUsoyFD
z*Z812{f;8lLik%gexTsY2z*h-F%Q<Q5W%jh>hubQb#>LN*-cD@hAMNyj(vPWnIR*Q
zELt{KH>YzDrb+`y;b;hVs~yN{_V&O!gBg$0VjN~}A*Fuu_L$E-K6(E|E?30IbN2oH
zjaXexE#T6q{lIyeklogHc-m^kZldPFU6~$7KI<!?IwP(uKC44B3$LsEjxTqn5G8YO
zJYck4>-*>Pt8OfgtnQ^{GU5BIk(Y<rbgaThPwoahoAMBs%Jr{Z&uL9U)zlRX25n|a
zrfgyj8hDBNsT>lY{^<m9Ej_&P3W3eg$5)sm2hHj_I;!?BvK->XnHjC*X(NDFOoTy6
zSJ}U3v~O(a(#x|)E1ikuluGl=uALJq(&=3i>{5eE)Y1!J=jZ>t@u^nYh?ui|aQ4(Y
z&K-npI+4zVui5jn^h>Y7v+ho9k11~J8yYt6CjND!1o_6mY=gTXBo)$cIU&MY0%IwA
z@RqTx^}&YeU1Xx4Ww^CFxWm@K4;ummt5lk)Wd#w#>;2Jip74f6N2Kl*#hNjyX3PV$
zT&VM4F1nvwV@`X^w_#V@by6aiHieqj2WPZ@ci(Y-ajq$AXap4PM!w@4)j!ujO)r{J
z)8Qv=Ugozibh?KxO#ZkmA!oClrFa?q9Zv)fdOw@DDd8Gw=ziO<STK-!48j#L=&E9#
zz}O`xRUt7Fc>-X|CqpRp=3DhPmOBm$cEok!Ro+|>6c|V@_dBNg-1wH!srZMZ%*<|n
zB0W7;2aA5UVLBE|4Za$Hnr(9VAaqtGT^u&BB(OU0srJr$lDdNAp2<pWu-Bv)Ms<N%
z8|k@m^kVvu<j1E9c%uQMS|eN%v{TDT;Q!jADEHCuDZhn49Rb#oTzK%dM<n-Ipw5x1
zWIjEKV5JsT9T!)*+F;it3P->VCF6Q-Y)s-4I4TLxT0ZUabXl*WQoA03gNw6e`HjyT
zwBxIOb5o;HCETQV+8;%l&}9ha%zJS^W!!Nu7j8TI^iOYz-FW1kWX8ea5!1Yhv$}4o
zJPLVI$rQ0L`yYNnlxaKF#Tj%$C!e8;af7vnmyvCKDT5V6v!&iFL0uV)4oTbYDGkc`
zLg3&+ho7r}^qt`V|ID7!K`b0Or+@Rw9Oq1Lim~7_B;qLHZipxmhVivdqC{ISuZh%V
z-0=>7r^T(uG8qHJQAV7EaTr;GUo2^=Fa{SiIjN(%UzI$dWHo$88hHb!R)Du77u-0-
zq(iM7Jcb?BxUeh!yTz2z<BrY+<tpoRrwamC82hz`$`aC1d@r@~D|>U`!}@Eh^$+_g
zOlFatOc$|r%>HrHR$Ewcczl@{86F@CL~Hwh>!r{&3Eb>?1w+jLtwr|Oxg6#UqH=dG
ztG%z|ESMKR|EP;$uU%+YuhQ^aU?o^b_ajpHjnufV7z5_`mu9+Jl$c`NO8lqP`a#=?
z|9cjx1p8!*${RAm$Qhyty8#7zzUv=f0a>c?)_S3C1h8?_U;3MZyb3d7L@;zfUGGx4
zmM4&rtR5&Me>SH1J_3)2k}zs<5xJ~uELwi>D!$I(q6Jb&Zk@r?cecP6epmC3ticaw
zLWqFRO#Uot&UW$Ts~$5%h?*wguaU^?h|EqG+WBgGsWDhUs~_T8)s_VDyp5;hu~}G}
z&{*$GA0%(+4{hddwvA>P9IV=E6Mg6NZYhjTE26~*&st3Gt$mixN3N_LBxX$#ID)O@
zaim(XaI$UNp0=xY)~ed+G)!~1?4rE&L$v{JPT6?{@4<-BzQ&K6c}+N8#h7+DE;EZ?
z54FCk>xN`-ZF_96mv;PE-8uX+S)t#hS7hu$>Q?wuN4LiH;-QP%m}OxehWkctcwMM^
z98|v~bZgj4q~P~1KosP7-xH-9y=P}%c2K?AOHPS!-E#1^y%TS7-h%S=n^G?QXa^fw
zDuU@xyU`y9k$sru%0$-Dh)={=uUGQvU%-#{{~Ue$>CO1hrIJP&cig{a1*DzMk{>!g
zeVRwzjXuw-q%;m^fdSW!zKPJ9(&fD$hNe8i{&qH^{bI|F1c~~hE#{dqc_UQtipX@=
zBc4@j^Nf!XI*=P&BiINNE%i6d!==gGnn#H%_dGOW6Z>qNC9)A7pK|gC5K+*vaGz8$
zMx0#_kmDa!p--o}^o{iRet{9BfqOELMOWSE#;Wf<ed#-9W|hh7PhVT2FLh?__-M1l
zpK+|W$*TKODdfJdHH1V|jsJLMvjn-t(x+crx{VPrnt4^T9ymK-BkQ!=eV01(@=1`=
z+csfYzouUkp8Xxxuvg>j`k^p(&)vs%Ud#0KbU-8Hz1YEKAQ9gC17@vOwet3+HjSjk
zco?9~OlzMDo=ZkA`NkhMV`Z8kHEmBzG=948q;m$DH#t2#`&B~#`4|~Z`VG{+UX55b
z=9+Wx*Y)R5LG18yxvZ>}<M7JrYET7V?cz!kLbW04DtY|Cmq#MRlA~k9-$v#}%9GFa
zanTq%=|`30kf{xm(`xPd7Lcy%RRO4k>(q_v@)a_ufd*01)~mDobTuC-xfdQgtj!K{
z7=f676=cZ;RZxG{`;35&VTr$eH_hkn>`Dn^M=D_|u5YSu!6@|kiPSI&Lv#XolMWxz
zz%i}+C=oc{_1vJe*X+%-%fv*~%jlGO_dcXwnoE7o)^?u;UiUX%^JGMhpK5bsX0aVu
z;4|IWr^xr834?VGes*>awC_w`z{QyKFHE3WzWN9AYp*O#)kcktEj>{9%}3Z+-x7hk
zaf_xG_%~5ZkLLML$6GjN87E3oi;aiFo!uCz2>G$TExT`@liPBsGdOA*c~{WL*E7Is
z7L`5vq$5hM7tXUc@of{jo-gLLACUR$v_C<xn-#=jtA*<9XMaCGAjvLhDU*~?y)<^I
zNcZh^^TuQfi%`@LYMw&#E9GwZw<Ahc_a8TkA2>;@s%#3qH7xN{a)_zv1~>W-M?a)&
zGx?rQUA(GN?k%NbEi~!tAt>O6EFpfl7=ts9<!N!e?4v9xDe(uSJN)ph_Q+V?g-d7g
zM?-v8%_?Y2+cz<1M-JTFXa~O<Ku5VrxxXBe#-Z?Sf5sorGqRdwRZcvQq4&WcvpXk4
zG?x{QB%e}%vKZQbhwj|%uW>L_nt3f(JRi&|)?BG^*dN1Ca1#!iWDSkIl82qXTi$%%
z!YN$^ewia^x)nKUYSqdgyS3ZCOdrJ=x(!cL3z9?UP7G_@*Fja;sERJwIBwayL&!F0
z4U+^lCTp46I1T{qt!u4y#^wGDy(eMwGf$cwmMt%nBKE&LbexN`1?E~1IQp5xuX<;)
ziZ6!rC&F>(g}09qebtSgek&A*$E_?gq+-2mw+WDk<wLam?n;FW{(cux?dTug<qJ(-
zR`!tF*kK(99V`nksTduvz1)I@!-!jdcaAU6>aW|?KXq~9=F&)0j^Jz+hB<4)Jgnf}
zY6j{b?MD1pPY(yefl2&@r4SK3pZoQaQnqjG_dx^sWpt>ruF9W9O)b<UJ?R>HxR>4b
zjW-Ys`6;UwR1G4Vm?nrAaCQgIp~>SCywYjm2}&Y182!HvBXT9D+&0VTgS9W$_>ug1
zhoBtMQaBgppyGmVS>Hk550Vw(dKGbf16tnYVs=ux=!t;TO`WeMWxcPx0qq^<Ub2n@
z;F(}Pfe5weZ4h|^9C5@~<bBU9skQ#7;m&##J{~-(_260Dl=~k*Jn!&5^WJmF_T3be
z6|l0_50bZ%%~a?7K7DRqIMHdjmHfd|B8Cdt(tQ0TKWa;l&hfEAi3SCHb~NnMLF!l@
z`pNDU3A)1P>-$G}SI3$n-rVAzD?93nU&9r<okhkPvn`E5#BW&aR1Nm!J$TqWWFwM!
zL(c=dMLkRQ6%tbiD`~V)oQ<T*Mh=_2S!<nvEg!(xGim+jzu22!2P{qB;z0tQM_S)g
z-l%YJ+ZqY2%HqAmTz*U@)po^u_HG7UB=X@6#|&At`XbF|GT>m7(G_iV{FNtpv}C)R
zctO`Ky6w-b+`a(Hu9Qmh;6;U0?#7Ryy+)6Ly=|}v#|V1jwmNT9&Vmz_a|C;?L}(Cn
zHV{v*QESABooNlI#uSl~XNKsBcz2|be@)LHh|~in#n6zK>;=vW%%-TLC@PM3|HGmY
zhgriA`F+6^Q@)pwFK47#K`A_G7dJaN@=@+r63l%z>m4J&g5Y-;m!&0uO%0o&cLKsV
zVsynx;dgE{r*Z_hvPjRbMOEX|!@XK<Kp*1++zY;Zj~uz>+kJI3P$=?K!#$_d5@z^3
zC^JLQ(%a<b>{m8O>orG18~<>NpZ-nkdMQ!mVx!09-ur$R0Gp#+nzF3kCT_Q{2+US0
zW+6!#8ru{XcWxey&^AzKJmeoH-`>#4Mx}EI!7k<lD?x?1O=#w|Jj&Rj(i+B$ha%yi
zOGF^1duNeW$mJ-`Xx+veu%YVBR4r{kS~BYy(i9RW+%h?M4siYg32+x8n`}|NRJ@!E
z$c)-IdUBUMY6E{`U?!^C($B`Ico_<Mq;?(Fa{08o!$)tVocOn=zZGRfX*%jE6P@48
ze5Iap&xUKYsqwTt0%%P{Z+H9H%t+3o`zRz2Ywi?vDr_aArHeHymD1i~S+OZ)4h=V&
zz0vU1ME&liE3QCh>q`;XO{E7Wc_uZQK<e<`U;V}fLh1I?p(T8HokdL)CCx4W+q<-B
z?)S?_Nx~e0vNBie1)zhY+T;O!=&9Dqu_~-E`8n)#{p-kX+E&zm4p{2y>JAR?20H`7
z(%RvujKb}XRCJe3$`$4aI*zqP*0~qif0jHV0&JNYzuZ}ZR2jnB^7~$2SZx6*NOy;A
z@7(kI-cxXI7n?XUZI=E5eNluRwtDd`?CH%nHqez(4L$JXfW9iiKOxkf`Mqz6)s7e;
z0tWH!%R>GB7Nr*=0rO|*npM;8p~EOAN8elZ1ybE$(`zYH>zE19+&$e%8owq*Q#5f%
zp&-BMs=pnZjsQmUKTDJSg|3Ung^+8v%GT6;dSnpT!8JM=1<cAipEl`)%Z@kN%3*BE
z5-LT^m>?I_s8zOI(6<!dm>(Bx93}d}sLN;ceJ%0FP->?yIxs8@a&<MSb$#lERfJwm
z{_JtD);o``bDoy+Ag;??GuLC3^g$gLC6mzejAW-ooq4Gi)^sQ)RBtvdH_xG{tlF^e
z-l@mUr;!Z&?133ZH|y1BIr0HWfPHU=G!8xg@Tl_{^=pdcU(WdSHUu>eg6Kz4JJQvl
zo!@mTZq-y(sgVK?$}7CjwIn6cmRl6J9=M*?`(da}6zndb-{xnY#)w`4x~oKOT!*-B
zjb@uAhP7X+C~ayT;M~#n^>5x7*xff7^tR4ZS#aebXTd^z7}}P9a9Ud3r-R`nG^6Aq
zT{W*nZ$U0<{qs=E0%Apfu@I~mv#tx@NP-EY-6bBY3Szzqd|(j9-6X@i(EWk}%t)w?
zA7u_9>Iwdhd&Ax}@M|2;J?Gg5!#@9T(SO0+G&$51bt`m@g9N&q!xjj0u^5gj2bV%i
zSig;-<DoD2iLJPQ_J!>AsvYO#<-vFn!(z`+8&@)4A(XVciAYMq(|w+NopcR8n?GRT
znz>^kiz>#)qZl=>?%7X%Qb#YBYQQ1(dzEs~tm@7$m5}e?USP(<ig8o?8N14h-IuX2
z3Lo7#S*`SG!Bn7>)P4miHF!1JGWWY*EY7iO6&C2D^Y)alSnuZj$*(CciS7=LK(7O@
zujZlK3<4yJXJ>IWcy#6#<8cv<^rIRXtjeR~K=T32>8d1%=_v+9az&X#cp?)}z;16x
z+pIX?PEX`$7SnpC^mqG@*nRpVIc-&n)R4RNHuxxF9wS_wKke1nZ$8U)i}6bf@NH_}
zELfy*dhkevqg%c1O=c>ze`{%l)>TzmRS*)<UY+v1w|D6vHfBLFx?_fgeiYbVtuXA#
z`w*s*+Sl3L)rJCZe;WJ46(KG<QgUsyyo6z5-%bg#_IF?@J<;@o>n`<st;Izn=vhPC
zg9%tgRLjaLrJV~fQMcpyE~6y|dz3JbiMv=kDp>on%3eFg5|J^(*#t4V(EHuu{z-%H
zOaydEp`Drag%9iKf195ghE@a-$5z&=Iy|fVz`ba=m*T1;Db^&CQQE6Srep3;)6qNY
z)fb;NLXoAa^1+2%kuhzL2A}D%;dU6_XrwlJ-*XLL9?aO3IL^~6n1xG(xear=d%gug
z1qG{$Rste~4q8KW@mM8j-?cygJNoALJ!?k#d#sV;Y7YF_(Ucll5W1;f;AK~#m|t;9
z<Z<PojtDjM-4Nf_ahOj7UIgKiuQ^b?^{hut+f-x<7eeFW;*xNryk`$A$z*nYa%}Q6
z<H^wDz;K(amW;e6+>sIp6J%9nCI9PFF%fVYXm0-1md50?@>28H@0P<6#Lp0CGby6D
zZok+f2Q&kEY%m%g{QQe$?kwSzL{PT%b}-D?^`_tqd`@jG7G2Wk4_3uOp@Czcu?p4&
zIJjW>evJ$(d=uFXB`zqrZ1#iJnx_Gx#=%vy0;9(C+OGP^p`Ku3A{=<(XZf-E86WFv
zt*&;%t_2h+u*x(cNo*S=80#Vd=lmXf_C>H6?FTthb1RTTB@)8cURJMx_=_+#qs~!R
zcl$RQz@H8~ePl9mZcWa2^w9#{>2bhn#VD>+^^4XW!o=<EL4S=XC<S!s|NSj12O8m=
zZTU0BM)TUMU?W>K-LEwRJw2drQYR6^p4M$`DV4ba*2fUz-Bb>fc0mnvG$Eu4EYDk;
z>~oZOGO#X?tU{KEfGcmKpA(}^h}1Cjsm{c^)f}z4`*|Cv+%N}SdipO(9sHOBl79$O
z&D{{#{P^<QQ9mMrD?2J4E3Y}`-CgblNMai5E8-vErnOY2TOYfukF}7@=CjU0{%KdL
z0kChs*4T};8|7ZAsSY57l`B0=E_%EksT(soi5+{VgG`A+w5^1fBGGFgpqUM~dOC``
z{pccT%rbC65XYJ&RyN_=d%6#aRm_m__56~lu8b#nzrQN1dg8nD-YKl5{*tAmmzAxm
z9$lfOgI)Ux84Pdd73<Ln4{o*h%H>r3;GdYip7UiDunUt<kX+7ZUdpP!K^K1eI@myH
zlfnNzUjlC;O3@FQM;OM=msA<YQDzV{D`F!`DYQRC#WRXWGxDrV<bfXiU2WxSd);^{
z*PyS5x8vG)YCzhJ!G&1%_B?F`yaaaGq$dM5I2+}v*PX5{?34^017ZSu)<^`_a>f+@
zFXPF-Jx-cLHPxGUq;5Tsg?am;Y$_>z8c{<W@HQo;F+Ls4C0y~b%@zpxdb#WLHETV8
z1P;v8QH0!cEaXLI(icO?)b}C#)5I2`S1`~^4())&AV{y}$xwZoZ%gQRA^c&e$P!b;
zS{XWx-{_A{4)^ksTbby8{uYj`zQ}5p%^%Z$z+--&Njo;Gn66M8KR2IhJ$&e#$87Pl
zz}+IZ`Scph3fiOV=_(Cw-Wzgo9|4UKFGk#~buIDOG6OnC@f2C8151NZA7IMd-<~nn
zTVW>`K)IlZzr#IU={&{?6J-G-Cg!LCIf}p-0s%qkQADF&(ok4|q)#(jFk;chCT^&N
zkf`fJ%jEF4&Gx>6p)}mmi28yL(Q56E)3~h`yueL4^7{Cy4r36{w<(;su{N1CjXNE_
z-SR(<t}-mjwu#apA>G|bcXtaYA;Qv~OG$T!lG4&rg0jTY-QBr#NJ@9t_q^XPmTQ0P
z?scE%o|!Xe&Pbs;kVJLXh=o(S1@yJ$!jlU%Uzs$-bFia8OsIP)YwFE<`a%w2&`gWd
z;S7_z8Zajr`1{a}lB1Q6k&Zb91s4So40(7uU!xKH<H1-$g69G{PJAM*CnP6KQT%r@
zd}l$-0k<?|P73gsI-;y^^nYEj8pL8C4jaAd&`xan(4|iR(~65HWH1q(`|+oyL;5GV
zwikVq_SXcbv{>j(WOyBeqPkh0jEZJobL>$9%hxY=zL2IedNyf%5h^K{E^U$`)~dYb
zB!+33X^l_OfVGYP<I?oO7kk+n@cRY@V-o+xpq{Y=X+vec>`LIw7ad#`xrF+%S`rc}
z>z1?iVwy_mE<}VQ^e=I67NH+N7~j%~vy9wg1PDShq|7X<u$LR06?}V>bu8k1b_n=O
z?Hg^|Hl<<&>f%<LI-6^~>K7)|@nCC)hU2UA&F39-tYV0sG7U0*jc>^J@xNRqWfOpw
z>6&6rUbMMG-)WhtX;FAfeu4uB)W0wim?xP(Zcp9)p!dB{w>SH82qjW@T>&8U)VJ6%
zK*BN$1k8<t-41TZX~N)*HJZZA2>!_AZ^RHKd;Cl$!q~sv-{0d@MwlP>zA;<<`L}!6
zdj$&(=b_cPpfLY%lddsua?%|oYqis>!y;?glZ2%A%&Ny+o6+<G(CLachr#bG&SQm;
z=A)p9wX>=DLVV7ta8eidz3cAOIh&WrWMWXdU%wVqSvb{~&hrL5T$$`_Zx_5HKo5_|
z&NfU<O49nztH{Uae(q^`ZchzI)Oze9&&;fQ;1AZtbOukg(&Z&JN!#6R*j8GJ{kUEX
z28Q5fXQS1BaCkTSsxP2yle?5KCM9-Ay_@|#OwFuH8+Y$TFCofpH!Y@{%yaDI?LT*j
zPNtxiX$!p1gWtch86DnZlsH~5rkqJhy<1{mwIVT3wz%5TWTqMhtpC#R#I24F#+KbV
zEXMr3p~q;mpY_~tvF0L5Ih3W(QRUhLG!hTbmv!Yh2EwG%UcD1BItK!LFo1i>`Kft>
z9*pnWGZ91y6UU~>>XTNXY7%z7*~8ZIs*4_hB=+|ytPmShb2zy#*MKt$=8fWp<MGfl
zg1?59J{?7BP`3yIl~&v(3%W%C|1{Ct)0ZqZG6$n`K4MUy=VLoM82a|lwg5H<v)Q*D
zZ+0jJw(}OL)|gHTQ_X+$y)fuw;u~1S-55@L>Elrdun=K5P^xF9=hG22^6v;nAZ*(e
z`KW*^BY041;tH_{q_c$3o?E;WuKE;8-#y40ug?tN3TgKP%>hIG9?}6%8+k5fD#$%r
z-_rHrlLnhj^<r1I^}-qkI$m_$fP)|;EG%N~v#L!MDDUnh!T$KP6470ohr4t)%kWH_
z4Due|AT~BO0&e{5ziUJv#SV9U7RkFj>ue5$@eAi{twno*r{UAW;rH}(-L&N75hCQe
z-5)#_{lWkk&?5>s93F`xzEv5haqgP|dsTd<Jcm!?Y<5r#4p`z&habsGdx$0e4lJ&j
z#Yj^^@6bIK=r|6}`sPGMMgI%rr9DJ8T1xEg=D(_+my~P(CNk6F^+)l4m~nVlqwtX~
zc)HaD@MHfY^pS$|yWR}##CWuK`96&*q%WX~Wn=X<F-y>xpJ^sX%AJzrv?wBc7KG6n
zJ-SgWZhH7FX_8Ot1NWfUdYs{H7jFoem$mIMVj?l>>lxvP)qJFd5Wa9j7Isad9%(&H
zL`Fyq%avrj?CBODk6^i53adm9h_7v>NRc;6Kady?@>BbBd*`OudNxNY`L3Q6O#6nf
z*I4-!xtu6?v;>JyJJ3^3A(K2>Qlx<lEYihcC9#4i_{0qTRb7e<9x@g+iKu%LIsm=c
zq^C85tu3IvuHu5z%(6?<c+<c{`DsS@fPS)7r~pb#XkJ|e@i3)8(06T(Wnp)?R`IqX
zkXaGr8rUJy(Cn`eTc|Z}8>Z*{vGNWuv+Fb;vF$ZB4rj;4@OOnORb77(U*~(H^63E(
zYAmoM^tZi#?qv8%KK5veBmYwa($oz2uL9IdB|d(H`53c^o;L1^J5$#2Xu~U+($D0S
zj)zku8OVLHdfsI+F<1Xp9hk>?;4MpzSQG~eN`H0tl8(hz@*flwAW@Ziso>uKdBgV#
zuSr54?RD56AOHgj{=fq^Ag~l23=^R5FpG#Zi6wpSPc|}81w8$knQgfK#N9}3nTp!5
zRJ`(G-loNdzr;$pL|%w}{P;-O(tq6(`8R+pqK$giEQa%#vV9>_%C?6%p&;JqVHp6>
zRo3!!B$wm|@^<gp_H#BA<MsM2y%o1M?Q2a{hnu%14$ro`>|TkWLf2-)GC?&;*5JCC
zZKx_VmzZi04}4DjkAo$eo49E-MKn32)umbc``}ydBy>DIT<q^jdEeMydBja0-zd=f
z4RW8)G0e026~g}b+H2X&uc_mRcydUx;Q;x}#;#K5^J)UZ);z0J2azu?M?w?xnV(Hj
zwY+h7yJdeq%WkA4#3zs7^~HBegA9si7eU(1XKE+v_+Ks_(%XtQWhIXH58=C+LJko+
zza7vYNqBzE;*<SM<XTnlU`rgrV_)8<AJQT!_`zXc$H=^E=nqE?MFMwE2JaX|f;Wv4
z#`NQx@#4nHadKm;vq(y0(g3vl-zu{G*2C6|fJg7IfJCR`watrcK}*=?vik>1jh4xV
z*gzncY<52gp8ND5>o%7sEa=Q#KZ4y`v>pU6gY)m)f_deoOsIqbRc2+YOTQ6rHt<Dn
zVLP;?pz3CKhB<#P-OJ8yv&vI*<K^tEgW=j24=GU|N1k2=2Zw02*(<@I(a$SQjTaml
zIRGTYn|DlH@`33;+(B9WLDJjMbz0LQnhaBpvq2QIft63W>61RY>p>;zS%O&8k<<G#
zK)(-E1i=&;=7(fSVTq*>xa<tOw)!{0>*<|t_`Rq64<+NHUBZGMG#}L-v04Uh2l{aX
zs;oiIEb&i-5mt#`?;YOSz>p_RNVdec=-%?M_g197x8NqTRok_IqwH;~EGB0v$Ia3E
z^iL57NwZ1s1sfhhNi!j<b~7JDuL{|Ttb=0@Qy_k9k#yO$3{YW^rn?Q>9@TH3*DTs`
z`8aB~s5y9Z(xdPx_ttb9nRF|rga|0!Xa_C{N+g#@+P->e$YqY8XUN568L8Id`Gnlz
zl=qKSC?Ip}9#+@M$T^a(leF*>_~y~r;6J~myP6^NAN_{6-1iC3k&(8>Q|qWVqIQKH
zO5Ad%Rs!$~+Dm%9R=cz`qVTxCNtIb`Wt`-h4B&Vh);=hh9pI;wv^}sw`k?BsHUkhx
zz45Nh=^|r1C<hkoW}K?CYyE4*3g;wa+SZrnVgCP$ZxsYsw#U3`gg{IBOgp-5gI>*<
zxH}<L>-txzSYhr%Z+q75goMb=uKdZo6;jWU$DjRRYB&`87|3^Oe`J|@dvE88aNz-o
z(z05lPHEBrkso}I8+{cWiIis~r01bK=2|gqWS>-7b@<gc?E8My{iysc_Hb*`mLw1V
zOAZww>h)+!ODc{g_so>T7!HijgqCIa^PL6c_nXD~kG+)($uwwbrR(Y-OaKa5?(Xem
zVAh8RuDfPEHbx`$j&)(wV)R$|#QnoiY}XviP=TAjb=~nIC+YtNsDs??#^3==_fKRX
zVi_=<ke?{t$Akqho6X*zB1t<&-?Dss{`xqgw6&I$*vM_c4Z}SA5Y4u%i^ziL5`6i?
zU7+)rn`|YXW@rpe@ol|1ty?F|^GD-to&Q#^0v+_1;HeV8KdKZDg(20msnh3e>*?ZI
zA=lL~?<U^lbQMJX;mbJe>sxNn`PK9{?HvN2&?mq$cZ7OQ?}bJEQl@Xfru6O(6A<}E
zU_xwYIM_1y79=W3G!uEwuH8ciEXX9q=auXnaE7JUl#GAk;!)V$Z5PFdKiYq-Uyt`5
zkYl;OqME8K-}qblmbxV1tLI`Q`-GG}R?RFi<=Opb)OHU!RJuAEr8|d#R)WTk(<!9-
z_`A_Hbzkh^P3OY;JA7bLKr@*<q~LZN3N$cpx5`bpIPca_;$$@-D0Et<G(5NTKGiZw
zWu3_FboV0mu6m_IR{6YR<f-qRHHggE7TPE*nLc~cHPKLhYmx!Vu*e^ns`9_=>BQ|&
z7pRG88Jxrs3Ln1*?-D9+j3OfhO)yW^*eFeVRe|R#e(?Blel(ht^Hvf4ampgwDTs{A
zv$q^8P$_L?cuVy%SK53cK!8pC9IxAe(tYV0beDM>7UdDtxIz)^r;gfn;dpopcsC%d
zN#+0To8wrJc=XCJJzkiWa>-E)shrcN=n%+?soP20GW+5~_7vA=5l3q#QWV8p()rRg
zTN#>Jqdv0Gy1fxY^YKH^*R3tws#BX_m7lJ}@P%ebx#J9QUW{;<aG2UQMoM<!B3efA
z`MeV;enHRoGTdZ}otn9DrP(Ycl?qGg{KgPcz@;-qVH$j2<@pU8JYF!&{@$-9CXsp&
zGt~f}Ky;A*WW3SEZElK0?2Os{corV8(B7-a;kK~F{#Qxy_Vg0*+}7Edn`O1@-`e7s
zz?XaM4;C;j<f?l6)T$xmL#uB<q!*AIeC|$jJAgsuqIzM*UT;D>ga7tG_0%YVmVLc~
z$t&LL^YRC^NdNgCmXQ53YMi{h#UUhncJvVL16i{HLl3t&@=%(<C38#5-`4g^RXwu=
z)4f!xs@qH#V`=X@#>46^;q1R}pUfiE?{k=n@p_5dm$AZ&JNc*~H}xvZ>Ak%=StZCd
zvfwp2tZfban^AZDiBR7Bm}XDa2pV#cH7U4OWR+o$eUkSMAF^mjTS=oqWo5=N#-l}L
z_2tLw=BFHbVYqr|K2?OjMcIV}HjO|>FyGG?)wfSMIcCnz6LF7Trv<d^m~kEgrD|Uk
z0i>Is9?RE0dor{O$1GhS@G~%W?k)07Zy8Jaey#Ru=^e+!s@@MS`;$}UVQB+7nwiF`
zY1OrHcr4?qa5xC3QAD-uwT(u4D>n5trhGmyC$W3!-5gSw_-Vjd;C$30$n5XE8QPi>
zEB(>TXNF&X7_la7>i)s~{l3$FhGh1%-#<TQ<FXm)Ch`AdW0f^GMi?ihl*u#kQ}#f3
z-AO-L@C~OU5V&2NAP8SdZzvrOObDGAFID!BkM7-LiJ|M^pg-Ewr9bZ4l0g%EA^ff6
z_Z?Qbld!!dv0(!v7BYJI?z@glOSUqxAF`$hVD<*8$6<lJdSm)d-O~}M0U9O68Q^Le
zTG|G&eZ!xADw+C;Z6xnW_+PZ5?gh*sS9zYZ@!13XSsIsDa$qHHCc*Z!s9XN$z8Hae
zQDUpOIKfh7sI=ph$4LMj;`KZex+#`6f`BOg_au|>l+9?NvH9p~7GJ{sN8I;9v=(tM
zNtNzOrTlwBOa{hrLrJRERV;C8^@fyT3L(^BG<*LR+J0&HL|=68RvQF%!q;w&IcQ_C
zC=s?-0wRd=?1umm@J&W<XAVf%(SNWv+3v<tAtL~*h?U_$LiBWsBY5CjJbXVi_`j62
z9o2dUfTB5>h|_@&2D7zW)t#GP9}DV;T--@r7hoa<W8Yza<w|h0jH>&PEKg`oHU232
zwz>JGYGUe~*sfqDa7RZRgrQ}5ve89G7)%<hpYn@2%*x_xL#9~QLL1S9T9&T1_sD!M
zy10@0lFf4);rP?U2P^KtBy{1!l8;1u*5w!gkKZ&L3opBT#_?~A`*YG87=lR>+l6i~
z2$Fa}@~vsAgnzm<+Z{f-UNPV^{O?ICg>L*Vi2e^sRD04zxR{9GbguXRsv8=V;`69A
zz9;neD{5Ok&~i<p{XQYqG%@(rzhuu}1@d+|r2>8pH3B;k>ytV<4abWnYPRv@`-4T>
zfn9g_tmCkh0@qeQYP6mJ?aAGb18a+}lZ$nPUdJexG-dR7AQhH3Lio{jvJ;4Rn}zTR
zUaP&bA3)*A7)1T$cUL5JeR&$m#9`CiY+Z|aP%bMJfpJiqKSaL+`hoe}?lLH}X%7c}
z!9TV`ty|y2361pLV~!<;$>Mk{%EM7{=|g&#DftyH2ESRNXQP-n<U#eC!Y+SLzqwSd
zVh{;z;td;OchQZC9^>bntzY6&=-yNR%9E+ut&b2uc~CYo)C1ZKL;iWQc_cM?`|`kJ
zZ$st8^lV%)5JXQK6JDpy!8!aVX`FV(9`_>8SutRLjtH`v!%P7FiN_M?{)f8_DZras
zN3mPKwu$F=un)tt$oh0p7hZmUQVmhF3L=<QMbAj{${)@gQ^eG-+6&L=cYI$P<<|G-
zT4F6wTX?&Y8c}f~w1SHiFo}8U{Bw;W3IL44ySn2{-F)LQ)z5?GYh-1Y{=i2{sHSS!
z2atis%~4k2d?lBr0Jp8Uy`84>$@c8s=Cfb8(gWpP1<w!&gRpbygItCg$JHrSK~;Tg
zTxA1W=xELPIMT`)AJQMMH=7tX@JRd|s_1Y6aFPhz#M5c$NK}Y+9j9u+I0k+7t>Z~?
zpA^6KW{$Ux1Dtd*Yf8IpdiG|PCC-umLs`D()tN(kME8E5a*=AAr=ecTy^I+j9h+2#
zj87(ZG-4d`!0$GRkl9xDBBHc>PIfg07>JWo+TVXBqJ^mMBj)V3z~{5^VcB1R|FuOX
z6gFs{zi}+jIa_ez9z0E5UU^yTX)0tW`2~qB=$Og<ai1e+W3wm21?S3)t|VLWOo0Ge
z=~A`ZL~UY-P5W@-8Q!6{1jr9j*)-lV;)aIJxwYM37_V%tSfbaZ6kG_(m5Zb~p1!LU
ztL5%XM5@mWwVl=3E39A-OV&%C5*CPJ4*Tw2pj4LMPu|rZV9JP;(~8?8%I>j9Xa`k%
zpx?v78ewO4f$riBWbkBcSaUM8C@T2qv#6l+Cf>Xt8zwx-^)IarnXasG;zJyppv^nC
z=sdEN<zcpv)C`2FsF0DM{KO@AfmzPdVo#JCFXWR6)QdRH(`p$8SXCvMNZMt9H&t;u
z=Dxp(G-*Qf%En*yH2}x!V+~fa0o#dJKqpxOuMY9-ou}MMkJNW3A%vq5InDhULOn>{
zmt@9YNYSs_+$hhJyuXfjFkXg`c|J5Iy@Qbey8QKL!q%-WQICV#eQ^8w7?0JC3S@5D
z-h*A_%O+21*FP;I1EXb-N!Y`M+U&McL4~mWxmVo#esvKb;VfuTwFX&eqRplgeZ~+u
ziLc$iW@?|pS@@)x<l>*W`F&e(-wWBq%33+g`VSgqLVu2F=Wl#e#t2C|Vz&fd=F|ml
znBMtkkl%4tLJ-s380>B1j)||T;eNb-rG>J30<G1YJU||Wp=KZN=V=ClaQ6=m&&~P>
zX8RQo6BF-fwt2=th%ph-w>HAb$cCb(GkH17+9_`T^=@G`e1e!K7;*PC5l&J~P55uX
z+3Txl)RcB#+iNJNZnE#lAWiqU-mifq=(2G`r{~~Yj3zd$qfRTd*nB$neKK>tl|=3D
z=W`k@=6z2G$=*?Kk@$}T@jJ&TU-t(;&{bM~f83An6s}`|y#dm-DW=jzDeBl+`qd6}
z`?0@X<&_J2zJyh^M$nthAr#KpS`$j}eKxuZj@RDLNgnVo)L&?nWkh}nk%bLbVRb?O
zF!cM&B|qcC0S+Q4a!By~<Oez7@p|+Pv`lBQ@7ZW9#=3(~v4>0ie_RrKeYB`z2}ufE
z&w{)|Gslt@EfYi6lcI~5!*|vT3hhcNP`w{CeG3b`gOB}=^Kvr83{<01?3kyUn@HU}
z;)ed#aeW1s&MmlPqP6#4FXch%CH4N5Ezgq~;#X#qG=PG^X;Aa`wX3#0!f8OaY_1|7
zEm|l`LX9d7_7Ifv%*bMst1~QOU&3kLA;Y|!P7<OqI0LHN7vS4b50-&{x5l1=0M?RE
z!b7?l`&qSoCHk59hA2mGYt}AoDaDwM*gb(?h;ag4ARL;{>(1p6-oB>z@4zWIejMfB
ze#Jn<Wtq#%ii$0mBcdM03;gN1cVlz;y8`q|pa^N{4L`$e0w#dyZJ}`GabN#rTnubU
z9;O>R>^0+<(8b8(OKv3ov8g^}4z+f6PVf&33htBT*utBho2U1DWdi<@Q%0k@@CdoE
zC>Q((?<$UFxW4#%447{+LjQz&&ZD>OiJj$9%5kM+SEQgS1p3ZnPU-0i)ye$#^*~LO
zSL!LYF_;?n`UMr~!OMwop*@^RuKAI4`_8SOYq#k){Uagan_DlMmno<Gg!8*I^0f#~
zc~Fu<R+XUttV#I*sf?+#(8V|ZL>27(&ZfUYxEbFXG!l2ChbNp^9<O3!YB#wJ<g4O)
zx*sP5WyXfx(9G+6ffRP^@7;zMbb^$qV2u+L<6lRa<?zcK$dVvdqw?}PWcM|!EHY19
zZU`X1s=U}b;@Nk1cXv2|@)f$~8m3kyI9*h{YZ^Bvehw;BiGPp?_l9VGlMr9cF1nz!
zn%edC2l;hJ2~cb9@jSXj$W*hM(DCM~Z<rpJ<l&Iuzn$2&6pxNaNgnGjE3MK6a5OdZ
z>7Tb9qL2_2<cCWglsII)C8JHSlAMH-on{!sOc!c!=ReuG26Y_%F+rj7(DbR~qa|d@
zRu6~_1Z3qh2n!Y3@|mCRI;fS4ZtpmG&q4U24^sYSCIFKDm49mfUUF_f1GZjAQ)-k@
z#tqUE1hK7Qgajz9*hz<O{nY9B$XHxaK-2G7W2K0luVEksMR^~a`@~!l)4W_2aA;2Q
z&oO*I)v?NqBH|kqk2BjK@^UXt_VUPID_gi7Co6@h^Z4XTdkpI82{=A$b5d3P0x_;}
ztKM}L+l5c^eS#Og0AH&6mv;$q>0brXVlX<*^ZSp){{xS#BXXxX?dr0Dt)DSOAo7m>
z@B=DjfBm`)T3@SVvr<=0(B!zcKs^P@iOgKVakYz+#_tt5l5d`1<cAUFb2_jeg!(1X
z@txUtw;w7a=y*Trq<rqpZ*Nb!+9|CZl(nlB017PnlP;&;wdD}o$K$Ua3o+40!mi7a
ztlHX4w7WAhjrShGHXGD*GP{X)1hGHET+sMBV?YMpj3V?b5+rXq)t8a#J_p@&r%iPv
zot(b<*#HYLp7Gri-k~K3Drz2C5GYE?>viK3L@m>aO`_}v>bUqQMKleh0MxvIMX*|a
z8lbi8zVcP|UyC}mrsL`cu}s>>NTDAO+n1KhhYY~yYw)$Vz=0u5t~K^IU0(8mX)^Wv
z{*#&GeM@evsCE;c>fQ8pZ|?5?!QIxW@c<Ka5Uk0($XT3^V_grIK`-Q>mZ31HTKi(I
zsJ{h_>hc3Oj!zsEEA^9u7X->;dUb+;BJ-19B>M4wUVxv5OW?rU&y=I%kG+heoZLuL
zesyEy?Jd=l!D(#0spB57)N;DXO3{07obn#`1~4F$jaMwgj}ag{*4HcQYpPcE4X`7S
zNQ@Ei_Imk0#z0nW(25HAGz}n7SuT+>qlwrQH|z_fThHdxQ5OxulCfaY$SQm^Rj)sy
z29_@Loi*Pj3f*Yo-4*(@@TFcPR~<LpXdwU${BR+M7eDnVr&qk3o}FY$>aLvC48p&C
zC-^WQOeUsbZb2>JKC_31<cPGzE=%6$ymz~`d71x}JyJO8T+}8RAsn@OxA}!A&*TsN
z&=+E%nv@I140p}n-(r)#)-m6n7AE$|rgoVXl~pPY_5<lQa>w2Tqd68k(VE^9D}E`*
z@f2xo(}j6MN$WjoT-<f3vag!44{bL}-1X<u*V<2T_G5{}R~QWoCwpqYO3$-xA;9j3
z&yvHNPIPlS!Ue|-^e0pB+Pln!6-n8pP7V&+FH+2}j4Mx~8x~HnlNkQenNlB{;t9VZ
z&%&Fl!{l1L7@wcq(&II#7Ncs&25Z+RYrxDW_0)m?I=e=*>V9_2B0u+iHuUu-x5-fR
zj_{ZMoF)}*PMLUO(-*gyg3aCPhq~vq0{6TKAi*H?<$!=)yx72=^@Od)Uhmh;nSu?{
z{Y%g4m!8iTm{Z?3jAWrYFH`VwSak?_<yGH=0gc92FHQQfmm-N3hAY0OY>FtgdbV6+
z6NH-xQg6kq@Zg#YZ^a#&u?o9>^P9_K7B8u2tsBOx+1z)05T6c-sA-o^{Pym2J<+hg
zWkBL6gi>+7k&x%Zoi;v?<r{(xj`#oJMm&S;yJOO|wBFW9gBG5<9D7CFJa|zhZQLob
z?Q1C3=|c(GN^fmlc&Mn@!1};kV*PVYi!_#>HCa#2irZyr3irv8%f~m8M^4TIKu2|e
zBk^{Ci*#BEBd;+TP0#z7Sw8-!gmyc}uB8)!Egn}Fbt;I*rV<F)5{VR{QjQxXAVM})
zEk5iiZHF1)q*o-Oiub2uUBAkDJc#Z$8)qyqsH-*Zj7{h%fpF$lW_<dgX-c;FT?nth
zqS<ku6v87HPmc9s+HJZ_@`#PbyA3R+)NUh@5Sikq-i{oZ;$WF%RePsTB-WlH2XV%Q
ze}?HCmYb2p>bXLyr~N5J{-AxDq5KcA&_p`UY?HN4j5@a^RhO$lR?aieQ&98~&CCPL
zGl&-i;lU&VQ-+O6cAC~W_igVo5eME>u*dNa?9G=nN`vEnh}jRajz;LZqObX@M858E
z4erXMvOpG>m+5a;#k6xZ<(eOSk=RKSnm0^^SK8PJVJB42HDkidXUpnEdGnXgqtyAM
zC$@vFk^Px?DSaRzk0DS&J}WlXeS(5)xk$m<Yj72aQP~Y#%Aw?R6wup3p8tzo_s>9Y
zplJADZB#dSfRIS$@>&}nGE{y_e<9y?F=0&dgn<f{dY*i9@f_5jIE46qq+#skn0VS^
zG&cujb?6(pqSxsrd-AuI6X(eVjf4Y3qG)q!`qc?Cs|+3%)_1*nO!xq(e@FzbTr89%
zNC&lPvZtL$P+rYx0IDLTld(R8<=k~r79Xu1F`vZMyq#~@8oHUGk<BWzsYUth2lay|
z6Nk6yuKD#x4-BoUZ{<`pMR?7nes=pa9(;TbSxOGeG@Zr8vWx!8qXGBWjVXLYGQq+2
zMb(4dIHv&asLv3N(e^1g`;!#itUZkr(#L03$f~aoQgME|=DjkZfX?gBk6sL9*dB<s
zlpR#ys6fS@#FJ7!iZJ^ug;J==@e(gmk9b73NR9A-P}c^n33g~%>E+V#t?Qdt6qr-a
z13qSG@O(3F5$7R^T!hkCWyG+lA+Fv`@(?CHTIf&Sj4tzoz)Yc2wtkm1_$EL9G``bQ
z30)`4e^p%_vU_K&wkHPhgqKXFqhCY*E$<P#A1#DjQJzdU(MMt)#p~e*^;i_9E<nxM
z)rD-80>cA<sm||(T4lZFaVm9x?_14P==Xs}1d+=BDGvnju67A?(=ZvB=g+4n1w-9m
z^{j;!buL;LpZg*=iT5<91F@Ce<t(n`7G<!sX}ZE|))#D8Zkxj~cR%*-vzyny0c)#d
z(!jP4vKqvwKL2AP0BfUrY4vC_7CYH5r_Y@(HBm4r4o}XnqFEK+3%g~8)v6K;eHLmE
z5L|0D22ukc#|%yU>swmJwP*eTxYSEqbkkHGmz?_tylko#8}4R~os*NNK)R9DB;;s_
z%f#ztrKRN&99bWHS5%2Git(z5E)ED;-$IlCkhf+@p$|D#R5dh2#l>Nbj*T^$fx&FS
z0!$vRS<qiCPh8UzWsff`^=+qfCK|-k#Bqe0r5v$;W7h#r8Ons{aYTy;)xo*Lh*k|N
z4%M}=p!YW~__7yAen5Uu?5p<KLsV8OBl<|PutOKWb1A$}0{J_v*aG#4Y91Sv39IuW
zzs<#U$(ehJKQ_E}S6I-B#+Tn}zS(^r?UGqt88ic}=>cG^czXgL7ia6>ATO)N%`3_L
z<&R}akqgxGz6){MV*ewy*<VIxJXJ0y>=aDiurGtci+S!Q{m`{R>rrR;<Ppvy>izfj
zTfP>-+8J#uu#if!nwudHVwip%`&wY%2pTXOI(S(tQ>aM%cj4VqbgN$tj^oeZNesS?
zpD={_?qI^;TZ;SyHqmSPlZTH03zq%NffO{r?UvylCP;NME`&S0LMpAq6yvkWIr0k@
zVuj@t&a359VMR%~AQ;iQd|FMqgGnSOw{Sl;WaSGpq88zn%N%w@8W}>d{qR_WRnXb>
z=`D7hVhA9PGZBf!C}mmA*aw6Ge==?ChDpGhJSgZx-5MZDXMrUZ69M+?oWx0sT82%s
z>8Ci{Yk9<X6Q1Z4h0OJ8^dA^D!$9`HAc?H3^)U)p#eLWFGZPv3-4pXe^%-0w1lpgw
z*oP=x{{3+H7p!$HYUCwp&nSD<ao%CJI4_X{rV>xP8SUC1mRjgT6#9DTOAaMsW&rEV
zx2}G)Sxe}y>Mzn%{xmKikZOPBF4Vc8jEjn05iIH`P?7QJ%Y727T5M_~sBmUZhn$qP
zd%>1IHjdzn=_@)5+t@&Td5nwctFMM#S#nX%{g4!Lw#_#J%hc5Td|q-w>eKq*<8e>R
z*0%8eNMCOz#y6C@UlRJdTXZYs&Byj%0#c3*JNq*8ayX8TkH6esSY-=;2_?6-wnhN)
ztxFaHgZmJET=KxjjK|B&z)fh{U8xwVu_n5$L+P$`ITZK$OBthVIcFpD!Gav^aa>Lc
z5};icLB-x|FDaQ#h<UPP#{++yB0>OVHGLC5agfb(;?}uCY+Y~gQ&rq77<S1AiOJnl
z{t0@H=A;xeo$NHZui8O6CKqZXVf$SwEh~#KIy&ldF#9egHTCZY7jCbXsWv}^gpw8t
zqBo3QSuf`KX}|f<@4W~OPQ<41_4>CGU;WEA9_sqHloPI7IgM5Y4A!A{c)ytOz<P;Z
zy=nWx{Wa!Y)-A}&gClYe0~-8CubTXxTCl>uHFU)A`FkRy_36yN;II8cY(6PS-qZvp
z)X(YpIfjnLx^!U#3<_k#>9NHW>AHYP6sPb>9Tefh`hu$_eTRkRYwC>3w*0qJN(IwG
zV$Wt0e)!qd*Mqa@r%iPfYC{m{;s|hD0(6QYymmK%u4p`9y^-r`UYqIhr1K8fQ(!On
z#~7aMVwhw`-QtKv909D()Db3=%M)Zbtrq#t*GvE3m*E(JP#SKly^m|LdaeKrwY!nR
zme+UYd`q9ve#)5Qdd)xTSND^t#=D^6aBXM0whL6=zf^a4o*4_DRFb4}d@2=)s9a;0
znpUviS3a$89Z(~SU_`R0TN%xa*V4rW(O>^HX{~Kq1CST_5UsJ;3YVFgeQqxpTPPe9
zXlH~0yK%5RArcVO>W#oSga#ba845Rq%;fs0{rQGGIyq_7T{TD1AS;(>2txabi}m@w
zlxsrTNI~+?!NEpO62g~+fTKO&6mD*ASQgvD!|Eam&o_RR4|;M@Nz#~&opk;Yv>0=r
zvHZtQJ@%}(pI{<iZ#37yXD?aXS@u#RSkl5fA}d;od@FBsWL~@b%LyC<fUKaZR{LN;
zo;jDGZFheU4j#g>Bm}n_c=A;bF{n%AUIsxq8Rb8}0E@kaK#+KhY-n0jGCsefV-rct
z`wt3$TY;LIn#;qL9b9LeZe`;#*2xNP?~<EpqQ*rVOr2r2`a?<K;3H<c?dvy(nv6lO
zl}LsON4mc$w;<B}C<CffvsIIW_iu&#2l8o7>L)QwS(ml`U0SuSh4l#8B=-Mliw*pb
z)K1~i?z3Qacmv1kdNRrsQa%_YvS(<0o4zn0<wm+{A1lAtPb(qz{tV%@ODz)ALe$fz
z&(Nkx&`rXQQk(as)Aet}Kfw>CJ%3xW>jxmC%0@|4zu2r`$9Cj&QE1N@abu63qTGNj
z-_OT{oWFsgHT{Rt?*o$Gg#N5Wg#p5!&DcE+U_J}S;^%il8}U<hKy*~JaGm72TU`sv
zYP7=O>XsC+f<-f`aW~!?0gS|wyczR-tZGz413t_c%||o})@mJPRaoo8MG=44k5rEe
z>vrPw?SB-1tEv=Wzx6}Fq-&I{IFtDjrqKJNF1_^;3Khw8_WX>cp9vPhM-k-etph)r
zIklti)e;N2@OgL+?2J_$@0yQIno_!RLBdZWK64ALBZ3cmwA$9yh}e`V8Z&#|2@<{7
z*_j61BUEl%E<{AU_s8TDCb^;O&;Kuj-0BVl${|!$$70ZIo40pVxPb0+*n)5)suP7?
z{DA0iV<|5N*-Vs-Rc|He`Vbr8pZ;1IMt$tRh#o$ap1liu`IV(`;yohsneS8!H@eh`
zpc#YfFt~QI>VKse`)mTRgJk|9McofZltMLWxmj%2TX<Uhi79!2^8S4U<D_Rgz1atK
z8-f#dDq1|dY4dUsckQ&qDyy429(QLqCelU}6gn|6awaAwVgEaBxQ);pN&s<Yn;SG}
zb-NWBxXKq*M1X}k4AtkYN;X8D#U~;}J+P&ZxTr3>Z#5yg$63o_jB|s!h=_nr>O7(o
znR~$C(}oY8p{H5pF(%%unz(zGWC`yq^}#zTF=rdZp9QoY^u$y{x;6;ce!_dzWnq1i
zl1~r8z)-J%l=>jDu_uTPo6oPW<y6dJ3aw>h6h0<5#v8%|!UP4HO0TAcT&AHgKt!ep
ztwcW_UqgQzLfYn&_BO3u@~CltiQ#{WbVr@am)rUw;<kCKZy;5|OY*I{SAVlukKP>9
z=JNpAXzq{@JiTrjh`gkz7X#Y+Ynn0wuUUpVa9;Ni`io_o!i2iXwzI&qdx?>Df_R!0
z!a->@=J(e{i|V#OqAKlQ^>A)@9V0#4@>c<%^9K8q+2D6LddSXSqnPT~*^*cGOY9E>
zf-Q3yi|6&Un96p*EvOTjw%eWd216)e!i+ni>*x=eySt7HGdaK&Mgnz9h2dfv&A!0;
z*KhkhmNn$XUHS%Ffb32=99iG>020vXqQ(x(m1>*{74YQ7qcWg*NlhEX*Z8=>=<gc<
z54}-Q_G|vM9r18EWAxKG2Yt>=BEp<w@Pc@s&$j5_TxiQ^nO0$0V?k(4U1Kf(Z|d|!
z$ArPz7P=a+4mH0r$f7hZ39SxhdW^Z_^+T#r9bvv07273k2x)cb&9`sgxOsTG;wi;6
zG_*o%)R@Ls8$-bU7OUPp-QYhO3?i5DdScTUB7!lRc(ybbpzq;z2wonRGlbs(9>%GI
zf?WV+te9*2n}eiBdR$E6#GXKpirF9y&225FH_Bev!%y;!eG3KbuZ0Y*R`hV<%R5<K
z&y)C_+!|LWw`%a*ON_|v=Tn678=S{Gt*v&n3H{|iUnj5unXrgT0mu7OyZqbFi&ik%
z4;<dNln=WO@#~j``_6fkTo*2)dVS>BRCyBxJQ>Cblyw((4R2z~-ZJs*?lRMRLw9Y9
zQ{JgU7LTdayJ?(<FxFo2kwVs$68fpw*Z|qsf1@n%Dn`it{z?WE9DvKym&Oc$gY+FE
zTXUKW2jFs#$3!B2Ur`CO_@Fu{@?!CWf~PX4s@`DmGPM>Rtg0xn(dHt)EPCz<&_8_g
zQ<<-HJI(&v*yRBU8QM+6n5@OI?^D^Vw02ZTwN>7PiIz`lMqMhnPX3t5a-%LTvhyPi
zQ+ZcYJiNNIn(*!X7YaVU6$o@R5Pv*kYFb5}Hh(K)0LHE5-*bcZw|bc40;~;8Q0b?S
zCp<A2#TQ)MPsYdZ?&BvL*Jb`UvaC!wTx4Ojd+#~grLL6~9t<;te2!R8ZWgu+dF1?!
zo~*cBh9>Pe5nfS>b+E_;nG1i4w1>%SM{p_zXnvjjH_XYoYaW;So#uKgS_R>pR{sM7
z%(!oz)@;nT(gEt}`2g&GmfVybnVm{pCiFeo{SY1z(be0F#LCL*O^w@ij4;;}V89Ps
zNsl(Hk~rAJv0T@ce_sXdwU8!*5H^<4U!I_g-=?Ia+owqebw6(rBH4(`Y0;7^K-E&@
zf6!jfX<FVJcBan{h$#CN_2<NHky;}0<w<C`{Xi==a7BBf7<u-0eL7Kzpd`6MEJ!Pq
z^g&EgvnhbeV!7zT#d{<_Efh-CKCImR?o0@)BS9er=T`UVi;QfOG&Q%~3+fp^0#}0L
zPT#EGVTMk1Z|20k2m^#Ceq!L-0z*EsKBImV%5-oum}F0Mww(e%z;%(=_-mhlN7$~)
zAVlKzKLi}de|Kwj6Ek;=|9UvwsbdMt_U59Pm}6Q3f|+Y!Dtox;hXeEx;LMqm70sf5
z?7s;(&cP_f?EgAaB2-SehNWWH*dA1|`o^v2jW%FP@NMW9iUqxbA^#$hn;RJ>mXNHf
z8!f6i%Aw1!qEh^@X>6l^s{NPqO>4upX2j-Za3e5t-a*l?7~Saa<HwuYMMBH@4<4TA
zI8MNTni`6uDjI}y)8HKAczM(=LJYP_oVSYq?-^xzOP65e=eNHnXg%j!z;8)#D=@3O
zqZ(H+yJE-*^QWgP3N&<dq!pLK#Qjz`cqESpQ{zlX1MIPcp37RSkl*O*`c!$Q4fU1@
zIX8kV#DmsC1;oUrKyJ%)1S)GGD&_hQ@AV-9Q6=-@w8G>lW!PJ0_~LbT`?TX1at%GZ
zh4t-t0*lnbMpb{U@2(s=q`ze)B-|pxtw`lK=!uKFzjcay3A6bU_5H~*-5msen+#vt
z{zB|>v8N+ZaW|q!pmQSabT8;cpzWZfx%1Xl`&d?Uj?;hibuvYyRp!OGDRU4LoC@E3
z*hkp$><f8!wAnW+_N!Y!&wOlaWqq;rQAoV@sfVly3I`Vq_g-E`J7@QW&{?6+>{DA~
z5C-u0vw!}S%?NP6235gc?D}dmNMR0d@G*@8{tFO94BHez#gtH(dauV$o(`~5<F@-;
z*0I{k&$N7_@Ic@tX7+h5=sI;*U~P%{6*ZYPod(?=lNEWO(hx4StMhk^4Q<70T~7>j
z{enzQP4LS=e#Q@$Wb}11GRS}onD0MRw8FfddOlw5?fR+dY;3tOEN<RaL>?1w;4RR-
zPyQ+&m^Q?mcK2~3e&HC%O<i1DSE~hW!^=mZY4@(!Y1a-RnGY%THgf=5U%-Dizq_Pv
zn^KL03fCKO-`$r9HZ?6{V)73B7ZslEl4#23+ma$aWqM6rWhDGmR^@3qEPa$Kjy8XU
zJZ0s5N=0my=5^`{{pEE?G|rnbSz8y8QCO%9nKFuh)3?NY^V_pe9}<N}YTw?|g+^pl
z#?HG8Z(Ay(u!)#&8q-u38O`ND@VPj&3(uH0lvEt+J@KOp{7k1VyN=HJlAU}R4c<jx
za#)?Mt9ALt9Ak!AIqZ3mp#6f<%gX0CMliE2jQG=wAbJ`Qy=(tMm|Gtc`1J3}8t3T`
z-=HK_!M4(=6LDP<ukPozt0QvdRAki@%pC`_MOsN~N`H;&{|bMDQrU4>mfFxC`M^q>
zH)b5vM4bkhJ><Gd1==GNbdu#`c@#4j4J-{t6^$;{fAa+VyC9QsI#0y!lo%tNl8o~T
zfhq$f?n0BIQy4S@51ihRYUcOZo29>uh7cp*2{l?xOGO_CbM2&DRy894RpjN>Orvc9
zrkg0?FI~Gv@Arg23Mm87Glq>-n33tT4CcrAdlE?DB3+DESQMaB(*g99H<L$t)Mvc2
zh=KVNxTK!cH(tH&U)o(00V-WRuMUDmcB8cmaueoFPx*||`l6bZuS2|oUo0b`fnye2
zeYaeWpbJt#Ck7`3`0HOUVE=W)x!M1t3|YmP*^)h8xSaZTyN69OQ?jfJtc{eBn1p^}
zww>BXSl|u1Kw1)V2FSxVas~!(VcMVj(vLRAAZ^@4?Y{7bwk_ry!^wsz^P;v%cYPgl
zHuPoen5C79*TmE*3MPBO$NMr2ZQ|dCvstv~2zz++_55Y#I)AfBoFk%gALJ|}gU#lH
zoC)RE{F`G_3V2f#r-w$$n+y|IT|X&W1aia_%{Q3FQPIqdW=<UmwEjS^&h#-z0|C|K
z&d{el2yVPe&WkFD9u2`ya157aZDm23^R1>yZWzJ@qByAV`@r(h$fYcMfnBIfWVn;Y
z#OZ^*k&a{V*UQIs<C#DZ2N>d`5vaz97AkFF;WDEoDp1Fmr;+mvU#E9Er=O@tPkS)5
zd;SqPY=VTkhC5EJ&(p2#ZTJtAYhu4m_H*AqM|-LtrFVd3*Rxksx(LNeUiCV_4`<Ce
ze2TE+A3T3P%BhzH4_jJ;ZK=6dcr3J6$4TiAJU>ty57-IS1~#mGkCbo?;y)_JbXrg)
zoi+9ST%PFEP7D)7%`dO}8Y8fZ!Di-A^p#%F`d*uf?=d@0<~P<B+UV$w+2yZ@$+^#A
z5ygtCMC0;xxxi<{U`XX1rnZ`Fq8@qicIgwXH&zc|9|4?~ssVX}(<)v<oy~+MHPISU
zJ&tyi1VLkPEiyQd%5gyTSfNNCj9T(~_E`hmzmz^nU#c9q#_EF1z~BP4-rI%!8Bk<8
ziVV6#PXt}6U+zjD_u0B1PW}G9V1;V<_^6IIX~++wnL5VBTcx7iJf=sIYDw6zx&87Q
z+YASL@I366$e`xoCxDyZiNgK@gaID|0}^s_3+A|f$^mOmYgc$6dAza_0>+k(qp*$v
z6N<{9#tDzrpjh|RL%CN)wG#_|e%P02^7%A`xa`=2bS)yP0f!`eDJONMFE|YJkaL@V
z(;mKc=yccx+KKm!(Lv>A+butaT^%QLixaOba|I;btbCqhgfhjlh{0X+1ld+G0udy+
zgh<g0ZMn`N0PA21EI@pqVAC@G+0Kd`=kd98C`NWl>^SW-BubQMjO1hYQt(i+51;kl
z4;gj*z~%1Wjsfui9cm`ylbC$MiF+8PSaZsF8F!T`KPz+(Vek2Tl8yuvqS}^2=@(dP
z<*~&R4t+?70c$aXh1V8O%ZOl2uXJ%*3rFq#hNo7N(Jdd$eoe!sYAhfjYucI{&oRIR
zqB`iuu_3TzzRQwIYS5Ib?|kd<Cxo9mD`l@|=>hF3v-%4P3K*YJLRXJqwZjU6)^?7<
z24VuKV))5EtQciG`5RduFS=>>^(GB_%|eYj$iU5PN*HSFXZ-hiOrXc!rRYCg?d1sb
z%l~XSVeEMl;5m!rX|BI@K|&0~+uu0<o?D9oow2^7@_;7hza6O8G-k((^+A&wCd^f@
zsF`F8rR9`sEmq<q|E7LQwQ&&``QF_8cjJd7;>I8D{{{LCY}nM%QTlG4$H&U>5TjeF
zc+51N7E_MvI`j%Z?5&|cADreQmT6rHTa)TKAG(80{@~{JJ2}s7WzZ66Q|w2xl6r*c
zP&|ZOx!osLl>14r`&cqHowb#u@eb(gr8J41y3u@_`lPcrBVX9`><uNdF2JF$5e0V<
z^pcGK*&Bi&KkGsPJ^y$qSF*4*$GQde$I>w((BGodA3VUFKMCCV(cyq^w^vBrg$|j*
z-ft_5kYROoNkG<1@dMBm19p+5QG|eYPyw>TA5wQ&0AYInn0d-Y-ju4XWwBWLbkmuc
zH$LjMEefVz4;+~oUfOl(N@X*6zcqE`4wF{5A!KKtGXwjX;{j9S*N3Q_#?6rE8XMv3
zg;GD=kS_5^)pTtUMsZA-N;Z~0(filw3*vI0NJ#&0#)x*hfD_3|dE(Z9v%7EFAhzc_
zV9R$Eh~=#qm&?WPA*(_rE=&O*vr?5y>Cc(Of2LbCHax-&E4n;{U^m2uZ8XbuQEF90
zl&zQo_le~Q>43j8F_@TI9H%4RmY!65@tzBqQK8{IP8>YSbUf3{cBPC-uIx8GYNcAi
zKYw|T_}&zwy+Rei;K%YOyxCc1OzDPS)kugaSfO2U<Ugfq2+=FR>bWje*7nggyStM$
z4L~~X&ddz*9>>cx^4sAiXll^OXE=%moIOwLQ5T8OT|Do?Y#>YAPi!$kmkO<RCfb8&
zVC0fO+{OvcpB``@fR649BFkS*Khv?yl<RN&C4=5cGAP)ktXb(f4@)j*DSIY}v%4L!
zz;k*wUj_fwO)M(uR}z&W#OFjQc1AMxZc8^GjB-mQnJrY)Z_m1#$Y2&KvjKQRT<8$J
z_hOi6%ooz><BmMa69AX;!xat<iA-&8!&K(dWX%Mv97pffv*)0Kg+={K(_gmk2PU<N
zj=qb)vTr|r-0sQTZ+L>JsihqF=rT>ttiq*^VYvM3L<i|nhn63IK?hFu^9*Hfws|9Y
zezgz08mCs5DOFem;|Ep<?SIqg1Z|0^;P&cneevbwtEL)p5<1#n&Zab<g=}S1GT~t8
zch<jC6*CL#m0iwbmkJm{Fs_Ij1QvMz<iWv`sJznOz(Ca78oD<bSE2_8BfSWt?^wRZ
z)Lk|>eRDL>%#b%0t)P4B6o`aSP#@i!IZ#qk^d4p8?Q0~}vsj@;)Y}D#3MrFFN2*+t
zMeG<3Rb(BGyCzlUr?ahuA055|6)Ss|vyhw&x+$y84LC|wRolgd@5D}f2_;@bAitV4
z@rBo8jg<gVG|fFfdcfD1KzyAZAF{J%9DgOZitEuXbRtQKG}0jV<$2X)9SJOX8(E;H
z2zqqQEtx#YuLwSet6Fq3xb`*QQhR@Dvzv~VVNos~9hmJN5M95*zI8##rCbMF*|z$G
zbNk|s2P=rPK7OvWh@(MUX@^8+-#!dpGzI&w&kWuOhk{TAe&m5@3G4w1aA2dWbv3K&
z!|Km(Kv7-Qepq&$A>fzGgWC52QAFT3!7!R#ja7N@Do1CFn_h~Ku^mBM>?~HMGBx`#
z*i&2UV7toFlJOLoVag*_Eni2sj{H{l>GOy#f!7Fd&b4*KLS!V6u>2Qa67qMOcT=BN
zHX9EPz(0Tg{sUYjW@a)0rsj~|40jh(k(*P4sFC!~S=C?2O-*YhRoOQz{%ze^o2@1h
z!V2_Witzm*m2<jYVb(U57^WOt9EiwYgocR!*@9<@7=J?T;Ln$yKm-pL#Sg1O1>B~L
z1-Utq(>Sg&hPo1q?qLt8Pv0W-dB>wi7R=#y&rT?b!2{)x-uf{%cV?R<GW+wTO1_o#
z*XWc2ynK-A;7FHV!+VCR92csvG2*C=yqssK+p}{Oh&T4pXfo#omDp~e<T<j9tz_fh
zw@;=kesG626Yr~<kIz94X-A=T0<ouSgn1wQoIbuRdL+QXBy;Wb{3Q;j`SYdAI8>yK
z^h6Jar#1Bm5|%=d0AH1#qHG`*So^=%zSX?}J_)mPPZkJ5e*iv20zFMBLy;NKwqKT;
zNzbDHG{x9&wILQXdQdZA5b?`N%L_|sMW8U2L?%~q55M>tuR%723%pEXP06CF`6AEk
zKsC3ICGE}<$72FWj~Sj@)u7h=U}mmAYipUb$rI6zqRGr<f@PAs)2$(|CRI9scL9Zz
zg#7wqS56cATd>saDc5(N<U%cc22+kF!1E)aj!oPIX#kMMSnAc@2V#jdO=%&FCaL6O
zCRQIC6)il2i0pDTiL7Mye&>A(yUSWNxNJV<puCPI)}mtGu@r0S1Y_O7kR83NtglYj
zFKR?f+8XnlkfPd8$S5SHLk0fpt$M2613ocGm;G-(fwSbe1(z@#9mgB%F8AJBN%aCs
z!C_az`%1m$dPo&fKRWy=W@W9kY9bC_LsfWAPL4dJc#jC(Gb~U=QAP9J1zsMSacv>H
z=0=@*)yPNyma9Z_0gLy4hK`AUZID(y2-r{ix|S-w7-{amUW5F|X@o2HRL29La4mm#
z`ufPmX0;ubYq?+uxA!Osp;^=+KVs(#botPV&>@7wCSk`1EBRHqLYU1nubsc`I%FKx
zq>eIp;3A#V>yLo05cuQEi#e_J&A-I$3iUmV?K~5^H|`<LD-_cD_J1ZX!#izEa-L<p
z1uv3oOm)UI6Kkc?vk-;BK`5Wv-@t$|0CenO>rk139_0`>W4RtG@o$NeEonqw@~z-+
zSyWH<I&6mc0iWOdLvvdj-Er#pw5@yJK+EP|mPtbexquVQpDZ&%yCS$pFISUmQVE~F
zd1U*a8?<BK`-ZB>yStN04h{}3Y7xNKhTKv~G@l>#wwOmqgKVyvPGMZkh;soL9FbiK
zYg2Yvi3%`CPprC;o5*cNdz?(si%I70qIm$&;KP<so!L9H+GoV)+R^&t{SIDHO4y>`
z^mnz3E5``)=RW<nJNF2Z_Q!|q4elwdJ}XPgDOQfjq%d*ykua{Z-Rp9xGC(Ur)+jJD
z&KX<})5n8-%+V5A=I`1N1voW8V$#QCH7-cGO35v-$~lLQvZF~9b>Bi|86`k8Ovll*
z_4h({pN`fu?qm87JvZ+&IG}B8yWOL&;DC9%nV7SikTeM1#zS=W{(fW4bs=s|KTwDd
zh&2gn5)zk~L_NCLa-15y8p$^)nu7#jYc(ZrI7yRyW!O8}O*(eX9n13b?=l_UGb5c?
zC{+G;_?-)gbkN<GbErII)qocd1wF`gX3zu*3`IgnVdO0~n4RzDp=ipNN`{^xaJ9zB
z&?2fBCfC@^5!!aOWr2JP*jm=j&gQ|${a+R{BZ41LP%?2mF!?ZkG}@1%UF=i%Ka#F8
zDyp{aA_$74NOwqgm$Za*GjxM6bT`sGba%HnG($JiB{g)Hba#En_xr(G%$Zqh;EpTz
zwRe|(P!#u^{#^locx%;di7)@e1}Am{fDc3k|Mwtd9teHAv_q$`97wzdy?Zhv5Z0NH
zaJl1uYu>gi^)--xvq#B+N}$}_+o6TX3g)V^OmgB_Zw?^c35>=7Cjd|HCXynV&U@zL
zhg>UM1rWJ-4MsAO)iqbU7z7_y@fjc2!137cZ9M!6X}U3^sN^3T;4byd>)ig$U5eQB
z;6M>&i`O$_M*+gKyo}b$gkE<BatDVp{1{W*$YG3(P)>gkzq;@_b&(-x0Dy;l9hS_<
zU|+B6o*s!XKFp;$T7WMvu-4r^5U2^9uU*eR5ag2#7wqFI5LA|q-A<P%<udK?)q@W{
zd<ZHEUNN<kVx2OP|1`6y!}+QH{>EadDEE|^Kw}(*!B8JDUG!M)k5oX5D*A}j$qTEo
z0+8QlP3yn|kwiWa&C@E{!C&qUMFT}-Jl68I##-U<-Z1R^@|O4BZmc2c3wA)L0T3g#
zX-`baIIDj(Oig8n`FP&?zvi52d|+Z?0%`=i6}mF?4AS~vKLglJ08D49{`nwbO9u1X
zgu=h+!HD^+fW7;w+4x%>5_-kf_<Jc*e$uzRvOT&f3=GKA5;5-r$}u{9T=Bkh!g{vU
z-yW7BH^-_MKkUe{z+kz8v<=LHUfGykBw?9kZzj4#Bu$P@{aD63az+Cd4po}=3xBkZ
z>z*Z4hR>B`o<IE+Ke_ET+9d-m1w)xlA0;fe)bZ^zgS`7QJoe3FAIIm6Hm>kflyWy+
zzyH=UjXr4zu}94e8l=uO;C!Sye*aE8y~RKO^PuvXICih7SJ|5n?Xf5ppzPVRon_1-
zvV)j<s+IGMh1~krA_s-wFtT9xzqnsatGX0mQEmYQiPZ0;Z%jOb>8U=;ljKrzsTAF3
z%2#V1Ip7ar+{7!#Uv3cYdkiYvkWZjTL8)wMpU)HTh=E%u!(7?aY$KC8Sk<>!OOd@+
zpA|bgz4!?{hLUsHfp=BMm|xj}Dis>R)?P~j;|cqhk2^0$I&M61sERo;k0J6oThKSy
z>Ia8ezU+qSBo#eazv99$KTeV{X_EfLqohKBdfL>O3OYZzd@~aC)(Z-TlC`?^wU#Q0
z<*TwQC>#T0(r<yTcg=``!czO=2oSg;+OWsyk5KN%@2FgDjon&}risO48Cg`M@jpPQ
zalGrit&;8ss<cnXjQ3^a{M17_?})6d7~|5L%V*<L8sM$SQhTjN_&8=#Vuo$UIMj|;
z(1w{qz3u4HNpxbKAGNx=j0Dq0sephA)5{C2hKk0sUjCCXDw@x9u2O#qO>V@OZN?Bo
ze?=o?v$cOrUuJs8)b1)C2R5IJ#W+&%SF`QWf5YRS;(_BO4bX{EiBCmPSBC=tHjpYY
z4J)Mmo(q1~PXIma;LWUL#HGq-!4vUi{c&Wv%YXAlPD1{a*<}&h@602h5pg1MY2{Qu
ze#TYbo4m0&I2r{QZ!Y)x8hi&b=p5Ge<dK%2-Z$NU3?K2K#j?2(YsK7JBXjK*Qpqg|
zNs~s64{`MDh7l89P$?(gegK}wld*jm&q?v1LV##DRbi@jm=?%XFSI<rsXBbdtXM%Y
ztPjnbmsUHYyt*kPpUEjB-x{?Khn*k-ZyO!nytC?b^Gketa~T6|*RQ@|aEV^;yWGSE
z#)M|IBi}~KE9swuBI{^Pqf191bT>Szat!qV05Sz_AM1HG9ZHeC0=$y_gzpP1(d?IY
zwqp($eZO*d*}d<X052XxCa$RYwD{3t^ING<T_8>9l}uD%<4_L{=w`rzaZQX5?0<^<
zXAuN7b}7VjEob2+LW-w4kQ_m3mh)f#Q716zzHCs2hr=D{Xf9x)@hFBeuRKzYXA4lX
z*;NRT!%4dz_l!0>+p7^oeZ1hbd;mz^!#@E03J>YddyD0N_oGwmuky>38|xmYCnsyB
zU%#xEVGpCy*I2YD8TjQTffDz<jAG;lZXH1a<v(0LYQN$g*{Pfz;2<)kTy5-01GyhI
z-+>}#6Wxm8!(7g5kEN5M_cx)}f}=KLi-t=cF-+h;Y0+DKRFF?Hw)Mr7l8X2P(+hT9
zWR&}D!km!Pbt%bA34r2oV5@z;;f%3dw9J2Od;$6#F0Msvys8XG+_rHADf0-<;mu<{
z+Eg>val;41kio$TF-=9v+xuFdajM0R9o9b9lf$?zPBebfPRa>Ox_fw>B1$!&MWy)F
zfZa2s5%5rN-zk1VslGU{PHXoHX-{RPYOPlGQE0&E%x|bnb1@W)$G`&zus?=~GegNy
zb|4$eb2_h%pE!g){?i}&L1vT6!z#9gXPUFt%o{j=+d&G>aTay=`u(m6QI)yUZioG?
zd?SU!rEYNGdWzj7aV##xT;Q}XbIw0#pXaS6sl?Zl!=JAr@OT`1aT>>gP;Z;=JqB}@
zcmmjzulzTVoVTAmJnST{0Z&>x5o|7%J^?HVNT6OWi!YoR&>l(Hk!Vrwvw(%V-PjD5
zlYEZlO+IEo(u43bxJI*So}o=<hv+ZingXT2<qc}-7`wMCfx|+%2L})cttAY1bNhUD
z`G$68mts-$O-*Q>ypHRbtu%y!{rp`us2Cn(TJvMuj0={Mzd0=t4`Phuk~Y5b&1?Cv
zR|ddHlRLfNDbakooU1?pD%X(vOA2)G7`yj|xD6+Jd{aS8Q&eG0_DbyQG)OHqF_YPx
z_wP<Grv++UZN=yuf-{IiweY^j(S2WLxgp~NO(Hy5F3gyjE*#$5`-9!Qs)PIG_thF}
zia(S4cWYgXn-9)9k^DQnE?UUli|D{4{d=L6S<klHOoN30z_K>e;@OVjP#3iJkq9OO
z6V{%JF%-4G7sJjham**@crJ3@ld^M*6{{jra<M~i?uHV@8@a>I&DDyqlc_|`5r-+q
z3nSVwxgqRjFDBs`J)-fnWPa7$(wbcwGZqB-G-h1o+RiG(Y;wDxUzJo<$cxIl5odXw
z)G!?|01&io-@g93=68oCS!{->IcMfrvrGEN@Gs=gX7F>-++x>3bpHWyn{X3)RT-zF
zfAN{*>b2#|KQSTG=WyZhYu}*$GWw$Dq_?p_ebWPm?|5SUMg8q0`xg(#RE;b6(}evU
zX<|IG#0-8=)UL#mAL8JUk(E&_`UxJj(R^DD)9sQCFx?kBTRY~Fs`%U!_2h#t%h9Vt
zbI5}X9=dgluSw|%gWk1nZ&8QV;o5(zm;9#vxxIlY!4Akz0r{iUw>2Q5``+*!34ajF
z8?b=_$Xg3na$-|VqLo<<yO8rVRl++JW~-tP^dc1g%xcFf3|~4P%_EI-_~Y@;>bJJ2
zJx1)~%25SHH#R4>U(FfiK5$IkZ8*<_>{KYmh4*D#&lxi_*`z3!aZ8KCE2{*wY{r(!
zyGj8PNy7yd%JCj#8vFKtl;hE`vEe>`<ZHCVK(@Zz*@nYKkrWnAYqUTEq${vrUUV5C
zDs<R`6KMezp`o_#h=SOU{RzQ@7Z<NG{8sCm-ObLA-_k=8@A1$?!@|G=e9J%p>mEfL
z)ScHgR^bXvF5RB;FF<usKb%w&hP?arGVEP#Gn)IFJYiP4n2=e{fHJMY!z!<}&~{c=
zKHS4v&JgJYJQ$vDF;_W)f(Z)&JFS=nf;vYY6cB49OB$+c;FkWfF-R*YuVrheuf-tI
zaaNphR+rX6+spL5R!#w-pgN07CWQ!`I(rCB;fUf#OM!u)LC4`>G#xO|oNUd(Gd);I
z(!^r=G9oOPgpo-AF#0nOG<To*eZ!XqAwtHo&o<ciZprj8!VIKFXD}q$S4#YkVp?Wq
zWR#HijnPO7^L(v2irWeH8mtct$5DIwo_ze-7lUQKU@G_0e707Fh~vkV4v~Z(+>~2k
z{tG%B5`$CK`U1?VhtuYR#JY{$`|Uq(G-(6Y9zza8s(LcgM+Efz&3`{HJoGuYy|1?Z
z1e2wzqL{r;gPSSt&ahvn3E28;VI(;Ig33i{$(M5q^lCqxl8U=Mp<uy;Ie0cr4cK{W
z6PJf1?YB<i8}@vC^d?<m28WT0!DiKe8GoYoD*+lA_n*;C4lQE{TWx&SxJ|@vE%6K)
zg3i?x>GY|1lR6?F2`NXbpmX;c($b}u-9d-tP;P!cK}R2MHygtUxl}i<Yh}7w?#6Z>
zZP$u`7ajbAsvrQ}asy@p>o8lq0RpPPY{68^#+!QpW~d8gIqWy!5S(@h@k7%3Yw2)4
zO#hv1s>@hN$QvNycrGc~)p<8#>~#J)V@a>Wt>t`q=Q5Ye#?~!jA6|$B7d#f9^mcpa
zjk&p~E4Q*LyqP5eJNq(E8;FR*ft&+KpzJc)ytshFDd2v>R67$^Hg9JQ%*;-v$+I#9
zP3{1PlgslyMD>ll!D_H<{#7!ToAB|u4oPy7fDl_&(u9%n+0{>(sM*?ui<w=c8oJY9
zsP|(EJYWXBBY%208eJU$?sB87XvQjW>M1cZ36JaS<+`6tFgfKGz@96s7&J-f2?Esw
zZ3bBsJd|u?Lfe|8C~g!4paV@cI!2Uh7q!jYLUi8`!vB2$oL#_WPW?7LrkwgPrPBM5
zh#FnnEh<4hTu{{rZzHIz7WZ~03a3lzI_#vjTj%%Ma(eh!W5(0_B0oObo3A{^J#SA8
z3jh%#+@+h<#I?A%0_wPAZ!(5~J{{2+3oKaeRQ6i~Fx4-VGjnb@njao;4dH%GVg4yx
zKI7BM2`O-9h5!S=8_jn!m&c4x$1T8F+y8a#fYu(NWZ03{)J7bQb{+n$l^R<eKxk~X
zOt8)0MTf|RV^MC7lb;tNCt$Ih``paMJsi*>gUQx%M6*u6eSIJa+!Le*J;sD4pE`gZ
zo`zO#!`5w!wn{%=5JC`W>xp0&&n$5@yI!I+Aa7qk<mKfms+)@^+-iLT(H6{>mc&j$
z_BSq5ZlQ@dmQG@6{QED-iAWJ7u?>d_><zj63=Lx${HD#1g3e2!mj=>ly=NWV-%+Lb
zk||ovOFiuI6nGpz#1b)>EWsrIOfAAAUE)J*V??DbB^8_n1$=L<S65Lg>ax=BOBE{-
zfkeNg<dH=8vW=A%4S%=MRbHoPT)sL+DQFGG?vOE$*N`m`D2B;b3L%y^<;cy^)Vejt
ze2Y&axPJb3^-O~xI<8Rd<4?{{!rnAmV5{6K0C1#qPu0C77!=IG)2hPIhWwueggHZ)
zB-gN=(l*l7P57HRo0p<~lf!b6=Ov8{(WkvJqCzv1sl;I;8Inh0690SQtsms?ulJ`@
zWf!1U_5J`UU-9q7#~Uv|f=`X(bgh*9^H*$OQowVm4wST1z+qEai9Nrdvi?^l{jNeJ
zOd%6DdZnnITphlH4<zV5Wsu$dXQ9?!?g!U#<B<k>skRROPfmP+v5gbYmE?N2(y&=h
zS0o8(O;DYA9XD_mog_wOoAndKv_i~b2LKxLJJ+JLBWRkFL&|tl`_1>f4l1~JGdTWV
zfrgE`(Fn2$yaR%0o^VoI=VBfy(4urr3l#1DB|!UD+s4*rwN2X$qT7fL(8TP7HZ`!W
zgi#()DL8Dt@utKB+duhBIf=30ff4`92t1|uMHSZo2Z!*377mH<@JZ$3{$B)_Pfmg5
zy2CG;PlYLjWb|>l41;Ftrfve1WzMlgtflwb%?a~T->Xqc-j4+4PaV(=q{SE8^Uh_4
zb;DX7gtB^I*ZhDt!@XQU39R5x$W|&WVIhUXfnK-9C$-|b2lZ3XdC*#sg?!Xn!~uH>
zFK(OPuMz{Ho!&~-R^hC*s+(<RG&SD0s@1p}-0M|w^1AciI|8*5_cc7COuyX>dAe^n
z2Yxqb3woov`_mrr9m?qPYdfD#8*!vI4&1|rt^HSb<jVP~+DV6HFKc|4R6#nVNGswb
z|8S-C_0wtII~TZ9Y}nb(zl@El(Rp~nx~hfz<QDhLFuxiiiT&n$4-Y??kAVL+pw8MF
zpv>a)JHp@hdudv27ept-fA6D+BlhOAI(K#8q$b3-x~}(~pkV$I;lhhj=i&ZZu2HqB
z><@zPqv_MS!*+l2faAlIk|n1ccW0+)WU#k;W7DuK@y&Fel4|ejB_+4pqBtazhn|%#
z70KY=AFF0a1n39pVjKt7$EqyUAbF2gI&{w1oum|fsy{~{0-z{-OIcxcW1ekAxqXq~
z(q<94Ppm8?_V=$O(?mcPn(M=Ac_us&A4K?s`OCIPr;QJ?|CcCFz=aDL>H4D(946cY
ze7Ll&*xO+f$XAS<=mybmPn>X8a4+isZ&dYCoyQUgP>#COh)+ofol;U#PT!3<$TFHq
z{+!Qrf?L~z+7~khR%p8-hIfB8RMsF40!E(zayF^^0dJ4vx%5bGfbsDoJ#RCJF;+*>
z4<pFiVZHAJe*5&THS3%ER(_GNTZByu_>cZ^Kl+K#C`8VU8}Y{1s<A(?_YSlgU72Ni
zK$=G-l(*RdiodP?x;z}cG9e2kDTNg~yZh{ZDTW_k)h#`~f!q!VRkIMgZx$rTL}jM^
z_*B#yQ5<Ww%^?>(tWZXn(^`UMO-d_SA~I~gzVqw=O09ZYmQY<{`g1N2I=AgCR)h)p
z$w|QHHWC^I{qMQY^mthE=+74l;W{2~F00&9`=v8<27mtpi^GUAId9I=Q|1O^;_iL5
z!{$91)2;R<mv1;a87M@VODk=j;@zQ+Z&O)+i5uFZ)pOzfn->0?W%%YFlB~UjvmOT|
zNQ-LFKV53NHv6mkWD!SNDH|Th3f`ESvb~3Yhl-Zp>he>$nqWMg>Wu%s-8_$SnRIqT
zu?)>OS^(zFQ7<kLkc54%EcZzdRz<U|@2l{aQ9VRR-19fHda&;4LuILdE0Ox}weU~u
zh}C${ORsMWDJwakL@pX;8jDrdFUPrZ*00PpyT+BZ)4R(p0^nn49M8Dnmp1@phVjAr
z``DJv74H^y;^my9%MZl;x4uWXdn4los$B)DXC7be`B0xi9_xzEba=3MTU>(ILTijv
z=sm#o)0se3?|PUm<<_(EFWJ@vL<68lRQ@>wa%5|E+X;p%C&co%>mhuTNA@H0JA_rj
zHARFWk+hI0C7>1`tnT9#e89T;9m0&{K-Oh+vPC%6f_&6?G$WI4R6%#supS&XxWv($
zkqE}{c)X>?K#y(u8khl;%nWaiXduZ2G-YIDFh5*mcB=yR?RNpUvHK1>bibo=Y=Ua0
zEowlmN41!S!Ykr#QzR@fQhyLC%4vS}IZ;f4tTAHEin3t_rDL?Ru@R%J1Hzf8QLcuD
zw+i7b$KOuA9*8d|xMSPykJDTbU{4!%nYN4CBtt(%2Sa~j;<2ndtF9)r`k2}j3HY-T
zP4P?kbT8%l>AqO*`TuU*zj)Eja%au3Dev^LLK&?*?%h>DaXd=Hf<R)|pPGyROl3{<
z5pM1Nyhq(-2kDai*j+&Uo?hIkSgw=O#!DmiWGaWLYm01hcx~vvVp))9WW{9}lMK5#
z&fwBrst85F)f4nN-?Yo9IM#FpAKFSe?}8?6Y#VbH8&8`iv-mZi@*8ay%>TW;I%uRD
zH{OVLlxL0AR#1=uD<47F-25>rPtJ=sIJo|#r}JTE4#lWKV3a!P3wUO8*<I*)X(i9e
ziKzGpX|`CEPN?{|&hN(Ggprc_O9|SAZ7-~*$H_m3KbFeLQWR`%n9nNRve=JoqD_No
zSAgg>nW)6O@V@ce2jBj_C3U1NS?ln=)D#xd%Zw5NSuK$I2ZNzkbR@AZ=W~ajHMnhH
zhLf9TWVcQi$@PYB0Dio=>eKH>>Q0Dz5*djGfC#~NWb^#J%oGldBJ-?<5u3t+5Z=Qn
zzs<uI#r#18SMt8ze)N!`dQG;D0@xzsW&Q5T`9W{2k5Y~4QHQ+!-)wI0G?ae7Wwj?%
zb4})C6I@n?0|RZ{&APyNowzW%!+jYuRMFK)LlvU=Pp$zXek3qZHh&`L>Xp>N@ymP8
z7ZNSI{m8CGO?;7+&!pfg-0qEMo2D9`{EIpwS=HR0MN4d^wlK=iuJPgUa~W{fD(O$^
zvehJF0MS-alQlfuJBP1-{eC&u%fv#_G8XMXjCV$&UX^-bLU;A$OIiccrrg^_URxv1
zPR7eh#yONVG{^FzfLN+!#8?K}qi5HYarRzBF52QwZ(~o!|KRDXfs7>wKojImHVR|D
zr<<^gt7gxX-(wYE=v_vHq(>{u1MI|lLoP>}LDRF^3)YZlB3@PF4LUDj5aa_^TTd_b
zIES=CG#u<eV(sCgit1Tk>GkDpkb<gPkO3dJx0^eC4eldz4em#FQ#K{uvI&0z@Y;!-
zg8xXJ1z5rr+ZXtr;Jt*8MwoB2=sUlmL3i(}%>f0OnUKWzCGOcYzzQ5&CjlGC+u{%`
zQm45P45b4$@bs>6z3Z-rMZ6j|T!xu733@(jtm@Z68o@^-L!4t&h;fUD2PYc&s&T-G
zv%RTk%n(%<T2(N+o98XVvOh*ZG1$H1Rn^f4#_F09k#cMZF{%Z8a9~{raI9m-MMLie
zO8R?hcIzcMU|FdSuvb)-uRE5!9%09uZUHG8r<iq=|55!>4jL{RPz_+7o_indY7S>3
zc~X~eA+qmy8;HG#2JXw(8XWkqkH<sll$j$?=|r??O!AJIkfK39tr^`()%SeT35NhY
zdFmnSerC)Z@gkMsJUEq~UDua-a#y@|L6L1KHwZ!WlY<Zd&FzB!IDVd0<ac}Nb#_<*
zbmPDfORGZD)+{Q{w_gMf)s5F%{ySMQ_yd(i)U5@hL5S7;CXO7In|8&;f%=8{-IYEA
z;S>KZVLG?xJ+mtO(Q=39rC&S;%I&$XN%WW|{t#z3`I#W>t$ne|mDV<EZu2-v;9vhj
zIcYxhLqyoBRUmocP_y$#2)k(sTlIY<37W+Ky2Df5ocHgwBLi%=ikMqZ7byC9VPV@(
zA}(=a`3oQES!C3xs*|g05cr7v2Xyg=pJ6m~c~3v?lk|x-OH7TV`~~fQ@9T`@182u-
zu$F{;Cc`3Y3f_;S4wkJ`i`U%jKC{Y<%2MSIOPW4tiAR6(>qn4z<etKrL^~+@uw^-n
zRo#G!yDH&$xT5}6ig;K2*zfEueM+1+d>*N5A2MBRCo{J7&UvGXRu)_y(vR%lzA3cz
z*mJ(Kijs~b!PtG#t<_RYJq5Y^<i%ygFA>w!CdYEyrsz|sy0BXL2oyUVp7Jl9bQ=Mm
z)>_IdRV`pneJLmS)6a9jO=1i;v@4f8YwXVm=<ZKhOj?Z0&<tGo0uc0W9?X*90%&dE
zGNIRjz4J<2Tc}%0T0f++{49CV8sGniTe%zG#|Sp5Xwmrsi->qz({CY|DmmrsS$%Wg
zn)Bid`S}fj&6S^@nIYsNF-f~=+dfk}F|%tLjqrs8EY1OrcahFvb+rJn62Kt{9w^v&
zzsfHO@VO}z-f@cv%j?_aG@XOrWcFt!OX}LO0Q2vuqG~6|Umvf;UPg7aKf!u_cLzT^
z*;|?awNS6y1Bz>?2cTy-7l4pGK-Bimz6_b*KkFMk^$>=FQCmh?*a#drM}%CYfxre=
zX5yQq*#RDXHP1&F?|_WW?YgHSOTR2-6=ihAn+bOjls>?H2ISrDeJi_w<uHDNge+cB
z9N!MpyT*e!Jxf00f>RADF?C9|Y@dkf=bmN}G12o#(USSg7$YQY{qPSWOeU4n5%SPQ
z+2ELe-e@IP_6oTnh`ZOL!1TlcUlQG}ruYSB@I@3D4_Reol<ChHp#GgPDwzO8*^uJj
zl+dQ-EoaHTQ=F5qijj83A4HY!eDWn^m@qqBWcGX<F?IQiEKhO#-O?%EfGO5CpWN>g
ztSbN>mL@wW*`f|gGu-s#hCFfJw7U|Z%2Zu6eZ|at+kNps0W<*MwW>~fXMb5Q<Df-F
zC)d6*?ztH6qyc+aAg(8AH}1hh0b-0U@?SrW7NdL)I}LomvseFM9-9O={iQtbkHYXm
zUM^6r6qhI+Ij@g>jp3$9hss29F55^H^^Mokp|}F|RL7Mpn{wjYDkB~Rzx4Tr1E<j0
zc+FnJwYmTNUgdLjTeiCVT>V^<cwB=*BZ9uAWjgZHOQ_~iekyzOwtQsg4rzahoT}>`
zH7iv4;faekBDaiu;snnQTSVvEq5<&a;>hdYgYCAHLG7TKU%XCRRaC`sbqS&#7nZ;s
zG*b+Y&NhRr_``Bh*xmBreV*P$1pf<$w8GdwtJhRM14trYuL~5b&fUilB}z80a`;5c
z2;c(B(!osXG-dyT?(!{gDNZ*3Bpw<mnfg4S1I=9wR9oJnq(8E0HHyZmq-a9l?-4Wk
zh`V((*uA)`ZL-uyk`*SU^X`W%`PLB~`V5P_R0rNA;a(L<fyCAeizIyFr|-dnWxp|z
zSMnq`$xFD}+$YR?TL<Ov>-t}C_e78`K{P;eKUaAinlmoT0t0w-{tZ@uGENO-00?Ha
zP|3fR%}=!mWz7r>jpV-S8vY0rJie_tR8&~$ljRFsY{R^?fV7m(5q1Q$o@<-|F+H6)
z>rGZcleRW6W9sPG!wFWo@@{*qifJT#)>nSrP2>I`sSo5@oC24-&vewV+74=<$1_Zv
zGpcjo4nh8wKA;<IXTaA?2}@{=3JZ3$ivMy9`_`kQ)_)`!S4RP$LN@5l5D^%Xb(Vv<
zQ~1(8ced({co&paWZ|+hLS|txpADG`nSv|-OUu2(Ca7r{yxETh#D^rsh67P3yj`|g
za3_ceYVhI!8IM0oKUIxv;ql!HsT-Uf2+46RpUy|?@sKqf-CzDy23OrEj^}i2)89jE
zLx(P-0oA7SKI?oCW99s!EM$o0;1_y=@LKCpGe-zvB6ZlZ%%=-7lo~exx+K)jYoZ50
z1xq-jZCaDKSDN4+A>4%LUKeFw=1FoEQ96{<N7v=Fl%ygvzUdUM7O!@TQvWw>hJ+Hi
zL*-YF_pV0B#TkZvtY(7eZOHAajCd++C127hkofb)-e~M;(a!FeOCsp{PkS{y-Z*nN
zaHXp27pl6t7bg=fELt5Nwh8}#cwDZ_h&W`ZPvOrOL9z$0!xv6dm~7#GNztedWM@qr
zFqsI+$yqgE4Go1ztW@V0W+rTd@t`p`mdKLBi<3^uDW^VnvFFTx@#edtBP5~X!lD@s
z+4&vcrO}Kh%AA{pwHg{qThecaGc%IBQiPBiD`wM=60<uzazWgL(Yu?k>SP;sQU!lh
zW`bLcROs?2zthFA*>4M}<h@vu0b>k)bg~8MMJN_J20XF_1OPeJLcN)q@YJWu0yeW$
zOvpz{Do%ME$ejmpv)sQ>0Zbx7_Z1o-=cyBEagF|8+CWT+5ZRTT%>3A%&!<NB`!5S^
zao3_w_fFwz^b?ITxN=LA&^P(<{vpIRksfAHt%X7=@v|eLX7?c~2+Hg)7Y)6TXjgWr
z7ZIh#^s@c{R6&oTW`3u<d@sUk0#{4^#S$HndSPk^T{MtGDciS>w5^kUQ8Iq4v^^~j
zVKH1(?bZDY`(s3Pb7T-WU8)ISlgZP78Cak;BwtnD48$7ZN|p#o$+%sAzGL8znzHeh
zzU);4z)b&fZ(<D^5C&ERH!eze)V63v2dRvb{ZM5{XvA+FPcC1<wX~+7HN<Osx1ix6
zl6a@)pP$q}6h|h37#~tVrgf!N)>caNFEQMcjl*vb#fomV^em!bQ|)7#salB~bvL_!
zi6h2k3SC02=_zpwC{T8KxO>wv1%IXY<1B$1_F<DOE{BThkxJGi4LAbXlBq{DY$M9V
zFaUG&wTU?{yqcD!YGd0=!lYF&rnB(_I2Qd0ps;l8!cI3rV}j?^(7o}t3^~(4J-J^V
z=-WF4^6`7G{B&sj-^4QcS!ve>9_z^1!b+(^eFsgg!hprit+H{LxOv1I*)5iM3LN98
zOb7wc*->pO0T6e47BWDG2=5<^qpRWGWQp3IC;+K<A3om8oV%2-fnVXT+iDq4Mu=L&
z9HKJR=eN>kjoS*A;Pv=_wsksoW!0|aL5q)V?k~$zQh?FICvd8EtEG1?0U)X4IT`^u
z<1FStk^GmIy8v%cjFf)pbSZD|s0}TP{wln0I~3^k=f05j=x|NE{lNf7^3^1|QPj?w
z;cP$gPQ2Ns!P%<5&!&SQfA{~l!U+>#-H16H&79K)9Fh4NPaRF^;53@fGYPoD!@n;^
zyKviy6U-ISl9bNP>bRaa`TbtuSUB9;S>={)4Keyf3<esJbE24&7%?j3>(_*bt)8{B
zZ~~CiWvvL4M*FjaimGkY<-+cYp2Z+$iKe`kPA^JpssV(2k)hA{kJ9nv9;;8~aK8=S
zhOHkka@PQ%K!*w)?4oB#Kjf#Q^dchoXN~kArw5fhA{!2NhZc>pH%U2N^=VI&H?X>?
z;ZTsfB|6NF30vgj#^3Up3&F?n&&vWX+$XzYm%H!l1g**d#ny?-1{lTaqhv^W_JV+`
z?viI)&D8`8w@Is5m7X@F)^b|0#uO&?k~P{o;VZw(L?YNqw)FU=v;tZNOz*&dw_*v-
z?-n2yYD=i!968?_E(PkMX`@?s%m5zTqyUw9%yqu#3)w@<@N!gEe7wnq|3({Ho`iOh
zCpAWq3Gi6}H^|)$gmKaf=;Ro9`JE4beNVicVC-Q6`c|>ngTH@WlCZ$D|5m;edJmUk
z;<Mxq`If0&IGpUXG`Wo-_aC<*^4~%5Fr*!CcDElo{Uj+!Vipa};u7hoq_f8!SpALz
zlPzG1zga*_?~aV$niQjhiIZI?0z!VPeppK@etbnZphLJY9IB=?r^ROsLa@-AYBMY)
zCS0H#W$$7DXTln^P<`9XLJFQpdYfml#VHHNO}2I0fC9tXy#4S+>m%8`Eaj-<eYY!Q
zb{1z*h>kvq)!?@nquO@xhZNkQLD@KTa84yL<XDfgA$uZ9*z4G}66k_ESMY_a&?m9T
zNxPA-0ub)eM!t#cX#>>>=DB?6drL(?O8I!6-CSrq4Qjdzlq8O(K|$Hpa{q=R@W$<X
ziz72LBR1_`m0W@}0lTvK7<3Z?`8NTeLMX|)<rx!vsx|7*StphMU2Xx*3t#jdy=4r{
zUk*|ON)iH6Mtb^7zo!^(0+VPOt${>s!GA4oZ(tp5t#1|8Gxyx~?qGLZbBWwA4$dA#
zBTZ~)Ie6Ie5Z?KB#*>EnEPS)CxnCP5M6qBXjCV3$=cngL9j-lTYgQ^AC5rnqBIPWx
zO0r^Nq)mIh(*Yi<Ae^FS!x@3kaO`_VJO(xJ)JC?6aIlm6A>=$71~I69HEwbq!<il=
zPRIw;inMb{3qXZx_Ahoc#cUgsaZ147jmEp5W$s0#jKnsbPtK`6g6&uSd2)=_Q~-%f
zqF2nOZ%SXRVoHxlY1+Jev2r<(jWcJl#v$8V1HJI~k%L&}WXA$Lfu@NU@PLne7u`ZQ
z$AoSJOhK`6E?xJ8I${gXrf|C^vH;YAE7dK2>mni0TDnM2pMm4qn=Tz~Y@sYmK3V4V
z`Ta+Y%e7{<Ti>4ydw%{@hzXm+SofWP@jrqoM#j(FoFK_6rnM{|*{5nJ3If9{A8~oA
z=G-Ae9CcD}h?4~X1*qzuPIyJ55X5hy(hWtZ%dMpk+dU<dSI4#eI$mxGqVDP{5E24#
zZq|MEuGk4jWG#*D-dAMd(l6o`XR6yCE?>`r0;Y_|<_t|*Gtqki5dVnxicFeUxuB?p
zG6Kls(gMNi)glZL&&D4ID}vWJ9$?A5QkR4Sv#zpYK_pU|8uY9CUz#-6o3jv7$f+Ra
z$BGIqxOD0aDOOfc`nrbwO-beNTo8WWxA(?#88IY8KI0P!gkVSE6X5u2pW9Y9c=eC^
zj_i=L+*D=Mm`wB_XCy3=7zkMo0_j}JF8t9-JHDVBQ(%5K3!6Rh8gLr(t2%EIfncP`
zq5-c(AcBoUIXHcR1*9(mN7Wn6_Qx>y(U8wRRciV+;WZCBKPL?0^cQDX`)I}e^r%sn
zZJ*E8yuwtj7f>&U95T7B$)!JfS!6X)qDrXE)l6h8y?gy|%L%>!at?A6lkInY0~t0o
zxQ-@66AH&s#iNiK>L~3IYwJC#as>#jXPfFj+pcX25Glm6%2`Ag@Oe-9dOm^V&bPf$
zCEmkyD7k6hyx1$sex0x5&2hN&X02I?ZtX4ZUv$3A`7F;r?TtXTH^@ZVo*}dNdacih
zNWR<ip*ORd?i}Q-iqn<hzK--p)K^Alh6VH(*QC7O+=jrrS+eF~7M8j3BH;_Lu8s=&
z5qsO(ECzD}wO#I(7C=>&&&Y`o@#DYrkb;B}t7dmZd+8Fv^|}#IvRL+OeI>PZxbEV}
zeMBl>#~7jd6^LP%#_sX@G_*B_QQ^S~iN4RrIdy*)+U@zzHp_XqGlILK@4Aig<Jmas
z4#cQ>pamJ6K9-1?vDGsBMz6VzWDlAuy4N$DVDCGQv@!ql=vo71imYDciW(UByO3!?
z-uE;aP4(@xZkT3%E)(bFQ5gRTJru5;-I*<FPD3HsO9JZ7G%uMT6tv>+&KzLQSHOfU
zm@wPDUKs+HV4jPg6DU?uydg<fI9`pgP8{K&vV@sbVk7}1cK~n>%T|)~*XJKlt<4(T
zUhGJKkJ$-e`v8{P*&U<J509L{^~8OnH-}z-0X@6pvwVB=W#XtsV4&oB{GNSNE5tk@
z;J9P~9@E)8q+95V4m_*@*@*dbnjR%JZ_oSF#9b%~>`COAiY+|=r<Mq)ZFD=dhVLI7
zq`97vyXkkbU>nn(@{<cN#uCAD>?H$j&(k^ot^Zga3Mp+u_00*hY9wR%Dx;#(gQh9W
z#3iYPhSObm+)4PqFI6amx3dzfx+G?;Sz;|)Vx_xohNL7dsmD%)p7ySBr=_uNjd*c8
zK7{nVGX^DpM<361v-ZYw4OL4knt!OxYx=jt!A3{j__5xK{XMK0+h~71(BQ`ZTNR{v
zS^h3#WTZm~R)#04Jb88~JToQ`dZ3?CrZ$};4VaJ3qfxKpzxaD6cWeuL`#~R8&pa;3
zFQJ8|dd_XWUY&97t+#cLJ7Y@)hMg8p93H#gG6Ze-m*BOkjAMss5h(Zy;kqy6RAV3y
zDmJ&Mrcl>V{(Zz$$X(u+&%8_n=(RHF;K*ArBzLDxhuSG4DC!QUoq`gXVLh`rNdIir
zcPAK7h3pSU7&uvJ9qBWN#gJl^ofs$rLX4y!#)wY26Ic|Ld(bX*a~w+<|BwMZ*k86M
zLyKIFvPbWfDXjI@`M=|=b|0Wn7!#h9dG<u^_mr_E=CpurpUT1ku!`osX)5LmDD@fO
z6NA+BZjiDF*IC?|wZg$R7Y1ZbomKzt10&Q}kEqSN1~cZ>Q|)J2I1$a#u_l?#%`!ho
zI=xe`JULe%!fjdy771U8MbM91(E+ir(Zf=EwTSYUtMt`@V_hTWBp_rfP!&ebB2yei
zjFc7IPDfl$z*VutqYfp}g!5i=G2V-)S9Wc-g%fzn+-u&F)@)Y2W%*XBnp(mod9vCr
zCwF_IpW<z_b`ZO}>)i+}48UewUo@G5Q}(NBP+7|`UA(X&+{QXrv5=Ym56s|kbIJ7h
z>_>*_-Y@W6miV(_*pKmgDVLc)fC_J1;iMj5ZaW0N*P8-f*gXEq-=iPGogz8C<_BE6
z-s7q9ov24s<a%m5o3v1b-IDKzTgNXi?FuW1Tu57Xhpl4tT72o;_w+y#rVFVlOZu2K
zO4z4}1>4@)c~_~|oY3xb?-c%@JP-f_;<47qOMc-c@Ezh&ACCdOt>1V)cP;d!V0!zZ
zV^e#X-x<=P)n9|#z4DOk-|_!<Y~azhbHdwPhQBeSd4@_%Q)3g>8xjBBXHKjHAn#tn
zfVFOaBmW{zn|kVi68%H^YyDfuF?QEts)NwfBQdTxSPRk@9B)a6*SEaMl#!E0dG6yn
zf5NkW*>Q40f6m_M^Q03Eb?5ZY2JpWdoQ1I?o&Q1G+-c?OR&IPh-ekv4>ZAS$sDE7Q
zo=Q{cT<aeW9yY?SyJ4JxVW$=FJ!B1DN*;{(?vO3lFQ_B+HVKLUYu!(ny+{H+rl4Ng
zIPv1?%j!a|&twyLF5?7P+stHK2;MaMuq+CEgB>84#Y<KPfWufL3wTq2AvC7tFLn2R
z05_*T4X99c0vLl-_pc`$-?!kdvdTz*{pWp1>>krcI|1y3qV9n9(~_7eTlqf<u%$Td
zI$$S_>MTe91yGi-n~_++0U4?7kcNYAjUty(K7^=#%~vL8+1}nh*c;2dr3w+}|7`P^
zjv!lvQaaJg>52WpJe;XUbM8!9s8lx*!;qa<Cj`11+0x{(^(yuu*t7T9_lLUa(%o&Y
zo_f?7HjxKnLzJcS^-;LDoG#|Is4E@lC0M>@_jvBzuJmqvwMCJ$EF2h%6CBg}O}Xxh
zAT;5<6K|8@dWl=Fj@yDz00&EPybAyq{1yU5;I&T>#&`hV0(?TkT^Kd2cH~EQ*a7bs
zgka<*LqBo>EB<78OG4siCM)2dc~+RX*=Bi_zAscbVU%uW|0Bkn%ykODAQ0JL7Ivzy
z3zB&mA=R$jQXMRdSC?TE*KqZ|VMGCbD-xOyP=ZB>PvA`A;pW$@62c**Pd@xH0yR!>
z_w~~Nz##ZYg<%xJ-v~CsZduD!`Nm*DE!VkF-GoI3MpmY!l1e9)UYMJmHxgi*Xc!Q*
zft|A%cAIrh$*9fw6U=R|ZKRMRCAgNPE!d@%_w;i6%R+F)rLA4?*IM)RYjwr(k5?~Z
zSC=DL3Okr7Wf@J;Lcwkoh{JHfHqiu0C2kYHq0@#`q*iV0?kCHB7Z(?MA+~jYXk)cZ
zGLHU<JBk?_?<s2=qy3Fb&{TD#U<}gu)=yaI3W|g#hI3odptoIJ#WNu6Z9hnjIwzBJ
zT(kHrygF3(2hj}#by9p0Z2+NMorH~q!4h%??#@WFW~aBLMCIXECHoUjwqjAVZnrWH
zJy>9NkBV6MXQx=zkd<mp<$WgQ{$j2v;@nG);+_nF#4mP}Gkp~bAUS%5fzo+VK)&jI
z=;RSeQH?3m2eSL6-}nq~hcDVN9YEupM^h$TVXrUr9_=1K=K1_z-j5$-C(Mr<nsRvD
zK0jU6x^*uaT>hHH+L*-_bmiytZ6sYqvm&e8=|Vq(wydsxLuCX~d6`S>oWQ2&Vinv}
z;1q0^&D_>@We_J@|4Hgbp^xO4ut|57wFHcmUnlZFuzEW8un@4Seha{=wh_6YmlCOu
zE9kYVUB34Gc!N+BVd(#?;di#)jo#C+(kex*&xKLO+zq_5e!5l+a9B|#0N)|IbpoNm
zYo=D>8+_g#=I!p%H4+c}4Ed%eGPW>+mqRB0xxxEsSYh+B7=XG8bEXBCh3STo>-2+A
z{CRM9mj<CQ)Z63V3w4&w8ziHl1COFp0GYkoBR0#bE*#KNcDQ)eg;T^>9s8~YF*l<{
zVb)|sg8}uP1eB4c)91d_aR7Q@?I@`^6;@i(Q;loN2WBJy*KHy$5-{A2T(q4j`WEy)
z22HDG_PS5p1(%}unTqHMf4Sa>_$c1H{`+J}AcL@>pn*3`P=RIQu}oaW`HM&`dCIWS
z-ywz=Z9{X?NfAxIr!%RnDG-YWG5eQ)BJiIq-M>AjsS%FkySfpfb5=E4+N(8%kLu`+
z$SXUq0i%0#KwF}%r3F~`^5&B(G0sEX#r5dvlF~0bW$I(QO=iA4A?~exXce`)w%81=
z!U_07a#Uj~xW?zzJFUi!*FbvmsPH#htoX=SnI03bA<Po>yWK>Qia{iJq)4T$qx094
zDYLqS-$%d(N7C#uSFVJFP)&PXAM7wHJY9^inm*p1`peEYU>g=PtVWhh4HIm%dtG0c
zFTZd<HlJ3ro={L>`G68-eYMpXJhv1E2bKOk$>>exE)MKexNHb73djLWZ}NXv-99UZ
z(Zwfwlf<5<LtF6|pxEx#_Pb-8qFvmGki@#w*ll*Oy>D?w`1;=?N}PY;;YPI&Dzd5#
z?ZP-xv@bt=qgE8HP*``j(C1)Jq_^Eb%0mgu=pA%JTNZ(Q{PAhp(gmR5fRZb%^VdyD
z0Ey5*o5{(e-PMuguj&*)uQ^pm&ySMiFRta6FiNgE3rJqiV|Fx;ayZV^_~YY3l=CH<
zR`ZGNPaPJfRUNyZ*DW2;9Fa;x!7K?=4(-_eR)%0(JiLDSt+#}ULkXU2_#FWKP=^CV
z`%h-<Yy|$p%#=(dd)v~ltqQ42vT1XbU4bIsuT#%=nh`_m{yD>Rm)bk*xPrPy-<$6q
zKi)jkIGC1?9Gj@_lz%n`Hiv0rGlnLW`lnE$RP#Wds+XUCSn*#ZjogliMD0SKI18S?
zbF0GzqeLD`<YOokBh%k4&AA+Kowzbwr<;hU9=w2A6FQa5{}Nn3@z?lasfv_3vqJg=
zck6Ay5rMrCcf=(0SPHB{?bMV<@pX)Cf%8C-!}mhn8X}~}8^UQ|yQ0p=^oa5X4{rn;
zEQZ_pKTSAjJz~gX(ww-4Mlz8WbA^$exkQVSsz*D`1kyN0=X>Bb0Ynvw1bE<!3)3M3
zRa0i3(jSi<hx|gxSYVu7wMd58J@`&8vd8mKXIkV5$e8Bt2t*R4o?ZFu&X4DDty!Z_
z7nL!R1B3Co^JZL7IHKTns}P&<J<PJBPD>p9;yYIgg1XJ5^c%sl`=4Ltudy<WBx@uQ
zB}LiuS4ku@5Cz{eM1+5s>I<fn{8WxjeO=b`^fDMq+kCWgymA8FzVvI~%{3btJvusi
zEWzC#dItA5+`PWN%oY+GkLVb$mcW^$6*jE5;~i?Zk#`fU720MD%-(pDBxugo?pi-$
zn?@;&?>m&NI)ABb5L{-l<Q>!rPk|maxT}-Q-K63VEd~_UWqr83)zCs$Og%)LHXGX^
z^uF?w3wzc!h@&0xuh7x%fatdBa5UKNx@fDb(l<WULSo8D(A@RtUb8gad4r%!?jw5!
zq;#B|oI#-&9e1jg3k_;+&Br{R*RxvhP+#5WR-8@}a9YfcFIP1LQGMo*Iqs*ECY@FW
z8Z#NdM3%XqFLQ0Eq;IU$pe_T^==|$jbvx5_zj_iX<Pc)FbU9_5FK<*Xmj>4~XL8c-
z_sTyyEu=I%Y3+EcBtwP3r4P2;H$UyP8Rt75zb_hOy%-N}89r}Mr>hS4znJ^4tdC60
zB|xDFg3AVSFeF#HnZFFrxP~#IeXFzg$BZ8?{gOLd54pY^=?eCfRzi~TwqNtLX{!i4
z%_YTNJ~XfRQaX_k_hqhBwl2-y{4m&eYRz(*|HSKmc;V%JO}6Z>%(vI9uXulBN|Jg_
zELc!Aa(ImMZSdT~ZX)?&-fZ*`nn>DqB~*Nmm#E0^SE`xjbASx^$k8w9?ES(HSupU$
zKJCc|>|K#RFCEc|&f{E!rNe=3vKlil^sIx4$zbWM0esW(qoY&>8*OLKe$b9Y>TLz+
z{wDrn$A0L-a5e=BK>_~<+TU^?XJENzUU^xl@2V{c%`P;2Tx0r!7-?R5ST)DJv6*lA
zZcvQO7jih?aJ)F=P3EuH0rcyMIW8lA7|;At()>2Vyf;F@*%=oi@-(2XeaS4M9|Q8}
zB)<Hvq4gJE3w(c+N^o)Q$ve1@*lV^CvxYFdn2}AiJqHdOB=gH<O0{{AeQEIx(R-b1
zD2JZHGs(AEp6&tr)5$Xq;Urb5f>g|3blMgowY>)9ILb&ojrdNUjpF`7as%a2gTV%^
zNBN5@c_chwc{aXUi$CTVTPX1OrZ)B)baL~xnrV%s{O?@Y8E-@F)E-^=IEoG55h&uP
zc>B+;|7i>0SavSGIwZezZXGc=nT*GPzxH^bRTHlAo^ySe+OxA3>739A0Wj|IpLDb6
zR-%U76@@hHvIVs&@wsGL2og#A(VGasJ@}@i{i_a~G+O8+42?dQ(OG{W=`Nf!z~>kA
z$5Z9rx%0D?9!j>u6k8{(KHKdedQw9z`FAi(qiP!X`GZ_!=ARlC7S;|xXOngQGPyIu
zDwRRNhiacv3FRcW^|To89+uD8O{0?AS1oH_U+a4s%u#lJV+f}lFE!2y3Eu1;+1z)X
zZM4L?3uIp$=-S1{Mj>}>cmK%}-2R=(Su}E-(&^(J@U!-2B0}v~(bcTq#nwB)VW_{|
z?2052QxaYbWQC-8KP+u<aeVV0I#7WV^M@HM7x|icQ(CGx%?x(x{W<oUW93`)eI~?I
z3++g`fZxD&z1V3i4?QThp<H3Yy2Wd~I1GVQ@Gc?OT|v&<b*+t)WdN^uWAoAWZO9s0
zMkg+?2P$XdLSdQ;En1;OyD`mLEz5TNPA>igL-)UERv5!P-VvljIhlSI-GyFyG5Z#d
z<ZJWh(uxdXI!&c(Y;sd^s>#w9+YiJPQr@`a3g-|vdMlGoO5N5B3_p9{$j}!*T_woH
zkX|lmRP31fMd<Nd@!V_VDhhg|5%GK;I3~sZb_X`s7}4<*%UQ1V*@k5^UdTBwpNPGB
zKJ14G=!}utW@bOfk!mjqZiGZK;-Wp)ne;7n95_1Rgm{MCwmd5RB)Ez87fxmGzlrtc
z@vdrpO^R@L5}|+o{<S-2A(7$r#k%|o!!)d&M#*YYoX37u&s_#Qr?{G)Nd)5`%j8XM
z)A*IQQ@c0lvv51sJ+<RDlH1t<I?-|Hf9;7a9lEF@n)~3r%bnPYn?>RN`lojM^@dqM
zj#Mw*iHn#{CQ*_)+39(g`J(aqP~js~q1Anc;BTkz;c(hu2JC`F4pudJ{qp)Wuv=*5
zVRB)nU)$jJr#L%ed9PxHvzHQsnO`!+|B|)YuSrd<OB3UW?bpK!8ds(5Y?s{54ZZDl
zKnU|r2bof;ps<WkwH>JSKgr&)m0tv(-{BAqWDx+Et0#>?{=CT9Y3EGE+#GKw`_r^k
zFYf`xNg}UkXQlBQ51Q*UFPac%gRwuohv`Yj$RbT&a(EvUveLM43NmZ(zC@9nldgUB
z%UO6Rb7&?=JTZ+;c5Zb~&8-K!U)jfsTqn6SuUw32RupBj-|thW4mPi}%nHY{^J~|~
zk!8tEjirq~&UKpQ1|U#jt<9oH6IXnZ^5xS}OjnuRyg&OpS$n!YB-Sfo+8=cw?Biiq
zw&fK?bZe@S3V!kT4WY9Cz(d4<sX8pxXWl^+DeIGqllp+J;SaHVt`^<>vZ%!QWxlSl
z?Xo*;=T+!Vx#H|7j(5jfgsJTER+-{)-*OugIQub#6_*9Vo#<>W9rolgkK&}+ZGC?q
z6?^z(KNN)_|FPD{`0!@dHTb7j@8$QAe_IlA=m*oV@LyK`94Y71v8lQiOkCB-HFF-+
zzv~CJ``+5yiDpadPqe6LmzhL^!E8ry`|6URcUz*S`Pwc3@vd7Dpm&ZnkE#)o;;Val
zeO>zF=JYtjbMYrZ&1}cratO^6kL3CBp>eUQD(#pL!7w#6L{IRd{=E)NlX4GE2F{Q4
zkJVY@tpQUnvV?(;`oFujmH(?(!2YH%d;3$)Q?>c=@xG~9x{hZX$F={84}$Ous3nyd
zg%D{hN9f^RNyL|D#<92K)$e>#RzY8`td0ECNYdCKSLOmbzqi#_-0=qZSu14bvIs%b
zZGe5OC2Q+7Q~6fR1gg&)e@z*GpgV9}thwJ4=&9d7?KGtXXTH4r8gHMgc$U&i_w^r|
z+VGcK$YSr;BULgl+bZ?HSnGX<2Tg+ZY^GfN*~G0KUjtr+;WqMp*2+C+?Z;nwohDcf
ziqs+f=`Ank$<}qhvzEh+2sK1Vguc##H|inG(&KO9;GXWbxu5rLJ1!25jO|W;?M?U`
zg|1l$yKOzB$F4N_-R1dx(l<E$5u0-WNFT1bgwWc**mecC&FKLT9ePup`+Yz_+#>CB
zM5^-Kn7`(GYf6WF$zu4D<lYw{2te?)JDw6Vl654FS2rRws8COT(iMNPaK7(gjF9u8
zij-w^|6C8TUHX^;VSYTAE*sdNV3xDCf7Rf-`TJVH4AvQOhv+|MuaXh)YNozP9k^8b
z{0S9~O#`MGE6`jCiT0pR17e6>R;lqfa6M(;OL!~jh~u@L707OD%}c#CD{Z#4n`_5*
zd(I;pUk>8Ad$SC8^>`}s@^-Ffe<|HS^cF0@0k@*Zrfq`d6Yi|KnqaEk_7G2!?a-&)
zk`l3D(@41+eSP%<B3*TzX2wY~+pXNzo&@NQv&C0KSVLu5>+$sXYxKKm!F5A>(A{H6
z;oNF1SS{PT%0LjH_Mxh}Mei?fxS4Kd5Hdsi+K9fw@f<8rs~PudVyiupc}fdLiFbyB
zn=Ydp%sn*xcn@m=BZDN3U;H{F%J}SXN|T~_l21A-n`ZWySt_0wKbjriX8VWHg4aeP
zys{eXAE7a9$4n23jSwLos|39UtEI_5?wf)w=C*re&WFq1v-X#AF2g$R{rHFcz7Ioj
z+;Nz-G%E@R!;9f~PX~jZek(;Hz{!W(9nvv=nFE4bvDMT6RQ>}l{f;*)Gs}6qs``Ph
zs@{Ph7KZlYR+TE6ws)N@40kTur+Txss(`fAc1deiFHbE6FDkD1SG)1x;<nD5Hy5fl
zqyBL`&MzradRAh`A^~)i-Pn_=y5tk%ethTVl~M_qXy6RzfOV9%_jpyz)3|-$n+7HX
zxHM@`v6rJWT^N>g_kalF_WyPFrtwg=@!#;ME0M?~d-g2FkY(&!jD1UrX0lX_FqX@{
zmO>fXB_vBGYX&t8*$dgX2_uA%J!B`_eT?h6{`Y;qcwRg&o;S~YKFkN_c^=2{TfV>V
z?|Yo%WPjbh<t-szkcP5ERVvvxl;`1qzXJ_eUfyhP5ab|i9mtU~>8orX!jL1Id&van
zmpb52a|uLMCLwZ_b;;_KcWY{iUtflYum1#=(0=Q!koii6DTvkCAf>8g?%j6x>OjEo
zcuFju;GZ-V2(Ryx89I5c7shNXW&w{hinBo=Orlv0`|K0#l<-Zp+kw~QIJ@l`<-9xq
zm?(`KMK4I$sl^0WzeBss;}nnfro-KA`Qvji&0G)dzXZ11kup3+VHlN`=tA$Ji?PCU
zt8ZsJyA)Hm3-jb&j*JSEMWnS<R5BP8S-(6=kZcZ!;hcSpe}c%u@vg*;pCdmwuv_A+
zPa>AYV<3?AD_|xjjY-6ing%<Ayu`H>+}g<_aq&%+o0bc&uY>UHHk3>yD-@OEjamzx
zkax;I#^8(g9jy)RTv}!_(a4GXE6BY-lcJ-i2}I}EJo0K*c0pcCU$Ob45^mpj!zWBl
zkts(AHo}&&ZB*s=<#k>R?~?_+`Yhhv1I&?{TTEtWmqsxa#1J30ruzI1dMWu&+}5$1
zIv!TIURkdN)7bm?vA-hgW52KbdC7q7W=|*DArq$cLOYk;uZo1N#Ri`HvKg*}%|is|
zfs}Vi#H*n7@#(;+Ft4~?Df(5v+@m5F2E*LR&Ae`%VqtBaqLv}qywRT8vB;IrJ<dR&
zKL2zr<Y<Z7jM64qMEebc;At;;?M3ZD54k%d(Y$?tE+X^>nitugS=;(U#KQ_pc0X9P
zGgTxmx!71P1b)oVmMZyJ=8=)H>b5c#<hqnZ^wn;~CFoZ=eIbCXeD84Wtgw1whf(m+
zt=SdD<YjqNmuW>oOC;c&Yu?L!IcbCPVo0-!*NYRI)>O!ov;vr?yJ+HKYmG3b!}2is
zk(z_rHDIC67r;l3-u8+v7d`ElY}X#rKm6P>dP8>PhCi>ZXXQ$g5jt?s^-AGI>zk8%
z`23~{LVh;kSFJc}zbo>!@;iO9xp;{v#vnN66`ncSd>ObH1{2>jk`NzN%Fgc}eEYG}
z_n@_;zE(7mW-~>$NYFNF+At%?{u06b#jn+=o?yHFeE7Loj@>(Nez)ewV@g#r4&U)w
z@3+p83PZS#e&@&6qXU&6uCj#ARp6&r3SgLBlbwU$@^M9H9{xcH#QyMpnxzg|_GjjV
zui?{7JWRcNz}_j3EC_$<yyaQE4G>ZF!`g^M%fLLfRoPuDcgN{eP^(wI2-d+CH0pD}
zdo3t*jo>Tz-Bt@;tYEnIb44YHj1M2PJ-pouR+4cy#&MHh+beIKnBlatoD3xD^KOGw
zU$?5S>>PA8n?E#H%2vL7J!rGcYje|__<k$x>gW46$yK>vnGY~iqv`l)^ryR+px$XO
z*#gzPQsU}^Yq1rwN$D;|)wqo(4*ahoSAwUf3AH7)Vug)|!qyyS>nR64wPiIkN82ig
zlRXKQ#)xGQ%L&99+CzfSV2pB?3Aug$5&ZCRT47h2agp!f1%j_qg+C~_xnsXq*7wma
z!}LWGSl=LT9|IJ-ZRfO49!ETp(<NHTiy%A1s9&Rq<m`BTBQ-7fCfV8Oxkh^`adm9b
z#VBBQ#@wZw;c+D{$+Oz7m@A>uuBcbO+LACI-EaHL`>@CI2I1F0!sf@nDrq2B4Ylso
zRe-eR_H}|GMO!7lgv9dM6}`39f$=T=@{5ve9;;vd<#~X1S)e~sm0-7n1x_}Rqa>45
z?lmaHx1v}BBUykAYJh!W=b*%Qy+65|**csC)-D{($|R*1871{!P=Q40p<K<{Ec?m?
z@mGGTD0;o^nA+WZQC#9o@6`#NQIwh;X7vGF)W(RW{^!Th(BEDVhd4r#Ty6}WIm&fj
z7!$aUBG+B(z9qRA(Bj^ws6cJBI46I@tW|X}EeSNwHa@D=nDiuKOw7>AXo7ZxI7VTr
zIlY6;7Q9)p72~~)9aBj|!+r+x4Fhe%x5xa)T?EBrA9RF<o_0OA{oQygS7-TA_6T=!
zOR3=VtZ&n+HBS?4GPR7j1&~|GpAkk<$!Xso#!<*`b?2;IzHNQo@~OV9iLQ*R6Bm^Q
zAsnfA=AW^60gM*Yo&E%3Lrwhwn65^*<kq8E*`-_`r`oDq>_d+Z|6u0t-t#=KSL*Ca
zI~E^0xo>rOMlRR*EhbkGN2Q1_rvBb^e^FvGqLjUDwNhO(mUo}aLph^3z^*8KaM3R6
z1Gn{x;6&?ild$-K?>60?<*L1X7OC&Q--s42gv#tNgBHy<b6jJKyLY7DXo09v;y&f<
zcXC1ag?Rh?ffi@-S>|Wsn`vMb9?mVo8r({y(FR-WJ4vgA+0_f%X{rZyl%-g9pdMLs
zAxGlIzn5&fRE+->D!~y@cgshievk0F`*8I&=P-UpXmOH$eR)MhZh!j>l02<U`KpvI
zETUZdQS3;}q07h-F_~_;-nhGF1*LFMZ_#G5TzBKq>fESQ;ID7_9Z$9W^uix|-vw*p
z?zsilWU^aPVg;YKX4l)ft1AZ-nCTxACLOvZADq6{5|RVGWY%3PJC<BShTlF~)3)~+
zxtF~CH+^+YIOf|el|Y87&9)~J<A*=*9{v8_DDg4CuQpkE{NPny+2IP$AC&{`WQyhD
zpQX7^4XY{muj%<|KxEY0EvD;{I^;*3<DFoo$>R&7nQ}js*GIkCUyeVT_)HiPk9*S4
z94M6o8uL=_Me$HB3!jlwYw4`q(Uo`rXQ7%tp#in8q9kWLs+FDzU|s~;ypo#9Dqm`(
zJ;_sjFf*7@w-{q#z36#MA~w%xIiHWUW^2RB7jYqDX)GtXrB8_CGstM;Ol$c2ix3C|
zOUs#5BlXU&jTb51nQ`!ml%teu(&Kcq#`#Ba>e2Z7ooVV(`l_Q*i@jgzf7aR;e!TwU
z@wxkQiR-xP^uXvq*3LoJoxPat806vD>!<LeVrFxbfQJvuM^vQjKTpjUJ|GQUjLl;L
z!0o3j$8J@15)28sm!PCl=vdye>rp=9-!$#ho|-inW?+L?6>k|i<TyI2{%-tg$^Fp}
z4<!>FV<F+HX1u?0MLxkt$&Q{f<N5Ha(No~Dp0`lv&6$gb6Q+D-XFiTr4%xaLDEx5G
zh!icYRT(Q$l{M!ZnQCiGmtXZ$Zkq$eb*cM)lw|VAC_RB1T&4;8%YCW1)29MPC+1{4
z?@{qme4A}k^E;ASjeOZ^x$Xmx=d{ncmcFQBVD;Kjc3ZKL#fOl8PJJva?5o^1?X%1P
zvjL~h7V=DDvg@X7B8hmT&rH$9c(B@YQq8x^TV9+*QkH!G6Y*fBW_v++W!RFd*neT!
zWpHc7+TG<SaO+RFs~bIPr+1EIV?A<Ir(blm7k<ZPX<ethMOs?>p5@Bw6s?I&6#=+A
z@M?2P$I_z<$CH4>IS^(xw`{?Z2KO!;TL!}W*$y@`HQ&Q#JH*|y9tQ^_LmoH1AhO;<
z1~UJ9)?LEPTEJ<_<VIBf`sa6ynwGBHmwA+@0?-AEGb#o=b=UrcKUJ_Av@=QjmI~OK
zzp~4tIsZNWqNyZh53}hO6BT8APk%vId?957h!F2e{TnU+!FAPwvAfoyiM|Ret)7kH
zQ9VA@I$NAC)ylIMcf&)t>JKvtWz~+zoJ_d)aPs<rkg@ZVJc=tGQ(v1NWzD=bwpsJ?
zb5o(>&-$-6peNn^^CLMsW9n#UWqR#ZMYy(Y->%8;pOgW6c|}%IC2eB;UV1B-1lY_8
zTe(&Q?F~H09`huRzPMc45(BsR25^1#_~`2^3ctrb71#M%Ck8a$Un!)>D{iBqcJi}E
zT-&*?aODCci?viH=O|a+<i0%p!DFmx%KNlJiTi+mALmnF@DaLJ7s?<1fBjPVyF2H}
zdugi4VEL~*OeC9t6-`8K^iO7JEn82}d5w*$Y)8r7GksUPccJMMJp9A$3P;yX6FC<a
zm4w1R#(N%SrIN2tZ#o<@l6nz(n%dgUdTHy%hz%KNv@q^e+WNS{Y&F(_XLg?vy2OVw
zLX;(V9`eoZ-{P;jLz8t$*Gf(>N-7wOm1QEy@HGuYFb4CdI{f4+?pa}j#1Wg4iNW_T
zVQLdB$sYIlFlp;@^xq$t7n&Ct7f7rezfYv~$i~e!PO={*CSKs24T3-qbP=cNlQO*#
zGS599Jq1mK`~dR{`lh3YTBgR2@l+6AOvEUG8W~xK*W*XU$H%+hAk<sT&(8}pktC?s
z`DX}8uU`j>K}WwRWagFsZW9R`f66F9!)I*3f;4N~-`Lp5rR0|#Jq$ySBKHT@nw=Xf
zye#xnv(pYHEnWJ7aq<yAibwET-x+3v%q2K{v-46syiFmP4y4>;{53L14ZeUUX(VAY
z{k+Ead)nMh`ebbWN$3HGrr!EFG@@TvRJ73aeCu$$U-Ufz94#1&7ZV3>MK!c?K$pr#
zmX7qxx52}_8KDO+&k~Zr^v^^6ao<MST?3Nuh$VS~4^>}+y2P}6(=P*SMTUYA&+C)l
z317T4vA2;Ev34GgEJYQ~r>(;ycpV=(Zb3;WBg8OH%6T|6z}VyC<&!nAX?Fg}QAzQ)
z+fs2N6-@CGBt)0Q5_f5}R#zgN=xm?$@4;|C<W!o)mFJVX8{4`xq-JNT=g;u8e1z!E
zH!&aHKXk1ai8Z;26u{NPSm^%e953VxM48BNXis$9t5-uQo^_Yb%yZj&u=|OzU+R+R
z^pwBYB8bBm^vsD;mH<{yq?W)qCHK)q{9%Bax+bEMp1s=HcQZ_4fky|Wq~sHFn@d<x
zWC(;}rqE<~_by-Lm#?y<F&-_`VbAV!f&~1Kb9t%4EV@m^32t}r;jbh(4>af6zh`JB
z!}SoDsoLpSn^*GjShAL6?K5<j6S4dfj=oLI$!RAXt0)BKb59RE6wtPn0|IIR64MJt
zwMCq08=e!%8;HZB(P%h7PGM8M|J}N6EKa0|=_c8$Uf`cdA()q-qdgxrInYJ2i#+#u
zc=l&g93DzC*wpHG`q|d5d*?k+fzsABpW`eqY9Sl{I{B~5Z?vXf!nv3i644je*JSvI
zGg=AY!{9d}9BdxGfWtQou2T#dgEdBUP$p%rbQsQup*JA+?*uWnNNt-&eU<N2zxY6_
z)H@RE5iw^Dj6%NuAr2>!hXR2TkuLz<{F&AxggYP&8}!?kt|AiQ@L=t?$F9}vpjZ;V
zFUPR!=XSPwpFaW4UnO?NeaHl%=^}gQ`IujJP7YiEcUpe-iz(K`8rPnBMSD>5e>;Ky
z3Ln1#ek~4*N8C)EBQz^yx_Bt(o{xur4Wc+0N_vsD?!h!wCP&E-#7j8;uy~j}r9dC&
zNI(ZzdF73ETU>fD_%1)Yem|}J9#naj&amc)ia($iuUv*In*F;wSk8TkcrD@z#%YJ<
zzmse5?CgJY+aIbx!(YYT>)?P!U&V|Ybnh~owzl+P=T4WRN*acqi7^m_o-%H0{2x;u
zen3R^M3|2ioSfYjuEHy%cMBoPMzRG(q~5;FWC(w&04;)Fj#YeSYGD}DC@lv6`t+B@
z>3gywl)&S#gE`&-saN#3V!BahcLfC}5M@%vjvOpA(sgaw<Tu<T@!03MG9lb~rb(sC
z@#vxe=>X}f1rnIH9auQhzzJz4I0Y|VkH(H+r%t?YY=~N<VOriro*f@ON{us7N>C?f
zGfvX}7lFSCxywBMuOiTkX9N~^zM#nRvxSDO^}#Lg4D~O^^5K}Z*Y(_3{glzs*ewb&
z(6@6`U88!8zh`RMiu&4-`ZMh)BO~JxfwZr0V1Q{>ka)gM)~`atfI|$KmS>~AD=*<<
zgqo@?a2=@4`wajgjVN<f?*L0J02fUX4)J1h`EtFH08oN)Qcb97kUh`$+nfjY^6l1C
zJ@h*LzcU33W77DpiBNm>+q7orlg@`o+U+A#8h4Yk=%Vn?fi4kKO8ZG9s(r}>;vH=M
zr@NNtbgC|$IiBk^GC=FE1TrNZC(|t0V6P{N{{}4Q^5x49+`E0*YkVua><uIpAFCQ7
z14n+;YJVwozVbZ5(W{oo)`rs2GL^#4J^s9AnwXSCJ_`d9)3Kk>MqMkXjT}b*D2JSz
z1Z&-UoXRTs0?r>W{-c&V%3|nd%V`d$qOYYg&)5mMGn-~YiSZF2lhyHH;V122?%@3O
z9wWczb5B>rKN@}<&x04UN&_J5(JzZ`X~c(LiEdI85SYro-G*{?T?U_sZ|H>^A~ogy
z3zQFbT@!z&eO4HE{H<VdyNGO_HR%HKI{M7X*`V;o33&l-g8fbIFvi)I(xCIC0D;vC
z0Q=8h;w76?MqMj7M^iGeK6%;MX{P|iR0kH)6U8{yjXO7Z9$uD{+y18R-re5rgh0?4
z-QL*{s;|MKJBDwBZWEd*SK|j)8*;w<ArZcrUNs&@*wte52hTnE7jY)rQd76BnKHIZ
zudU7aGZn9pTO;if;B<Dd{fD{{b4*O_F?9c#u>cKIQ8}=Ci*bjNuJJXU;^^7r=T~(2
zJ<LgLHUxDp44>YuFn;g7_`91Iz5p%hf2MlqdsS-Pg1+#V&)(|5VA;r0i)Z&B+bB+t
z#@+F8&13w4C(>-Zh|?%PlEogtYRJDuAp0d8P9JLMx9m3Hm+LQN>2@~`91Mpb%}P|r
zVUn>u|Dn%~j?}(+=lc!K<2qrCgN!6%+PZ*t1&;?vOiD3{ii&!HbqFOD|G9hT5hwx_
zz~RNvN?@WS?Lq$Y;T}@2e0YT|=cs8`eck2bgQbkZ2&VMGz;N!J&0CRnTB<dgQc5Zv
zho=N)LFJE-`jG!k9c6&Oy5xSZn)@0<?K;P(e4N)WZh(LNINto>d(d0YK!H}&$rtdv
zzM(MBx=sfR6{yweW8-jS;5YLn2)VgBe7FSp#8)aBG+Ga=)yW(w_yWgWIp`AHucQbR
zgPd`168#wpX0YH+JZk-MFc!7m^81wo><Z^Oq*-4-i~&7Ue08iSJ09NcZ^PH5vU&zl
z_Mxsd6(zfua-BRDdTh^$w&8Sp^BVU!Vo>PnO1c9WckzHNDcQF%s3Jj+oS=9q6<=Vr
z>1in9={qR0I7fX7LST9I>zlJIch4sUwTpB}vkTMIq0B4W?vJ{8*ey>k)Ped@I57Nm
zuCrUWI)`FuM(=05I2Gy@<c-m#m?R33iGP+(%XkEKC%@cx#JvAH%H=G*%2tLilD<u{
z$;5&=6ul+E`@GKX)X9brXptCj-$7DWb!Tet31A{ZQYT@{M2wO=GICj8Yn6?0N%k_!
zERlk6Q?!wh?V}5K2G;n+UIV@$j&T}Fv)AC*!*O1q<h;>%?V-%=p>xqM@G34>$4+Z3
z-C=X1tl%$x6z3`EZ8J|bQwlU#{_+W=;~&271-0k@!~PF4v!DX%ByUf+(v>Otm$ib-
zvhynS;774HuVW+el0IdHf8ruwPNyU0_)nsl0FHykOek!}B(Zvd4|5#zPEYsJXixO2
zH5WOZOMU-&W2B82vmhPt86W$aaZ(}l_@qLl?D(@|$B^8Ri+4ltF9A_-5?j+=;`n}F
zBhAf-1=&Fvx~y6^x<#YbsveY_RBlQJrL7MfvkcgCLK2`;-=c1<M>uGU*+1h*S20(y
z?sBcD&;`s@aNx5-i40?`el61#if^utw?$&-cq#28GBN>Q@Uo~STfBS__ew$o3!aQy
zvFVu7Bd`oSqBf$gY$^28h+;)i?vuO}5Jg>}@R_F(%nsus5yL9lYhOx2>S63?qv#Gi
z&9Yiw)1D?sDevpm3#{st`brdOORbWhR%8+-eK5`|jbQiBYF_eYnktu8QK@w#w5N``
z9<f4~7^V)ZZ``=i9Rd;ycbSrp02LKxnJL(-8Bc5kpw(<R)IX}mO(#EVEU<g`I9*GO
zVg{w5%CTYb@MbpP(kuMKc@MZmwM>hpDxEdJJU&mZ)BLy2e`>nInL8Y{28bgDVR6~l
zFfA^f?btS)`Q+d7slwG1lx3V;xZ4wnm8Ih=j?ox0<Nypd6YJnwb7HmzpVgN7r_qi2
zp9_Wn!~JSB#oxA|<D;hKD>l85<4x&+oJ2{qAT9^)f3Va;NSr4<7ipdtqRG^0XydSr
z$^p!YNn?W-r+_FkrMIEu^Z5GpYpPa(v(O7Xa&niOiG+J5f+;8{c;M0POJS*-R^-Eo
zaD2g3Bg>Zs3rXlw^h7QBsggO2goYU(hfm*&tvevvD4wx1DzcN1s@{`?o`70C_~B0}
z5OKuceQMmt{7CB>na$RaW)-2rM3g(LdJec10Ev*Jqhpu+Z1BI{YE9(`*V{yp?b%0>
zR3M~7@mgu8lR4Q#=_qMPjid_!RZ2W*Y7p0tE0;|e$~-1OUHw6RT>pEJPWw`K{^6u-
zoH<TJAM+yP^fAkcj5}sV8+88}5SSZ)0qf$ewytmaqpe{lj%Q>q&JsCo$v=GV7#eZB
zn1KeC85W(@v(p;bqm+GRuqKcI*TNWMk5QizV1Fj`rqWmiKjtsJzb)qS_V<6s^m|{d
z{|EC-6F`K3?gwUD`O+|DBJg!r^V^Mo4^!~JFNnKw%ve~aZCXGQfd2`oj@{tCgi9_Z
z5ID3}|FI<e#q|q0$9fbpk_!AcEt@7JdFD<L+4KH?16KM=Q>;KSYqd?=AQP!a($#41
z7EL^J<1E#2gVk9iXDo<Y0%1*Y&9_G>#nWj$&nN3}I#>sB=;)OkWufMtlgD;{CE;wr
zZq*HbfY`w@R@Ks+3Fb!n`t8Vtl=4jM+?&r2R?p1_(ar{`E34J~Lqip5_=;r-VvNAR
zz?5CQl-9OzG+Tm+w1+6Wkxo04StkIvceg+2!Uei_)%mN4w+hYkF6sJH@{Si{+5pJb
z&GFq$Co2f@<Qu-br9*z%e1d}0VohpQx|d`1Oia`iD6GA#tjzwyGWjfPcq8e1tF-Bb
z>99X*u9u&Cgv8g-JSZ{eR~&7v_3-qJjV{HrKd;YV@Aj##efoLU-7=&W(<11(Pxb#=
zSJ41D+RckoikQ>m=g>z?Da^W^C-ouvVH|Xw!=T5Dn4{|6E!DtQL^xc8(z9qN1BpVD
z#yvHDF)uGKvr{1x_e>A5@t7pfWSYzYK5K%g{2aroVQDsX`yABDPKH4PdksFt=sfMA
zWvV!+OxESa2~Q#GuyY!vU(fSC)Rb9%H5+V+LZPGudU_~Ux-jk2?XSkqVThOtV|4TE
z&J@I*E;7ed(N1q%hS$A_aKMtduHG;+>)GfD@9*!IerqLh`FX-M#JPeI{B(i;CdX`z
z#B5C=$twrYxtzDohBIk^xy$vh1*Vg#F6#!E{7CcV$5|s14G?d!t%bRjnT-6REV~R4
zU9oFQG1xzhBn_?+MXrf72^Ni?cJ}tNvcI7p&hS0+><%6*<;kronR)9|eXv85JtK33
zIm5RsEut^6W98|Nohm)3_@u9=_kn$%@o2%fEAIqXhr-H(N$NEl?dx^i@WLQkK36G8
z7;1#RsIPSqcG#kDF-DqyXQKD!0p#e-@;b*ARV_qf$%EH95cE&cqX!S{SWiZNNm$^~
z0pB?U?>QFfw+nIYdSN|PV?CEC+>8HXvOvR{M;LbIJZV(hm&+ae4m)>`|Bv>p{jyH~
z(t`Dk3)44)+93HY`Fk8JT05pA>WGRk<mHTa<=MYte`mY~?OM2*q*EIZLYOry86|)o
zBPDRB@lq(hV7l;I=h{m=0r<P+Q?-w}i>c!18zArm2*#sfl-T9xC^~cdl0PvXyBrmd
zAE;R|0aWVN$N85xxCO#KW_limKiNwLAg;A$%L0k}lwUvD{CdMZ(5k1zJMxQ%Yc`K)
z^lvCMovi?0FmVph94Qvi)B2ujRdRa>6p<h!toE+HEV2}kSte4T&=;3d#>pT7aEKaz
z*vHEWQlPWEqh&@GV=++TA9lTAZDeR-;>J-Bru`@Amru1yR1*0Gg<f|oOOTxA|AI8J
z@hiq->*&Zi>Ik}sxrao~`?z5l8;&14jR>!M*g)$R1&MPv+7jPwr?e~ZbSNBQJ?rEV
z79=SZo=#qZkiu*!|9l-Uj@8HkS!lf1xEcrNPt6i(r=Oq(B7k_tw5Xuq7j1-!ci4$&
znb=-;Yq?T8BN}%ODC`XROOJvLE@}G%LgrRiq{_AKg6kKi15OfzBJwXK#0JRR0d1yL
zgo9h$_D>1^)VDD_oM3dI;fNsy|A6L&q@0ih=l}EBiI`!=CC1WGse#3WF>XUii)rgt
zRLi@y-DKs@3KD1e?iNPOdGfEln~>&5UBEvG!H#{gV0iq853}-@Ut0woAK@fXwqVMo
zs^I*s^_tIos<&O_XVFy43OY3IMsHU2fb#^QDs1_p(b&3UVx$gw@7fDsznhUzp6R(9
z6^f4rE}2X-d5+#alb|LoGubQIfO!hTR905Dyz|H!I?<>Qe5n_*+1c6I41^b;_A%=M
zb~`c@-wvwZ%jdYXI2wXBg7rM94zju*g%v-ykx}@<Jb>CMUI1sJdB988ORuQZAA7!g
z_Y-8hM)q4JL->^Zk%#rvcNN6OSt#;kdgie@H>!ac|C4UR{!1C6zJ?ucq`HEgXJ=;@
zp09kCxW?AKE3k0-*WO(#ddlzIyDc!^OB1kFbI}!wx+-ew-!<DN9kZwx7F-Ij&+r9V
z^50*fBSbJC#BG3Tx8Q75^gu-@?Sqz6g<GXIiku5T?jnfLdmc4tBd!+I1$9($Um(}5
zyF%0=!96K3418_JDta&atb6xI^+qK?b|bH5w!K7@g<u&(o`2=CQGg_*QDB{_%0fs>
zO4HC}n-5x>4QG>0NV>GyxLIQ^hkS2N%>|;t!9-qq8Pw$jY#qa_0%#UaU9mxI7?-tM
z04ZoVHR$%#p@h!uWr<#=bOtz5JsjlX0=o&)?7`E$7RQPKCl%p_q)|DdkOK{0qDUJm
zwfTUBx^nOfRYs$(0NUEbR|3MTfExINIZ!-TA$lpTJrt`ilhpOG<*s5~uWn1(RkTYq
z`G;k#|2?k|DyR!xFI@R55)C6yi^ijktX>p$H=PyWu_Z=+?7rP|7beL;C>MI%YKaqO
zus6AS{lTN<0c>AaytOpYTA|PbHe-y%V_NDeI~Zu6Z+H9W92w5=qNfasR^79nft!~&
zAV?%KT7FhZ=1R7)WKv_Lc8O@%bx?h^7g5ix0Xba6Iux3VUKay;F#2*;{^Il9l60@q
z?tLRRq*=$Hap_NyR}>Wbk}D}W!w5wh>h@J|to(-55^}}o{={h4IS-V!z8ivJ5Hhy~
zRCqYMghAg~epIc6*gL5rEdawfDVFbzVoV<g{0J)26N(qxrGn&#|K$*1!#o{3t#K4c
zeFv@9i81Nh`LRI~#eirQ3;TFe^G`M-zc4kST+66s5mhAk948MNyAz2e4Sq?xegH%_
z&*V+Zbq3X4n;MR60DU0P$9Zu!G8uz4*Nc?wEAXcr<`?g3Tf28Zz|?Gyc7eQBw89L<
zK{h{ma<tTiOI(2P-WB8v^W#Hp1Kfk{-(kf%#FE@~;a@%9YUjwAmEdpr?)|m%o*OWx
zhu~pJcf2DL%`vo4<}j3wc)XnvMl6eQa+mrFCR1lo=Q+rQX!j@KC%fJc#1Z2MzB1np
znuxni#6#n?FfG(f!RlUvN?8qW@S{bhTbVS!xw{8NIMY|3o`5)*4?79E-?}jUTd2sp
z)-dVX5!H9*iS|^~6Jru~F^TbHt5H00!DeRR2E(CyN~#!0Y8y;YQ;9R^HziqC-;-)Z
z4<@C|1gt8;1Tb*ae2hasT}2BHZ8S>C>b4VRTBNBaCtS8~Pwldw0&?JyPC=4#A)VG<
z#ZR6y@VBgx-uHGz-6yi_AE|4!MW7<4Q~l2sEg{RkUeG7^Ygq;laM-Zs-)S{OnyIlY
zMa(_cz8Iim06;W2A9H)2b_{XF2B?=5j)rjww)3bAzO@q7eV34XsAhpFmxUfEQNu7j
z4&SRY+t8naL;BQEMSJnBK$IWEcu!F~-6|b&RwiqjLLhq7v->7THeRHf%x9f{T{N@j
zH8PMvow^9_>)O=O#mqRpfq(BzBJzd=UhQSeU~`kZm8Lr_3i{^4>C4|z2s9lJZEESj
zlM~_ILQ~E~LtjxaRr_|1*?m~8ZTs28C(#@$hmMM9msgCFxeITMX%-9+yNC_X$J27E
zv}NLNa3bueslQgePeA(dWek7ZM$e;>flAcOs~3wRPJ;Ocd^bXkYNV|fYom=Y^Dz*|
z)cjSdZ%GLW9_IWVsoJ~4qm1aT`ya}r39Gf;zKg2SUeh}Kn0I%}`<-%xaPt9n{g3fR
zU;QN9q@+vaXAR(AU*?*T8%C3*)xHIUXkZJ8KgH8FD2lX!o}Pl}%}=c79{+qvJYTPW
z-z^c0xapJJ=J>~Ss?pswn~-b1T;kMJZAe2BVj<+Z{;Ac#)L%P-Rh~B_-$&J*|A=0?
zSafjN=uw47nQV3JO>+N~Ohw?@%2#PKGS;E2`G8=UL>%Byn+wZe(M+G9fj-Q7kar3e
zFN`Z`>?~DQS#9`d@Mw;g=KU<9^u4#%quRFfrL7T*7HD~(+0Nz@7xvzzjtFWQfL082
zNjZO|6v%ZN0vw3|l8?!I;L`YG7^O&o!v-mTcb|4hoNb8)3Qq3IAa*Y+l_}nkyELgV
zKF0aQdV77KwUf7*_ArQR--YPNszdAaVsp^QyqPhmYdv~e4t9G?Yi#7A^_yJCn*&<6
zMfV?!IvUZ?=#ZT*+Tcwk>v;<B^X#QF+p8a~G1a(K*g0BRPMO@};NUtrQ_t(_e`&<!
zR78h-t>)Q=csMaFYQWFU_qG_z^ANlv?DhIH<Zia{)^8ite3?&sGric39)wpVM=`U8
zavo{4z6H2-fC+5H825f`v6&EifIu_?5ux7=xz0AkbTwoz$B`Z-yUJQ>CZHl3(wgjw
zEUZ(7E}fIP0~-eFYZkfg9rM868=(~Zm$D$iclZMTTEnS2*3^{Z@%<7W2e<EkQ*_AM
z%d<frwD(!%fo5;-6Y2!ZzUXYyMYA@Ks#VILOQ+XIoO4<_d?V6cptuMtavfT4Xe}ip
zWD>B=gEVSj4<KKS;8US3xUMC$QZS&127;@QRiHYXv|M8n9NxqIb%A9v&E~U0u<S5F
zC`b93r>X&_-pIReW1997X7s*Q-T7POFvgOnrGhu*|GKT@Y!K%cE{IuBU^yZ-zU!ca
zBD+9hU7J(kD9tpHo8LXxr>hw(K*+V;HjB1ZlVQxuqt9KZ0zTUegJAYAl2X~3yT~kj
zO@F@~yv3UQ9p}DO2=?9J^w!ZqduCIi&Q(Bn^2!}s;c(w+4Tf*{wF5mZ>vnPp*hc|m
zHOG80@>l?kO_YNdt8@eC=~xVwsqz$rZc6&Q_0Dr_`;i<}(ROxe+3;mE8uurrNV68f
z<^GRb2a0Q(9IzpVvhSc<e@w0Wcr#HoihR&-6dCK_HI>7*PqR%*g)ln&3Wp*o+c>9E
z4(laA7G(rdL6_*6!~NP(%EzHwC3y465MAB7BByB%$EsFmq*>2HZJkQFOO)!A1CQx&
ztvKrVQ5vjQC@QC`+<>}}jCCcU4CVWu{kqn!Z39ffd-qGe`TcWRtD(CEWd5x9!-Sg`
z1T_~!q0Z(>P^2y1iG>w<z<mF@Tfd!=%8@FUbl>C^aB;ils-WZD!$pSZz?E39Ux19%
z@P3DVk7`Z5!jk#yim$ev5$yFiCL3d%Z!{g6T^Xuqd2PEi*6#Glq6lt8+0~mhL_{oh
zYcV~a(*E8nEAHy!2p0_dD3`XFZ<{+dk;Zyz4+6T}46^z|{#4FoAH>4rpH>{JHXQdQ
z^)(5(?=pS!A&^rjJ;b$}=2$MG{exyu2_DD^flj11e9&R{OuzTbRzmLcZvG;30kEqU
zQnQ1aLY)SBKPU_U5rDiYjPoWX!ugtVsH!a0gmFxbHDoyA<~#QyH_d(+xQiLQN+FT7
z_1SNgALhB&r$6x#eS)Xz{dE2GxfR;qA9zag_MTviH($q>3*25;gQ{G7gF6bvE;GQr
zYbm`x4WBh#FK)|MU;jA_amw{Jxqnfa)dXn(dXjg7kcdkdgk7}vu08@;xLUl#(Ayx3
zz?8a0d%VaYK1)YE^Ym&OiKED5U+ya;ds?#>;|n@cK4Kj}wHUZ7Efg`=20_or@h{*6
zGL4xu&JKPPQTf5Z3y}X|NpbHE)K}!@0WKy`^y?K)4eacO>vC~S7bn;sc=PDYND->u
zuFxXGqFU7w(N6-%ajV*-`V1fSZjU<NJwv!jMdx&Ulo3J(MdJ?oW+teWHlpIZsRUe{
znW|gq&FmB=313hoC_M>s&pQ!P6dB(-?3T8EdE(jiNY0kG{|1H{Rnp`5v~_*rW_|@~
zOkyg{7wp7qA_R!4Gw`ny1MF^%ATwu|{{|Z8@>ccsvs5|*%=f8L-uY2og#UA#moRRz
zUlB(KRe86}`(Eyozbf#PB5Fw>0S+J2ESu!i|JZLGuCC_nQy3UG<_y%6&7X-BQhlsw
zRUy;&Z$9w`h%?^cBMse+S`N=M7n9~<XmM9mwd^_lEl@h)eI!<V@UnbvE6Q7x2kJs&
zL2elOtgaJKOxx>np=&AEX>690YkHA|sblc0%CsmHSk^lE?{43el%tY4E8PJxunn+U
zZcWM1F5;LsU(>@U#U;z!QcX=k!yL|QPmzR~zvW~4Qf1T;Od9DJ(3(O?`swql^C}EB
z@{k26*rgQ45vi{<X=-36CdBkUDXhHPoS-W`e<+^Do@3vRineL0^DDy-?9gn-zQsQ*
zlFk&DMb*jAx@lGY)WU&sU-uF_!`8X&GO?WQn2SdPVS?d3kK4QEQdX+3zw=`}`bPh%
zOlNkAlmUIGidra^!9mO~usY^}7p|&ziHd2g%Os-pc?l<E^DObiGPC`(Ul_KI_QCX0
zYX0k&Y6V1dQ|$Xh&#}uPEL3J_qoOpo^+HQqum>!tCTUFAy2THWFp<bH{X^|@GZ*#z
z`9PtBT5|xP&F{#Vjqz)Ix^i<;M`*PRT8>4ts+6{imd~1|--zu}$)mE{ViwxJRXKq#
zOL(^2j4t8o3o91B3T&jUOHP#Q7B*fRi@h`od3;H8DdeN&(z6s3#3D975ex345bEB&
z!T$$A6VKHxVa~Pv>y0t@PK;;WGwh+cXr>FIOoOYhucdX^nIeD#{x*1)qK47JUW9m#
z>6s=jYDPzb9rLce)2L5!A+blN1_sY2>G)KSE@z&Of2NznhSdSxtkS_0_x!>RU_1vU
zXgfYLZ-o?V#0EPQW>Ni%fsr&0ZtF-}_eaR2V8vs-Xz763d0TABsd)&r<F*a4VN5WV
zj+gMYjV5)pu~lG68urWut@(>>v3fu(=f`EGt*=Blz@ST}!j8^BQZnl>iec1{Oc0W8
zSAZhlErxLn(qhW-fRz}({3F*N@FC8#PIGiL>t=ci@j6$ZkHsZ5a38||$FC0)M^yK|
zNH5B)ps$0W1iiFwd)eLdLMz&OpurnN>Z+tXOi~IaC390!Mp0T)QA$?y>Q%+7SHFde
iz4^aRaB;J9wD<piKA~VZk#e6TL{G~YQLJ${<bMIS5c0eL

literal 0
HcmV?d00001

diff --git a/cypress/integration/common/post.js b/cypress/integration/common/post.js
index 39407ef4f..2c35cb280 100644
--- a/cypress/integration/common/post.js
+++ b/cypress/integration/common/post.js
@@ -1,5 +1,8 @@
 import { When, Then } from "cypress-cucumber-preprocessor/steps";
+import locales from '../../../webapp/locales'
+import orderBy from 'lodash/orderBy'
 
+const languages = orderBy(locales, 'name')
 const narratorAvatar =
   "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg";
 
@@ -83,3 +86,71 @@ And("the post with title {string} has a ribbon for pinned posts", (title) => {
 Then("I see a toaster with {string}", (title) => {
   cy.get(".iziToast-message").should("contain", title);
 })
+
+Then("I should be able to {string} a teaser image", condition => {
+  let teaserImageUpload = "onourjourney.png";
+  if (condition === 'change') teaserImageUpload = "humanconnection.png";
+  cy.fixture(teaserImageUpload).as('postTeaserImage').then(function() {
+    cy.get("#postdropzone").upload(
+      { fileContent: this.postTeaserImage, fileName: teaserImageUpload, mimeType: "image/png" },
+      { subjectType: "drag-n-drop", force: true }
+    );
+  })
+})
+
+Then('confirm crop', () => {
+  cy.get('.crop-confirm')
+    .click()
+})
+
+Then("I add all required fields", () => {
+  cy.get('input[name="title"]')
+    .type('new post')
+    .get(".editor .ProseMirror")
+    .type('new post content')
+    .get(".base-button")
+    .contains("Just for Fun")
+    .click()
+    .get('.ds-flex-item > .ds-form-item .ds-select ')
+    .click()
+    .get('.ds-select-option')
+    .eq(languages.findIndex(l => l.code === 'en'))
+    .click()
+})
+
+Then("the post was saved successfully with the {string} teaser image", condition => {
+  cy.get(".ds-card-content > .ds-heading")
+    .should("contain", condition === 'new' ? 'new post' : 'to be updated')
+    .get(".content")
+    .should("contain", condition === 'new' ? 'new post content' : 'successfully updated')
+    .get('.post-page img')
+    .should("have.attr", "src")
+    .and("contains", condition === 'new' ? "onourjourney" : "humanconnection")
+})
+
+Then("the first image should be removed from the preview", () => {
+  cy.fixture("humanconnection.png").as('postTeaserImage').then(function() {
+    cy.get("#postdropzone")
+      .children()
+      .get('img.thumbnail-preview')
+      .should('have.length', 1)
+      .and('have.attr', 'src')
+      .and('contain', this.postTeaserImage)
+  })
+})
+
+Then('the post was saved successfully without a teaser image', () => {
+  cy.get(".ds-card-content > .ds-heading")
+    .should("contain", 'new post')
+    .get(".content")
+    .should("contain", 'new post content')
+    .get('.post-page')
+    .should('exist')
+    .get('.post-page img.ds-card-image')
+    .should('not.exist')
+})
+
+Then('I should be able to remove it', () => {
+  cy.get('.crop-cancel')
+    .click()
+})
\ No newline at end of file
diff --git a/cypress/integration/post/ImageUploader.feature b/cypress/integration/post/ImageUploader.feature
new file mode 100644
index 000000000..061001ffb
--- /dev/null
+++ b/cypress/integration/post/ImageUploader.feature
@@ -0,0 +1,47 @@
+Feature: Upload Teaser Image
+  As a user
+  I would like to be able to add a teaser image to my Post
+  So that I can personalize my posts
+
+
+  Background:
+    Given I have a user account
+    Given I am logged in
+    Given we have the following posts in our database:
+      | authorId         | id | title              | content              | 
+      | id-of-peter-pan  | p1 | Post to be updated | successfully updated |
+
+  Scenario: Create a Post with a Teaser Image
+    When I click on the big plus icon in the bottom right corner to create post
+    Then I should be able to "add" a teaser image
+    And confirm crop
+    And I add all required fields
+    And I click on "Save"
+    Then I get redirected to ".../new-post"
+    And the post was saved successfully with the "new" teaser image
+
+  Scenario: Update a Post to add an image
+    Given I am on the 'post/edit/p1' page
+    And I should be able to "change" a teaser image
+    And confirm crop
+    And I click on "Save"
+    Then I see a toaster with "Saved!"
+    And I get redirected to ".../post-to-be-updated"
+    Then the post was saved successfully with the "updated" teaser image
+  
+  Scenario: Add image, then add a different image
+    When I click on the big plus icon in the bottom right corner to create post
+    Then I should be able to "add" a teaser image
+    And confirm crop
+    And I should be able to "change" a teaser image
+    And confirm crop
+    And the first image should be removed from the preview
+
+  Scenario: Add image, then delete it
+    When I click on the big plus icon in the bottom right corner to create post
+    Then I should be able to "add" a teaser image
+    And I should be able to remove it
+    And I add all required fields
+    And I click on "Save"
+    Then I get redirected to ".../new-post"
+    And the post was saved successfully without a teaser image
\ No newline at end of file
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 5943526c7..82ab65318 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -68,6 +68,7 @@ export default {
       oldImage: null,
       error: false,
       showCropper: false,
+      imageAspectRatio: null,
     }
   },
   methods: {
@@ -113,29 +114,41 @@ export default {
     },
     cropImage() {
       this.showCropper = false
+      if (this.file.type === 'image/png' || this.file.type === 'image/svg+xml') {
+        this.uploadSvgOrPng()
+      } else {
+        this.uploadJpeg()
+      }
+    },
+    uploadSvgOrPng() {
+      this.imageAspectRatio = this.file.width / this.file.height || 1.0
+      this.image = new Image()
+      this.image.src = this.file.dataURL
+      this.setupPreview()
+      this.emitImageData(this.file)
+    },
+    uploadJpeg() {
       const canvas = this.cropper.getCroppedCanvas()
       canvas.toBlob(blob => {
-        const imageAspectRatio = canvas.width / canvas.height
-        this.setupPreview(canvas)
-        this.removeCropper()
+        this.imageAspectRatio = canvas.width / canvas.height
+        this.image = new Image()
+        this.image.src = canvas.toDataURL()
+        this.setupPreview()
         const croppedImageFile = new File([blob], this.file.name, { type: this.file.type })
-        this.$emit('addTeaserImage', croppedImageFile)
-        this.$emit('addImageAspectRatio', imageAspectRatio)
+        this.emitImageData(croppedImageFile)
       }, 'image/jpeg')
     },
-    setupPreview(canvas) {
-      this.image = new Image()
-      this.image.src = canvas.toDataURL()
+    setupPreview() {
       this.image.classList.add('thumbnail-preview')
       this.thumbnailElement.appendChild(this.image)
     },
     cancelCrop() {
-      this.showCropper = false
       if (this.oldImage) this.thumbnailElement.appendChild(this.oldImage)
-      this.removeCropper()
+      this.showCropper = false
     },
-    removeCropper() {
-      this.editor.removeChild(document.querySelectorAll('.cropper-container')[0])
+    emitImageData(imageFile) {
+      this.$emit('addTeaserImage', imageFile)
+      this.$emit('addImageAspectRatio', this.imageAspectRatio)
     },
   },
 }

From f9829e573d2c8678dd3fa446e6d08d61029cda04 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2020 17:04:41 +0000
Subject: [PATCH 142/171] build(deps-dev): bump @storybook/addon-actions in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 50f68c868..37d5e49d2 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.4",
     "@storybook/addon-a11y": "^5.3.13",
-    "@storybook/addon-actions": "^5.3.12",
+    "@storybook/addon-actions": "^5.3.13",
     "@storybook/addon-notes": "^5.3.13",
     "@storybook/vue": "~5.3.13",
     "@vue/cli-shared-utils": "~4.2.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index abe5d0f6a..ede67cd56 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2125,17 +2125,17 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.12.tgz#024678ddd207f050e42c5f8e20b5064cf9839a38"
-  integrity sha512-3j6ZJROcH4bm8vpaM2RU/sRdoOLF9DpVWiE6uutlrVEV6eWuexrUAYwSzuF4Pjr1LUWDSDIT9pEES+tHdn9Rww==
+"@storybook/addon-actions@^5.3.13":
+  version "5.3.13"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.13.tgz#faf57ca14a46ce0c69168c631fbfc3d79d294b38"
+  integrity sha512-NoKTI/7Zf/IpbfeIFPWQT3eN0As1yICLcSklj9BjHq7itSssaqZzvP/vxmeAvdagIBcPM58GaN9XXXLQIn5HLg==
   dependencies:
-    "@storybook/addons" "5.3.12"
-    "@storybook/api" "5.3.12"
-    "@storybook/client-api" "5.3.12"
-    "@storybook/components" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    "@storybook/theming" "5.3.12"
+    "@storybook/addons" "5.3.13"
+    "@storybook/api" "5.3.13"
+    "@storybook/client-api" "5.3.13"
+    "@storybook/components" "5.3.13"
+    "@storybook/core-events" "5.3.13"
+    "@storybook/theming" "5.3.13"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -2177,19 +2177,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/addons@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.12.tgz#77fb0e0d3ac9eb70414bff4b03c12bbccfe31716"
-  integrity sha512-5jVns+wq95ZismEQ5ByDhrEFzDH8OIEj2BLSPT7VTbik7iLC+h7H2toWKAwIYZCxAuq0OTy6ZpIyhU/R2YuO4w==
-  dependencies:
-    "@storybook/api" "5.3.12"
-    "@storybook/channels" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/addons@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.13.tgz#8c16fbab1142e2cd4bdfb93ffcb35a883dac2866"
@@ -2226,32 +2213,6 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.12.tgz#7d1ca7a487fb9b6604d26cae756e291015908d35"
-  integrity sha512-wYsr97vqARwmOordlPY17MJ9PrHSCsSM9JRC/zh698kXQGwYnse1nErzAiwj8YxuItfWGzE06kqjZBccnfSxPQ==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/channels" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "5.3.12"
-    "@storybook/theming" "5.3.12"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.13.tgz#51cbdb461ff2ee8468a3c54411f42f07aa307f5d"
@@ -2278,17 +2239,6 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.12.tgz#945c9702f335018f6224af3159bf4d33c66a131e"
-  integrity sha512-yQZ6Ef0KnxI7vxJrcJaBYeZpxhl/18WEFtAO9MphvYvtd1dudqKNqdx9B/30PIXb7c/SptvGJR/EZhsRNr4Oug==
-  dependencies:
-    "@storybook/channels" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^3.2.0"
-
 "@storybook/channel-postmessage@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.13.tgz#80cf8136bf4b96b2f9b291d3cc81e5d02abecc98"
@@ -2307,13 +2257,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/channels@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.12.tgz#dd2e111377f0eaafa0e66746cb6628322615ade9"
-  integrity sha512-sfSHIRUusjZ69WhfPp8BrfmlGg80PYTNCBSE+1apK/WkgzYJyGgQmJgRAW6HTFqjawD7T+utAtarsqS30jo9jQ==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/channels@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.13.tgz#2adf4595988e2586f1a360cf4760f16338ffec26"
@@ -2321,29 +2264,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-api@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.12.tgz#7c18921d0290b30b020ad7d41fbda170009780bd"
-  integrity sha512-Qzi+pS9FwqrArnG1VMV4QJxEdvw7KVc2ufgax7jCvK8JtDlSVe1/qpbJn7U3o1z4TPY/u3m6PbBLJDoSWTVonw==
-  dependencies:
-    "@storybook/addons" "5.3.12"
-    "@storybook/channel-postmessage" "5.3.12"
-    "@storybook/channels" "5.3.12"
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/core-events" "5.3.12"
-    "@storybook/csf" "0.0.1"
-    "@types/webpack-env" "^1.15.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    stable "^0.1.8"
-    ts-dedent "^1.1.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.13.tgz#0d41ae3846a6ae2ebbbeef0ca945c3ee6448ba2e"
@@ -2374,13 +2294,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-logger@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.12.tgz#64033dd647b6ce6971977e4f5ce2908de21526eb"
-  integrity sha512-LsKDW4ijGJjyRg3GetS/OtVS+8ESxydVG55jvAlExHehUcVRvrPew5MsW63CRTQDpZsoh1aT9oV1yr8eYu1HZg==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-logger@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.13.tgz#1c2abf0fc53009cf159eb76e30cf32ce2b9327b1"
@@ -2413,33 +2326,6 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/components@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.12.tgz#0d930343624d459f46cd55b140be979709ee5a29"
-  integrity sha512-Ma67yaSJHaNqLjp2csOZvHdu1Sk1eMke29WVEWjPYUBzzaZK7ZlmGiXzN0roYJVGaqHkl2f7xxRfPfWQp9NCIw==
-  dependencies:
-    "@storybook/client-logger" "5.3.12"
-    "@storybook/theming" "5.3.12"
-    "@types/react-syntax-highlighter" "11.0.2"
-    "@types/react-textarea-autosize" "^4.3.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^2.1.0"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^11.0.2"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-    ts-dedent "^1.1.0"
-
 "@storybook/components@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.13.tgz#646f8347ffa38298e3f9c1d15866c2167f577027"
@@ -2474,13 +2360,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.12.tgz#188526c9003884104cce4fcd20448ca34d14d9f7"
-  integrity sha512-qUX0xvADM8LBUtzeTi8r803eeikyzooH8HwnUg6GP238NRnR13BK/tSnBx6XpJubGL5gv9a1jZJQWxP25KPHfA==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core-events@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.13.tgz#df74d2ffe29a1924557dc67e46d5d399893b2b11"
@@ -2599,21 +2478,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.12.tgz#f08d75793790aacc5543c55e62d08d3bb00188fd"
-  integrity sha512-IuI/MMFb27XGFaFjaUCYUgK+P4jeGLBDI4cCn6Fezb5RRgpdOf2DobDIUZtujSmvPnEF8C+SJE/v1dXihRO1Xg==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/csf" "0.0.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/router@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.13.tgz#1ef971488036083ee284323fe8814b8795f94626"
@@ -2647,24 +2511,6 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/theming@5.3.12":
-  version "5.3.12"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.12.tgz#70908dc23c0635765256fc4dbb7cd6d318886dfe"
-  integrity sha512-LwyFBbxYtm2rr86mA0d+oYisIpW2GrDqmv0ZGEmx9EqKK1JwG3N99VSK7iHig6vpNu42LHLakuaqK55H2Q7YcA==
-  dependencies:
-    "@emotion/core" "^10.0.20"
-    "@emotion/styled" "^10.0.17"
-    "@storybook/client-logger" "5.3.12"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-    ts-dedent "^1.1.0"
-
 "@storybook/theming@5.3.13":
   version "5.3.13"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.13.tgz#17e8101e2d3ad3fb6245b2cb15b07e9f2a9881cd"

From 5a50a88714a7c0e4aaab1bd8c7960e8341af748a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2020 04:19:42 +0000
Subject: [PATCH 143/171] build(deps-dev): bump vue-loader from 15.8.3 to
 15.9.0 in /webapp

Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.8.3 to 15.9.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.8.3...v15.9.0)

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

diff --git a/webapp/package.json b/webapp/package.json
index 37d5e49d2..a88318ac7 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -141,7 +141,7 @@
     "style-loader": "~0.23.1",
     "style-resources-loader": "~1.3.3",
     "vue-jest": "~3.0.5",
-    "vue-loader": "~15.8.3",
+    "vue-loader": "~15.9.0",
     "vue-svg-loader": "~0.16.0",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ede67cd56..0ae22380e 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -16492,10 +16492,10 @@ vue-jest@~3.0.5:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-loader@^15.8.3, vue-loader@~15.8.3:
-  version "15.8.3"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.8.3.tgz#857cb9e30eb5fc25e66db48dce7e4f768602a23c"
-  integrity sha512-yFksTFbhp+lxlm92DrKdpVIWMpranXnTEuGSc0oW+Gk43M9LWaAmBTnfj5+FCdve715mTHvo78IdaXf5TbiTJg==
+vue-loader@^15.8.3, vue-loader@~15.9.0:
+  version "15.9.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998"
+  integrity sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ==
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
     hash-sum "^1.0.2"

From b93ed8dc1b35b7f25d12512ec1b9c1273154b66f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2020 04:18:52 +0000
Subject: [PATCH 144/171] build(deps): bump metascraper-image from 5.10.7 to
 5.11.1 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 188681945..2fd13a021 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -75,7 +75,7 @@
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.10.7",
     "metascraper-description": "^5.11.0",
-    "metascraper-image": "^5.10.7",
+    "metascraper-image": "^5.11.1",
     "metascraper-lang": "^5.10.7",
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.10.7",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 8d9d8e42d..b48f3bcaa 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1175,13 +1175,13 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.10.7":
-  version "5.10.7"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.10.7.tgz#4d330204372ce5c1afedfc3ac891fb373f72c085"
-  integrity sha512-YkL4vTF4grgNTFhe9t4qsD0c5aEjxWoC0cpvMICs6JriRtedwjVfiwWhaGiTbU3pGFhmLgE9fV42wXOXGUGjMQ==
+"@metascraper/helpers@^5.10.7", "@metascraper/helpers@^5.11.1":
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.11.1.tgz#227fdd0caf1d33f4b24a85298a355ce7ebb451df"
+  integrity sha512-oES/e6bwKBlT7WGa2ni3xbJMDx2rbFxSzbUhRX8D+Kylb8H2ThP07c7f+VXMPXWx5CPrNMai/Oyp5IczCf3v8g==
   dependencies:
     audio-extensions "0.0.0"
-    chrono-node "~1.4.2"
+    chrono-node "~1.4.3"
     condense-whitespace "~2.0.0"
     entities "~2.0.0"
     file-extension "~4.0.5"
@@ -2691,10 +2691,10 @@ chrono-node@~1.3.11:
   dependencies:
     moment "2.21.0"
 
-chrono-node@~1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-1.4.2.tgz#0c7fc1f264e60a660c2b2dab753a3f285dbfd8c9"
-  integrity sha512-fsb82wPDHVZl3xtche8k4ZZtNwf81/ZMueil2ANpSfogUAEa3BuzZAar7ObLXi1ptMjBzdzA6ys/bFq1oBjO8w==
+chrono-node@~1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-1.4.3.tgz#4c8e24643ec5e576f6f8fe0429370c3b554491b4"
+  integrity sha512-ZyKcnTcr8i7Mt9p4+ixMHEuR6+eMTrjYCL9Rm9TZHviLleCtcZoVzmr2uSc+Vg8MX1YbNCnPbEd4rfV8WvzLcw==
   dependencies:
     dayjs "^1.8.19"
 
@@ -6234,12 +6234,12 @@ metascraper-description@^5.11.0:
   dependencies:
     "@metascraper/helpers" "^5.10.7"
 
-metascraper-image@^5.10.7:
-  version "5.10.7"
-  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.10.7.tgz#9b1da02f2e748fd388dea6394d29b6e43c367924"
-  integrity sha512-xrR4Rl8UNwwyzMfrKH3RtaC775aHDXVT0TQEzn5p5uYfd4evLI2O+jr1CIBIl1d3CXqVxWCQWBY3gA7RtcjgWQ==
+metascraper-image@^5.11.1:
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.11.1.tgz#e63e9ff045441783f9aa8c684e04927cac289e44"
+  integrity sha512-Nz2ZTecj2V0KgK2QE390dOSedppaG2PtUBrTz/oaFLMZEReBtMVrcygYm9VuuTpa6XwkubvuBaouCRah12zdfg==
   dependencies:
-    "@metascraper/helpers" "^5.10.7"
+    "@metascraper/helpers" "^5.11.1"
 
 metascraper-lang-detector@^4.10.2:
   version "4.10.2"

From 4fae9191c1995b3ffd69645bcfa65a6b6957fb25 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2020 04:23:15 +0000
Subject: [PATCH 145/171] build(deps): bump @nuxtjs/sentry from 3.2.2 to 3.2.3
 in /webapp

Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.2.2...v3.2.3)

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

diff --git a/webapp/package.json b/webapp/package.json
index a88318ac7..740d3f539 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,7 +62,7 @@
     "@nuxtjs/axios": "~5.9.5",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
-    "@nuxtjs/sentry": "^3.2.2",
+    "@nuxtjs/sentry": "^3.2.3",
     "@nuxtjs/style-resources": "~1.0.0",
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.5",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 0ae22380e..609c2e043 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1721,15 +1721,15 @@
     jimp-compact "^0.8.0"
     workbox-cdn "^4.3.1"
 
-"@nuxtjs/sentry@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.2.2.tgz#ee0add861b18844f8367e1e30d5c7bac1e5f5c91"
-  integrity sha512-eoHSoN9+QiHwIBY8aa8sVgZnh9X73BqlZy0qtO3LthM2awROFEYJ3sqIGkhrucgTrRM8na6LAFNEvd64QI9sCw==
+"@nuxtjs/sentry@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.2.3.tgz#ac102faeb9b1d6ad65d14abdb9705173108dc6c2"
+  integrity sha512-3dTH9y2Of70h7JSk73kuxRMd9zxidwMsZp/OJJlb66b73rKR9dZtBCkH6J7z1vh+32b5IZh9vLP1LfWZaHnd0Q==
   dependencies:
-    "@sentry/browser" "^5.11.2"
-    "@sentry/integrations" "^5.11.1"
-    "@sentry/node" "^5.11.2"
-    "@sentry/webpack-plugin" "^1.9.3"
+    "@sentry/browser" "^5.12.1"
+    "@sentry/integrations" "^5.12.0"
+    "@sentry/node" "^5.12.3"
+    "@sentry/webpack-plugin" "^1.10.0"
     consola "^2.11.3"
     deepmerge "^4.2.2"
 
@@ -1989,26 +1989,26 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@sentry/apm@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.11.2.tgz#35961b9d2319ad21ae91f1b697998a8c523f1919"
-  integrity sha512-qn4HiSZ+6b1Gg+DlXdHVpiPPEbRu4IicGSbI8HTJLzrlsjoaBQPPkDwtuQUBVq21tU3RYXnTwrl9m45KuX6alA==
+"@sentry/apm@5.12.3":
+  version "5.12.3"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.12.3.tgz#23a5e9c771a8748f59426a1d0f8b1fbb9b72a717"
+  integrity sha512-OSGEeo4b1Gsu/TUcWMx9vmgSnQvR+zM+1Iwq5xFQAK2ET3Y4gBFqZ1iRt2hxlzr8KCQmQTQc1mao1X0tmidFQg==
   dependencies:
-    "@sentry/browser" "5.11.2"
-    "@sentry/hub" "5.11.2"
-    "@sentry/minimal" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/browser" "5.12.1"
+    "@sentry/hub" "5.12.0"
+    "@sentry/minimal" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/browser@5.11.2", "@sentry/browser@^5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.11.2.tgz#f0b19bd97e9f09a20e9f93a9835339ed9ab1f5a4"
-  integrity sha512-ls6ARX5m+23ld8OsuoPnR+kehjR5ketYWRcDYlmJDX2VOq5K4EzprujAo8waDB0o5a92yLXQ0ZSoK/zzAV2VoA==
+"@sentry/browser@5.12.1", "@sentry/browser@^5.12.1":
+  version "5.12.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.12.1.tgz#dc1f268595269fb7277f55eb625c7e92d76dc01b"
+  integrity sha512-Zl7VdppUxctyaoqMSEhnDJp2rrupx8n8N2n3PSooH74yhB2Z91nt84mouczprBsw3JU1iggGyUw9seRFzDI1hw==
   dependencies:
-    "@sentry/core" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/core" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
 "@sentry/cli@^1.49.0":
@@ -2023,76 +2023,76 @@
     progress "2.0.0"
     proxy-from-env "^1.0.0"
 
-"@sentry/core@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.11.2.tgz#f2d9d37940d291dbcb9a9e4a012f76919474bdf6"
-  integrity sha512-IFCXGy7ebqIq/Kb8RVryCo/SjwhPcrfBmOjkicr4+DxN1UybLre2N3p9bejQMPIteOfDVHlySLYeipjTf+mxZw==
+"@sentry/core@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.12.0.tgz#d6380c4ef7beee5f418ac1d0e5be86a2de2af449"
+  integrity sha512-wY4rsoX71QsGpcs9tF+OxKgDPKzIFMRvFiSRcJoPMfhFsTilQ/CBMn/c3bDtWQd9Bnr/ReQIL6NbnIjUsPHA4Q==
   dependencies:
-    "@sentry/hub" "5.11.2"
-    "@sentry/minimal" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/hub" "5.12.0"
+    "@sentry/minimal" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/hub@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.11.2.tgz#a3b7ec27cd4cea2cddd75c372fbf1b4bc04c6aae"
-  integrity sha512-5BiDin6ZPsaiTm29rCC41MAjP1vOaKniqfjtXHVPm7FeOBA2bpHm95ncjLkshKGJTPfPZHXTpX/1IZsHrfGVEA==
+"@sentry/hub@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.12.0.tgz#5e8c8f249f5bdbeb8cc4ec02c2ccc53a67f2cc02"
+  integrity sha512-3k7yE8BEVJsKx8mR4LcI4IN0O8pngmq44OcJ/fRUUBAPqsT38jsJdP2CaWhdlM1jiNUzUDB1ktBv6/lY+VgcoQ==
   dependencies:
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/integrations@^5.11.1":
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.11.1.tgz#6612efc620c187ba85a57c6e70e69d9474af7fb6"
-  integrity sha512-zubOE9zQ4qSutS0ZTnAteDnzbVcHSI2bXD/0nTD3t3ljY+OWgcluBXYCAeAp8vOv2qCoef5ySdQa1DBCW7NQ3Q==
+"@sentry/integrations@^5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.12.0.tgz#4d735abf2989049ef860e3eaad0883b63d8274e6"
+  integrity sha512-4G/TvCEP9M6xgY61r46UE4ruSgF42rZnvO0ZfIBI/240DNYMTpHLvjU3Xvrv3wDl3emCvy4QgAIceI/zj8nPjw==
   dependencies:
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.11.2.tgz#ae417699342266ecd109a97e53cd9519c0893b21"
-  integrity sha512-oNuJuz3EZhVtamzABmPdr6lcYo06XHLWb2LvgnoNaYcMD1ExUSvhepOSyZ2h5STCMbmVgGVfXBNPV9RUTp8GZg==
+"@sentry/minimal@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.12.0.tgz#2611e2aa520c1edb7999e6de51bd65ec66341757"
+  integrity sha512-fk73meyz4k4jCg9yzbma+WkggsfEIQWI2e2TWfYsRGcrV3RnlSrXyM4D91/A8Bjx10SNezHPUFHjasjlHXOkyA==
   dependencies:
-    "@sentry/hub" "5.11.2"
-    "@sentry/types" "5.11.0"
+    "@sentry/hub" "5.12.0"
+    "@sentry/types" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/node@^5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.11.2.tgz#575c320b624c218d2155183f6bbe82b732bfb1f2"
-  integrity sha512-jYq9u76BdAbOKPuYg39Xh/+797MevzjMkCIC9cw/bQxAm6nHc3FXeKqd79O33jO4Jag0JL+Bz/0JidgrKgKgXg==
+"@sentry/node@^5.12.3":
+  version "5.12.3"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.12.3.tgz#4a4934b04c5163fc340312eaf0d152990aa7140f"
+  integrity sha512-QwqN+i6IC3/YrNq7kqxH7YiXtZYY8tBuJqFi84WbiMHF7MAqxMSPNQJGfX2GJuMHKHwn6IZdgSE8+FkfN9zGLQ==
   dependencies:
-    "@sentry/apm" "5.11.2"
-    "@sentry/core" "5.11.2"
-    "@sentry/hub" "5.11.2"
-    "@sentry/types" "5.11.0"
-    "@sentry/utils" "5.11.1"
+    "@sentry/apm" "5.12.3"
+    "@sentry/core" "5.12.0"
+    "@sentry/hub" "5.12.0"
+    "@sentry/types" "5.12.0"
+    "@sentry/utils" "5.12.0"
     cookie "^0.3.1"
     https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.11.0.tgz#40f0f3174362928e033ddd9725d55e7c5cb7c5b6"
-  integrity sha512-1Uhycpmeo1ZK2GLvrtwZhTwIodJHcyIS6bn+t4IMkN9MFoo6ktbAfhvexBDW/IDtdLlCGJbfm8nIZerxy0QUpg==
+"@sentry/types@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.12.0.tgz#5367e53c74261beea01502e3f7b6f3d822682a31"
+  integrity sha512-aZbBouBLrKB8wXlztriIagZNmsB+wegk1Jkl6eprqRW/w24Sl/47tiwH8c5S4jYTxdAiJk+SAR10AAuYmIN3zg==
 
-"@sentry/utils@5.11.1":
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.11.1.tgz#aa19fcc234cf632257b2281261651d2fac967607"
-  integrity sha512-O0Zl4R2JJh8cTkQ8ZL2cDqGCmQdpA5VeXpuBbEl1v78LQPkBDISi35wH4mKmLwMsLBtTVpx2UeUHBj0KO5aLlA==
+"@sentry/utils@5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.12.0.tgz#62967f934a3ee6d21472eac0219084e37225933e"
+  integrity sha512-fYUadGLbfTCbs4OG5hKCOtv2jrNE4/8LHNABy9DwNJ/t5DVtGqWAZBnxsC+FG6a3nVqCpxjFI9AHlYsJ2wsf7Q==
   dependencies:
-    "@sentry/types" "5.11.0"
+    "@sentry/types" "5.12.0"
     tslib "^1.9.3"
 
-"@sentry/webpack-plugin@^1.9.3":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.9.3.tgz#bf29bf16ae82863140639063ffa620a80452303b"
-  integrity sha512-b0ZExcvde15jSm7N5LjeosCcWFZFjZbGHEsXdNramm5B0TL+kwWA4thyW4v8rSrAEA2jxXDW2aop5cwBHCI2wg==
+"@sentry/webpack-plugin@^1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.10.0.tgz#7f7727b18dbdd3eaeb0998102be89d8733ddbca5"
+  integrity sha512-keT6cH8732bFjdH/v+C/UwbJu6byZ5L8t7QRLjgj+fqDyc/RlVEw9VzIQSJGUtd2XgImpdduWzgxythLkwKJjg==
   dependencies:
     "@sentry/cli" "^1.49.0"
 

From 62d4947dd84e69cd3e65c8104e7bb4f2397da257 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2020 04:23:49 +0000
Subject: [PATCH 146/171] build(deps): bump cookie-universal-nuxt from 2.1.1 to
 2.1.2 in /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index a88318ac7..ef3813112 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -67,7 +67,7 @@
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
-    "cookie-universal-nuxt": "~2.1.1",
+    "cookie-universal-nuxt": "~2.1.2",
     "cropperjs": "^1.5.5",
     "cross-env": "~7.0.0",
     "date-fns": "2.9.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 0ae22380e..8dac1c72a 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5944,10 +5944,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie-universal-nuxt@~2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.1.tgz#883b28d699b69f3b56de437253978e43c4e4d672"
-  integrity sha512-ACKtgwafdIE3Kr18pv8JJiEUvOEygKeD7dVowytlbpEuPKrMh288XEkPsTSjgsRY35vRkSorifePo4uv+YQsNw==
+cookie-universal-nuxt@~2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.2.tgz#790a6fc72e5f34b4cf7cf77d92bf2ee63e207901"
+  integrity sha512-UEE8uglIlTq+SYhOv6LhdZ/ByDk+f3mQPrUEkJFXU81Ck56ox5UR5CdHmeFtfpibpD8DvWHh4nnCHOpA22gRnQ==
   dependencies:
     "@types/cookie" "^0.3.3"
     cookie-universal "^2.1.1"

From d8d1db389aaf21f35adef73bcfdb04fb72aed862 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 14 Feb 2020 19:49:00 +0100
Subject: [PATCH 147/171] Follow @roschaefer PR review suggestions

- create mapping for expectedValues in post.js
- check from image/jpeg and compress, if not just pass to backend as is
---
 cypress/integration/common/post.js            | 10 ++++++----
 webapp/components/TeaserImage/TeaserImage.vue |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cypress/integration/common/post.js b/cypress/integration/common/post.js
index 2c35cb280..3f5e0f3b2 100644
--- a/cypress/integration/common/post.js
+++ b/cypress/integration/common/post.js
@@ -5,7 +5,7 @@ import orderBy from 'lodash/orderBy'
 const languages = orderBy(locales, 'name')
 const narratorAvatar =
   "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg";
-
+let expectedValue = { title: 'new post', content: 'new post content', src: 'onourjourney' }
 When("I type in a comment with {int} characters", size => {
   var c="";
   for (var i = 0; i < size; i++) {
@@ -119,13 +119,15 @@ Then("I add all required fields", () => {
 })
 
 Then("the post was saved successfully with the {string} teaser image", condition => {
+  if (condition === 'change') 
+    expectedValue = { title: 'to be updated', content: 'successfully updated', src: 'humanconnection' }
   cy.get(".ds-card-content > .ds-heading")
-    .should("contain", condition === 'new' ? 'new post' : 'to be updated')
+    .should("contain", expectedValue.title)
     .get(".content")
-    .should("contain", condition === 'new' ? 'new post content' : 'successfully updated')
+    .should("contain", expectedValue.content)
     .get('.post-page img')
     .should("have.attr", "src")
-    .and("contains", condition === 'new' ? "onourjourney" : "humanconnection")
+    .and("contains", expectedValue.src)
 })
 
 Then("the first image should be removed from the preview", () => {
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 82ab65318..534331347 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -114,13 +114,13 @@ export default {
     },
     cropImage() {
       this.showCropper = false
-      if (this.file.type === 'image/png' || this.file.type === 'image/svg+xml') {
-        this.uploadSvgOrPng()
-      } else {
+      if (this.file.type === 'image/jpeg') {
         this.uploadJpeg()
+      } else {
+        this.uploadOtherImageType()
       }
     },
-    uploadSvgOrPng() {
+    uploadOtherImageType() {
       this.imageAspectRatio = this.file.width / this.file.height || 1.0
       this.image = new Image()
       this.image.src = this.file.dataURL

From 7ce40b3b37cf278318a4c4a2618e1d7446c7dbc2 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 14 Feb 2020 20:44:39 +0100
Subject: [PATCH 148/171] Fix cypress test

---
 cypress/integration/common/post.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/common/post.js b/cypress/integration/common/post.js
index 3f5e0f3b2..04bc23a8e 100644
--- a/cypress/integration/common/post.js
+++ b/cypress/integration/common/post.js
@@ -119,7 +119,7 @@ Then("I add all required fields", () => {
 })
 
 Then("the post was saved successfully with the {string} teaser image", condition => {
-  if (condition === 'change') 
+  if (condition === 'updated') 
     expectedValue = { title: 'to be updated', content: 'successfully updated', src: 'humanconnection' }
   cy.get(".ds-card-content > .ds-heading")
     .should("contain", expectedValue.title)

From 6d635bac1dce7bdbd916d8cbcbe42edcc2f6bf87 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 17 Feb 2020 12:41:46 +0100
Subject: [PATCH 149/171] Wait for category to be created

---
 cypress/integration/common/steps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index c51290537..f96ec78e6 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -196,8 +196,8 @@ Given("we have the following comments in our database:", table => {
   })
 });
 
-Given("we have the following posts in our database:", table => {
-  cy.factory().build('category', {
+Given("we have the following posts in our database:", async table => {
+  await cy.factory().build('category', {
     id: `cat-456`,
     name: "Just For Fun",
     slug: `just-for-fun`,

From 54af884e5064c0863989fe5605bff255018f3337 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 17 Feb 2020 18:38:51 +0100
Subject: [PATCH 150/171] Log out before logging in as other user

---
 cypress/integration/common/steps.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index eb533a5a2..dd90e7e76 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -46,6 +46,7 @@ Given("I am logged in", () => {
 });
 
 Given("I log in as {string}", name => {
+  cy.logout()
   cy.neode()
     .first("User", {
       name

From a2f78462d27edf5f34144b3cc579523cefcaef61 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 17 Feb 2020 20:23:09 +0100
Subject: [PATCH 151/171] Use promise for creating category

---
 cypress/integration/common/steps.js | 40 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index dd90e7e76..0245da208 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -229,24 +229,28 @@ Given("we have the following comments in our database:", table => {
   })
 });
 
-Given("we have the following posts in our database:", async table => {
-  await cy.factory().build('category', {
-    id: `cat-456`,
-    name: "Just For Fun",
-    slug: `just-for-fun`,
-    icon: "smile"
-  })
-
-  table.hashes().forEach((attributesOrOptions, i) => {
-    cy.factory().build("post", {
-      ...attributesOrOptions,
-      deleted: Boolean(attributesOrOptions.deleted),
-      disabled: Boolean(attributesOrOptions.disabled),
-      pinned: Boolean(attributesOrOptions.pinned),
-    }, {
-      ...attributesOrOptions,
-      categoryIds: ['cat-456']
-    });
+Given("we have the following posts in our database:", table => {
+  return new Cypress.Promise((resolve, reject) => {
+    cy.factory().build('category', {
+      id: `cat-456`,
+      name: "Just For Fun",
+      slug: `just-for-fun`,
+      icon: "smile"
+    }).then(categoryJson => {
+      categoryJson.toJson().then(category => resolve(category))
+    }).then(category => {
+      table.hashes().forEach((attributesOrOptions, i) => {
+        cy.factory().build("post", {
+          ...attributesOrOptions,
+          deleted: Boolean(attributesOrOptions.deleted),
+          disabled: Boolean(attributesOrOptions.disabled),
+          pinned: Boolean(attributesOrOptions.pinned),
+        }, {
+          ...attributesOrOptions,
+          categoryIds: category.id
+        });
+      })
+    })
   })
 });
 

From 119e542e8669a7ffa8c4c0328fdc4d600c7bc6a9 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 17 Feb 2020 20:51:13 +0100
Subject: [PATCH 152/171] Fix syntax error

---
 cypress/integration/common/steps.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 0245da208..11feb4eaf 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -230,15 +230,17 @@ Given("we have the following comments in our database:", table => {
 });
 
 Given("we have the following posts in our database:", table => {
-  return new Cypress.Promise((resolve, reject) => {
     cy.factory().build('category', {
       id: `cat-456`,
       name: "Just For Fun",
       slug: `just-for-fun`,
       icon: "smile"
     }).then(categoryJson => {
-      categoryJson.toJson().then(category => resolve(category))
-    }).then(category => {
+      return new Cypress.Promise((resolve, _reject) => {
+        return categoryJson.toJson().then(category => resolve(category))
+      })
+    })
+    .then(category => {
       table.hashes().forEach((attributesOrOptions, i) => {
         cy.factory().build("post", {
           ...attributesOrOptions,

From 1ca8a7fc86e31e7f0dbdfd719d8b3cd34c403f00 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 17 Feb 2020 21:23:49 +0100
Subject: [PATCH 153/171] Fix other syntax error :doh:

---
 cypress/integration/common/steps.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 11feb4eaf..02a5635d6 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -253,8 +253,7 @@ Given("we have the following posts in our database:", table => {
         });
       })
     })
-  })
-});
+})
 
 Then("I see a success message:", message => {
   cy.contains(message);

From 2e19cf6592d546ffa1ce31ed40da80a5f554a9b4 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 17 Feb 2020 22:54:19 +0100
Subject: [PATCH 154/171] fix(nuxt-env): Configuration issue with websockets

After some intensive debugging I found out that `req` (on the server)
and `nuxtState` (on the client) have access to the configurations
changed at runtime.

How did I debug it:
```
yarn run build
env WEBSOCKET_URI=whatever yarn run start
```
I also put a `console.log` into `plugins/apollo-client.js`.
---
 webapp/.env.template            | 2 ++
 webapp/nuxt.config.js           | 8 +++++++-
 webapp/plugins/apollo-config.js | 7 ++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/webapp/.env.template b/webapp/.env.template
index fdabcf003..b00e6855a 100644
--- a/webapp/.env.template
+++ b/webapp/.env.template
@@ -2,3 +2,5 @@ MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2l
 SENTRY_DSN_WEBAPP=
 COMMIT=
 PUBLIC_REGISTRATION=false
+WEBSOCKETS_URI=ws://localhost:3000/api/graphql
+GRAPHQL_URI=http://localhost:4000/
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index c1283a9be..2ef42f139 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -4,7 +4,13 @@ import dotenv from 'dotenv'
 dotenv.config() // we want to synchronize @nuxt-dotenv and nuxt-env
 
 const pkg = require('./package')
-export const envWhitelist = ['NODE_ENV', 'MAPBOX_TOKEN', 'PUBLIC_REGISTRATION']
+export const envWhitelist = [
+  'NODE_ENV',
+  'MAPBOX_TOKEN',
+  'PUBLIC_REGISTRATION',
+  'WEBSOCKETS_URI',
+  'GRAPHQL_URI',
+]
 const dev = process.env.NODE_ENV !== 'production'
 
 const styleguidePath = '../styleguide'
diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js
index b89d9a188..63282a341 100644
--- a/webapp/plugins/apollo-config.js
+++ b/webapp/plugins/apollo-config.js
@@ -5,11 +5,12 @@ const fragmentMatcher = new IntrospectionFragmentMatcher({
   introspectionQueryResultData,
 })
 
-export default ({ app }) => {
-  const backendUrl = process.env.GRAPHQL_URI || 'http://localhost:4000'
+export default ({ req, nuxtState }) => {
+  const { env } = req || nuxtState
+  const backendUrl = env.GRAPHQL_URI || 'http://localhost:4000'
 
   return {
-    wsEndpoint: process.env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
+    wsEndpoint: env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
     httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {
       credentials: 'same-origin',

From 2ca4939ef045d8092beb43d40252a3415fae8996 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 17 Feb 2020 20:15:51 +0100
Subject: [PATCH 155/171] Refactor: Don't use async/await in cypress

---
 cypress/integration/common/report.js |  8 +++---
 cypress/integration/common/steps.js  | 40 +++++++++++++++++-----------
 cypress/support/commands.js          | 31 ++++++++++++---------
 cypress/support/factories.js         | 15 +++++------
 4 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index cc424ef3e..f209ceef7 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -42,10 +42,12 @@ Given('I am logged in with a {string} role', role => {
     .first("User", {
       name: `${role} is my name`,
     })
-    .then(async user => {
-      const userJson = await user.toJson()
-      cy.login(userJson)
+    .then(user => {
+      return new Cypress.Promise((resolve, reject) => {
+        return user.toJson().then((user) => resolve(user))
+      })
     })
+    .then(user => cy.login(user))
 })
 
 When('I click on "Report Post" from the content menu of the post', () => {
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 73de67480..a4bdb6475 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -39,10 +39,12 @@ Given("I am logged in", () => {
     .first("User", {
       name: narratorParams.name
     })
-    .then(async user => {
-      const userJson = await user.toJson()
-      cy.login(userJson)
+    .then(user => {
+      return new Cypress.Promise((resolve, reject) => {
+        return user.toJson().then((user) => resolve(user))
+      })
     })
+    .then(user => cy.login(user))
 });
 
 Given("I log in as {string}", name => {
@@ -50,10 +52,12 @@ Given("I log in as {string}", name => {
     .first("User", {
       name
     })
-    .then(async user => {
-      const userJson = await user.toJson()
-      cy.login(userJson)
+    .then(user => {
+      return new Cypress.Promise((resolve, reject) => {
+        return user.toJson().then((user) => resolve(user))
+      })
     })
+    .then(user => cy.login(user))
 })
 
 Given("the {string} user searches for {string}", (_, postTitle) => {
@@ -62,10 +66,12 @@ Given("the {string} user searches for {string}", (_, postTitle) => {
     .first("User", {
       id: "annoying-user"
     })
-    .then(async user => {
-      const userJson = await user.toJson()
-      cy.login(userJson)
+    .then(user => {
+      return new Cypress.Promise((resolve, reject) => {
+        return user.toJson().then((user) => resolve(user))
+      })
     })
+    .then(user => cy.login(user))
   cy.get(".searchable-input .ds-select-search")
     .focus()
     .type(postTitle);
@@ -142,10 +148,12 @@ When("a blocked user visits the post page of one of my authored posts", () => {
     .first("User", {
       name: 'Harassing User'
     })
-    .then(async user => {
-      const userJson = await user.toJson()
-      cy.login(userJson)
+    .then(user => {
+      return new Cypress.Promise((resolve, reject) => {
+        return user.toJson().then((user) => resolve(user))
+      })
     })
+    .then(user => cy.login(user))
   cy.openPage('post/previously-created-post')
 })
 
@@ -349,10 +357,12 @@ Given("I am logged in with these credentials:", table => {
     .first("User", {
       name: loginCredentials.email,
     })
-    .then(async user => {
-      const userJson = await user.toJson()
-      cy.login(userJson)
+    .then(user => {
+      return new Cypress.Promise((resolve, reject) => {
+        return user.toJson().then((user) => resolve(user))
+      })
     })
+    .then(user => cy.login(user))
 });
 
 When("I fill the password form with:", table => {
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index f3035dcdd..75f27d0f7 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -25,14 +25,17 @@ const switchLang = name => {
   cy.contains(".locale-menu-popover a", name).click();
 };
 
-const authenticatedHeaders = async (variables) => {
+const authenticatedHeaders = (variables) => {
   const mutation = gql`
     mutation($email: String!, $password: String!) {
       login(email: $email, password: $password)
     }
   `
-  const response = await request(config.GRAPHQL_URI, mutation, variables)
-  return { authorization: `Bearer ${response.login}` }
+  return new Cypress.Promise((resolve, reject) => {
+    request(config.GRAPHQL_URI, mutation, variables).then((response) => {
+      resolve({ authorization: `Bearer ${response.login}` })
+    })
+  })
 }
 
 Cypress.Commands.add("switchLanguage", (name, force) => {
@@ -81,20 +84,22 @@ Cypress.Commands.add("openPage", page => {
 
 Cypress.Commands.add(
   'authenticateAs',
-  async ({email, password}) => {
-    const headers = await authenticatedHeaders({ email, password })
-    return new GraphQLClient(config.GRAPHQL_URI, { headers })
-  }
-)
+  ({email, password}) => {
+    return new Cypress.Promise((resolve, reject) => {
+      authenticatedHeaders({ email, password }).then((headers) => {
+        resolve(new GraphQLClient(config.GRAPHQL_URI, { headers }))
+      })
+    })
+  })
 
 Cypress.Commands.add(
   'mutate',
   { prevSubject: true },
-  async (graphQLClient, mutation, variables) => {
-    await graphQLClient.request(mutation, variables)
-    return graphQLClient
-  }
-)
+  (graphQLClient, mutation, variables) => {
+    return new Cypress.Promise((resolve, reject) => {
+      graphQLClient.request(mutation, variables).then(() => resolve(graphQLClient))
+    })
+  })
 
 //
 //
diff --git a/cypress/support/factories.js b/cypress/support/factories.js
index bee0d8542..d2a8d87ad 100644
--- a/cypress/support/factories.js
+++ b/cypress/support/factories.js
@@ -8,9 +8,7 @@ const neo4jConfigs = {
 }
 const neodeInstance = getNeode(neo4jConfigs)
 
-beforeEach(async () => {
-  await cleanDatabase()
-})
+beforeEach(() => cleanDatabase())
 
 Cypress.Commands.add('neode', () => {
   return neodeInstance
@@ -19,14 +17,14 @@ Cypress.Commands.add('neode', () => {
 Cypress.Commands.add(
   'first',
   { prevSubject: true },
-  async (neode, model, properties) => {
+  (neode, model, properties) => {
     return neode.first(model, properties)
   }
 )
 Cypress.Commands.add(
   'relateTo',
   { prevSubject: true },
-  async (node, otherNode, relationship) => {
+  (node, otherNode, relationship) => {
     return node.relateTo(otherNode, relationship)
   }
 )
@@ -36,9 +34,10 @@ Cypress.Commands.add('factory', () => Factory)
 Cypress.Commands.add(
   'build',
   { prevSubject: true },
-  async (factory, name, atrributes, options) => {
-    await factory.build(name, atrributes, options)
-    return factory
+  (factory, name, atrributes, options) => {
+    return new Cypress.Promise((resolve, reject) => {
+      return factory.build(name, atrributes, options).then(() => resolve(factory))
+    })
   }
 )
 

From 6bba756856b82565336f0bf66a126f78867559e0 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 17 Feb 2020 21:09:53 +0100
Subject: [PATCH 156/171] Fix seeds, don't create additional categories

---
 backend/src/db/seed.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index f966f8b07..cf36f3039 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -967,7 +967,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(4).keys()].map(() =>
         Factory.build(
           'comment',
-          4,
           {},
           {
             author: jennyRostock,

From ea6856310f865df0f8623bfc26addc9b36901c5d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 18 Feb 2020 04:20:05 +0000
Subject: [PATCH 157/171] build(deps-dev): bump eslint-plugin-vue from 6.1.2 to
 6.2.1 in /webapp

Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.2...v6.2.1)

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

diff --git a/webapp/package.json b/webapp/package.json
index bd5c3ce39..6914053b9 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -126,7 +126,7 @@
     "eslint-plugin-prettier": "~3.1.2",
     "eslint-plugin-promise": "~4.2.1",
     "eslint-plugin-standard": "~4.0.1",
-    "eslint-plugin-vue": "~6.1.2",
+    "eslint-plugin-vue": "~6.2.1",
     "faker": "^4.1.0",
     "flush-promises": "^1.0.2",
     "fuse.js": "^3.4.6",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index bf5532123..863f59205 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7307,11 +7307,12 @@ eslint-plugin-standard@~4.0.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"
   integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==
 
-eslint-plugin-vue@~6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz#4b05c28c83c0ec912669b64dbd998bb8bf692ef6"
-  integrity sha512-M75oAB+2a/LNkLKRbeEaS07EjzjIUaV7/hYoHAfRFeeF8ZMmCbahUn8nQLsLP85mkar24+zDU3QW2iT1JRsACw==
+eslint-plugin-vue@~6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz#ca802df5c33146aed1e56bb21d250c1abb6120a3"
+  integrity sha512-MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==
   dependencies:
+    natural-compare "^1.4.0"
     semver "^5.6.0"
     vue-eslint-parser "^7.0.0"
 

From 0f74273b5b0742bfe16c750a924e099186b57e1c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 18 Feb 2020 10:36:34 +0100
Subject: [PATCH 158/171] Let post factory create default category

- since we have factories that ensure a post has a category created, we
  don't need extra code to create a category before the post
---
 backend/test/features/support/steps.js |  2 +-
 cypress/integration/common/post.js     |  2 +-
 cypress/integration/common/steps.js    | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/backend/test/features/support/steps.js b/backend/test/features/support/steps.js
index e11c69faa..e15801f83 100644
--- a/backend/test/features/support/steps.js
+++ b/backend/test/features/support/steps.js
@@ -13,7 +13,7 @@ function createUser (slug) {
   return Factory.build('user', {
     name: slug,
   }, {
-    password: '1234'
+    password: '1234',
     email: 'example@test.org',
   })
   // await login({ email: 'example@test.org', password: '1234' })
diff --git a/cypress/integration/common/post.js b/cypress/integration/common/post.js
index 04bc23a8e..c7cad0829 100644
--- a/cypress/integration/common/post.js
+++ b/cypress/integration/common/post.js
@@ -109,7 +109,7 @@ Then("I add all required fields", () => {
     .get(".editor .ProseMirror")
     .type('new post content')
     .get(".base-button")
-    .contains("Just for Fun")
+    .contains("Global Peace & Nonviolence")
     .click()
     .get('.ds-flex-item > .ds-form-item .ds-select ')
     .click()
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index d9c9e8ddd..5beb43f96 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -238,17 +238,6 @@ Given("we have the following comments in our database:", table => {
 });
 
 Given("we have the following posts in our database:", table => {
-    cy.factory().build('category', {
-      id: `cat-456`,
-      name: "Just For Fun",
-      slug: `just-for-fun`,
-      icon: "smile"
-    }).then(categoryJson => {
-      return new Cypress.Promise((resolve, _reject) => {
-        return categoryJson.toJson().then(category => resolve(category))
-      })
-    })
-    .then(category => {
       table.hashes().forEach((attributesOrOptions, i) => {
         cy.factory().build("post", {
           ...attributesOrOptions,
@@ -257,10 +246,8 @@ Given("we have the following posts in our database:", table => {
           pinned: Boolean(attributesOrOptions.pinned),
         }, {
           ...attributesOrOptions,
-          categoryIds: category.id
         });
       })
-    })
 })
 
 Then("I see a success message:", message => {

From e41a639cf1a4920b3e1d47b2d6213aa68380e9cd Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 18 Feb 2020 00:56:40 +0100
Subject: [PATCH 159/171] fix(jwt): Encode only 3 attributes in JWT

This will prevent unintentional encoding of users email addresses in the
JWT.

@steffi201028 this might be interesting for you as well.
---
 backend/src/jwt/encode.js                     |  6 +-
 backend/src/jwt/encode.spec.js                | 62 +++++++++++++++++++
 .../schema/resolvers/user_management.spec.js  |  4 +-
 3 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/jwt/encode.spec.js

diff --git a/backend/src/jwt/encode.js b/backend/src/jwt/encode.js
index f2547e30e..9126f2577 100644
--- a/backend/src/jwt/encode.js
+++ b/backend/src/jwt/encode.js
@@ -3,14 +3,12 @@ import CONFIG from './../config'
 
 // Generate an Access Token for the given User ID
 export default function encode(user) {
-  const token = jwt.sign(user, CONFIG.JWT_SECRET, {
+  const { id, name, slug } = user
+  const token = jwt.sign({ id, name, slug }, CONFIG.JWT_SECRET, {
     expiresIn: '1d',
     issuer: CONFIG.GRAPHQL_URI,
     audience: CONFIG.CLIENT_URI,
     subject: user.id.toString(),
   })
-  // jwt.verifySignature(token, CONFIG.JWT_SECRET, (err, data) => {
-  //   console.log('token verification:', err, data)
-  // })
   return token
 }
diff --git a/backend/src/jwt/encode.spec.js b/backend/src/jwt/encode.spec.js
new file mode 100644
index 000000000..21ebdffec
--- /dev/null
+++ b/backend/src/jwt/encode.spec.js
@@ -0,0 +1,62 @@
+import encode from './encode'
+import jwt from 'jsonwebtoken'
+import CONFIG from './../config'
+
+describe('encode', () => {
+  let payload
+  beforeEach(() => {
+    payload = {
+      name: 'Some body',
+      slug: 'some-body',
+      id: 'some-id',
+    }
+  })
+
+  it('encodes a valided JWT bearer token', () => {
+    const token = encode(payload)
+    expect(token.split('.')).toHaveLength(3)
+    const decoded = jwt.verify(token, CONFIG.JWT_SECRET)
+    expect(decoded).toEqual({
+      name: 'Some body',
+      slug: 'some-body',
+      id: 'some-id',
+      sub: 'some-id',
+      aud: expect.any(String),
+      iss: expect.any(String),
+      iat: expect.any(Number),
+      exp: expect.any(Number),
+    })
+  })
+
+  describe('given sensitive data', () => {
+    beforeEach(() => {
+      payload = {
+        ...payload,
+        email: 'none-of-your-business@example.org',
+        password: 'topsecret',
+      }
+    })
+
+    it('does not encode sensitive data', () => {
+      const token = encode(payload)
+      expect(payload).toEqual({
+        email: 'none-of-your-business@example.org',
+        password: 'topsecret',
+        name: 'Some body',
+        slug: 'some-body',
+        id: 'some-id',
+      })
+      const decoded = jwt.verify(token, CONFIG.JWT_SECRET)
+      expect(decoded).toEqual({
+        name: 'Some body',
+        slug: 'some-body',
+        id: 'some-id',
+        sub: 'some-id',
+        aud: expect.any(String),
+        iss: expect.any(String),
+        iat: expect.any(Number),
+        exp: expect.any(Number),
+      })
+    })
+  })
+})
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index b343c8a1b..1e295638d 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -192,7 +192,9 @@ describe('login', () => {
           data: { login: token },
         } = await mutate({ mutation: loginMutation, variables })
         jwt.verify(token, CONFIG.JWT_SECRET, (err, data) => {
-          expect(data.email).toEqual('test@example.org')
+          expect(data).toMatchObject({
+            id: 'acb2d923-f3af-479e-9f00-61b12e864666',
+          })
           expect(err).toBeNull()
           done()
         })

From 6f6b1534dfb36473a9dbc8e043c723730104459a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 18 Feb 2020 13:33:34 +0100
Subject: [PATCH 160/171] Reload page to add Category button

- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
---
 backend/src/db/factories.js                             | 5 ++++-
 cypress/integration/common/post.js                      | 5 +++--
 cypress/integration/common/steps.js                     | 1 +
 webapp/components/CategoriesSelect/CategoriesSelect.vue | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js
index 1aa369e95..ab2d13529 100644
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@@ -27,7 +27,10 @@ export const cleanDatabase = async (options = {}) => {
 Factory.define('category')
   .attr('id', uuid)
   .attr('icon', 'globe')
-  .attr('name', 'global-peace-nonviolence')
+  .attr('name', 'Global Peace & Nonviolence')
+  .sequence('slug', i => {
+    return `global-peace-nonviolence-${i}`
+  })
   .after((buildObject, options) => {
     return neode.create('Category', buildObject)
   })
diff --git a/cypress/integration/common/post.js b/cypress/integration/common/post.js
index c7cad0829..f728449d2 100644
--- a/cypress/integration/common/post.js
+++ b/cypress/integration/common/post.js
@@ -88,6 +88,7 @@ Then("I see a toaster with {string}", (title) => {
 })
 
 Then("I should be able to {string} a teaser image", condition => {
+  cy.reload()
   let teaserImageUpload = "onourjourney.png";
   if (condition === 'change') teaserImageUpload = "humanconnection.png";
   cy.fixture(teaserImageUpload).as('postTeaserImage').then(function() {
@@ -108,8 +109,8 @@ Then("I add all required fields", () => {
     .type('new post')
     .get(".editor .ProseMirror")
     .type('new post content')
-    .get(".base-button")
-    .contains("Global Peace & Nonviolence")
+    .get(".categories-select .base-button")
+    .first()
     .click()
     .get('.ds-flex-item > .ds-form-item .ds-select ')
     .click()
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 5beb43f96..3d46e74f1 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -262,6 +262,7 @@ When(
   "I click on the big plus icon in the bottom right corner to create post",
   () => {
     cy.get(".post-add-button").click();
+    cy.location("pathname").should('eq', '/post/create')
   }
 );
 
diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue
index 3e240e435..54c0d3524 100644
--- a/webapp/components/CategoriesSelect/CategoriesSelect.vue
+++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="categories-select">
     <ds-flex :gutter="{ base: 'xx-small', md: 'small', lg: 'xx-small' }">
       <div v-for="category in categories" :key="category.id">
         <ds-flex-item>

From 1b62dc3b2e83d9ad3c7916dd6f0ebc91ea9833c5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 18 Feb 2020 13:40:48 +0100
Subject: [PATCH 161/171] Remove sequence for slug as it's not needed

---
 backend/src/db/factories.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js
index ab2d13529..754f84dec 100644
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@@ -28,9 +28,6 @@ Factory.define('category')
   .attr('id', uuid)
   .attr('icon', 'globe')
   .attr('name', 'Global Peace & Nonviolence')
-  .sequence('slug', i => {
-    return `global-peace-nonviolence-${i}`
-  })
   .after((buildObject, options) => {
     return neode.create('Category', buildObject)
   })

From 5b41561cc42b118bdb8f03a505effd1f7d158162 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Feb 2020 14:16:46 +0100
Subject: [PATCH 162/171] throw error added to template

---
 backend/src/db/migrate/template.js                  |  1 +
 .../20200206190233-swap_latitude_with_longitude.js  | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/src/db/migrate/template.js b/backend/src/db/migrate/template.js
index 1d63673b4..9adb0786d 100644
--- a/backend/src/db/migrate/template.js
+++ b/backend/src/db/migrate/template.js
@@ -18,6 +18,7 @@ export async function up(next) {
     await transaction.rollback()
     // eslint-disable-next-line no-console
     console.log('rolled back')
+    throw new Error(error)
   } finally {
     session.close()
   }
diff --git a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
index 381d6db1d..619e30320 100644
--- a/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
+++ b/backend/src/db/migrations/20200206190233-swap_latitude_with_longitude.js
@@ -1,7 +1,12 @@
 import { getDriver } from '../../db/neo4j'
 
-export const description =
-  'This migration swaps the value stored in Location.lat with the value of Location.lng.'
+export const description = `
+This migration swaps the value stored in Location.lat with the value
+of Location.lng. This is necessary as the values of lat and lng were
+stored incorrectly. For example Hamburg, Germany, was stored with the
+values lat=10.0 and lng=53.55, which is close to the horn of Africa,
+but it is lat=53.55 and lng=10.0
+`
 
 const swap = async function(next) {
   const driver = getDriver()
@@ -11,8 +16,8 @@ const swap = async function(next) {
     // Implement your migration here.
     await transaction.run(`
         MATCH (l:Location) WHERE NOT(l.lat IS NULL)
-        WITH l.lng AS longitude, l.lat AS latitude, l AS Location
-        SET Location.lat = longitude, Location.lng = latitude
+        WITH l.lng AS longitude, l.lat AS latitude, l AS location
+        SET location.lat = longitude, location.lng = latitude
     `)
     await transaction.commit()
     next()

From cca9ec8e81944d3accaeb4f6d0bfd13d8f8b0f7a Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 18 Feb 2020 16:17:27 +0100
Subject: [PATCH 163/171] avatar image spans 100% width and height

---
 webapp/components/_new/generic/UserAvatar/UserAvatar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/_new/generic/UserAvatar/UserAvatar.vue b/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
index b9007b919..578bfb7a6 100644
--- a/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
+++ b/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
@@ -76,6 +76,7 @@ export default {
   > .image {
     position: relative;
     width: 100%;
+    height: 100%;
     object-fit: cover;
     object-position: center;
   }

From d9fcc9f720f3a86a69dffeff42b6df81d6495e5a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 5 Feb 2020 14:31:29 +0100
Subject: [PATCH 164/171] Basic script to normalize the locale files and check
 if those files are normalized

To Do: Check if keys in en.json and de.json are the same
Check dependencies (jq must be installed)
Where to place the file?
Add test to travis? How?
---
 webapp/check-json.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100755 webapp/check-json.sh

diff --git a/webapp/check-json.sh b/webapp/check-json.sh
new file mode 100755
index 000000000..2f39bbccb
--- /dev/null
+++ b/webapp/check-json.sh
@@ -0,0 +1,44 @@
+#! /usr/bin/env bash
+
+ERRORS=false
+FIX=false
+
+for arg in "$@"
+do
+    if [ "$arg" == "--fix" ]
+    then
+        FIX=true
+    fi
+done
+
+# normalize the locale file. WS 2 blanks, keys are sorted
+if  $FIX ; then
+    for locale_file in locales/*.json
+    do
+	jq --sort-keys . $locale_file > locales/tmp.json
+	mv locales/tmp.json $locale_file
+    done
+    exit 0
+fi
+
+# check if keys are sorted alphabetically and WS is two blanks
+for locale_file in locales/*.json
+do
+    jq --sort-keys . $locale_file | diff -q $locale_file - > /dev/null && echo "$locale_file is OK" ||
+	    { ERRORS=true ; echo "$locale_file is not normalized" ; }
+done
+
+# check if all the keys in en.json are present in de.json and vice versa
+
+# TO DO!!
+
+
+# Exit with status 1 if there were errors
+
+if $ERRORS ; then
+    echo "Some locale files are not normalized."
+    exit 1
+else
+    echo "All locales are normalized."
+    exit 0
+fi

From 9011f922bb4bfd4d68953dd7636c5011642b3ac2 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 12 Feb 2020 13:38:13 +0100
Subject: [PATCH 165/171] refactor(ci): Move translations to scripts/ folder

And refactor the script a little
---
 .travis.yml                  |  2 ++
 scripts/sort-translations.sh | 24 ++++++++++++++++++++
 webapp/check-json.sh         | 44 ------------------------------------
 3 files changed, 26 insertions(+), 44 deletions(-)
 create mode 100755 scripts/sort-translations.sh
 delete mode 100755 webapp/check-json.sh

diff --git a/.travis.yml b/.travis.yml
index 621453bc7..f8c869972 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ script:
   - export CYPRESS_RETRIES=1
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
   - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
+  # Miscellaneous
+  - ./scripts/sort-translations.sh
   # Backend
   - docker-compose exec backend yarn run lint
   - docker-compose exec backend yarn run test --ci --verbose=false --coverage
diff --git a/scripts/sort-translations.sh b/scripts/sort-translations.sh
new file mode 100755
index 000000000..5bb5e988e
--- /dev/null
+++ b/scripts/sort-translations.sh
@@ -0,0 +1,24 @@
+#! /usr/bin/env bash
+
+ROOT_DIR=$(dirname "$0")/..
+tmp=$(mktemp)
+exit_code=0
+
+for locale_file in $ROOT_DIR/webapp/locales/*.json
+do
+  jq --sort-keys . $locale_file > "$tmp"
+  if [ "$*" == "--fix" ]
+  then
+    mv "$tmp" $locale_file
+  else
+    if diff -q "$tmp" $locale_file > /dev/null ;
+    then
+      : # all good
+    else
+      exit_code=$?
+      echo "$locale_file is not sorted by keys"
+    fi
+  fi
+done
+
+exit $exit_code
diff --git a/webapp/check-json.sh b/webapp/check-json.sh
deleted file mode 100755
index 2f39bbccb..000000000
--- a/webapp/check-json.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env bash
-
-ERRORS=false
-FIX=false
-
-for arg in "$@"
-do
-    if [ "$arg" == "--fix" ]
-    then
-        FIX=true
-    fi
-done
-
-# normalize the locale file. WS 2 blanks, keys are sorted
-if  $FIX ; then
-    for locale_file in locales/*.json
-    do
-	jq --sort-keys . $locale_file > locales/tmp.json
-	mv locales/tmp.json $locale_file
-    done
-    exit 0
-fi
-
-# check if keys are sorted alphabetically and WS is two blanks
-for locale_file in locales/*.json
-do
-    jq --sort-keys . $locale_file | diff -q $locale_file - > /dev/null && echo "$locale_file is OK" ||
-	    { ERRORS=true ; echo "$locale_file is not normalized" ; }
-done
-
-# check if all the keys in en.json are present in de.json and vice versa
-
-# TO DO!!
-
-
-# Exit with status 1 if there were errors
-
-if $ERRORS ; then
-    echo "Some locale files are not normalized."
-    exit 1
-else
-    echo "All locales are normalized."
-    exit 0
-fi

From fa906efb1f40dc5bd80c9678f33c7b607a320099 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 12 Feb 2020 14:50:22 +0100
Subject: [PATCH 166/171] locales sorted.

---
 scripts/sort-translations.sh |    2 +-
 webapp/locales/de.json       | 1592 ++++++++++++++++-----------------
 webapp/locales/en.json       | 1555 ++++++++++++++++----------------
 webapp/locales/es.json       | 1606 +++++++++++++++++-----------------
 webapp/locales/fr.json       | 1482 +++++++++++++++----------------
 webapp/locales/it.json       | 1482 +++++++++++++++----------------
 webapp/locales/nl.json       |  266 +++---
 webapp/locales/pl.json       |  609 +++++++------
 webapp/locales/pt.json       | 1482 +++++++++++++++----------------
 webapp/locales/ru.json       |  114 +--
 webapp/package.json          |    1 +
 11 files changed, 5096 insertions(+), 5095 deletions(-)

diff --git a/scripts/sort-translations.sh b/scripts/sort-translations.sh
index 5bb5e988e..f2a5edebb 100755
--- a/scripts/sort-translations.sh
+++ b/scripts/sort-translations.sh
@@ -16,7 +16,7 @@ do
       : # all good
     else
       exit_code=$?
-      echo "$locale_file is not sorted by keys"
+      echo "$(basename -- $locale_file) is not sorted by keys"
     fi
   fi
 done
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e3e214d32..b70227557 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -1,821 +1,788 @@
 {
-    "login": {
-        "copy": "Falls Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
-        "login": "Anmelden",
-        "logout": "Abmelden",
-        "email": "Deine E-Mail",
-        "password": "Dein Passwort",
-        "moreInfo": "Was ist Human Connection?",
-        "hello": "Hallo",
-        "forgotPassword": "Passwort vergessen?",
-        "no-account": "Du hast noch kein Benutzerkonto?",
-        "register": "Benutzerkonto erstellen",
-        "moreInfoURL": "https:\/\/human-connection.org",
-        "moreInfoHint": "zur Präsentationsseite",
-        "success": "Du bist eingeloggt!",
-        "failure": "Fehlerhafte E-Mail-Adresse oder Passwort."
+  "actions": {
+    "cancel": "Abbrechen",
+    "create": "Erstellen",
+    "delete": "Löschen",
+    "edit": "Bearbeiten",
+    "loadMore": "mehr laden",
+    "loading": "wird geladen",
+    "save": "Speichern"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Name",
+      "name": "Kategorien",
+      "postCount": "Beiträge"
     },
-    "profile": {
-        "name": "Mein Profil",
-        "memberSince": "Mitglied seit",
-        "follow": "Folgen",
-        "followers": "Folgen",
-        "following": "Folge Ich",
-        "shouted": "Empfohlen",
-        "commented": "Kommentiert",
-        "userAnonym": "Anonymus",
-        "socialMedia": "Wo sonst finde ich",
-        "network": {
-            "title": "Netzwerk",
-            "following": "folgt:",
-            "followingNobody": "folgt niemandem.",
-            "followedBy": "wird gefolgt von:",
-            "followedByNobody": "wird von niemandem gefolgt.",
-            "andMore": "und {number} weitere …"
-        },
-        "invites": {
-            "title": "Lade jemanden zu Human Connection ein!",
-            "description": "Zur Einladung die E-Mail-Adresse hier eintragen.",
-            "emailPlaceholder": "E-Mail-Adresse für die Einladung"
-        }
+    "dashboard": {
+      "comments": "Kommentare",
+      "follows": "Folgen",
+      "invites": "Einladungen",
+      "name": "Startzentrale",
+      "notifications": "Benachrichtigungen",
+      "organizations": "Organisationen",
+      "posts": "Beiträge",
+      "projects": "Projekte",
+      "shouts": "Empfehlungen",
+      "users": "Benutzer"
+    },
+    "donations": {
+      "goal": "Monatlich benötigte Spenden",
+      "name": "Spendeninfo",
+      "progress": "Bereits gesammelte Spenden",
+      "successfulUpdate": "Spenden-Info erfolgreich aktualisiert!"
+    },
+    "hashtags": {
+      "name": "Hashtags",
+      "nameOfHashtag": "Name",
+      "number": "Nr.",
+      "tagCount": "Beiträge",
+      "tagCountUnique": "Benutzer"
+    },
+    "invites": {
+      "description": "Einladungen sind ein wunderbarer Weg, deine Freund in deinem Netzwerk zu haben …",
+      "name": "Benutzer einladen",
+      "title": "Leute einladen"
+    },
+    "name": "Systemverwaltung",
+    "notifications": {
+      "name": "Benachrichtigungen"
+    },
+    "organizations": {
+      "name": "Organisationen"
+    },
+    "pages": {
+      "name": "Seiten"
     },
     "settings": {
-        "name": "Einstellungen",
-        "data": {
-            "name": "Deine Daten",
-            "labelName": "Dein Name",
-            "labelCity": "Deine Stadt oder Region",
-            "labelBio": "Über Dich",
-            "labelSlug": "Dein eindeutiger Benutzername",
-            "namePlaceholder": "Petra Lustig",
-            "success": "Deine Daten wurden erfolgreich aktualisiert!"
-        },
-        "security": {
-            "name": "Sicherheit",
-            "change-password": {
-                "button": "Passwort ändern",
-                "success": "Passwort erfolgreich geändert!",
-                "label-old-password": "Dein altes Passwort",
-                "label-new-password": "Dein neues Passwort",
-                "label-new-password-confirm": "Bestätige Dein neues Passwort",
-                "message-old-password-required": "Gebe dein altes Passwort ein",
-                "message-new-password-required": "Gebe ein neues Passwort ein",
-                "message-new-password-confirm-required": "Bestätige dein neues Passwort",
-                "message-new-password-missmatch": "Gebe das gleiche Passwort nochmals ein",
-                "passwordSecurity": "Passwortsicherheit",
-                "passwordStrength0": "Sehr unsicheres Passwort",
-                "passwordStrength1": "Unsicheres Passwort",
-                "passwordStrength2": "Mittelmäßiges Passwort",
-                "passwordStrength3": "Sicheres Passwort",
-                "passwordStrength4": "Sehr sicheres Passwort"
-            }
-        },
-        "privacy": {
-          "name": "Privatsphäre",
-          "make-shouts-public": "Teile von mir empfohlene Artikel öffentlich auf meinem Profil",
-          "success-update": "Privatsphäre-Einstellungen gespeichert"
-        },
-        "invites": {
-            "name": "Einladungen"
-        },
-        "download": {
-            "name": "Daten herunterladen"
-        },
-        "organizations": {
-            "name": "Meine Organisationen"
-        },
-        "languages": {
-            "name": "Sprachen"
-        },
-        "email": {
-            "validation": {
-                "same-email": "Das ist deine aktuelle E-Mail Addresse"
-            },
-            "name": "Deine E-Mail",
-            "labelEmail": "E-Mail Adresse ändern",
-            "labelNewEmail": "Neue E-Mail Adresse",
-            "labelNonce": "Bestätigungscode eingeben",
-            "success": "Eine neue E-Mail Addresse wurde registriert.",
-            "submitted": "Eine E-Mail zur Bestätigung deiner Adresse wurde an <b>{email}<\/b> gesendet.",
-            "change-successful": "Deine E-Mail Adresse wurde erfolgreich geändert.",
-            "verification-error": {
-                "message": "Deine E-Mail Adresse konnte nicht verifiziert werden.",
-                "explanation": "Das kann verschiedene Ursachen haben:",
-                "reason": {
-                    "invalid-nonce": "Ist der Bestätigungscode falsch?",
-                    "no-email-request": "Bist du dir sicher, dass du eine Änderung deiner E-Mail Adresse angefragt hattest?"
-                },
-                "support": "Wenn das Problem weiterhin besteht, kontaktiere uns gerne per E-Mail an"
-            }
-        },
-        "validation": {
-            "slug": {
-                "regex": "Es sind nur Kleinbuchstaben, Zahlen, Unterstriche oder Bindestriche erlaubt.",
-                "alreadyTaken": "Dieser Benutzername ist schon vergeben."
-            }
-        },
-        "deleteUserAccount": {
-            "name": "Benutzerkonto löschen",
-            "contributionsCount": "Meine {count} Beiträge 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!",
-            "pleaseConfirm": "<b class='is-danger'>Zerstörerische Aktion!<\/b> Gib <b>{confirm}<\/b> ein, um zu bestätigen."
-        },
-        "embeds": {
-            "name": "Drittanbieter",
-            "info-description": "Hier ist die Liste an Drittanbietern, deren Inhalte als Fremdcode z.B. in Form von eingebetteten Videos angezeigt werden kann:",
-            "status": {
-                "description": "Als Grundeinstellung für dich wird eingebetter Fremdcode von Drittanbietern",
-                "disabled": {
-                    "off": "zunächst nicht angezeigt",
-                    "on": "sofort angezeigt"
-                },
-                "change": {
-                    "question": "Soll eingebetter Fremdcode von Dritten für dich immer angezeigt werden?",
-                    "allow": "Na klar",
-                    "deny": "Lieber nicht"
-                }
-            }
-        },
-        "social-media": {
-            "name": "Soziale Medien",
-            "placeholder": "Deine Social-Media URL",
-            "requireUnique": "Dieser Link existiert bereits",
-            "submit": "Link hinzufügen",
-            "successAdd": "Social-Media hinzugefügt. Profil aktualisiert!",
-            "successDelete": "Social-Media gelöscht. Profil aktualisiert!"
-        },
-        "muted-users": {
-          "name": "Stummgeschaltete Benutzer",
-          "explanation": {
-            "intro": "Wenn ein anderer Benutzer von dir stummgeschaltet wurde, dann passiert folgendes:",
-            "your-perspective": "In deiner Beitragsübersicht tauchen keine Beiträge der stummgeschalteten Person mehr auf.",
-            "search": "Die Beiträge von stummgeschalteten Personen verschwinden aus deinen Suchergebnissen."
-          },
-          "columns": {
-            "name": "Name",
-            "slug": "Alias",
-            "unmute": "Entsperren"
-          },
-          "empty": "Bislang hast du niemanden stummgeschaltet.",
-          "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü stummschalten.",
-          "mute": "Stumm schalten",
-          "unmute": "Stummschaltung aufheben",
-          "unmuted": "{name} ist nicht mehr stummgeschaltet"
-        },
-        "blocked-users": {
-          "name": "Blocked users",
-          "explanation": {
-            "intro": "Wenn ein anderer Benutzer von dir blockiert wurde, dann passiert folgendes:",
-            "your-perspective": "Du kannst keine Beiträge der blockierten Person mehr kommentieren.",
-            "their-perspective": "Die blockierte Person kann deine Beiträge nicht mehr kommentieren",
-            "notifications": "Von dir blockierte Personen erhalten keine Benachrichtigungen mehr, wenn sie in deinen Beiträgen erwähnt werden.",
-            "closing": "Das sollte fürs Erste genügen, damit blockierte Benutzer dich nicht mehr länger belästigen können.",
-            "commenting-disabled": "Du kannst den Beitrag derzeit nicht kommentieren.",
-            "commenting-explanation": "Dafür kann es mehrere Gründe geben, bitte schau in unsere "
-          },
-          "columns": {
-            "name": "Name",
-            "slug": "Alias",
-            "unblock": "Entsperren"
-          },
-          "empty": "Bislang hast du niemanden blockiert.",
-          "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
-          "block": "Nutzer blockieren",
-          "unblock": "Nutzer entsperren",
-          "unblocked": "{name} ist wieder entsperrt"
+      "name": "Einstellungen"
+    },
+    "users": {
+      "empty": "Keine Benutzer gefunden",
+      "form": {
+        "placeholder": "E-Mail, Name oder Beschreibung"
+      },
+      "name": "Benutzer",
+      "table": {
+        "columns": {
+          "createdAt": "Erstellt am",
+          "email": "E-mail",
+          "name": "Name",
+          "number": "Nr.",
+          "role": "Rolle",
+          "slug": "Alias"
         }
+      }
+    }
+  },
+  "code-of-conduct": {
+    "consequences": {
+      "description": "Wenn ein Gemeinschaftsmitglied inakzeptables Verhalten an den Tag legt, können die verantwortlichen Betreiber, Moderatoren und Administratoren des Netzwerks angemessene Maßnahmen ergreifen, u.a.:",
+      "list": {
+        "0": "Aufforderung zum sofortigen Abstellen des inakzeptablen Verhaltens",
+        "1": "Sperren oder Löschen von Kommentaren",
+        "2": "Temporärer Ausschluss aus dem jeweiligen Beitrag",
+        "3": "Sperren bzw. Löschen von Inhalten",
+        "4": "Temporärer Entzug von Schreibrechten",
+        "5": "Vorübergehender Ausschluss aus dem Netzwerk",
+        "6": "Endgültiger Ausschluss aus dem Netzwerk",
+        "7": "Verstöße gegen deutsches Recht können zur Anzeige gebracht werden."
+      },
+      "title": "Konsequenzen inakzeptablen Verhaltens"
     },
-    "admin": {
-        "name": "Systemverwaltung",
-        "dashboard": {
-            "name": "Startzentrale",
-            "users": "Benutzer",
-            "posts": "Beiträge",
-            "comments": "Kommentare",
-            "notifications": "Benachrichtigungen",
-            "organizations": "Organisationen",
-            "projects": "Projekte",
-            "invites": "Einladungen",
-            "follows": "Folgen",
-            "shouts": "Empfehlungen"
-        },
-        "organizations": {
-            "name": "Organisationen"
-        },
-        "users": {
-            "name": "Benutzer",
-            "form": {
-                "placeholder": "E-Mail, Name oder Beschreibung"
-            },
-            "table": {
-                "columns": {
-                    "number": "Nr.",
-                    "name": "Name",
-                    "email": "E-mail",
-                    "slug": "Alias",
-                    "role": "Rolle",
-                    "createdAt": "Erstellt am"
-                }
-            },
-            "empty": "Keine Benutzer gefunden"
-        },
-        "pages": {
-            "name": "Seiten"
-        },
-        "notifications": {
-            "name": "Benachrichtigungen"
-        },
-        "categories": {
-            "name": "Kategorien",
-            "categoryName": "Name",
-            "postCount": "Beiträge"
-        },
-        "settings": {
-            "name": "Einstellungen"
-        },
-        "hashtags": {
-            "name": "Hashtags",
-            "number": "Nr.",
-            "nameOfHashtag": "Name",
-            "tagCountUnique": "Benutzer",
-            "tagCount": "Beiträge"
-        },
-        "invites": {
-            "name": "Benutzer einladen",
-            "title": "Leute einladen",
-            "description": "Einladungen sind ein wunderbarer Weg, deine Freund in deinem Netzwerk zu haben …"
-        },
-        "donations": {
-            "name": "Spendeninfo",
-            "goal": "Monatlich benötigte Spenden",
-            "progress": "Bereits gesammelte Spenden",
-            "successfulUpdate": "Spenden-Info erfolgreich aktualisiert!"
-        }
+    "expected-behaviour": {
+      "description": "Die folgenden Verhaltensweisen werden von allen Community-Mitgliedern erwartet und gefordert:",
+      "list": {
+        "0": "Sei rücksichtsvoll und respektvoll bei dem was Du schreibst und tust.",
+        "1": "Versuche auf andere zuzugehen, bevor ein Konflikt entsteht.",
+        "2": "Vermeide erniedrigende, diskriminierende oder belästigende Verhaltensweisen und Ausdrücke.",
+        "3": "Gehe achtsam mit Deiner Umgebung um. Informiere den Support bei gefährlichen Situationen, wenn eine Person in Not ist oder bei Verstößen gegen diesen Verhaltenskodex, auch wenn sie unbedeutend erscheinen."
+      },
+      "title": "Erwartetes Verhalten"
     },
-    "post": {
-        "name": "Beitrag",
-        "moreInfo": {
-            "name": "Mehr Info",
-            "title": "Mehr Informationen",
-            "description": "Hier findest du weitere Infos zum Thema.",
-            "titleOfCategoriesSection": "Kategorien",
-            "titleOfHashtagsSection": "Hashtags",
-            "titleOfRelatedContributionsSection": "Verwandte Beiträge"
-        },
-        "takeAction": {
-            "name": "Aktiv werden"
-        },
-        "pinned": "Meldung",
-        "menu": {
-            "edit": "Beitrag bearbeiten",
-            "delete": "Beitrag löschen",
-            "pin": "Post festpinnen",
-            "pinnedSuccessfully": "Post erfolgreich festgepinnt!",
-            "unpin": "Post nicht mehr festpinnen",
-            "unpinnedSuccessfully": "Post erfolgreich nicht mehr festgepinnt!"
-        },
-        "comment": {
-            "submit": "Kommentiere",
-            "submitted": "Kommentar gesendet!",
-            "updated": "Änderungen gespeichert",
-            "reply": "Antworten"
-        },
-        "edited": "bearbeitet"
+    "get-help": "Wenn Du einem inakzeptablen Verhalten ausgesetzt bist, es miterlebst oder andere Bedenken hast, benachrichtige bitte so schnell wie möglich einen Organisator der Gemeinschaft und verlinke oder verweise auf den entsprechenden Inhalt:",
+    "preamble": {
+      "description": "Human Connection ist ein gemeinnütziges soziales Wissens- und Aktionsnetzwerk der nächsten Generation. Von Menschen – für Menschen. Open Source, fair und transparent. Für positiven lokalen und globalen Wandel in allen Lebensbereichen. Wir gestalten den öffentlichen Austausch von Wissen, Ideen und Projekten völlig neu. Die Funktionen von Human Connection bringen die Menschen zusammen – offline und online – so dass wir die Welt zu einem besseren Ort machen können.",
+      "title": "Präambel"
     },
-    "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"
-        }
+    "purpose": {
+      "description": "Mit diesen Verhaltensregeln regeln wir die wesentlichen Grundsätze für das Verhalten in unserem Sozialen Netzwerk. Dabei ist die Menschenrechtscharta der Vereinten Nationen unsere Orientierung und bildet das Herz unseres Werteverständnisses. Die Verhaltensregeln dienen als Leitsätze für den persönlichen Auftritt und den Umgang untereinander. Wer als Nutzer im Human Connection Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an.",
+      "title": "Zweck"
     },
-    "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": "Schlagwort ::: Schlagwörter",
-        "name": "Name",
-        "loadMore": "mehr laden",
-        "loading": "wird geladen",
-        "reportContent": "Melden",
+    "subheader": "für das Soziale Netzwerk der Human Connection gGmbH",
+    "unacceptable-behaviour": {
+      "description": "Die folgenden Verhaltensweisen sind in unserer Community inakzeptabel:",
+      "list": {
+        "0": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen, insbesondere solche, die sich auf Geschlecht, sexuelle Orientierung, Rasse, Religion, politische oder weltanschauliche Ausrichtung oder Behinderung beziehen.",
+        "1": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
+        "2": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
+        "3": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
+        "4": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
+        "5": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
+        "6": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
+        "7": "Befürwortung oder Ermutigung zu diesen Verhaltensweisen."
+      },
+      "title": "Nichtakzeptables Verhalten"
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "… dieser Kommentar ist nicht mehr verfügbar"
+    },
+    "edited": "bearbeitet",
+    "menu": {
+      "delete": "Kommentar löschen",
+      "edit": "Kommentar bearbeiten"
+    },
+    "show": {
+      "less": "weniger anzeigen",
+      "more": "mehr anzeigen"
+    }
+  },
+  "common": {
+    "category": "Kategorie ::: Kategorien",
+    "comment": "Kommentar ::: Kommentare",
+    "letsTalk": "Miteinander reden",
+    "loadMore": "mehr laden",
+    "loading": "wird geladen",
+    "moreInfo": "Mehr Info",
+    "name": "Name",
+    "organization": "Organisation ::: Organisationen",
+    "post": "Beitrag ::: Beiträge",
+    "project": "Projekt ::: Projekte",
+    "reportContent": "Melden",
+    "shout": "Empfehlung ::: Empfehlungen",
+    "tag": "Schlagwort ::: Schlagwörter",
+    "takeAction": "Aktiv werden",
+    "user": "Benutzer ::: Benutzer",
+    "validations": {
+      "categories": "es müssen eine bis drei Kategorien ausgewählt werden",
+      "email": "muss eine gültige E-Mail Adresse sein",
+      "url": "muss eine gültige URL sein"
+    },
+    "versus": "Versus"
+  },
+  "components": {
+    "enter-nonce": {
+      "form": {
+        "description": "Öffne dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
+        "next": "Weiter",
+        "nonce": "Code eingeben",
         "validations": {
-            "email": "muss eine gültige E-Mail Adresse sein",
-            "url": "muss eine gültige URL sein",
-            "categories": "es müssen eine bis drei Kategorien ausgewählt werden"
+          "length": "muss genau 6 Buchstaben lang sein"
         }
+      }
     },
-    "actions": {
-        "loading": "wird geladen",
-        "loadMore": "mehr laden",
-        "create": "Erstellen",
-        "save": "Speichern",
-        "edit": "Bearbeiten",
-        "delete": "Löschen",
-        "cancel": "Abbrechen"
+    "password-reset": {
+      "change-password": {
+        "error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",
+        "help": "Falls Probleme auftreten, schreib uns gerne eine Mail an:",
+        "success": "Änderung des Passworts war erfolgreich!"
+      },
+      "request": {
+        "form": {
+          "description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
+          "submit": "E-Mail anfordern",
+          "submitted": "Eine E-Mail mit weiteren Instruktionen wurde verschickt an <b>{email}</b>"
+        },
+        "title": "Passwort zurücksetzen"
+      }
     },
-    "moderation": {
-        "name": "Moderation",
-        "reports": {
-            "empty": "Glückwunsch, es gibt nichts zu moderieren.",
-            "name": "Meldungen",
-            "status": "Aktueller Status",
-            "content": "Inhalt",
-            "author": "Autor",
-            "decision": "Entscheidung",
-            "enabled": "Entsperrt",
-            "disabled": "Gesperrt",
-            "decided": "Entschieden",
-            "noDecision": "Keine Entscheidung!",
-            "decideButton": "Bestätige",
-            "DecisionSuccess": "Erfolgreich entschieden!",
-            "enabledBy": "Entsperrt von",
-            "disabledBy": "Gesperrt von",
-            "previousDecision": "Vorherige Entscheidung:",
-            "enabledAt": "Entsperrt am",
-            "disabledAt": "Gesperrt am",
-            "reasonCategory": "Kategorie",
-            "reasonDescription": "Beschreibung",
-            "submitter": "Gemeldet von",
-            "numberOfUsers": "{count} Nutzern",
-            "filterLabel": {
-              "all": "Alle",
-              "unreviewed": "Nicht bearbeitet",
-              "reviewed": "Bearbeitet",
-              "closed": "Abgeschlossen"
-            },
-            "reportedOn": "Datum",
-            "moreDetails": "Details öffnen",
-            "decideModal": {
-              "submit": "Bestätige Entscheidung",
-              "cancel": "Abbruch",
-              "User": {
-                "disable": {
-                  "title": "Sperre den Benutzer abschließend",
-                  "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?"
-                },
-                "enable": {
-                  "title": "Entsperre den Benutzer abschließend",
-                  "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?"
-                }
-              },
-              "Post": {
-                "disable": {
-                  "title": "Sperre den Beitrag abschließend",
-                  "message": "Möchtest du den Beitrag \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?"
-                },
-                "enable": {
-                  "title": "Entsperre den Beitrag abschließend",
-                  "message": "Möchtest du den Beitrag \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?"
-                }
-              },
-              "Comment": {
-                "disable": {
-                  "title": "Sperre den Kommentar abschließend",
-                  "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?"
-                },
-                "enable": {
-                  "title": "Entsperre den Kommentar abschließend",
-                  "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?"
-                }
-              }
-            }
-        }
+    "registration": {
+      "create-user-account": {
+        "error": "Es konnte kein Benutzerkonto erstellt werden!",
+        "help": "Vielleicht war der Bestätigungscode falsch oder abgelaufen? Wenn das Problem weiterhin besteht, schick uns gerne eine E-Mail an:",
+        "success": "Dein Benutzerkonto wurde erstellt!",
+        "title": "Benutzerkonto anlegen"
+      },
+      "signup": {
+        "form": {
+          "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärung</ds-text></a> gelesen und verstanden",
+          "description": "Um loszulegen, kannst du dich hier kostenfrei registrieren:",
+          "errors": {
+            "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
+            "invalid-invitation-token": "Es sieht so aus, als ob der Einladungscode schon eingelöst wurde. Jeder Code kann nur einmalig benutzt werden."
+          },
+          "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
+          "minimum-age": "Ich bin 18 Jahre oder älter.",
+          "no-commercial": "Ich habe keine kommerziellen Absichten und ich repräsentiere kein kommerzielles Unternehmen oder Organisation.",
+          "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk. ",
+          "submit": "Konto erstellen",
+          "success": "Eine Mail mit einem Bestätigungslink für die Registrierung wurde an <b>{email}</b> geschickt",
+          "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen</ds-text></a>zu."
+        },
+        "title": "Mach mit bei Human Connection!",
+        "unavailable": "Leider ist die öffentliche Registrierung von Benutzerkonten auf diesem Server derzeit nicht möglich."
+      }
+    }
+  },
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": "{chosen} von {max} Kategorien ausgewählt"
     },
-    "disable": {
-        "user": {
-            "title": "Nutzer sperren",
-            "type": "Nutzer",
-            "message": "Bist Du sicher, dass Du den Nutzer „<b>{name}<\/b>“ sperren möchtest?"
-        },
-        "contribution": {
-            "title": "Beitrag sperren",
-            "type": "Beitrag",
-            "message": "Bist Du sicher, dass Du den Beitrag von „<b>{name}<\/b>“ deaktivieren möchtest?"
-        },
-        "comment": {
-            "title": "Kommentar sperren",
-            "type": "Kommentar",
-            "message": "Bist Du sicher, dass Du den Kommentar „<b>{name}<\/b>“ deaktivieren möchtest?"
-        },
-        "submit": "Deaktivieren",
-        "cancel": "Abbrechen",
-        "success": "Erfolgreich deaktiviert"
+    "category": {
+      "name": {
+        "animal-protection": "Schutz der Tiere",
+        "art-culture-sport": "Kunst, Kultur & Sport",
+        "consumption-sustainability": "Verbrauch & Nachhaltigkeit",
+        "cooperation-development": "Zusammenarbeit & Entwicklung",
+        "democracy-politics": "Demokratie & Politik",
+        "economy-finances": "Wirtschaft & Finanzen",
+        "education-sciences": "Bildung & Wissenschaft",
+        "energy-technology": "Energie & Technologie",
+        "environment-nature": "Umwelt & Natur",
+        "freedom-of-speech": "Redefreiheit",
+        "global-peace-nonviolence": "Globaler Frieden & Gewaltlosigkeit",
+        "happiness-values": "Glück & Werte",
+        "health-wellbeing": "Gesundheit & Wohlbefinden",
+        "human-rights-justice": "Menschenrechte & Gerechtigkeit",
+        "it-internet-data-privacy": "IT, Internet & Datenschutz",
+        "just-for-fun": "Nur zum Spaß"
+      }
     },
-    "report": {
-        "submit": "Meldung senden",
-        "cancel": "Abbrechen",
-        "success": "Vielen Dank für diese Meldung!",
-        "user": {
-            "title": "Nutzer melden",
-            "type": "Nutzer",
-            "message": "Bist Du sicher, dass Du den Nutzer „<b>{name}<\/b>“ melden möchtest?",
-            "error": "Du hast den Benutzer bereits gemeldet!"
-        },
-        "contribution": {
-            "title": "Beitrag melden",
-            "type": "Beitrag",
-            "message": "Bist Du sicher, dass Du den Beitrag „<b>{name}<\/b>“ melden möchtest?",
-            "error": "Du hast den Beitrag bereits gemeldet!"
-        },
-        "comment": {
-            "title": "Kommentar melden",
-            "type": "Kommentar",
-            "message": "Bist Du sicher, dass Du den Kommentar von „<b>{name}<\/b>“ melden möchtest?",
-            "error": "Du hast den Kommentar bereits gemeldet!"
-        },
-        "reason": {
-            "category": {
-                "label": "Wähle eine Kategorie:",
-                "placeholder": "Kategorie …",
-                "options": {
-                    "discrimination_etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.",
-                    "pornographic_content_links": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
-                    "glorific_trivia_of_cruel_inhuman_acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
-                    "doxing": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
-                    "intentional_intimidation_stalking_persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
-                    "advert_products_services_commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
-                    "criminal_behavior_violation_german_law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
-                    "other": "Andere …"
-                },
-                "invalid": "Bitte wähle eine gültige Kategorie aus"
-            },
-            "description": {
-                "label": "Bitte erkläre: Warum möchtest du dies melden?",
-                "placeholder": "Zusätzliche Information …"
-            }
-        }
+    "emotions-label": {
+      "angry": "Verärgert",
+      "cry": "Zum Weinen",
+      "funny": "Lustig",
+      "happy": "Glücklich",
+      "surprised": "Erstaunt"
+    },
+    "filterALL": "Alle Beiträge anzeigen",
+    "filterFollow": "Beiträge filtern von Usern denen ich folge",
+    "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
+    "inappropriatePictureText": "Wann soll ein Foto versteckt werden",
+    "languageSelectLabel": "Sprache deines Beitrags",
+    "languageSelectText": "Sprache wählen",
+    "newPost": "Erstelle einen neuen Beitrag",
+    "success": "Gespeichert!",
+    "teaserImage": {
+      "cropperConfirm": "Bestätigen"
+    },
+    "title": "Titel"
+  },
+  "delete": {
+    "cancel": "Abbrechen",
+    "comment": {
+      "message": "Bist du sicher, dass du den Kommentar \"<b>{name}</b>\" löschen möchtest?",
+      "success": "Kommentar erfolgreich gelöscht!",
+      "title": "Lösche Kommentar",
+      "type": "Comment"
     },
     "contribution": {
-        "title": "Titel",
-        "newPost": "Erstelle einen neuen Beitrag",
-        "filterFollow": "Beiträge filtern von Usern denen ich folge",
-        "filterALL": "Alle Beiträge anzeigen",
-        "success": "Gespeichert!",
-        "languageSelectLabel": "Sprache deines Beitrags",
-        "languageSelectText": "Sprache wählen",
-        "categories": {
-            "infoSelectedNoOfMaxCategories": "{chosen} von {max} Kategorien ausgewählt"
-        },
-        "emotions-label": {
-            "funny": "Lustig",
-            "happy": "Glücklich",
-            "surprised": "Erstaunt",
-            "cry": "Zum Weinen",
-            "angry": "Verärgert"
-        },
-        "category": {
-            "name": {
-                "freedom-of-speech": "Redefreiheit",
-                "consumption-sustainability": "Verbrauch & Nachhaltigkeit",
-                "global-peace-nonviolence": "Globaler Frieden & Gewaltlosigkeit",
-                "just-for-fun": "Nur zum Spaß",
-                "happiness-values": "Glück & Werte",
-                "health-wellbeing": "Gesundheit & Wohlbefinden",
-                "environment-nature": "Umwelt & Natur",
-                "animal-protection": "Schutz der Tiere",
-                "human-rights-justice": "Menschenrechte & Gerechtigkeit",
-                "education-sciences": "Bildung & Wissenschaft",
-                "cooperation-development": "Zusammenarbeit & Entwicklung",
-                "democracy-politics": "Demokratie & Politik",
-                "economy-finances": "Wirtschaft & Finanzen",
-                "energy-technology": "Energie & Technologie",
-                "it-internet-data-privacy": "IT, Internet & Datenschutz",
-                "art-culture-sport": "Kunst, Kultur & Sport"
-            }
-        },
-        "teaserImage": {
-            "cropperConfirm": "Bestätigen"
-        },
-        "inappropriatePicture" : "Dieses Bild kann für einige Menschen unangemessen sein.",
-        "inappropriatePictureText" : "Wann soll ein Foto versteckt werden"
+      "message": "Bist du sicher, dass du den Beitrag \"<b>{name}</b>\" löschen möchtest?",
+      "success": "Beitrag erfolgreich gelöscht!",
+      "title": "Lösche Beitrag",
+      "type": "Contribution"
     },
+    "submit": "Löschen"
+  },
+  "disable": {
+    "cancel": "Abbrechen",
     "comment": {
-        "content": {
-            "unavailable-placeholder": "… dieser Kommentar ist nicht mehr verfügbar"
-        },
-        "menu": {
-            "edit": "Kommentar bearbeiten",
-            "delete": "Kommentar löschen"
-        },
-        "show": {
-            "more": "mehr anzeigen",
-            "less": "weniger anzeigen"
-        },
-        "edited": "bearbeitet"
+      "message": "Bist Du sicher, dass Du den Kommentar „<b>{name}</b>“ deaktivieren möchtest?",
+      "title": "Kommentar sperren",
+      "type": "Kommentar"
     },
-    "followButton": {
-        "follow": "Folgen",
-        "following": "Folge Ich"
-    },
-    "shoutButton": {
-        "shouted": "empfohlen"
-    },
-    "search": {
-        "placeholder": "Suchen",
-        "hint": "Wonach suchst Du?",
-        "failed": "Nichts gefunden",
-        "heading": {
-          "Post": "Beiträge",
-          "User": "Benutzer"
-        }
-    },
-    "components": {
-        "password-reset": {
-            "request": {
-                "title": "Passwort zurücksetzen",
-                "form": {
-                    "description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
-                    "submit": "E-Mail anfordern",
-                    "submitted": "Eine E-Mail mit weiteren Instruktionen wurde verschickt an <b>{email}<\/b>"
-                }
-            },
-            "change-password": {
-                "success": "Änderung des Passworts war erfolgreich!",
-                "error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",
-                "help": "Falls Probleme auftreten, schreib uns gerne eine Mail an:"
-            }
-        },
-        "enter-nonce": {
-            "form": {
-                "nonce": "Code eingeben",
-                "description": "Öffne dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
-                "next": "Weiter",
-                "validations": {
-                    "length": "muss genau 6 Buchstaben lang sein"
-                }
-            }
-        },
-        "registration": {
-            "signup": {
-                "unavailable": "Leider ist die öffentliche Registrierung von Benutzerkonten auf diesem Server derzeit nicht möglich.",
-                "title": "Mach mit bei Human Connection!",
-                "form": {
-                    "description": "Um loszulegen, kannst du dich hier kostenfrei registrieren:",
-                    "terms-and-condition": "Ich stimme den <a href=\"\/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen<\/ds-text><\/a>zu.",
-                    "data-privacy": "Ich habe die  <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärung<\/ds-text><\/a> gelesen und verstanden",
-                    "minimum-age": "Ich bin 18 Jahre oder älter.",
-                    "no-commercial": "Ich habe keine kommerziellen Absichten und ich repräsentiere kein kommerzielles Unternehmen oder Organisation.",
-                    "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk. ",
-                    "invitation-code": "Dein Einladungscode lautet: <b>{code}<\/b>",
-                    "errors": {
-                        "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
-                        "invalid-invitation-token": "Es sieht so aus, als ob der Einladungscode schon eingelöst wurde. Jeder Code kann nur einmalig benutzt werden."
-                    },
-                    "submit": "Konto erstellen",
-                    "success": "Eine Mail mit einem Bestätigungslink für die Registrierung wurde an <b>{email}<\/b> geschickt"
-                }
-            },
-            "create-user-account": {
-                "title": "Benutzerkonto anlegen",
-                "success": "Dein Benutzerkonto wurde erstellt!",
-                "error": "Es konnte kein Benutzerkonto erstellt werden!",
-                "help": "Vielleicht war der Bestätigungscode falsch oder abgelaufen? Wenn das Problem weiterhin besteht, schick uns gerne eine E-Mail an:"
-            }
-        }
-    },
-    "store": {
-        "posts": {
-            "orderBy": {
-                "newest": {
-                    "label": "Neueste"
-                },
-                "oldest": {
-                    "label": "Älteste"
-                }
-            }
-        }
-    },
-    "maintenance": {
-        "title": "Human Connection befindet sich in der Wartung",
-        "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.",
-        "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an"
-    },
-    "index": {
-        "no-results": "Keine Beiträge gefunden.",
-        "change-filter-settings": "Verändere die Filter-Einstellungen um mehr Ergebnisse zu erhalten."
-    },
-    "filter-menu": {
-        "title": "Deine Filterblase",
-        "hashtag-search": "Suche nach #{hashtag}",
-        "clearSearch": "Suche löschen"
-    },
-    "filter-posts": {
-        "categories": {
-            "header": "Themenkategorien",
-            "all": "Alle"
-        },
-        "general": {
-            "header": "Filtern nach …"
-        },
-        "followers": {
-            "label": "Benutzern, denen ich folge"
-        },
-        "language": {
-            "header": "Sprachen",
-            "all": "Alle"
-        }
-    },
-    "site": {
-        "thanks": "Danke!",
-        "error-occurred": "Ein Fehler ist aufgetreten.",
-        "made": "Mit &#10084; gemacht",
-        "imprint": "Impressum",
-        "termsAndConditions": "Nutzungsbedingungen",
-        "data-privacy": "Datenschutz",
-        "contact": "Kontakt",
-        "tribunal": "Registergericht",
-        "register": "Registernummer",
-        "director": "Geschäftsführer",
-        "taxident": "Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz (Deutschland)",
-        "responsible": "Verantwortlicher gemäß § 55 Abs. 2 RStV ",
-        "bank": "Bankverbindung",
-        "germany": "Deutschland",
-        "code-of-conduct": "Verhaltenscodex",
-        "back-to-login": "Zurück zur Anmeldung",
-        "faq": "FAQ"
-    },
-    "editor": {
-        "placeholder": "Schreib etwas Inspirierendes …",
-        "mention": {
-            "noUsersFound": "Keine Benutzer gefunden"
-        },
-        "hashtag": {
-            "noHashtagsFound": "Keine Hashtags gefunden",
-            "addHashtag": "Neuer Hashtag",
-            "addLetter": "Tippe einen Buchstaben"
-        },
-        "embed": {
-            "data_privacy_warning": "Achte auf deine Daten!",
-            "data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn du dieses Video jetzt abspielst, registriert der folgende Anbieter wahrscheinlich deine Nutzerdaten:",
-            "play_now": "Jetzt ansehen",
-            "always_allow": "Inhalte von Drittanbietern immer anzeigen (diese Einstellung kannst du jederzeit ändern)"
-        }
-    },
-    "notifications": {
-        "reason": {
-            "mentioned_in_post": "Hat dich in einem Beitrag erwähnt …",
-            "mentioned_in_comment": "Hat dich in einem Kommentar erwähnt …",
-            "commented_on_post": "Hat deinen Beitrag kommentiert …"
-        },
-        "comment": "Kommentar",
-        "title": "Benachrichtigungen",
-        "pageLink": "Alle Benachrichtigungen",
-        "post": "Beitrag",
-        "user": "Benutzer",
-        "content": "Inhalt",
-        "filterLabel": {
-            "all": "Alle",
-            "read": "Gelesen",
-            "unread": "Ungelesen"
-        },
-        "empty": "Bedaure, Du hast momentan keinerlei Benachrichtigungen."
-    },
-    "delete": {
-        "submit": "Löschen",
-        "cancel": "Abbrechen",
-        "contribution": {
-            "title": "Lösche Beitrag",
-            "type": "Contribution",
-            "message": "Bist du sicher, dass du den Beitrag \"<b>{name}<\/b>\" löschen möchtest?",
-            "success": "Beitrag erfolgreich gelöscht!"
-        },
-        "comment": {
-            "title": "Lösche Kommentar",
-            "type": "Comment",
-            "message": "Bist du sicher, dass du den Kommentar \"<b>{name}<\/b>\" löschen möchtest?",
-            "success": "Kommentar erfolgreich gelöscht!"
-        }
-    },
-    "release": {
-        "submit": "freigeben",
-        "cancel": "Abbrechen",
-        "success": "Erfolgreich freigegeben!",
-        "user": {
-            "title": "Nutzer freigeben",
-            "type": "Nutzer",
-            "message": "Bist du sicher, dass du den Nutzer \"<b>{name}<\/b>\" freigeben möchtest?",
-            "error": "Den User hast du schon gemeldet!"
-        },
-        "contribution": {
-            "title": "Beitrag freigeben",
-            "type": "Beitrag",
-            "message": "Bist du sicher, dass du den Beitrag \"<b>{name}<\/b>\" freigeben möchtest?",
-            "error": "Den Beitrag hast du schon gemeldet!"
-        },
-        "comment": {
-            "title": "Kommentar freigeben",
-            "type": "Kommentar",
-            "message": "Bist du sicher, dass du den Kommentar \"<b>{name}<\/b>\" freigeben möchtest?",
-            "error": "Den Kommentar hast du schon gemeldet!"
-        }
+    "contribution": {
+      "message": "Bist Du sicher, dass Du den Beitrag von „<b>{name}</b>“ deaktivieren möchtest?",
+      "title": "Beitrag sperren",
+      "type": "Beitrag"
     },
+    "submit": "Deaktivieren",
+    "success": "Erfolgreich deaktiviert",
     "user": {
-        "avatar": {
-            "submitted": "Upload erfolgreich"
-        }
+      "message": "Bist Du sicher, dass Du den Nutzer „<b>{name}</b>“ sperren möchtest?",
+      "title": "Nutzer sperren",
+      "type": "Nutzer"
+    }
+  },
+  "donations": {
+    "amount-of-total": "{amount} von {total} € erreicht",
+    "donate-now": "Jetzt spenden",
+    "donations-for": "Spenden für"
+  },
+  "editor": {
+    "embed": {
+      "always_allow": "Inhalte von Drittanbietern immer anzeigen (diese Einstellung kannst du jederzeit ändern)",
+      "data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn du dieses Video jetzt abspielst, registriert der folgende Anbieter wahrscheinlich deine Nutzerdaten:",
+      "data_privacy_warning": "Achte auf deine Daten!",
+      "play_now": "Jetzt ansehen"
     },
+    "hashtag": {
+      "addHashtag": "Neuer Hashtag",
+      "addLetter": "Tippe einen Buchstaben",
+      "noHashtagsFound": "Keine Hashtags gefunden"
+    },
+    "mention": {
+      "noUsersFound": "Keine Benutzer gefunden"
+    },
+    "placeholder": "Schreib etwas Inspirierendes …"
+  },
+  "filter-menu": {
+    "clearSearch": "Suche löschen",
+    "hashtag-search": "Suche nach #{hashtag}",
+    "title": "Deine Filterblase"
+  },
+  "filter-posts": {
+    "categories": {
+      "all": "Alle",
+      "header": "Themenkategorien"
+    },
+    "followers": {
+      "label": "Benutzern, denen ich folge"
+    },
+    "general": {
+      "header": "Filtern nach …"
+    },
+    "language": {
+      "all": "Alle",
+      "header": "Sprachen"
+    }
+  },
+  "followButton": {
+    "follow": "Folgen",
+    "following": "Folge Ich"
+  },
+  "index": {
+    "change-filter-settings": "Verändere die Filter-Einstellungen um mehr Ergebnisse zu erhalten.",
+    "no-results": "Keine Beiträge gefunden."
+  },
+  "login": {
+    "copy": "Falls Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
+    "email": "Deine E-Mail",
+    "failure": "Fehlerhafte E-Mail-Adresse oder Passwort.",
+    "forgotPassword": "Passwort vergessen?",
+    "hello": "Hallo",
+    "login": "Anmelden",
+    "logout": "Abmelden",
+    "moreInfo": "Was ist Human Connection?",
+    "moreInfoHint": "zur Präsentationsseite",
+    "moreInfoURL": "https://human-connection.org",
+    "no-account": "Du hast noch kein Benutzerkonto?",
+    "password": "Dein Passwort",
+    "register": "Benutzerkonto erstellen",
+    "success": "Du bist eingeloggt!"
+  },
+  "maintenance": {
+    "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.",
+    "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an",
+    "title": "Human Connection befindet sich in der Wartung"
+  },
+  "moderation": {
+    "name": "Moderation",
+    "reports": {
+      "DecisionSuccess": "Erfolgreich entschieden!",
+      "author": "Autor",
+      "content": "Inhalt",
+      "decideButton": "Bestätige",
+      "decideModal": {
+        "Comment": {
+          "disable": {
+            "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?",
+            "title": "Sperre den Kommentar abschließend"
+          },
+          "enable": {
+            "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?",
+            "title": "Entsperre den Kommentar abschließend"
+          }
+        },
+        "Post": {
+          "disable": {
+            "message": "Möchtest du den Beitrag \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?",
+            "title": "Sperre den Beitrag abschließend"
+          },
+          "enable": {
+            "message": "Möchtest du den Beitrag \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?",
+            "title": "Entsperre den Beitrag abschließend"
+          }
+        },
+        "User": {
+          "disable": {
+            "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?",
+            "title": "Sperre den Benutzer abschließend"
+          },
+          "enable": {
+            "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?",
+            "title": "Entsperre den Benutzer abschließend"
+          }
+        },
+        "cancel": "Abbruch",
+        "submit": "Bestätige Entscheidung"
+      },
+      "decided": "Entschieden",
+      "decision": "Entscheidung",
+      "disabled": "Gesperrt",
+      "disabledAt": "Gesperrt am",
+      "disabledBy": "Gesperrt von",
+      "empty": "Glückwunsch, es gibt nichts zu moderieren.",
+      "enabled": "Entsperrt",
+      "enabledAt": "Entsperrt am",
+      "enabledBy": "Entsperrt von",
+      "filterLabel": {
+        "all": "Alle",
+        "closed": "Abgeschlossen",
+        "reviewed": "Bearbeitet",
+        "unreviewed": "Nicht bearbeitet"
+      },
+      "moreDetails": "Details öffnen",
+      "name": "Meldungen",
+      "noDecision": "Keine Entscheidung!",
+      "numberOfUsers": "{count} Nutzern",
+      "previousDecision": "Vorherige Entscheidung:",
+      "reasonCategory": "Kategorie",
+      "reasonDescription": "Beschreibung",
+      "reportedOn": "Datum",
+      "status": "Aktueller Status",
+      "submitter": "Gemeldet von"
+    }
+  },
+  "notifications": {
+    "comment": "Kommentar",
+    "content": "Inhalt",
+    "empty": "Bedaure, Du hast momentan keinerlei Benachrichtigungen.",
+    "filterLabel": {
+      "all": "Alle",
+      "read": "Gelesen",
+      "unread": "Ungelesen"
+    },
+    "pageLink": "Alle Benachrichtigungen",
+    "post": "Beitrag",
+    "reason": {
+      "commented_on_post": "Hat deinen Beitrag kommentiert …",
+      "mentioned_in_comment": "Hat dich in einem Kommentar erwähnt …",
+      "mentioned_in_post": "Hat dich in einem Beitrag erwähnt …"
+    },
+    "title": "Benachrichtigungen",
+    "user": "Benutzer"
+  },
+  "post": {
+    "comment": {
+      "reply": "Antworten",
+      "submit": "Kommentiere",
+      "submitted": "Kommentar gesendet!",
+      "updated": "Änderungen gespeichert"
+    },
+    "edited": "bearbeitet",
+    "menu": {
+      "delete": "Beitrag löschen",
+      "edit": "Beitrag bearbeiten",
+      "pin": "Post festpinnen",
+      "pinnedSuccessfully": "Post erfolgreich festgepinnt!",
+      "unpin": "Post nicht mehr festpinnen",
+      "unpinnedSuccessfully": "Post erfolgreich nicht mehr festgepinnt!"
+    },
+    "moreInfo": {
+      "description": "Hier findest du weitere Infos zum Thema.",
+      "name": "Mehr Info",
+      "title": "Mehr Informationen",
+      "titleOfCategoriesSection": "Kategorien",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Verwandte Beiträge"
+    },
+    "name": "Beitrag",
+    "pinned": "Meldung",
+    "takeAction": {
+      "name": "Aktiv werden"
+    }
+  },
+  "profile": {
+    "commented": "Kommentiert",
+    "follow": "Folgen",
+    "followers": "Folgen",
+    "following": "Folge Ich",
+    "invites": {
+      "description": "Zur Einladung die E-Mail-Adresse hier eintragen.",
+      "emailPlaceholder": "E-Mail-Adresse für die Einladung",
+      "title": "Lade jemanden zu Human Connection ein!"
+    },
+    "memberSince": "Mitglied seit",
+    "name": "Mein Profil",
+    "network": {
+      "andMore": "und {number} weitere …",
+      "followedBy": "wird gefolgt von:",
+      "followedByNobody": "wird von niemandem gefolgt.",
+      "following": "folgt:",
+      "followingNobody": "folgt niemandem.",
+      "title": "Netzwerk"
+    },
+    "shouted": "Empfohlen",
+    "socialMedia": "Wo sonst finde ich",
+    "userAnonym": "Anonymus"
+  },
+  "quotes": {
+    "african": {
+      "author": "Afrikanisches Sprichwort",
+      "quote": "Viele kleine Leute an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern."
+    }
+  },
+  "release": {
+    "cancel": "Abbrechen",
+    "comment": {
+      "error": "Den Kommentar hast du schon gemeldet!",
+      "message": "Bist du sicher, dass du den Kommentar \"<b>{name}</b>\" freigeben möchtest?",
+      "title": "Kommentar freigeben",
+      "type": "Kommentar"
+    },
+    "contribution": {
+      "error": "Den Beitrag hast du schon gemeldet!",
+      "message": "Bist du sicher, dass du den Beitrag \"<b>{name}</b>\" freigeben möchtest?",
+      "title": "Beitrag freigeben",
+      "type": "Beitrag"
+    },
+    "submit": "freigeben",
+    "success": "Erfolgreich freigegeben!",
+    "user": {
+      "error": "Den User hast du schon gemeldet!",
+      "message": "Bist du sicher, dass du den Nutzer \"<b>{name}</b>\" freigeben möchtest?",
+      "title": "Nutzer freigeben",
+      "type": "Nutzer"
+    }
+  },
+  "report": {
+    "cancel": "Abbrechen",
+    "comment": {
+      "error": "Du hast den Kommentar bereits gemeldet!",
+      "message": "Bist Du sicher, dass Du den Kommentar von „<b>{name}</b>“ melden möchtest?",
+      "title": "Kommentar melden",
+      "type": "Kommentar"
+    },
+    "contribution": {
+      "error": "Du hast den Beitrag bereits gemeldet!",
+      "message": "Bist Du sicher, dass Du den Beitrag „<b>{name}</b>“ melden möchtest?",
+      "title": "Beitrag melden",
+      "type": "Beitrag"
+    },
+    "reason": {
+      "category": {
+        "invalid": "Bitte wähle eine gültige Kategorie aus",
+        "label": "Wähle eine Kategorie:",
+        "options": {
+          "advert_products_services_commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
+          "criminal_behavior_violation_german_law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
+          "discrimination_etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.",
+          "doxing": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
+          "glorific_trivia_of_cruel_inhuman_acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
+          "intentional_intimidation_stalking_persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
+          "other": "Andere …",
+          "pornographic_content_links": "Das Posten oder Verlinken eindeutig pornografischen Materials."
+        },
+        "placeholder": "Kategorie …"
+      },
+      "description": {
+        "label": "Bitte erkläre: Warum möchtest du dies melden?",
+        "placeholder": "Zusätzliche Information …"
+      }
+    },
+    "submit": "Meldung senden",
+    "success": "Vielen Dank für diese Meldung!",
+    "user": {
+      "error": "Du hast den Benutzer bereits gemeldet!",
+      "message": "Bist Du sicher, dass Du den Nutzer „<b>{name}</b>“ melden möchtest?",
+      "title": "Nutzer melden",
+      "type": "Nutzer"
+    }
+  },
+  "search": {
+    "failed": "Nichts gefunden",
+    "heading": {
+      "Post": "Beiträge",
+      "User": "Benutzer"
+    },
+    "hint": "Wonach suchst Du?",
+    "placeholder": "Suchen"
+  },
+  "settings": {
+    "blocked-users": {
+      "block": "Nutzer blockieren",
+      "columns": {
+        "name": "Name",
+        "slug": "Alias",
+        "unblock": "Entsperren"
+      },
+      "empty": "Bislang hast du niemanden blockiert.",
+      "explanation": {
+        "closing": "Das sollte fürs Erste genügen, damit blockierte Benutzer dich nicht mehr länger belästigen können.",
+        "commenting-disabled": "Du kannst den Beitrag derzeit nicht kommentieren.",
+        "commenting-explanation": "Dafür kann es mehrere Gründe geben, bitte schau in unsere ",
+        "intro": "Wenn ein anderer Benutzer von dir blockiert wurde, dann passiert folgendes:",
+        "notifications": "Von dir blockierte Personen erhalten keine Benachrichtigungen mehr, wenn sie in deinen Beiträgen erwähnt werden.",
+        "their-perspective": "Die blockierte Person kann deine Beiträge nicht mehr kommentieren",
+        "your-perspective": "Du kannst keine Beiträge der blockierten Person mehr kommentieren."
+      },
+      "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
+      "name": "Blocked users",
+      "unblock": "Nutzer entsperren",
+      "unblocked": "{name} ist wieder entsperrt"
+    },
+    "data": {
+      "labelBio": "Über Dich",
+      "labelCity": "Deine Stadt oder Region",
+      "labelName": "Dein Name",
+      "labelSlug": "Dein eindeutiger Benutzername",
+      "name": "Deine Daten",
+      "namePlaceholder": "Petra Lustig",
+      "success": "Deine Daten wurden erfolgreich aktualisiert!"
+    },
+    "deleteUserAccount": {
+      "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>",
+      "commentedCount": "Meine {count} Kommentare löschen",
+      "contributionsCount": "Meine {count} Beiträge löschen",
+      "name": "Benutzerkonto löschen",
+      "pleaseConfirm": "<b class='is-danger'>Zerstörerische Aktion!</b> Gib <b>{confirm}</b> ein, um zu bestätigen.",
+      "success": "Konto erfolgreich gelöscht!"
+    },
+    "download": {
+      "name": "Daten herunterladen"
+    },
+    "email": {
+      "change-successful": "Deine E-Mail Adresse wurde erfolgreich geändert.",
+      "labelEmail": "E-Mail Adresse ändern",
+      "labelNewEmail": "Neue E-Mail Adresse",
+      "labelNonce": "Bestätigungscode eingeben",
+      "name": "Deine E-Mail",
+      "submitted": "Eine E-Mail zur Bestätigung deiner Adresse wurde an <b>{email}</b> gesendet.",
+      "success": "Eine neue E-Mail Addresse wurde registriert.",
+      "validation": {
+        "same-email": "Das ist deine aktuelle E-Mail Addresse"
+      },
+      "verification-error": {
+        "explanation": "Das kann verschiedene Ursachen haben:",
+        "message": "Deine E-Mail Adresse konnte nicht verifiziert werden.",
+        "reason": {
+          "invalid-nonce": "Ist der Bestätigungscode falsch?",
+          "no-email-request": "Bist du dir sicher, dass du eine Änderung deiner E-Mail Adresse angefragt hattest?"
+        },
+        "support": "Wenn das Problem weiterhin besteht, kontaktiere uns gerne per E-Mail an"
+      }
+    },
+    "embeds": {
+      "info-description": "Hier ist die Liste an Drittanbietern, deren Inhalte als Fremdcode z.B. in Form von eingebetteten Videos angezeigt werden kann:",
+      "name": "Drittanbieter",
+      "status": {
+        "change": {
+          "allow": "Na klar",
+          "deny": "Lieber nicht",
+          "question": "Soll eingebetter Fremdcode von Dritten für dich immer angezeigt werden?"
+        },
+        "description": "Als Grundeinstellung für dich wird eingebetter Fremdcode von Drittanbietern",
+        "disabled": {
+          "off": "zunächst nicht angezeigt",
+          "on": "sofort angezeigt"
+        }
+      }
+    },
+    "invites": {
+      "name": "Einladungen"
+    },
+    "languages": {
+      "name": "Sprachen"
+    },
+    "muted-users": {
+      "columns": {
+        "name": "Name",
+        "slug": "Alias",
+        "unmute": "Entsperren"
+      },
+      "empty": "Bislang hast du niemanden stummgeschaltet.",
+      "explanation": {
+        "intro": "Wenn ein anderer Benutzer von dir stummgeschaltet wurde, dann passiert folgendes:",
+        "search": "Die Beiträge von stummgeschalteten Personen verschwinden aus deinen Suchergebnissen.",
+        "your-perspective": "In deiner Beitragsübersicht tauchen keine Beiträge der stummgeschalteten Person mehr auf."
+      },
+      "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü stummschalten.",
+      "mute": "Stumm schalten",
+      "name": "Stummgeschaltete Benutzer",
+      "unmute": "Stummschaltung aufheben",
+      "unmuted": "{name} ist nicht mehr stummgeschaltet"
+    },
+    "name": "Einstellungen",
+    "organizations": {
+      "name": "Meine Organisationen"
+    },
+    "privacy": {
+      "make-shouts-public": "Teile von mir empfohlene Artikel öffentlich auf meinem Profil",
+      "name": "Privatsphäre",
+      "success-update": "Privatsphäre-Einstellungen gespeichert"
+    },
+    "security": {
+      "change-password": {
+        "button": "Passwort ändern",
+        "label-new-password": "Dein neues Passwort",
+        "label-new-password-confirm": "Bestätige Dein neues Passwort",
+        "label-old-password": "Dein altes Passwort",
+        "message-new-password-confirm-required": "Bestätige dein neues Passwort",
+        "message-new-password-missmatch": "Gebe das gleiche Passwort nochmals ein",
+        "message-new-password-required": "Gebe ein neues Passwort ein",
+        "message-old-password-required": "Gebe dein altes Passwort ein",
+        "passwordSecurity": "Passwortsicherheit",
+        "passwordStrength0": "Sehr unsicheres Passwort",
+        "passwordStrength1": "Unsicheres Passwort",
+        "passwordStrength2": "Mittelmäßiges Passwort",
+        "passwordStrength3": "Sicheres Passwort",
+        "passwordStrength4": "Sehr sicheres Passwort",
+        "success": "Passwort erfolgreich geändert!"
+      },
+      "name": "Sicherheit"
+    },
+    "social-media": {
+      "name": "Soziale Medien",
+      "placeholder": "Deine Social-Media URL",
+      "requireUnique": "Dieser Link existiert bereits",
+      "submit": "Link hinzufügen",
+      "successAdd": "Social-Media hinzugefügt. Profil aktualisiert!",
+      "successDelete": "Social-Media gelöscht. Profil aktualisiert!"
+    },
+    "validation": {
+      "slug": {
+        "alreadyTaken": "Dieser Benutzername ist schon vergeben.",
+        "regex": "Es sind nur Kleinbuchstaben, Zahlen, Unterstriche oder Bindestriche erlaubt."
+      }
+    }
+  },
+  "shoutButton": {
+    "shouted": "empfohlen"
+  },
+  "site": {
+    "back-to-login": "Zurück zur Anmeldung",
+    "bank": "Bankverbindung",
+    "code-of-conduct": "Verhaltenscodex",
+    "contact": "Kontakt",
+    "data-privacy": "Datenschutz",
+    "director": "Geschäftsführer",
+    "error-occurred": "Ein Fehler ist aufgetreten.",
+    "faq": "FAQ",
+    "germany": "Deutschland",
+    "imprint": "Impressum",
+    "made": "Mit &#10084; gemacht",
+    "register": "Registernummer",
+    "responsible": "Verantwortlicher gemäß § 55 Abs. 2 RStV ",
+    "taxident": "Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz (Deutschland)",
+    "termsAndConditions": "Nutzungsbedingungen",
+    "thanks": "Danke!",
+    "tribunal": "Registergericht"
+  },
+  "store": {
+    "posts": {
+      "orderBy": {
+        "newest": {
+          "label": "Neueste"
+        },
+        "oldest": {
+          "label": "Älteste"
+        }
+      }
+    }
+  },
+  "termsAndConditions": {
+    "addition": {
+      "description": "<a href=\"https://human-connection.org/veranstaltungen/\" target=\"_blank\" > https://human-connection.org/veranstaltungen/ </a>",
+      "title": "Zusätzlich machen wir regelmäßig Veranstaltungen, wo Du auch Eindrücke wiedergeben und Fragen stellen kannst. Du findest eine aktuelle Übersicht hier:"
+    },
+    "agree": "Ich stimme zu!",
     "code-of-conduct": {
-        "subheader": "für das Soziale Netzwerk der Human Connection gGmbH",
-        "preamble": {
-            "title": "Präambel",
-            "description": "Human Connection ist ein gemeinnütziges soziales Wissens- und Aktionsnetzwerk der nächsten Generation. Von Menschen – für Menschen. Open Source, fair und transparent. Für positiven lokalen und globalen Wandel in allen Lebensbereichen. Wir gestalten den öffentlichen Austausch von Wissen, Ideen und Projekten völlig neu. Die Funktionen von Human Connection bringen die Menschen zusammen – offline und online – so dass wir die Welt zu einem besseren Ort machen können."
-        },
-        "purpose": {
-            "title": "Zweck",
-            "description": "Mit diesen Verhaltensregeln regeln wir die wesentlichen Grundsätze für das Verhalten in unserem Sozialen Netzwerk. Dabei ist die Menschenrechtscharta der Vereinten Nationen unsere Orientierung und bildet das Herz unseres Werteverständnisses. Die Verhaltensregeln dienen als Leitsätze für den persönlichen Auftritt und den Umgang untereinander. Wer als Nutzer im Human Connection Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an."
-        },
-        "expected-behaviour": {
-            "title": "Erwartetes Verhalten",
-            "description": "Die folgenden Verhaltensweisen werden von allen Community-Mitgliedern erwartet und gefordert:",
-            "list": {
-                "0": "Sei rücksichtsvoll und respektvoll bei dem was Du schreibst und tust.",
-                "1": "Versuche auf andere zuzugehen, bevor ein Konflikt entsteht.",
-                "2": "Vermeide erniedrigende, diskriminierende oder belästigende Verhaltensweisen und Ausdrücke.",
-                "3": "Gehe achtsam mit Deiner Umgebung um. Informiere den Support bei gefährlichen Situationen, wenn eine Person in Not ist oder bei Verstößen gegen diesen Verhaltenskodex, auch wenn sie unbedeutend erscheinen."
-            }
-        },
-        "unacceptable-behaviour": {
-            "title": "Nichtakzeptables Verhalten",
-            "description": "Die folgenden Verhaltensweisen sind in unserer Community inakzeptabel:",
-            "list": {
-                "0": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen, insbesondere solche, die sich auf Geschlecht, sexuelle Orientierung, Rasse, Religion, politische oder weltanschauliche Ausrichtung oder Behinderung beziehen.",
-                "1": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
-                "2": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
-                "3": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
-                "4": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
-                "5": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
-                "6": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
-                "7": "Befürwortung oder Ermutigung zu diesen Verhaltensweisen."
-            }
-        },
-        "consequences": {
-            "title": "Konsequenzen inakzeptablen Verhaltens",
-            "description": "Wenn ein Gemeinschaftsmitglied inakzeptables Verhalten an den Tag legt, können die verantwortlichen Betreiber, Moderatoren und Administratoren des Netzwerks angemessene Maßnahmen ergreifen, u.a.:",
-            "list": {
-                "0": "Aufforderung zum sofortigen Abstellen des inakzeptablen Verhaltens",
-                "1": "Sperren oder Löschen von Kommentaren",
-                "2": "Temporärer Ausschluss aus dem jeweiligen Beitrag",
-                "3": "Sperren bzw. Löschen von Inhalten",
-                "4": "Temporärer Entzug von Schreibrechten",
-                "5": "Vorübergehender Ausschluss aus dem Netzwerk",
-                "6": "Endgültiger Ausschluss aus dem Netzwerk",
-                "7": "Verstöße gegen deutsches Recht können zur Anzeige gebracht werden."
-            }
-        },
-        "get-help": "Wenn Du einem inakzeptablen Verhalten ausgesetzt bist, es miterlebst oder andere Bedenken hast, benachrichtige bitte so schnell wie möglich einen Organisator der Gemeinschaft und verlinke oder verweise auf den entsprechenden Inhalt:"
-    },
-    "termsAndConditions": {
-        "newTermsAndConditions": "Neue Nutzungsbedingungen",
-        "termsAndConditionsConfirmed": "Ich habe die <a href=\"\/terms-and-conditions\" target=\"_blank\">Nutzungsbedingungen<\/a> durchgelesen und stimme ihnen zu.",
-        "termsAndConditionsNewConfirmText": "Bitte lies Dir die neue Nutzungsbedingungen jetzt durch!",
-        "termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.",
-        "agree": "Ich stimme zu!",
-        "terms-of-service": {
-            "title": "Nutzungsbedingungen",
-            "description": "Die folgenden Nutzungsbedingungen sind Basis für die Nutzung unseres Netzwerkes. Beim Registrieren musst Du sie anerkennen und wir werden Dich auch später über ggf. stattfindende Änderungen informieren. Das Human Connection Netzwerk wird in Deutschland betrieben und unterliegt daher deutschem Recht. Gerichtsstand ist Kirchheim \/ Teck. Zu Details schau in unser Impressum: <a href=\"https:\/\/human-connection.org\/impressum\/\" target=\"_blank\" >https:\/\/human-connection.org\/impressum\/<\/a>"
-        },
-        "use-and-license": {
-            "title": "Nutzung und Lizenz",
-            "description": "Sind Inhalte, die Du bei uns einstellst, durch Rechte am geistigen Eigentum geschützt, erteilst Du uns eine nicht-exklusive, übertragbare, unterlizenzierbare und weltweite Lizenz für die Nutzung dieser Inhalte für die Bereitstellung in unserem Netzwerk. Diese Lizenz endet, sobald Du Deine Inhalte oder Deinen ganzen Account löscht. Bedenke, dass andere Deine Inhalte weiter teilen können und wir diese nicht löschen können."
-        },
-        "privacy-statement": {
-            "title": "Datenschutz",
-            "description": "Unser Netzwerk ist ein soziales Wissens- und Aktionsnetzwerk. Daher ist es uns besonders wichtig, dass möglichst viele Inhalte öffentlich zugänglich sind. Im Laufe der Entwicklung unseres Netzwerkes wird es mehr und mehr die Möglichkeit geben, über die Sichtbarkeit der selbst angegebenen bzw. persönlichen Daten zu entscheiden. Über diese neuen Funktionen werden wir Euch informieren. Ansonsten gilt, dass Du immer darüber nachdenken solltest, welche persönlichen Daten Du über Dich (oder andere) preisgibst. Dies gilt insbesondere für Inhalte von Beiträgen und Kommentaren, da diese einen weitgehend öffentlichen Charakter haben. Später wird es Möglichkeiten geben, die Sichtbarkeit Deines Profils einzuschränken. Teil der Nutzungsbedingungen ist unsere Datenschutzerklärung, die Dich über die einzelnen Datenverarbeitungen in unserem Netzwerk informiert: <a href=\"https:\/\/human-connection.org\/datenschutz\/#netzwerk\" target=\"_blank\"> https:\/\/human-connection.org\/datenschutz\/#netzwerk<\/a> bzw. <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz\/<\/a> Unsere Datenschutzerklärung ist an die Gesetzeslage und die Charakteristika unseres Netzwerks angepasst und gilt immer in der aktuellsten Version."
-        },
-        "code-of-conduct": {
-            "title": "Verhaltenscodex",
-            "description": "Unser Verhaltenskodex dient als Leitfaden für das persönliche Auftreten und den Umgang miteinander. Wer als Nutzer im Human Connection-Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an. <a href=\"https:\/\/alpha.human-connection.org\/code-of-conduct\" target=\"_blank\"> https:\/\/alpha.human-connection.org\/code-of-conduct<\/a>"
-        },
-        "moderation": {
-            "title": "Moderation",
-            "description": "Bis unsere finanziellen Möglichkeiten uns erlauben, das Community-Moderationssystem zu implementieren, moderieren wir mit einem vereinfachten System und eigenen bzw. ggf. ehrenamtlichen Mitarbeitern. Wir schulen diese Moderatoren und aus diesem Grund treffen auch nur diese entsprechende Entscheidungen. Diese Moderatoren führen Ihre Tätigkeit anonym aus. Du kannst uns Beiträge, Kommentare und auch Nutzer melden (wenn diese zum Beispiel in ihrem Profil Angaben machen oder Bilder haben, die diese Nutzungsbedingungen verletzen). Wenn Du uns etwas meldest, kannst Du einen Meldegrund angeben und noch eine kurze Erläuterung mitgeben. Wir schauen uns dann das Gemeldete an und sanktionieren ggf., z.B. indem wir Beiträge, Kommentare oder Nutzer sperren. Du und auch der Betroffene erhält derzeitig von uns leider noch keine Rückmeldung, das ist aber in Planung. Unabhängig davon behalten wir uns prinzipiell Sanktionen vor aus Gründen, die unter Umständen nicht oder noch nicht in unserem Verhaltenscodex oder diesen Nutzungsbedingungen aufgeführt sind."
-        },
-        "errors-and-feedback": {
-            "title": "Fehler und Rückmeldungen",
-            "description": "Wir sind sehr bemüht, unser Netzwerk und unsere Daten sicher und abrufbar zu erhalten. Jede neue Version der Software durchläuft sowohl automatisierte als auch manuelle Tests. Es können jedoch unvorhergesehene Fehler auftreten. Deshalb sind wir dankbar für jeden gemeldeten Fehler. Du kannst gerne jeden von Dir entdeckten Fehler dem Support\/der Hilfe-Assistenz mitteilen: support@human-connection.org"
-        },
-        "no-commercial-use" : {
-          "title": "Keine kommerzielle Nutzung",
-          "description": "Die Nutzung des Human Connection Netzwerkes ist nicht gestattet für kommerzielle Nutzung. Darunter fällt unter anderem das Bewerben von Produkten mit kommerzieller Absicht, das Einstellen von Affiliate-Links, direkter Aufruf zu Spenden oder finanzieller Unterstützung für Zwecke, die steuerlich nicht als gemeinnützig anerkannt sind."
-        },
-        "help-and-questions": {
-            "title": "Hilfe und Fragen",
-            "description": "Für Hilfe und Fragen haben wir Dir eine umfassende Sammlung an häufig gestellten Fragen und Antworten (FAQ) zusammengestellt. Du findest diese hier: <a href=\"https:\/\/support.human-connection.org\/kb\/\" target=\"_blank\" > https:\/\/support.human-connection.org\/kb\/ <\/a>"
-        },
-        "addition": {
-            "title": "Zusätzlich machen wir regelmäßig Veranstaltungen, wo Du auch Eindrücke wiedergeben und Fragen stellen kannst. Du findest eine aktuelle Übersicht hier:",
-            "description": "<a href=\"https:\/\/human-connection.org\/veranstaltungen\/\" target=\"_blank\" > https:\/\/human-connection.org\/veranstaltungen\/ <\/a>"
-        }
+      "description": "Unser Verhaltenskodex dient als Leitfaden für das persönliche Auftreten und den Umgang miteinander. Wer als Nutzer im Human Connection-Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
+      "title": "Verhaltenscodex"
     },
     "donations": {
         "donations-for": "Spenden für",
@@ -832,5 +799,42 @@
 	"500-default": "Internal Server Error",
 	"503-default": "Dienst steht nicht zur Verfügung",
 	"default": "Ein Fehler ist aufgetreten"
+    "errors-and-feedback": {
+      "description": "Wir sind sehr bemüht, unser Netzwerk und unsere Daten sicher und abrufbar zu erhalten. Jede neue Version der Software durchläuft sowohl automatisierte als auch manuelle Tests. Es können jedoch unvorhergesehene Fehler auftreten. Deshalb sind wir dankbar für jeden gemeldeten Fehler. Du kannst gerne jeden von Dir entdeckten Fehler dem Support/der Hilfe-Assistenz mitteilen: support@human-connection.org",
+      "title": "Fehler und Rückmeldungen"
+    },
+    "help-and-questions": {
+      "description": "Für Hilfe und Fragen haben wir Dir eine umfassende Sammlung an häufig gestellten Fragen und Antworten (FAQ) zusammengestellt. Du findest diese hier: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
+      "title": "Hilfe und Fragen"
+    },
+    "moderation": {
+      "description": "Bis unsere finanziellen Möglichkeiten uns erlauben, das Community-Moderationssystem zu implementieren, moderieren wir mit einem vereinfachten System und eigenen bzw. ggf. ehrenamtlichen Mitarbeitern. Wir schulen diese Moderatoren und aus diesem Grund treffen auch nur diese entsprechende Entscheidungen. Diese Moderatoren führen Ihre Tätigkeit anonym aus. Du kannst uns Beiträge, Kommentare und auch Nutzer melden (wenn diese zum Beispiel in ihrem Profil Angaben machen oder Bilder haben, die diese Nutzungsbedingungen verletzen). Wenn Du uns etwas meldest, kannst Du einen Meldegrund angeben und noch eine kurze Erläuterung mitgeben. Wir schauen uns dann das Gemeldete an und sanktionieren ggf., z.B. indem wir Beiträge, Kommentare oder Nutzer sperren. Du und auch der Betroffene erhält derzeitig von uns leider noch keine Rückmeldung, das ist aber in Planung. Unabhängig davon behalten wir uns prinzipiell Sanktionen vor aus Gründen, die unter Umständen nicht oder noch nicht in unserem Verhaltenscodex oder diesen Nutzungsbedingungen aufgeführt sind.",
+      "title": "Moderation"
+    },
+    "newTermsAndConditions": "Neue Nutzungsbedingungen",
+    "no-commercial-use": {
+      "description": "Die Nutzung des Human Connection Netzwerkes ist nicht gestattet für kommerzielle Nutzung. Darunter fällt unter anderem das Bewerben von Produkten mit kommerzieller Absicht, das Einstellen von Affiliate-Links, direkter Aufruf zu Spenden oder finanzieller Unterstützung für Zwecke, die steuerlich nicht als gemeinnützig anerkannt sind.",
+      "title": "Keine kommerzielle Nutzung"
+    },
+    "privacy-statement": {
+      "description": "Unser Netzwerk ist ein soziales Wissens- und Aktionsnetzwerk. Daher ist es uns besonders wichtig, dass möglichst viele Inhalte öffentlich zugänglich sind. Im Laufe der Entwicklung unseres Netzwerkes wird es mehr und mehr die Möglichkeit geben, über die Sichtbarkeit der selbst angegebenen bzw. persönlichen Daten zu entscheiden. Über diese neuen Funktionen werden wir Euch informieren. Ansonsten gilt, dass Du immer darüber nachdenken solltest, welche persönlichen Daten Du über Dich (oder andere) preisgibst. Dies gilt insbesondere für Inhalte von Beiträgen und Kommentaren, da diese einen weitgehend öffentlichen Charakter haben. Später wird es Möglichkeiten geben, die Sichtbarkeit Deines Profils einzuschränken. Teil der Nutzungsbedingungen ist unsere Datenschutzerklärung, die Dich über die einzelnen Datenverarbeitungen in unserem Netzwerk informiert: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a> bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Unsere Datenschutzerklärung ist an die Gesetzeslage und die Charakteristika unseres Netzwerks angepasst und gilt immer in der aktuellsten Version.",
+      "title": "Datenschutz"
+    },
+    "terms-of-service": {
+      "description": "Die folgenden Nutzungsbedingungen sind Basis für die Nutzung unseres Netzwerkes. Beim Registrieren musst Du sie anerkennen und wir werden Dich auch später über ggf. stattfindende Änderungen informieren. Das Human Connection Netzwerk wird in Deutschland betrieben und unterliegt daher deutschem Recht. Gerichtsstand ist Kirchheim / Teck. Zu Details schau in unser Impressum: <a href=\"https://human-connection.org/impressum/\" target=\"_blank\" >https://human-connection.org/impressum/</a>",
+      "title": "Nutzungsbedingungen"
+    },
+    "termsAndConditionsConfirmed": "Ich habe die <a href=\"/terms-and-conditions\" target=\"_blank\">Nutzungsbedingungen</a> durchgelesen und stimme ihnen zu.",
+    "termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.",
+    "termsAndConditionsNewConfirmText": "Bitte lies Dir die neue Nutzungsbedingungen jetzt durch!",
+    "use-and-license": {
+      "description": "Sind Inhalte, die Du bei uns einstellst, durch Rechte am geistigen Eigentum geschützt, erteilst Du uns eine nicht-exklusive, übertragbare, unterlizenzierbare und weltweite Lizenz für die Nutzung dieser Inhalte für die Bereitstellung in unserem Netzwerk. Diese Lizenz endet, sobald Du Deine Inhalte oder Deinen ganzen Account löscht. Bedenke, dass andere Deine Inhalte weiter teilen können und wir diese nicht löschen können.",
+      "title": "Nutzung und Lizenz"
     }
+  },
+  "user": {
+    "avatar": {
+      "submitted": "Upload erfolgreich"
+    }
+  }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 5beec4328..8944985d4 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -1,58 +1,767 @@
 {
-  "components": {
-    "password-reset": {
-      "request": {
-        "title": "Reset your password",
-        "form": {
-          "description": "A password reset e-mail will be sent to the given e-mail address.",
-          "submit": "Request e-mail",
-          "submitted": "An e-mail with further instructions has been sent to <b>{email}</b>"
-        }
-      },
-      "change-password": {
-        "success": "Changing your password was successful!",
-        "error": "Changing your password failed. Maybe the security code was not correct?",
-        "help": "In case of problems, feel free to ask for help by sending us a mail to:"
-      }
+  "actions": {
+    "cancel": "Cancel",
+    "create": "Create",
+    "delete": "Delete",
+    "edit": "Edit",
+    "loadMore": "load more",
+    "loading": "loading",
+    "save": "Save"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Name",
+      "name": "Categories",
+      "postCount": "Posts"
     },
+    "dashboard": {
+      "comments": "Comments",
+      "follows": "Follows",
+      "invites": "Invites",
+      "name": "Dashboard",
+      "notifications": "Notifications",
+      "organizations": "Organizations",
+      "posts": "Posts",
+      "projects": "Projects",
+      "shouts": "Shouts",
+      "users": "Users"
+    },
+    "donations": {
+      "goal": "Monthly donations needed",
+      "name": "Donations info",
+      "progress": "Donations collected so far",
+      "successfulUpdate": "Donations info updated successfully!"
+    },
+    "hashtags": {
+      "name": "Hashtags",
+      "nameOfHashtag": "Name",
+      "number": "No.",
+      "tagCount": "Posts",
+      "tagCountUnique": "Users"
+    },
+    "invites": {
+      "description": "Invitations are a wonderful way to have your friends in your network …",
+      "name": "Invite users",
+      "title": "Invite people"
+    },
+    "name": "Admin",
+    "notifications": {
+      "name": "Notifications"
+    },
+    "organizations": {
+      "name": "Organizations"
+    },
+    "pages": {
+      "name": "Pages"
+    },
+    "settings": {
+      "name": "Settings"
+    },
+    "users": {
+      "empty": "No users found",
+      "form": {
+        "placeholder": "e-mail, name or description"
+      },
+      "name": "Users",
+      "table": {
+        "columns": {
+          "createdAt": "Created at",
+          "email": "E-mail",
+          "name": "Name",
+          "number": "No.",
+          "role": "Role",
+          "slug": "Slug"
+        }
+      }
+    }
+  },
+  "code-of-conduct": {
+    "consequences": {
+      "description": "If a community member exhibits unacceptable behaviour, the responsible operators, moderators and administrators of the network may take appropriate measures, including but not limited to:",
+      "list": {
+        "0": "Request for immediate cessation of unacceptable conduct",
+        "1": "Locking or deleting comments",
+        "2": "Temporary exclusion from the respective post or contribution",
+        "3": "Blocking or deleting of content",
+        "4": "Temporary withdrawal of write permissions",
+        "5": "Temporary exclusion from the network",
+        "6": "Final exclusion from the network",
+        "7": "Violations of German law can be reported."
+      },
+      "title": "Consequences of Unacceptable Behavior"
+    },
+    "expected-behaviour": {
+      "description": "The following behaviors are expected and requested of all community members:",
+      "list": {
+        "0": "Exercise consideration and respect in your speech and actions.",
+        "1": "Attempt collaboration before conflict.",
+        "2": "Refrain from demeaning, discriminatory, or harassing behavior and speech.",
+        "3": "Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential."
+      },
+      "title": "Expected Behaviour"
+    },
+    "get-help": "If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible and link or refer to the corresponding content:",
+    "preamble": {
+      "description": "Human Connection is a non-profit social knowledge and action network of the next generation. By people - for people. Open Source, fair and transparent. For positive local and global change in all areas of life. We completely redesign the public exchange of knowledge, ideas and projects. The functions of Human Connection bring people together - offline and online - so that we can make the  world a better place.",
+      "title": "Preamble"
+    },
+    "purpose": {
+      "description": "With these code of conduct we regulate the essential principles for behavior in our social network. The United Nations Charter of Human Rights is our orientation and forms the heart of our understanding of values. The code of conduct serves as guiding principles for our personal appearance and interaction with one another. Anyone who is active as a user in the Human Connection Network, writes articles, comments or contacts other users, including those outside the network,acknowledges these rules of conduct as binding.",
+      "title": "Purpose"
+    },
+    "subheader": "for the social network of the Human Connection gGmbH",
+    "unacceptable-behaviour": {
+      "description": "The following behaviors are unacceptable within our community:",
+      "list": {
+        "0": "Discriminatory posts, comments, utterances or insults, particularly those relating to gender, sexual orientation, race, religion, political or philosophical orientation or disability.",
+        "1": "Posting or linking of clearly pornographic material.",
+        "2": "Glorification or trivialization of cruel or inhuman acts of violence.",
+        "3": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
+        "4": "Intentional intimidation, stalking or persecution.",
+        "5": "Advertising products and services with commercial intent.",
+        "6": "Criminal behavior or violation of German law.",
+        "7": "Endorse or encourage such conduct."
+      },
+      "title": "Unacceptable Behavior"
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "… this comment is not available anymore"
+    },
+    "edited": "edited",
+    "menu": {
+      "delete": "Delete Comment",
+      "edit": "Edit Comment"
+    },
+    "show": {
+      "less": "show less",
+      "more": "show more"
+    }
+  },
+  "common": {
+    "category": "Category ::: Categories",
+    "comment": "Comment ::: Comments",
+    "letsTalk": "Let`s Talk",
+    "loadMore": "load more",
+    "loading": "loading",
+    "moreInfo": "More Info",
+    "name": "Name",
+    "organization": "Organization ::: Organizations",
+    "post": "Post ::: Posts",
+    "project": "Project ::: Projects",
+    "reportContent": "Report",
+    "shout": "Shout ::: Shouts",
+    "tag": "Tag ::: Tags",
+    "takeAction": "Take Action",
+    "user": "User ::: Users",
+    "validations": {
+      "categories": "at least one and at most three categories must be selected",
+      "email": "must be a valid e-mail address",
+      "url": "must be a valid URL"
+    },
+    "versus": "Versus"
+  },
+  "components": {
     "enter-nonce": {
       "form": {
-        "nonce": "Enter your code",
         "description": "Open your inbox and enter the code that we've sent to you.",
         "next": "Continue",
+        "nonce": "Enter your code",
         "validations": {
           "length": "must be 6 characters long"
         }
       }
     },
-    "registration": {
-      "signup": {
-        "unavailable": "Unfortunately, public registration of user accounts is not available right now on this server.",
-        "title": "Join Human Connection!",
+    "password-reset": {
+      "change-password": {
+        "error": "Changing your password failed. Maybe the security code was not correct?",
+        "help": "In case of problems, feel free to ask for help by sending us a mail to:",
+        "success": "Changing your password was successful!"
+      },
+      "request": {
+        "form": {
+          "description": "A password reset e-mail will be sent to the given e-mail address.",
+          "submit": "Request e-mail",
+          "submitted": "An e-mail with further instructions has been sent to <b>{email}</b>"
+        },
+        "title": "Reset your password"
+      }
+    },
+    "registration": {
+      "create-user-account": {
+        "error": "No user account could be created!",
+        "help": " Maybe the confirmation was invalid? In case of problems, feel free to ask for help by sending us a mail to:",
+        "success": "Your account has been created!",
+        "title": "Create user account"
+      },
+      "signup": {
         "form": {
-          "description": "To get started, you can register here for free:",
-          "terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>.",
           "data-privacy": " I have read and understood the <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Privacy Statement</ds-text></a> ",
-          "minimum-age": "I'm 18 years or older.",
-          "no-commercial": "I have no commercial interests and I am not representing a company or any other commercial organisation on the network.",
-          "no-political": "I am not on behalf of a party or political organization in the network.",
-          "invitation-code": "Your invitation code is: <b>{code}</b>",
+          "description": "To get started, you can register here for free:",
           "errors": {
             "email-exists": "There is already a user account with this e-mail address!",
             "invalid-invitation-token": "It looks like as if the invitation has been used already. Invitation links can only be used once."
           },
+          "invitation-code": "Your invitation code is: <b>{code}</b>",
+          "minimum-age": "I'm 18 years or older.",
+          "no-commercial": "I have no commercial interests and I am not representing a company or any other commercial organisation on the network.",
+          "no-political": "I am not on behalf of a party or political organization in the network.",
           "submit": "Create an account",
-          "success": "A mail with a link to complete your registration has been sent to <b>{email}</b>"
-        }
-      },
-      "create-user-account": {
-        "title": "Create user account",
-        "success": "Your account has been created!",
-        "error": "No user account could be created!",
-        "help": " Maybe the confirmation was invalid? In case of problems, feel free to ask for help by sending us a mail to:"
+          "success": "A mail with a link to complete your registration has been sent to <b>{email}</b>",
+          "terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>."
+        },
+        "title": "Join Human Connection!",
+        "unavailable": "Unfortunately, public registration of user accounts is not available right now on this server."
       }
     }
   },
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": "{chosen} of {max} categories selected"
+    },
+    "category": {
+      "name": {
+        "animal-protection": "Animal Protection",
+        "art-culture-sport": "Art, Culture, & Sport",
+        "consumption-sustainability": "Consumption & Sustainability",
+        "cooperation-development": "Cooperation & Development",
+        "democracy-politics": "Democracy & Politics",
+        "economy-finances": "Economy & Finances",
+        "education-sciences": "Education & Sciences",
+        "energy-technology": "Energy & Technology",
+        "environment-nature": "Environment & Nature",
+        "freedom-of-speech": "Freedom of Speech",
+        "global-peace-nonviolence": "Global Peace & Nonviolence",
+        "happiness-values": "Happiness & Values",
+        "health-wellbeing": "Health & Wellbeing",
+        "human-rights-justice": "Human Rights & Justice",
+        "it-internet-data-privacy": "IT, Internet & Data Privacy",
+        "just-for-fun": "Just for Fun"
+      }
+    },
+    "emotions-label": {
+      "angry": "Angry",
+      "cry": "Cry",
+      "funny": "Funny",
+      "happy": "Happy",
+      "surprised": "Surprised"
+    },
+    "filterALL": "View all contributions",
+    "filterFollow": "Filter contributions from users I follow",
+    "inappropriatePicture": "This image may be inappropriate for some people.",
+    "inappropriatePictureText": "When should my picture be blurred",
+    "languageSelectLabel": "Language of your contribution",
+    "languageSelectText": "Select Language",
+    "newPost": "Create a new Post",
+    "success": "Saved!",
+    "teaserImage": {
+      "cropperConfirm": "Confirm"
+    },
+    "title": "Title"
+  },
+  "delete": {
+    "cancel": "Cancel",
+    "comment": {
+      "message": "Do you really want to delete the comment \"<b>{name}</b>\"?",
+      "success": "Comment successfully deleted!",
+      "title": "Delete Comment",
+      "type": "Comment"
+    },
+    "contribution": {
+      "message": "Do you really want to delete the post \"<b>{name}</b>\"?",
+      "success": "Post successfully deleted!",
+      "title": "Delete Post",
+      "type": "Contribution"
+    },
+    "submit": "Delete"
+  },
+  "disable": {
+    "cancel": "Cancel",
+    "comment": {
+      "message": "Do you really want to disable the comment from \"<b>{name}</b>\"?",
+      "title": "Disable Comment",
+      "type": "Comment"
+    },
+    "contribution": {
+      "message": "Do you really want to disable the contribution \"<b>{name}</b>\"?",
+      "title": "Disable Contribution",
+      "type": "Contribution"
+    },
+    "submit": "Disable",
+    "success": "Disabled successfully!",
+    "user": {
+      "message": "Do you really want to disable the user \"<b>{name}</b>\"?",
+      "title": "Disable User",
+      "type": "User"
+    }
+  },
+  "donations": {
+    "amount-of-total": "{amount} of {total} € collected",
+    "donate-now": "Donate now",
+    "donations-for": "Donations for"
+  },
+  "editor": {
+    "embed": {
+      "always_allow": "Always allow embedded content by third party providers (this setting can be changed any time)",
+      "data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to watch this video the following provider will likely collect user data:",
+      "data_privacy_warning": "Data Privacy Warning!",
+      "play_now": "Watch now"
+    },
+    "hashtag": {
+      "addHashtag": "New hashtag",
+      "addLetter": "Type a letter",
+      "noHashtagsFound": "No hashtags found"
+    },
+    "mention": {
+      "noUsersFound": "No users found"
+    },
+    "placeholder": "Leave your inspirational thoughts …"
+  },
+  "filter-menu": {
+    "clearSearch": "Clear search",
+    "hashtag-search": "Searching for #{hashtag}",
+    "title": "Your filter bubble"
+  },
+  "filter-posts": {
+    "categories": {
+      "all": "All",
+      "header": "Categories of Content"
+    },
+    "followers": {
+      "label": "Users I follow"
+    },
+    "general": {
+      "header": "Filter by …"
+    },
+    "language": {
+      "all": "All",
+      "header": "Languages"
+    }
+  },
+  "followButton": {
+    "follow": "Follow",
+    "following": "Following"
+  },
+  "index": {
+    "change-filter-settings": "Change your filter settings to get more results.",
+    "no-results": "No contributions found."
+  },
+  "login": {
+    "copy": "If you already have a human-connection account, please login.",
+    "email": "Your E-mail",
+    "failure": "Incorrect email address or password.",
+    "forgotPassword": "Forgot Password?",
+    "hello": "Hello",
+    "login": "Login",
+    "logout": "Logout",
+    "moreInfo": "What is Human Connection?",
+    "moreInfoHint": "to the presentation page",
+    "moreInfoURL": "https://human-connection.org/en/",
+    "no-account": "Don't have an account?",
+    "password": "Your Password",
+    "register": "Sign up",
+    "success": "You are logged in!"
+  },
+  "maintenance": {
+    "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
+    "questions": "Any Questions or concerns, send an e-mail to",
+    "title": "Human Connection is under maintenance"
+  },
+  "moderation": {
+    "name": "Moderation",
+    "reports": {
+      "DecisionSuccess": "Decided successfully!",
+      "author": "Author",
+      "content": "Content",
+      "decideButton": "Confirm",
+      "decideModal": {
+        "Comment": {
+          "disable": {
+            "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>disabled</b>?",
+            "title": "Finally Disable Comment"
+          },
+          "enable": {
+            "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>enabled</b>?",
+            "title": "Finally Enable Comment"
+          }
+        },
+        "Post": {
+          "disable": {
+            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>disabled</b>?",
+            "title": "Finally Disable Post"
+          },
+          "enable": {
+            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>enabled</b>?",
+            "title": "Finally Enable Post"
+          }
+        },
+        "User": {
+          "disable": {
+            "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>disabled</b>?",
+            "title": "Finally Disable User"
+          },
+          "enable": {
+            "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>enabled</b>?",
+            "title": "Finally Enable User"
+          }
+        },
+        "cancel": "Cancel",
+        "submit": "Confirm decision"
+      },
+      "decided": "Decided",
+      "decision": "Decision",
+      "disabled": "Disabled",
+      "disabledAt": "Disabled at",
+      "disabledBy": "Disabled by",
+      "empty": "Congratulations, nothing to moderate.",
+      "enabled": "Enabled",
+      "enabledAt": "Enabled at",
+      "enabledBy": "Enabled by",
+      "filterLabel": {
+        "all": "All",
+        "closed": "Closed",
+        "reviewed": "Reviewed",
+        "unreviewed": "Unreviewed"
+      },
+      "moreDetails": "View Details",
+      "name": "Reports",
+      "noDecision": "No decision!",
+      "numberOfUsers": "{count} users",
+      "previousDecision": "Previous decision:",
+      "reasonCategory": "Category",
+      "reasonDescription": "Description",
+      "reportedOn": "Date",
+      "status": "Current status",
+      "submitter": "Reported by"
+    }
+  },
+  "notifications": {
+    "comment": "Comment",
+    "content": "Content",
+    "empty": "Sorry, you don't have any notifications at the moment.",
+    "filterLabel": {
+      "all": "All",
+      "read": "Read",
+      "unread": "Unread"
+    },
+    "pageLink": "All notifications",
+    "post": "Post",
+    "reason": {
+      "commented_on_post": "Commented on your post …",
+      "mentioned_in_comment": "Mentioned you in a comment …",
+      "mentioned_in_post": "Mentioned you in a post …"
+    },
+    "title": "Notifications",
+    "user": "User"
+  },
+  "post": {
+    "comment": {
+      "reply": "Reply",
+      "submit": "Comment",
+      "submitted": "Comment submitted!",
+      "updated": "Changes saved!"
+    },
+    "edited": "edited",
+    "menu": {
+      "delete": "Delete post",
+      "edit": "Edit post",
+      "pin": "Pin post",
+      "pinnedSuccessfully": "Post pinned successfully!",
+      "unpin": "Unpin post",
+      "unpinnedSuccessfully": "Post unpinned successfully!"
+    },
+    "moreInfo": {
+      "description": "Here you can find more information about this topic.",
+      "name": "More info",
+      "title": "More information",
+      "titleOfCategoriesSection": "Categories",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Related posts"
+    },
+    "name": "Post",
+    "pinned": "Announcement",
+    "takeAction": {
+      "name": "Take action"
+    }
+  },
+  "profile": {
+    "commented": "Commented",
+    "follow": "Follow",
+    "followers": "Followers",
+    "following": "Following",
+    "invites": {
+      "description": "Enter their e-mail address for invitation.",
+      "emailPlaceholder": "E-mail to invite",
+      "title": "Invite somebody to Human Connection!"
+    },
+    "memberSince": "Member since",
+    "name": "My Profile",
+    "network": {
+      "andMore": "and {number} more …",
+      "followedBy": "is followed by:",
+      "followedByNobody": "is not followed by anyone.",
+      "following": "is following:",
+      "followingNobody": "follows nobody.",
+      "title": "Network"
+    },
+    "shouted": "Shouted",
+    "socialMedia": "Where else can I find",
+    "userAnonym": "Anonymous"
+  },
+  "quotes": {
+    "african": {
+      "author": "African proverb",
+      "quote": "Many small people in many small places do many small things, that can alter the face of the world."
+    }
+  },
+  "release": {
+    "cancel": "Cancel",
+    "comment": {
+      "error": "You have already reported the comment!",
+      "message": "Do you really want to release the comment from \"<b>{name}</b>\"?",
+      "title": "Release Comment",
+      "type": "Comment"
+    },
+    "contribution": {
+      "error": "You have already reported the contribution!!",
+      "message": "Do you really want to release the contribution \"<b>{name}</b>\"?",
+      "title": "Release Contribution",
+      "type": "Contribution"
+    },
+    "submit": "Release",
+    "success": "Released successfully!",
+    "user": {
+      "error": "You already reported the user!",
+      "message": "Do you really want to release the user \"<b>{name}</b>\"?",
+      "title": "Release User",
+      "type": "User"
+    }
+  },
+  "report": {
+    "cancel": "Cancel",
+    "comment": {
+      "error": "You have already reported the comment!",
+      "message": "Do you really want to report the comment from \"<b>{name}</b>\"?",
+      "title": "Report Comment",
+      "type": "Comment"
+    },
+    "contribution": {
+      "error": "You have already reported the contribution!",
+      "message": "Do you really want to report the contribution \"<b>{name}</b>\"?",
+      "title": "Report Post",
+      "type": "Contribution"
+    },
+    "reason": {
+      "category": {
+        "invalid": "Please select a valid category",
+        "label": "Select a category:",
+        "options": {
+          "advert_products_services_commercial": "Advertising products and services with commercial intent.",
+          "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
+          "discrimination_etc": "Discriminatory posts, comments, utterances or insults.",
+          "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
+          "glorific_trivia_of_cruel_inhuman_acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
+          "intentional_intimidation_stalking_persecution": "Intentional intimidation, stalking or persecution.",
+          "other": "Other …",
+          "pornographic_content_links": "Posting or linking of clearly pornographic material."
+        },
+        "placeholder": "Category …"
+      },
+      "description": {
+        "label": "Please explain: Why you like to report this?",
+        "placeholder": "Additional information …"
+      }
+    },
+    "submit": "Report",
+    "success": "Thanks for reporting!",
+    "user": {
+      "error": "You already reported the user!",
+      "message": "Do you really want to report the user \"<b>{name}</b>\"?",
+      "title": "Report User",
+      "type": "User"
+    }
+  },
+  "search": {
+    "failed": "Nothing found",
+    "heading": {
+      "Post": "Posts",
+      "User": "Users"
+    },
+    "hint": "What are you searching for?",
+    "placeholder": "Search"
+  },
+  "settings": {
+    "blocked-users": {
+      "block": "Block user",
+      "columns": {
+        "name": "Name",
+        "slug": "Slug",
+        "unblock": "Unblock"
+      },
+      "empty": "So far, you have not blocked anybody.",
+      "explanation": {
+        "closing": "This should be sufficient for now so that blocked users can no longer bother you.",
+        "commenting-disabled": "Commenting is not possible at this time on this post.",
+        "commenting-explanation": "This can happen for several reasons, please see our ",
+        "intro": "If another user has been blocked by you, this is what happens:",
+        "notifications": "Blocked users will no longer receive notifications if they mention each other.",
+        "their-perspective": "Vice versa: The blocked person will also no longer be able to interact with your contributions.",
+        "your-perspective": "You will no longer be able to interact with their contributions."
+      },
+      "how-to": "You can block other users on their profile page via the content menu.",
+      "name": "Blocked users",
+      "unblock": "Unblock user",
+      "unblocked": "{name} is unblocked again"
+    },
+    "data": {
+      "labelBio": "About You",
+      "labelCity": "Your City or Region",
+      "labelName": "Your Name",
+      "labelSlug": "Your unique user name",
+      "name": "Your data",
+      "namePlaceholder": "Femanon Funny",
+      "success": "Your data was successfully updated!"
+    },
+    "deleteUserAccount": {
+      "accountDescription": "Be aware that your Posts 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!",
+      "commentedCount": "Delete my {count} comments",
+      "contributionsCount": "Delete my {count} posts",
+      "name": "Delete user account",
+      "pleaseConfirm": "<b class='is-danger'>Destructive action!</b> Type <b>{confirm}</b> to confirm",
+      "success": "Account successfully deleted!"
+    },
+    "download": {
+      "name": "Download Data"
+    },
+    "email": {
+      "change-successful": "Your e-mail address has been changed successfully.",
+      "labelEmail": "Change your e-mail address",
+      "labelNewEmail": "New e-mail Address",
+      "labelNonce": "Enter your code",
+      "name": "Your e-mail",
+      "submitted": "An e-mail to verify your address has been sent to <b>{email}</b>.",
+      "success": "A new e-mail address has been registered.",
+      "validation": {
+        "same-email": "This is your current e-mail address"
+      },
+      "verification-error": {
+        "explanation": "This can have different causes:",
+        "message": "Your e-mail could not be changed.",
+        "reason": {
+          "invalid-nonce": "Is the confirmation code invalid?",
+          "no-email-request": "Are you certain that you requested a change of your e-mail address?"
+        },
+        "support": "If the problem persists, please contact us by e-mail at"
+      }
+    },
+    "embeds": {
+      "info-description": "Here is the list of third-party providers whose content can be displayed as third-party code, e.g. in the form of embedded videos.",
+      "name": "Third party providers",
+      "status": {
+        "change": {
+          "allow": "Sure",
+          "deny": "No thanks",
+          "question": "Should embedded source code from third parties always be displayed to you?"
+        },
+        "description": "As a default for you, embedded code of third-party providers is",
+        "disabled": {
+          "off": "initially not displayed",
+          "on": "displayed immediately"
+        }
+      }
+    },
+    "invites": {
+      "name": "Invites"
+    },
+    "languages": {
+      "name": "Languages"
+    },
+    "muted-users": {
+      "columns": {
+        "name": "Name",
+        "slug": "Slug",
+        "unmute": "Unmute"
+      },
+      "empty": "So far, you have not muted anybody.",
+      "explanation": {
+        "intro": "If another user has been muted by you, this is what happens:",
+        "search": "Posts of muted people disappear from your search results.",
+        "your-perspective": "The muted person's posts will no longer appear in your news feed."
+      },
+      "how-to": "You can mute other users on their profile page via the content menu.",
+      "mute": "Mute user",
+      "name": "Muted users",
+      "unmute": "Unmute user",
+      "unmuted": "{name} is unmuted again"
+    },
+    "name": "Settings",
+    "organizations": {
+      "name": "My Organizations"
+    },
+    "privacy": {
+      "make-shouts-public": "Share articles I have shouted on my public profile",
+      "name": "Privacy",
+      "success-update": "Privacy settings saved"
+    },
+    "security": {
+      "change-password": {
+        "button": "Change password",
+        "label-new-password": "Your new password",
+        "label-new-password-confirm": "Confirm new password",
+        "label-old-password": "Your old password",
+        "message-new-password-confirm-required": "Confirm your new password",
+        "message-new-password-missmatch": "Type the same password again",
+        "message-new-password-required": "Enter a new password",
+        "message-old-password-required": "Enter your old password",
+        "passwordSecurity": "Password security",
+        "passwordStrength0": "Very insecure password",
+        "passwordStrength1": "Insecure password",
+        "passwordStrength2": "Mediocre password",
+        "passwordStrength3": "Strong password",
+        "passwordStrength4": "Very strong password",
+        "success": "Password successfully changed!"
+      },
+      "name": "Security"
+    },
+    "social-media": {
+      "name": "Social media",
+      "placeholder": "Your social media url",
+      "requireUnique": "You added this url already",
+      "submit": "Add link",
+      "successAdd": "Added social media. Updated user profile!",
+      "successDelete": "Deleted social media. Updated user profile!"
+    },
+    "validation": {
+      "slug": {
+        "alreadyTaken": "This user name is already taken.",
+        "regex": "Allowed characters are only lowercase letters, numbers, underscores and hyphens."
+      }
+    }
+  },
+  "shoutButton": {
+    "shouted": "shouted"
+  },
+  "site": {
+    "back-to-login": "Back to login page",
+    "bank": "bank account",
+    "code-of-conduct": "Code of Conduct",
+    "contact": "Contact",
+    "data-privacy": "Data privacy",
+    "director": "Managing Director",
+    "error-occurred": "An error occurred.",
+    "faq": "FAQ",
+    "germany": "Germany",
+    "imprint": "Imprint",
+    "made": "Made with &#10084;",
+    "register": "Registry number",
+    "responsible": "responsible for contents of this page (§ 55 Abs. 2 RStV)",
+    "taxident": "USt-ID. according to §27a of the German Sales Tax Law:",
+    "termsAndConditions": "Terms and conditions",
+    "thanks": "Thanks!",
+    "tribunal": "Registry court"
+  },
   "store": {
     "posts": {
       "orderBy": {
@@ -65,619 +774,47 @@
       }
     }
   },
-  "donations": {
-    "donations-for": "Donations for",
-    "donate-now": "Donate now",
-    "amount-of-total": "{amount} of {total} € collected"
-  },
-  "maintenance": {
-    "title": "Human Connection is under maintenance",
-    "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
-    "questions": "Any Questions or concerns, send an e-mail to"
-  },
-  "index": {
-    "no-results": "No contributions found.",
-    "change-filter-settings": "Change your filter settings to get more results."
-  },
-  "filter-menu": {
-    "title": "Your filter bubble",
-    "hashtag-search": "Searching for #{hashtag}",
-    "clearSearch": "Clear search"
-  },
-  "filter-posts": {
-    "categories": {
-      "header": "Categories of Content",
-      "all": "All"
+  "termsAndConditions": {
+    "addition": {
+      "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
+      "title": "In addition, we regularly hold events where you can also share your impressions and ask questions. You can find a current overview here:"
     },
-    "general": {
-      "header": "Filter by …"
+    "agree": "I agree!",
+    "code-of-conduct": {
+      "description": "Our code of conduct serves as a handbook for personal appearance and interaction with each other. Whoever is active as a user in the Human Connection network, writes articles, comments or makes contact with other users, even outside the network, acknowledges these rules of conduct as binding. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
+      "title": "Code of Conduct"
     },
-    "followers": {
-      "label": "Users I follow"
+    "errors-and-feedback": {
+      "description": "We make every effort to keep our network and data secure and available. Each new release of the software goes through both automated and manual testing. However, unforeseen errors may occur. Therefore, we are grateful for any reported bugs. You are welcome to report any bugs you discover by emailing Support at support@human-connection.org",
+      "title": "Errors and Feedback"
     },
-    "language": {
-      "header": "Languages",
-      "all": "All"
-    }
-  },
-  "site": {
-    "thanks": "Thanks!",
-    "error-occurred": "An error occurred.",
-    "made": "Made with &#10084;",
-    "imprint": "Imprint",
-    "termsAndConditions": "Terms and conditions",
-    "data-privacy": "Data privacy",
-    "contact": "Contact",
-    "tribunal": "Registry court",
-    "register": "Registry number",
-    "director": "Managing Director",
-    "taxident": "USt-ID. according to §27a of the German Sales Tax Law:",
-    "responsible": "responsible for contents of this page (§ 55 Abs. 2 RStV)",
-    "bank": "bank account",
-    "germany": "Germany",
-    "code-of-conduct": "Code of Conduct",
-    "back-to-login": "Back to login page",
-    "faq": "FAQ"
-  },
-  "login": {
-    "copy": "If you already have a human-connection account, please login.",
-    "login": "Login",
-    "logout": "Logout",
-    "email": "Your E-mail",
-    "password": "Your Password",
-    "forgotPassword": "Forgot Password?",
-    "no-account": "Don't have an account?",
-    "register": "Sign up",
-    "moreInfo": "What is Human Connection?",
-    "moreInfoURL": "https://human-connection.org/en/",
-    "moreInfoHint": "to the presentation page",
-    "hello": "Hello",
-    "success": "You are logged in!",
-    "failure": "Incorrect email address or password."
-  },
-  "editor": {
-    "placeholder": "Leave your inspirational thoughts …",
-    "mention": {
-      "noUsersFound": "No users found"
+    "help-and-questions": {
+      "description": "For help and questions we have compiled a comprehensive collection of frequently asked questions and answers (FAQ) for you. You can find them here: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
+      "title": "Help and Questions"
     },
-    "hashtag": {
-      "noHashtagsFound": "No hashtags found",
-      "addHashtag": "New hashtag",
-      "addLetter": "Type a letter"
+    "moderation": {
+      "description": "Until our financial possibilities allow us to implement the community moderation system, we moderate with a simplified system and with our own or possibly volunteer staff. We train these moderators and for this reason only they make the appropriate decisions. These moderators carry out their work anonymously. You can report posts, comments and users to us (for example, if they provide information in their profile or have images that violate these Terms of Use). If you report something to us, you can give us a reason and a short explanation. We will then take a look at what you have reported and sanction you if necessary, e.g. by blocking contributions, comments or users. Unfortunately, you and the person concerned will not receive any feedback from us at this time, but this is in the planning stage. Irrespective of this, we reserve the right to impose sanctions in principle for reasons that may not or not yet be listed in our Code of Conduct or these terms of service.",
+      "title": "Moderation"
     },
-    "embed": {
-      "data_privacy_warning": "Data Privacy Warning!",
-      "data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to watch this video the following provider will likely collect user data:",
-      "play_now": "Watch now",
-      "always_allow": "Always allow embedded content by third party providers (this setting can be changed any time)"
-    }
-  },
-  "profile": {
-    "name": "My Profile",
-    "memberSince": "Member since",
-    "follow": "Follow",
-    "followers": "Followers",
-    "following": "Following",
-    "shouted": "Shouted",
-    "commented": "Commented",
-    "userAnonym": "Anonymous",
-    "socialMedia": "Where else can I find",
-    "network": {
-      "title": "Network",
-      "following": "is following:",
-      "followingNobody": "follows nobody.",
-      "followedBy": "is followed by:",
-      "followedByNobody": "is not followed by anyone.",
-      "andMore": "and {number} more …"
+    "newTermsAndConditions": "New Terms and Conditions",
+    "no-commercial-use": {
+      "description": "The use of the Human Connection Network is not permitted for commercial purposes. This includes, but is not limited to, advertising products with commercial intent, posting affiliate links, directly soliciting donations, or providing financial support for purposes that are not recognized as charitable for tax purposes.",
+      "title": "No Commercial Use"
     },
-    "invites": {
-      "title": "Invite somebody to Human Connection!",
-      "description": "Enter their e-mail address for invitation.",
-      "emailPlaceholder": "E-mail to invite"
-    }
-  },
-  "notifications": {
-    "reason": {
-      "mentioned_in_post": "Mentioned you in a post …",
-      "mentioned_in_comment": "Mentioned you in a comment …",
-      "commented_on_post": "Commented on your post …"
+    "privacy-statement": {
+      "description": "Our network is a social knowledge and action network. It is therefore particularly important to us that as much content as possible is publicly accessible. In the course of the development of our network there will be more and more the possibility to decide about the visibility of the personal data. We will inform you about these new features. Otherwise, you should always think about which personal data you disclose about yourself (or others). This applies in particular to the content of posts and comments, as these have a largely public character. Later there will be possibilities to limit the visibility of your profile. Part of the terms of service is our privacy statement, which informs you about the individual data processing operations in our network: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a>  bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Our privacy statement is adapted to the legal situation and characteristics of our network and is always valid in the most current version.",
+      "title": "Privacy Statement"
     },
-    "comment": "Comment",
-    "title": "Notifications",
-    "pageLink": "All notifications",
-    "post": "Post",
-    "user": "User",
-    "content": "Content",
-    "filterLabel": {
-      "all": "All",
-      "read": "Read",
-      "unread": "Unread"
+    "terms-of-service": {
+      "description": "The following terms of use form the basis for the use of our network. When you register, you must accept them and we will inform you later about any changes that may take place. The Human Connection Network is operated in Germany and is therefore subject to German law. Place of jurisdiction is Kirchheim / Teck. For details see our imprint: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> ",
+      "title": "Terms of Service"
     },
-    "empty": "Sorry, you don't have any notifications at the moment."
-  },
-  "search": {
-    "placeholder": "Search",
-    "hint": "What are you searching for?",
-    "failed": "Nothing found",
-    "heading": {
-      "Post": "Posts",
-      "User": "Users"
-    }
-  },
-  "settings": {
-    "name": "Settings",
-    "data": {
-      "name": "Your data",
-      "labelName": "Your Name",
-      "labelSlug": "Your unique user name",
-      "namePlaceholder": "Femanon Funny",
-      "labelCity": "Your City or Region",
-      "labelBio": "About You",
-      "success": "Your data was successfully updated!"
-    },
-    "email": {
-      "validation": {
-        "same-email": "This is your current e-mail address"
-      },
-      "name": "Your e-mail",
-      "labelEmail": "Change your e-mail address",
-      "labelNewEmail": "New e-mail Address",
-      "labelNonce": "Enter your code",
-      "success": "A new e-mail address has been registered.",
-      "submitted": "An e-mail to verify your address has been sent to <b>{email}</b>.",
-      "change-successful": "Your e-mail address has been changed successfully.",
-      "verification-error": {
-        "message": "Your e-mail could not be changed.",
-        "explanation": "This can have different causes:",
-        "reason": {
-          "invalid-nonce": "Is the confirmation code invalid?",
-          "no-email-request": "Are you certain that you requested a change of your e-mail address?"
-        },
-        "support": "If the problem persists, please contact us by e-mail at"
-      }
-    },
-    "validation": {
-      "slug": {
-        "regex": "Allowed characters are only lowercase letters, numbers, underscores and hyphens.",
-        "alreadyTaken": "This user name is already taken."
-      }
-    },
-    "security": {
-      "name": "Security",
-      "change-password": {
-        "button": "Change password",
-        "success": "Password successfully changed!",
-        "label-old-password": "Your old password",
-        "label-new-password": "Your new password",
-        "label-new-password-confirm": "Confirm new password",
-        "message-old-password-required": "Enter your old password",
-        "message-new-password-required": "Enter a new password",
-        "message-new-password-confirm-required": "Confirm your new password",
-        "message-new-password-missmatch": "Type the same password again",
-        "passwordSecurity": "Password security",
-        "passwordStrength0": "Very insecure password",
-        "passwordStrength1": "Insecure password",
-        "passwordStrength2": "Mediocre password",
-        "passwordStrength3": "Strong password",
-        "passwordStrength4": "Very strong password"
-      }
-    },
-    "privacy": {
-      "name": "Privacy",
-      "make-shouts-public": "Share articles I have shouted on my public profile",
-      "success-update": "Privacy settings saved"
-    },
-    "invites": {
-      "name": "Invites"
-    },
-    "download": {
-      "name": "Download Data"
-    },
-    "deleteUserAccount": {
-      "name": "Delete user account",
-      "contributionsCount": "Delete my {count} posts",
-      "commentedCount": "Delete my {count} comments",
-      "accountDescription": "Be aware that your Posts 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!",
-      "pleaseConfirm": "<b class='is-danger'>Destructive action!</b> Type <b>{confirm}</b> to confirm"
-    },
-    "embeds": {
-      "name": "Third party providers",
-      "info-description": "Here is the list of third-party providers whose content can be displayed as third-party code, e.g. in the form of embedded videos.",
-      "status": {
-        "description": "As a default for you, embedded code of third-party providers is",
-        "disabled": {
-          "off": "initially not displayed",
-          "on": "displayed immediately"
-        },
-        "change": {
-          "question": "Should embedded source code from third parties always be displayed to you?",
-          "allow": "Sure",
-          "deny": "No thanks"
-        }
-      }
-    },
-    "organizations": {
-      "name": "My Organizations"
-    },
-    "languages": {
-      "name": "Languages"
-    },
-    "social-media": {
-      "name": "Social media",
-      "placeholder": "Your social media url",
-      "requireUnique": "You added this url already",
-      "submit": "Add link",
-      "successAdd": "Added social media. Updated user profile!",
-      "successDelete": "Deleted social media. Updated user profile!"
-    },
-    "muted-users": {
-      "name": "Muted users",
-      "explanation": {
-        "intro": "If another user has been muted by you, this is what happens:",
-        "your-perspective": "The muted person's posts will no longer appear in your news feed.",
-        "search": "Posts of muted people disappear from your search results."
-      },
-      "columns": {
-        "name": "Name",
-        "slug": "Slug",
-        "unmute": "Unmute"
-      },
-      "empty": "So far, you have not muted anybody.",
-      "how-to": "You can mute other users on their profile page via the content menu.",
-      "mute": "Mute user",
-      "unmute": "Unmute user",
-      "unmuted": "{name} is unmuted again"
-    },
-    "blocked-users": {
-      "name": "Blocked users",
-      "explanation": {
-        "intro": "If another user has been blocked by you, this is what happens:",
-        "your-perspective": "You will no longer be able to interact with their contributions.",
-        "their-perspective": "Vice versa: The blocked person will also no longer be able to interact with your contributions.",
-        "notifications": "Blocked users will no longer receive notifications if they mention each other.",
-        "closing": "This should be sufficient for now so that blocked users can no longer bother you.",
-        "commenting-disabled": "Commenting is not possible at this time on this post.",
-        "commenting-explanation": "This can happen for several reasons, please see our "
-      },
-      "columns": {
-        "name": "Name",
-        "slug": "Slug",
-        "unblock": "Unblock"
-      },
-      "empty": "So far, you have not blocked anybody.",
-      "how-to": "You can block other users on their profile page via the content menu.",
-      "block": "Block user",
-      "unblock": "Unblock user",
-      "unblocked": "{name} is unblocked again"
-    }
-  },
-  "admin": {
-    "name": "Admin",
-    "dashboard": {
-      "name": "Dashboard",
-      "users": "Users",
-      "posts": "Posts",
-      "comments": "Comments",
-      "notifications": "Notifications",
-      "organizations": "Organizations",
-      "projects": "Projects",
-      "invites": "Invites",
-      "follows": "Follows",
-      "shouts": "Shouts"
-    },
-    "organizations": {
-      "name": "Organizations"
-    },
-    "users": {
-      "name": "Users",
-      "form": {
-        "placeholder": "e-mail, name or description"
-      },
-      "table": {
-        "columns": {
-          "number": "No.",
-          "name": "Name",
-          "email": "E-mail",
-          "slug": "Slug",
-          "role": "Role",
-          "createdAt": "Created at"
-        }
-      },
-      "empty": "No users found"
-    },
-    "pages": {
-      "name": "Pages"
-    },
-    "notifications": {
-      "name": "Notifications"
-    },
-    "categories": {
-      "name": "Categories",
-      "categoryName": "Name",
-      "postCount": "Posts"
-    },
-    "hashtags": {
-      "name": "Hashtags",
-      "number": "No.",
-      "nameOfHashtag": "Name",
-      "tagCountUnique": "Users",
-      "tagCount": "Posts"
-    },
-    "settings": {
-      "name": "Settings"
-    },
-    "invites": {
-      "name": "Invite users",
-      "title": "Invite people",
-      "description": "Invitations are a wonderful way to have your friends in your network …"
-    },
-    "donations": {
-      "name": "Donations info",
-      "goal": "Monthly donations needed",
-      "progress": "Donations collected so far",
-      "successfulUpdate": "Donations info updated successfully!"
-    }
-  },
-  "post": {
-    "name": "Post",
-    "pinned": "Announcement",
-    "moreInfo": {
-      "name": "More info",
-      "title": "More information",
-      "description": "Here you can find more information about this topic.",
-      "titleOfCategoriesSection": "Categories",
-      "titleOfHashtagsSection": "Hashtags",
-      "titleOfRelatedContributionsSection": "Related posts"
-    },
-    "takeAction": {
-      "name": "Take action"
-    },
-    "menu": {
-      "edit": "Edit post",
-      "delete": "Delete post",
-      "pin": "Pin post",
-      "pinnedSuccessfully": "Post pinned successfully!",
-      "unpin": "Unpin post",
-      "unpinnedSuccessfully": "Post unpinned successfully!"
-    },
-    "comment": {
-      "submit": "Comment",
-      "submitted": "Comment submitted!",
-      "updated": "Changes saved!",
-      "reply": "Reply"
-    },
-    "edited": "edited"
-  },
-  "comment": {
-    "content": {
-      "unavailable-placeholder": "… this comment is not available anymore"
-    },
-    "menu": {
-      "edit": "Edit Comment",
-      "delete": "Delete Comment"
-    },
-    "show": {
-      "more": "show more",
-      "less": "show less"
-    },
-    "edited": "edited"
-  },
-  "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",
-    "validations": {
-      "email": "must be a valid e-mail address",
-      "url": "must be a valid URL",
-      "categories": "at least one and at most three categories must be selected"
-    }
-  },
-  "actions": {
-    "loading": "loading",
-    "loadMore": "load more",
-    "create": "Create",
-    "save": "Save",
-    "edit": "Edit",
-    "delete": "Delete",
-    "cancel": "Cancel"
-  },
-  "moderation": {
-    "name": "Moderation",
-    "reports": {
-      "empty": "Congratulations, nothing to moderate.",
-      "name": "Reports",
-      "status": "Current status",
-      "content": "Content",
-      "author": "Author",
-      "decision": "Decision",
-      "enabled": "Enabled",
-      "disabled": "Disabled",
-      "decided": "Decided",
-      "noDecision": "No decision!",
-      "decideButton": "Confirm",
-      "DecisionSuccess": "Decided successfully!",
-      "enabledBy": "Enabled by",
-      "disabledBy": "Disabled by",
-      "previousDecision": "Previous decision:",
-      "enabledAt": "Enabled at",
-      "disabledAt": "Disabled at",
-      "reasonCategory": "Category",
-      "reasonDescription": "Description",
-      "submitter": "Reported by",
-      "numberOfUsers": "{count} users",
-      "filterLabel": {
-        "all": "All",
-        "unreviewed": "Unreviewed",
-        "reviewed": "Reviewed",
-        "closed": "Closed"
-      },
-      "reportedOn": "Date",
-      "moreDetails": "View Details",
-      "decideModal": {
-        "submit": "Confirm decision",
-        "cancel": "Cancel",
-        "User": {
-          "disable": {
-            "title": "Finally Disable User",
-            "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>disabled</b>?"
-          },
-          "enable": {
-            "title": "Finally Enable User",
-            "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>enabled</b>?"
-          }
-        },
-        "Post": {
-          "disable": {
-            "title": "Finally Disable Post",
-            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>disabled</b>?"
-          },
-          "enable": {
-            "title": "Finally Enable Post",
-            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>enabled</b>?"
-          }
-        },
-        "Comment": {
-          "disable": {
-            "title": "Finally Disable Comment",
-            "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>disabled</b>?"
-          },
-          "enable": {
-            "title": "Finally Enable Comment",
-            "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>enabled</b>?"
-          }
-        }
-      }
-    }
-  },
-  "disable": {
-    "submit": "Disable",
-    "cancel": "Cancel",
-    "success": "Disabled successfully!",
-    "user": {
-      "title": "Disable User",
-      "type": "User",
-      "message": "Do you really want to disable the user \"<b>{name}</b>\"?"
-    },
-    "contribution": {
-      "title": "Disable Contribution",
-      "type": "Contribution",
-      "message": "Do you really want to disable the contribution \"<b>{name}</b>\"?"
-    },
-    "comment": {
-      "title": "Disable Comment",
-      "type": "Comment",
-      "message": "Do you really want to disable the comment from \"<b>{name}</b>\"?"
-    }
-  },
-  "delete": {
-    "submit": "Delete",
-    "cancel": "Cancel",
-    "contribution": {
-      "title": "Delete Post",
-      "type": "Contribution",
-      "message": "Do you really want to delete the post \"<b>{name}</b>\"?",
-      "success": "Post successfully deleted!"
-    },
-    "comment": {
-      "title": "Delete Comment",
-      "type": "Comment",
-      "message": "Do you really want to delete the comment \"<b>{name}</b>\"?",
-      "success": "Comment successfully deleted!"
-    }
-  },
-  "report": {
-    "submit": "Report",
-    "cancel": "Cancel",
-    "success": "Thanks for reporting!",
-    "user": {
-      "title": "Report User",
-      "type": "User",
-      "message": "Do you really want to report the user \"<b>{name}</b>\"?",
-      "error": "You already reported the user!"
-    },
-    "contribution": {
-      "title": "Report Post",
-      "type": "Contribution",
-      "message": "Do you really want to report the contribution \"<b>{name}</b>\"?",
-      "error": "You have already reported the contribution!"
-    },
-    "comment": {
-      "title": "Report Comment",
-      "type": "Comment",
-      "message": "Do you really want to report the comment from \"<b>{name}</b>\"?",
-      "error": "You have already reported the comment!"
-    },
-    "reason": {
-      "category": {
-        "label": "Select a category:",
-        "placeholder": "Category …",
-        "options": {
-          "discrimination_etc": "Discriminatory posts, comments, utterances or insults.",
-          "pornographic_content_links": "Posting or linking of clearly pornographic material.",
-          "glorific_trivia_of_cruel_inhuman_acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
-          "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
-          "intentional_intimidation_stalking_persecution": "Intentional intimidation, stalking or persecution.",
-          "advert_products_services_commercial": "Advertising products and services with commercial intent.",
-          "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
-          "other": "Other …"
-        },
-        "invalid": "Please select a valid category"
-      },
-      "description": {
-        "label": "Please explain: Why you like to report this?",
-        "placeholder": "Additional information …"
-      }
-    }
-  },
-  "followButton": {
-    "follow": "Follow",
-    "following": "Following"
-  },
-  "shoutButton": {
-    "shouted": "shouted"
-  },
-  "release": {
-    "submit": "Release",
-    "cancel": "Cancel",
-    "success": "Released successfully!",
-    "user": {
-      "title": "Release User",
-      "type": "User",
-      "message": "Do you really want to release the user \"<b>{name}</b>\"?",
-      "error": "You already reported the user!"
-    },
-    "contribution": {
-      "title": "Release Contribution",
-      "type": "Contribution",
-      "message": "Do you really want to release the contribution \"<b>{name}</b>\"?",
-      "error": "You have already reported the contribution!!"
-    },
-    "comment": {
-      "title": "Release Comment",
-      "type": "Comment",
-      "message": "Do you really want to release the comment from \"<b>{name}</b>\"?",
-      "error": "You have already reported the comment!"
+    "termsAndConditionsConfirmed": "I have read and confirmed the <a href=\"/terms-and-conditions\" target=\"_blank\">Terms and Conditions</a>.",
+    "termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.",
+    "termsAndConditionsNewConfirmText": "Please read the new terms of use now!",
+    "use-and-license": {
+      "description": "If any content you post to us is protected by intellectual property rights, you grant us a non-exclusive, transferable, sublicensable, worldwide license to use such content for posting to our network. This license expires when you delete your content or your entire account. Remember that others may share your content and we cannot delete it.",
+      "title": "Use and License"
     }
   },
   "user": {
@@ -685,143 +822,6 @@
       "submitted": "Upload successful!"
     }
   },
-  "contribution": {
-    "title": "Title",
-    "newPost": "Create a new Post",
-    "filterFollow": "Filter contributions from users I follow",
-    "filterALL": "View all contributions",
-    "success": "Saved!",
-    "languageSelectLabel": "Language of your contribution",
-    "languageSelectText": "Select Language",
-    "categories": {
-      "infoSelectedNoOfMaxCategories": "{chosen} of {max} categories selected"
-    },
-    "emotions-label": {
-      "funny": "Funny",
-      "happy": "Happy",
-      "surprised": "Surprised",
-      "cry": "Cry",
-      "angry": "Angry"
-    },
-    "category": {
-      "name": {
-        "freedom-of-speech": "Freedom of Speech",
-        "consumption-sustainability": "Consumption & Sustainability",
-        "global-peace-nonviolence": "Global Peace & Nonviolence",
-        "just-for-fun": "Just for Fun",
-        "happiness-values": "Happiness & Values",
-        "health-wellbeing": "Health & Wellbeing",
-        "environment-nature": "Environment & Nature",
-        "animal-protection": "Animal Protection",
-        "human-rights-justice": "Human Rights & Justice",
-        "education-sciences": "Education & Sciences",
-        "cooperation-development": "Cooperation & Development",
-        "democracy-politics": "Democracy & Politics",
-        "economy-finances": "Economy & Finances",
-        "energy-technology": "Energy & Technology",
-        "it-internet-data-privacy": "IT, Internet & Data Privacy",
-        "art-culture-sport": "Art, Culture, & Sport"
-      }
-    },
-    "teaserImage": {
-      "cropperConfirm": "Confirm"
-    },
-    "inappropriatePicture" : "This image may be inappropriate for some people.",
-    "inappropriatePictureText" : "When should my picture be blurred"
-  },
-  "code-of-conduct": {
-    "subheader": "for the social network of the Human Connection gGmbH",
-    "preamble": {
-      "title": "Preamble",
-      "description": "Human Connection is a non-profit social knowledge and action network of the next generation. By people - for people. Open Source, fair and transparent. For positive local and global change in all areas of life. We completely redesign the public exchange of knowledge, ideas and projects. The functions of Human Connection bring people together - offline and online - so that we can make the  world a better place."
-    },
-    "purpose": {
-      "title": "Purpose",
-      "description": "With these code of conduct we regulate the essential principles for behavior in our social network. The United Nations Charter of Human Rights is our orientation and forms the heart of our understanding of values. The code of conduct serves as guiding principles for our personal appearance and interaction with one another. Anyone who is active as a user in the Human Connection Network, writes articles, comments or contacts other users, including those outside the network,acknowledges these rules of conduct as binding."
-    },
-    "expected-behaviour": {
-      "title": "Expected Behaviour",
-      "description": "The following behaviors are expected and requested of all community members:",
-      "list": {
-        "0": "Exercise consideration and respect in your speech and actions.",
-        "1": "Attempt collaboration before conflict.",
-        "2": "Refrain from demeaning, discriminatory, or harassing behavior and speech.",
-        "3": "Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential."
-      }
-    },
-    "unacceptable-behaviour": {
-      "title": "Unacceptable Behavior",
-      "description": "The following behaviors are unacceptable within our community:",
-      "list": {
-        "0": "Discriminatory posts, comments, utterances or insults, particularly those relating to gender, sexual orientation, race, religion, political or philosophical orientation or disability.",
-        "1": "Posting or linking of clearly pornographic material.",
-        "2": "Glorification or trivialization of cruel or inhuman acts of violence.",
-        "3": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
-        "4": "Intentional intimidation, stalking or persecution.",
-        "5": "Advertising products and services with commercial intent.",
-        "6": "Criminal behavior or violation of German law.",
-        "7": "Endorse or encourage such conduct."
-      }
-    },
-    "consequences": {
-      "title": "Consequences of Unacceptable Behavior",
-      "description": "If a community member exhibits unacceptable behaviour, the responsible operators, moderators and administrators of the network may take appropriate measures, including but not limited to:",
-      "list": {
-        "0": "Request for immediate cessation of unacceptable conduct",
-        "1": "Locking or deleting comments",
-        "2": "Temporary exclusion from the respective post or contribution",
-        "3": "Blocking or deleting of content",
-        "4": "Temporary withdrawal of write permissions",
-        "5": "Temporary exclusion from the network",
-        "6": "Final exclusion from the network",
-        "7": "Violations of German law can be reported."
-      }
-    },
-    "get-help": "If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible and link or refer to the corresponding content:"
-  },
-  "termsAndConditions": {
-    "newTermsAndConditions": "New Terms and Conditions",
-    "termsAndConditionsConfirmed": "I have read and confirmed the <a href=\"/terms-and-conditions\" target=\"_blank\">Terms and Conditions</a>.",
-    "termsAndConditionsNewConfirmText": "Please read the new terms of use now!",
-    "termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.",
-    "agree": "I agree!",
-    "terms-of-service": {
-      "title": "Terms of Service",
-      "description": "The following terms of use form the basis for the use of our network. When you register, you must accept them and we will inform you later about any changes that may take place. The Human Connection Network is operated in Germany and is therefore subject to German law. Place of jurisdiction is Kirchheim / Teck. For details see our imprint: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> "
-    },
-    "use-and-license" : {
-      "title": "Use and License",
-      "description": "If any content you post to us is protected by intellectual property rights, you grant us a non-exclusive, transferable, sublicensable, worldwide license to use such content for posting to our network. This license expires when you delete your content or your entire account. Remember that others may share your content and we cannot delete it."
-    },
-    "privacy-statement" : {
-      "title": "Privacy Statement",
-      "description": "Our network is a social knowledge and action network. It is therefore particularly important to us that as much content as possible is publicly accessible. In the course of the development of our network there will be more and more the possibility to decide about the visibility of the personal data. We will inform you about these new features. Otherwise, you should always think about which personal data you disclose about yourself (or others). This applies in particular to the content of posts and comments, as these have a largely public character. Later there will be possibilities to limit the visibility of your profile. Part of the terms of service is our privacy statement, which informs you about the individual data processing operations in our network: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a>  bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Our privacy statement is adapted to the legal situation and characteristics of our network and is always valid in the most current version."
-    },
-    "code-of-conduct" : {
-      "title": "Code of Conduct",
-      "description": "Our code of conduct serves as a handbook for personal appearance and interaction with each other. Whoever is active as a user in the Human Connection network, writes articles, comments or makes contact with other users, even outside the network, acknowledges these rules of conduct as binding. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>"
-    },
-    "moderation" : {
-      "title": "Moderation",
-      "description": "Until our financial possibilities allow us to implement the community moderation system, we moderate with a simplified system and with our own or possibly volunteer staff. We train these moderators and for this reason only they make the appropriate decisions. These moderators carry out their work anonymously. You can report posts, comments and users to us (for example, if they provide information in their profile or have images that violate these Terms of Use). If you report something to us, you can give us a reason and a short explanation. We will then take a look at what you have reported and sanction you if necessary, e.g. by blocking contributions, comments or users. Unfortunately, you and the person concerned will not receive any feedback from us at this time, but this is in the planning stage. Irrespective of this, we reserve the right to impose sanctions in principle for reasons that may not or not yet be listed in our Code of Conduct or these terms of service."
-    },
-    "errors-and-feedback" : {
-      "title": "Errors and Feedback",
-      "description": "We make every effort to keep our network and data secure and available. Each new release of the software goes through both automated and manual testing. However, unforeseen errors may occur. Therefore, we are grateful for any reported bugs. You are welcome to report any bugs you discover by emailing Support at support@human-connection.org"
-    },
-    "no-commercial-use" : {
-      "title": "No Commercial Use",
-      "description": "The use of the Human Connection Network is not permitted for commercial purposes. This includes, but is not limited to, advertising products with commercial intent, posting affiliate links, directly soliciting donations, or providing financial support for purposes that are not recognized as charitable for tax purposes."
-    },
-    "help-and-questions" : {
-      "title": "Help and Questions",
-      "description": "For help and questions we have compiled a comprehensive collection of frequently asked questions and answers (FAQ) for you. You can find them here: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>"
-    },
-    "addition" : {
-      "title": "In addition, we regularly hold events where you can also share your impressions and ask questions. You can find a current overview here:",
-      "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>"
-    }
-  },
   "error-pages" : {
     "profile-not-found": "This profile could not be found",
     "back-to-index": "Back to index page",
@@ -834,6 +834,3 @@
     "default": "An error occurred"
   }
 }
-
-
-
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index f916f849b..177ca0a64 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -1,809 +1,809 @@
 {
-    "login": {
-        "copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
-        "login": "Iniciar sesión",
-        "logout": "Cierre de sesión",
-        "email": "Su correo electrónico",
-        "password": "Su contraseña",
-        "moreInfo": "¿Qué es Human Connection?",
-        "hello": "Hola",
-        "forgotPassword": "¿Olvidó su contraseña?",
-        "no-account": "¿No tiene una cuenta?",
-        "register": "Regístrese",
-        "moreInfoURL": "https:\/\/human-connection.org\/es\/",
-        "moreInfoHint": "a la página de presentación",
-        "success": "¡Usted ha iniciado sesión!",
-        "failure": "Dirección de correo electrónico o contraseña incorrecta."
+  "actions": {
+    "cancel": "Cancelar",
+    "create": "Crear",
+    "delete": "Borrar",
+    "edit": "Edite",
+    "loadMore": "cargar más",
+    "loading": "cargamento",
+    "save": "Guardar"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Nombre",
+      "name": "Categorías",
+      "postCount": "Contribuciones"
     },
-    "profile": {
-        "name": "Mi perfil",
-        "memberSince": "Miembro desde",
-        "follow": "Seguir",
-        "followers": "Seguidores",
-        "following": "Siguiendo",
-        "shouted": "Recomendado",
-        "commented": "Comentado",
-        "userAnonym": "Anónimo",
-        "socialMedia": "¿Dónde más puedo encontrar?",
-        "network": {
-            "title": "Red",
-            "following": "está siguiendo:",
-            "followingNobody": "no sigue a nadie.",
-            "followedBy": "es seguido por:",
-            "followedByNobody": "no es seguido por nadie.",
-            "andMore": "y {number} más ..."
-        },
-        "invites": {
-            "title": "¡Invite a alguien a Human Connection!",
-            "description": "Introduzca la dirección de correo electrónico para la invitación.",
-            "emailPlaceholder": "Correo electrónico para invitar"
-        }
-    },
-    "settings": {
-        "name": "Configuración",
-        "data": {
-            "name": "Sus datos",
-            "labelName": "Su nombre",
-            "labelCity": "Su ciudad o región",
-            "labelBio": "Acerca de usted",
-            "labelSlug": "Su nombre de usuario único",
-            "namePlaceholder": "Femanon Funny",
-            "success": "¡Sus datos han sido actualizados con éxito!"
-        },
-        "security": {
-            "name": "Seguridad",
-            "change-password": {
-                "button": "Cambiar contraseña",
-                "success": "¡Contraseña cambiada con éxito!",
-                "label-old-password": "Su contraseña antigua",
-                "label-new-password": "Su nueva contraseña",
-                "label-new-password-confirm": "Confirmar nueva contraseña",
-                "message-old-password-required": "Ingrese su contraseña anterior",
-                "message-new-password-required": "Introduzca una nueva contraseña",
-                "message-new-password-confirm-required": "Confirme su nueva contraseña",
-                "message-new-password-missmatch": "Vuelva a escribir la misma contraseña",
-                "passwordSecurity": "Seguridad de la contraseña",
-                "passwordStrength0": "Contraseña muy insegura",
-                "passwordStrength1": "Contraseña insegura",
-                "passwordStrength2": "Contraseña mediocre",
-                "passwordStrength3": "Contraseña segura",
-                "passwordStrength4": "Contraseña muy sólida"
-            }
-        },
-        "invites": {
-            "name": "Invita"
-        },
-        "download": {
-            "name": "Descargar datos"
-        },
-        "delete": {
-            "name": "Borrar cuenta"
-        },
-        "organizations": {
-            "name": "Mis organizaciones"
-        },
-        "languages": {
-            "name": "Idiomas"
-        },
-        "email": {
-            "validation": {
-                "same-email": "Esta es su dirección de correo electrónico actual"
-            },
-            "name": "Su correo electrónico",
-            "labelEmail": "Cambiar su dirección de correo electrónico",
-            "labelNewEmail": "Nueva dirección de correo electrónico",
-            "labelNonce": "Introduzca su código",
-            "success": "Se ha registrado una nueva dirección de correo electrónico.",
-            "submitted": "Se ha enviado un correo electrónico a <b>{email}<\/b> para verificar su dirección.",
-            "change-successful": "Su dirección de correo electrónico ha sido cambiada con éxito.",
-            "verification-error": {
-                "message": "Su correo electrónico no se pudo cambiar.",
-                "explanation": "Esto puede tener diferentes causas:",
-                "reason": {
-                    "invalid-nonce": "¿El código de confirmación no es válido?",
-                    "no-email-request": "¿Está seguro de que ha solicitado un cambio de su dirección de correo electrónico?"
-                },
-                "support": "Si el problema persiste, póngase en contacto con nosotros por correo electrónico a"
-            }
-        },
-        "validation": {
-            "slug": {
-                "regex": "Los caracteres permitidos son solo letras minúsculas, números, guiones bajos y guiones.",
-                "alreadyTaken": "Este nombre de usuario ya está en uso."
-            }
-        },
-        "deleteUserAccount": {
-            "name": "Eliminar cuenta de usuario",
-            "contributionsCount": "Eliminar mis {count} contribuciones",
-            "commentedCount": "Eliminar mis {count} comentarios",
-            "accountDescription": "Tenga en cuenta que su contribución y sus comentarios son importantes para nuestra comunidad. Si aún decide borrarlos, debe marcarlos a continuación.",
-            "accountWarning": "¡<b> NO PUEDE GESTIONAR <\/b> y <b> NO PUEDE RECUPERAR <\/b> su cuenta, contribuciones o comentarios después de eliminar su cuenta!",
-            "success": "¡Cuenta eliminada con éxito!",
-            "pleaseConfirm": "<b class='is-danger'> ¡Acción destructiva! <\/b> Escriba <b> {confirm} <\/b> para confirmar"
-        },
-        "embeds": {
-            "name": "Proveedores externos",
-            "info-description": "Aquí está la lista de proveedores de terceros cuyo contenido se puede mostrar como código de terceros, por ejemplo, en forma de vídeos incrustados.",
-            "status": {
-                "description": "Por defecto, el código incrustado de proveedores externos está",
-                "disabled": {
-                    "off": "inicialmente sin mostrar",
-                    "on": "mostrado inmediatamente"
-                },
-                "change": {
-                    "question": "¿Debería mostrarse siempre el código fuente incrustado de terceros?",
-                    "allow": "Seguro",
-                    "deny": "No, gracias"
-                }
-            }
-        },
-        "social-media": {
-            "name": "Medios de comunicación social",
-            "placeholder": "Agregar una URL de Social-Media",
-            "requireUnique": "Ya ha añadido esta url",
-            "submit": "Añadir enlace",
-            "successAdd": "Social-Media agregó. Perfil actualizado!",
-            "successDelete": "Social-Media borrado. Perfil actualizado!"
-        },
-        "muted-users": {
-            "name": "Usuarios bloqueados",
-            "explanation": {
-                "intro": "Si otro usuario ha sido bloqueado por usted, esto es lo que sucede:",
-                "your-perspective": "Las contribuciones de la persona bloqueada no aparecerán más en su canal de noticias.",
-                "search": "Las contribuciones de personas bloqueadas desaparecen de los resultados de búsqueda."
-            },
-            "columns": {
-                "name": "Nombre",
-                "slug": "Alias",
-                "unmute": "Desbloquear"
-            },
-            "empty": "Hasta ahora, no ha bloqueado a nadie.",
-            "how-to": "Puede bloquear a otros usuarios en la página de perfil de aquellos a través del menú de contenido.",
-            "mute": "Bloquear usuario",
-            "unmute": "Desbloquear usuario",
-            "unmuted": "{name} está desbloqueado nuevamente"
-        },
-        "privacy": {
-            "name": "Privacidad",
-            "make-shouts-public": "Compartir artículos que he recomendado en mi perfil público",
-            "success-update": "Configuración de privacidad guardada"
-        }
-    },
-    "admin": {
-        "name": "Admin",
-        "dashboard": {
-            "name": "Tablero",
-            "users": "Usuarios",
-            "posts": "Contribuciones",
-            "comments": "Comentarios",
-            "notifications": "Notificaciones",
-            "organizations": "Organizaciones",
-            "projects": "Proyectos",
-            "invites": "Invita",
-            "follows": "Sigue",
-            "shouts": "Recomendaciones"
-        },
-        "organizations": {
-            "name": "Organizaciones"
-        },
-        "users": {
-            "name": "Usuarios",
-            "form": {
-                "placeholder": "correo electrónico, nombre o descripción"
-            },
-            "table": {
-                "columns": {
-                    "number": "No.",
-                    "name": "Nombre",
-                    "email": "Correo electrónico",
-                    "slug": "Alias",
-                    "role": "Rol",
-                    "createdAt": "Creado el"
-                }
-            },
-            "empty": "No se han encontrado usuarios"
-        },
-        "pages": {
-            "name": "Páginas"
-        },
-        "notifications": {
-            "name": "Notificaciones"
-        },
-        "categories": {
-            "name": "Categorías",
-            "categoryName": "Nombre",
-            "postCount": "Contribuciones"
-        },
-        "tags": {
-            "name": "Etiquetas",
-            "tagCountUnique": "Usuarios",
-            "tagCount": "Contribuciones"
-        },
-        "settings": {
-            "name": "Configuración"
-        },
-        "hashtags": {
-            "name": "Hashtags",
-            "number": "No.",
-            "nameOfHashtag": "Nombre",
-            "tagCountUnique": "Usuarios",
-            "tagCount": "Contribuciones"
-        },
-        "invites": {
-            "name": "Invitar usuarios",
-            "title": "Invitar personas",
-            "description": "Las invitaciones son una manera maravillosa de tener a sus amigos en su red ..."
-        },
-        "donations": {
-            "name": "Información de donaciones",
-            "goal": "Donaciones mensuales necesarias",
-            "progress": "Donaciones recogidas hasta ahora",
-            "successfulUpdate": "¡Información de donaciones actualizada con éxito!"
-        }
-    },
-    "post": {
-        "name": "Contribución",
-        "moreInfo": {
-            "name": "Más info",
-            "title": "Más información",
-            "description": "Aquí puede encontrar más información sobre este tema.",
-            "titleOfCategoriesSection": "Categorías",
-            "titleOfHashtagsSection": "Hashtags",
-            "titleOfRelatedContributionsSection": "Contribuciones relacionadas"
-        },
-        "takeAction": {
-            "name": "Tomar acción"
-        },
-        "pinned": "Anuncio",
-        "menu": {
-            "edit": "Editar contribución",
-            "delete": "Borrar contribución",
-            "pin": "Anclar contribución",
-            "pinnedSuccessfully": "¡Contribución anclado con éxito!",
-            "unpin": "Desanclar contribución",
-            "unpinnedSuccessfully": "¡Contribución desanclado con éxito!"
-        },
-        "comment": {
-            "submit": "Comentario",
-            "submitted": "Comentario enviado",
-            "updated": "Cambios guardados"
-        },
-        "edited": "editado"
-    },
-    "quotes": {
-        "african": {
-            "quote": "Muchas personas pequeñas en muchos lugares pequeños hacen muchas cosas pequeñas, que pueden alterar la faz del mundo.",
-            "author": "Proverbio africano"
-        }
-    },
-    "common": {
-        "post": "Mensaje ::: Mensajes",
-        "comment": "Comentario ::: Comentarios",
-        "letsTalk": "Hablemos",
-        "versus": "Versus",
-        "moreInfo": "Más información",
-        "takeAction": "Tomar acción",
-        "shout": "Grito ::: Gritos",
-        "user": "Usuario ::: Usuarios",
-        "category": "Categoría ::: Categorías",
-        "organization": "Organización ::: Organizaciones",
-        "project": "Proyecto ::: Proyectos",
-        "tag": "Etiqueta ::: Etiquetas",
-        "name": "Nombre",
-        "loadMore": "cargar más",
-        "loading": "cargando",
-        "reportContent": "Informe",
-        "validations": {
-            "email": "debe ser una dirección de correo electrónico válida",
-            "url": "debe ser una URL válida",
-            "categories": "deben seleccionarse al menos una y como máximo tres categorías"
-        }
-    },
-    "actions": {
-        "loading": "cargamento",
-        "loadMore": "cargar más",
-        "create": "Crear",
-        "save": "Guardar",
-        "edit": "Edite",
-        "delete": "Borrar",
-        "cancel": "Cancelar"
-    },
-    "moderation": {
-        "name": "Moderación",
-        "reports": {
-            "empty": "Felicitaciones, nada que moderar.",
-            "name": "Informes",
-            "reporter": "reportado por",
-            "submitter": "comunicado por",
-            "disabledBy": "desactivado por",
-            "reasonCategory": "Categoría",
-            "reasonDescription": "Descripción",
-            "status": "Estado actual",
-            "content": "Contenido",
-            "author": "Autor",
-            "decision": "Decisión",
-            "enabled": "Habilitado",
-            "disabled": "Deshabilitado",
-            "decided": "Decidido",
-            "noDecision": "¡No hay decisión!",
-            "decideButton": "Confirmar",
-            "DecisionSuccess": "Decidido con éxito!",
-            "enabledBy": "Habilitado por",
-            "previousDecision": "Decisión previa:",
-            "enabledAt": "Habilitado el",
-            "disabledAt": "Deshabilitado el",
-            "numberOfUsers": "{count} usuarios",
-            "filterLabel": {
-                "all": "Todos",
-                "unreviewed": "Sin revisar",
-                "reviewed": "Revisado",
-                "closed": "Cerrado"
-            },
-            "reportedOn": "Fecha",
-            "moreDetails": "Ver Detalles",
-            "decideModal": {
-                "submit": "Confirmar decisión",
-                "cancel": "Cancelar",
-                "User": {
-                    "disable": {
-                        "title": "Finalmente Deshabilitar Usuario",
-                        "message": "¿Realmente quiere que el usuario \"<b>{nombre}<\/b>\" permanezca <b>desactivado<\/b>?"
-                    },
-                    "enable": {
-                        "title": "Finalmente Habilitar Usuario",
-                        "message": "¿Realmente quiere que el usuario \"<b>{nombre}<\/b>\" permanezca <b>habilitado<\/b>?"
-                    }
-                },
-                "Post": {
-                    "disable": {
-                        "title": "Finalmente Desactivar Contribución",
-                        "message": "¿Realmente quiere que la entrada \"<b>{nombre}<\/b>\" permanezca <b>desactivada<\/b>?"
-                    },
-                    "enable": {
-                        "title": "Finalmente Habilitar Contribución",
-                        "message": "¿Realmente quiere que la contribución \"<b>{nombre}<\/b>\" permanezca <b>activada<\/b>?"
-                    }
-                },
-                "Comment": {
-                    "disable": {
-                        "title": "Desactivar finalmente Comentario",
-                        "message": "¿Realmente quiere que el comentario \"<b>{nombre}<\/b>\" permanezca <b>desactivado<\/b>?"
-                    },
-                    "enable": {
-                        "title": "Finalmente Habilitar Comentario",
-                        "message": "¿Realmente quiere que el comentario \"<b>{nombre}<\/b>\" permanezca <b>habilitado<\/b>?"
-                    }
-                }
-            }
-        }
-    },
-    "disable": {
-        "user": {
-            "title": "Desactivar usuario",
-            "type": "Usuario",
-            "message": "¿Realmente quieres deshabilitar el usuario \"<b>{name}<\/b>\"?"
-        },
-        "contribution": {
-            "title": "Deshabilitar contribución",
-            "type": "Contribución",
-            "message": "¿Realmente quieres deshabilitar la contribución \"<b>{name}<\/b>\"?"
-        },
-        "comment": {
-            "title": "Desactivar comentario",
-            "type": "Comentario",
-            "message": "¿Realmente quieres deshabilitar el comentario de \"<b>{name}<\/b>\"?"
-        },
-        "submit": "Desactivar",
-        "cancel": "Cancelar",
-        "success": "Discapacitado con éxito"
-    },
-    "report": {
-        "submit": "Informe",
-        "cancel": "Cancelar",
-        "user": {
-            "title": "Reportar usuario",
-            "type": "Usuario",
-            "message": "¿Realmente quieres reportar al usuario \"<b>{name}<\/b>\"?",
-            "error": "¡Ya reportó al usuario!"
-        },
-        "contribution": {
-            "title": "Informe Contribución",
-            "type": "Contribución",
-            "message": "¿Realmente quieres informar al usuario de la contribución \"<b>{name}<\/b>\"?",
-            "error": "¡Ya ha reportado la contribución!"
-        },
-        "comment": {
-            "title": "Reportar comentario",
-            "type": "Comentario",
-            "message": "¿Realmente quieres reportar el comentario de \"<b>{name}<\/b>\"?",
-            "error": "¡Ya ha reportado al comentario!"
-        },
-        "success": "¡Gracias por informar!",
-        "reason": {
-            "category": {
-                "label": "Seleccione una categoría:",
-                "placeholder": "Categoría ...",
-                "options": {
-                    "discrimination_etc": "Contribuciones discriminatorias, comentarios, expresiones o insultos.",
-                    "pornographic_content_links": "Publicación o enlace de material claramente pornográfico.",
-                    "glorific_trivia_of_cruel_inhuman_acts": "Glorificación o minimización de actos de violencia crueles o inhumanos.",
-                    "doxing": "La divulgación de información personal de otros sin su consentimiento o amenaza de (\"doxing\").",
-                    "intentional_intimidation_stalking_persecution": "Intimidación intencional, acoso o persecución.",
-                    "advert_products_services_commercial": "Publicidad de productos y servicios con fines comerciales.",
-                    "criminal_behavior_violation_german_law": "Comportamiento criminal o violación de la ley alemana.",
-                    "other": "Otra ..."
-                },
-                "invalid": "Por favor seleccione una categoría válida"
-            },
-            "description": {
-                "label": "Por favor explique: ¿Por qué le gusta reportar esto?",
-                "placeholder": "Información adicional...."
-            }
-        }
-    },
-    "contribution": {
-        "edit": "Editar contribución",
-        "delete": "Eliminar contribución",
-        "title": "Título",
-        "newPost": "Crear una nueva contribución",
-        "filterFollow": "Filtrar las contribuciones de los usuarios que sigo",
-        "filterALL": "Ver todas las contribuciones",
-        "success": "¡Guardado!",
-        "languageSelectLabel": "Idioma",
-        "categories": {
-            "infoSelectedNoOfMaxCategories": "{chosen} de {max} categorías seleccionadas"
-        },
-        "emotions-label": {
-            "funny": "Gracioso",
-            "happy": "Feliz",
-            "surprised": "Sorprendido",
-            "cry": "Llorar",
-            "angry": "Enfadado"
-        },
-        "category": {
-            "name": {
-                "freedom-of-speech": "Libertad de expresión",
-                "consumption-sustainability": "Consumo y Sostenibilidad",
-                "global-peace-nonviolence": "Paz Global y No-Violencia",
-                "just-for-fun": "Sólo por diversión",
-                "happiness-values": "Felicidad y Valores",
-                "health-wellbeing": "Salud y Bienestar",
-                "environment-nature": "Medio ambiente y Naturaleza",
-                "animal-protection": "Protección de animales",
-                "human-rights-justice": "Derechos Humanos y Justicia",
-                "education-sciences": "Educación y Ciencias",
-                "cooperation-development": "Cooperación y Desarrollo",
-                "democracy-politics": "Democracia y Política",
-                "economy-finances": "Economía y Finanzas",
-                "energy-technology": "Energía y Tecnología",
-                "it-internet-data-privacy": "TI, Internet y privacidad de datos",
-                "art-culture-sport": "Arte, Cultura y Deporte"
-            }
-        },
-        "teaserImage": {
-            "cropperConfirm": "Confirmar"
-        },
-        "languageSelectText": "Seleccione el idioma"
-    },
-    "comment": {
-        "edit": "Editar comentario",
-        "delete": "Eliminar comentario",
-        "content": {
-            "unavailable-placeholder": "... este comentario ya no está disponible"
-        },
-        "menu": {
-            "edit": "Editar comentario",
-            "delete": "Borrar comentario"
-        },
-        "show": {
-            "more": "mostrar más",
-            "less": "mostrar menos"
-        },
-        "edited": "editado"
-    },
-    "followButton": {
-        "follow": "Seguir",
-        "following": "Siguiendo"
-    },
-    "shoutButton": {
-        "shouted": "recomendado"
-    },
-    "search": {
-        "placeholder": "Buscar",
-        "hint": "¿Qué estás buscando?",
-        "failed": "No se ha encontrado nada"
-    },
-    "components": {
-        "password-reset": {
-            "request": {
-                "title": "Restablecer su contraseña",
-                "form": {
-                    "description": "Se enviará un correo electrónico de restablecimiento de contraseña a la dirección de correo electrónico especificada.",
-                    "submit": "Solicitar correo electrónico",
-                    "submitted": "Se ha enviado un correo electrónico con más instrucciones a <b>{email}<\/b>."
-                }
-            },
-            "change-password": {
-                "success": "El cambio de contraseña ha sido un éxito!",
-                "error": "Error al cambiar la contraseña. ¿Posiblemente un código de seguridad incorrecto?",
-                "help": "Si tiene algún problema, por favor envíenos un correo electrónico a:"
-            }
-        },
-        "enter-nonce": {
-            "form": {
-                "nonce": "Introduzca el código",
-                "description": "Abra su buzón de correo e introduzca el código que le enviamos.",
-                "next": "Continuar",
-                "validations": {
-                    "length": "debe tener exactamente 6 letras"
-                }
-            }
-        },
-        "registration": {
-            "signup": {
-                "unavailable": "Desafortunadamente, el registro público de cuentas de usuario en este servidor actualmente no es posible.",
-                "title": "¡Únete a Human Connection!",
-                "form": {
-                    "description": "Para empezar, introduzca su dirección de correo electrónico:",
-                    "terms-and-condition": "Estoy de acuerdo con los <a href=\"\/terms-and-conditions\"><ds-text bold color=\"primary\" >términos de uso<\/ds-text><\/a>.",
-                    "data-privacy": "He leido y entendido la <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"><ds-text bold color=\"primary\" >declaración de protección de datos<\/ds-text><\/a>",
-                    "minimum-age": "Tengo 18 años o más.",
-                    "invitation-code": "Su código de invitación es: <b>{code}<\/b>",
-                    "errors": {
-                        "email-exists": "¡Ya hay una cuenta de usuario con esta dirección de correo electrónico!",
-                        "invalid-invitation-token": "Parece que el código de invitación ya ha sido canjeado. Cada código sólo se puede utilizar una vez."
-                    },
-                    "submit": "Crear una cuenta",
-                    "success": "Se ha enviado un correo electrónico con un enlace de confirmación para el registro a <b>{email}<\/b>.",
-                    "no-commercial": "No tengo intensiones comerciales y no represento una empresa u organización comercial.",
-                    "no-political": "No estoy en la red en nombre de un partido o una organización política."
-                }
-            },
-            "create-user-account": {
-                "title": "Crear una cuenta de usuario",
-                "success": "¡Su cuenta de usuario ha sido creada!",
-                "error": "¡No se ha podido crear una cuenta de usuario!",
-                "help": "¿Tal vez el código de verificación era incorrecto o expiró? Si el problema persiste, por favor envíenos un correo electrónico a:"
-            }
-        }
-    },
-    "store": {
-        "posts": {
-            "orderBy": {
-                "newest": {
-                    "label": "Más reciente"
-                },
-                "oldest": {
-                    "label": "Más antiguo"
-                }
-            }
-        }
-    },
-    "maintenance": {
-        "title": "Human Connection está en mantenimiento",
-        "explanation": "Actualmente estamos llevando a cabo algunos trabajos de mantenimiento planificados, por favor, inténtelo de nuevo más tarde.",
-        "questions": "Si tiene alguna pregunta o problema, por favor contáctenos por correo electrónico a"
-    },
-    "index": {
-        "no-results": "No se han encontrado contribuciones.",
-        "change-filter-settings": "Cambie la configuración de sus filtros para obtener más resultados."
-    },
-    "filter-menu": {
-        "title": "Su burbuja de filtro",
-        "hashtag-search": "Buscando a #{hashtag}",
-        "clearSearch": "Borrar búsqueda"
-    },
-    "filter-posts": {
-        "categories": {
-            "header": "Categorías de contenido",
-            "all": "Todas"
-        },
-        "general": {
-            "header": "Filtrar por...."
-        },
-        "followers": {
-            "label": "Usuarios que sigo"
-        },
-        "language": {
-            "header": "Idiomas",
-            "all": "Todos"
-        }
-    },
-    "site": {
-        "thanks": "¡Gracias!",
-        "error-occurred": "Se ha ocurrido un error.",
-        "made": "Hecho con &#10084;",
-        "imprint": "Pie de imprenta",
-        "termsAndConditions": "Términos y condiciones",
-        "data-privacy": "Protección de datos",
-        "contact": "Contacto",
-        "tribunal": "Tribunal de registro",
-        "register": "Número de registro",
-        "director": "Director General",
-        "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)",
-        "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)",
-        "bank": "cuenta bancaria",
-        "germany": "Alemania",
-        "code-of-conduct": "Código de conducta",
-        "back-to-login": "Volver a la página de inicio de sesión",
-        "faq": "Preguntas más frecuentes"
-    },
-    "editor": {
-        "placeholder": "Deje sus pensamientos inspiradores....",
-        "mention": {
-            "noUsersFound": "No se han encontrado usuarios"
-        },
-        "hashtag": {
-            "noHashtagsFound": "No se han encontrado hashtags",
-            "addHashtag": "Nuevo hashtag",
-            "addLetter": "Escriba una letra"
-        },
-        "embed": {
-            "data_privacy_warning": "¡Advertencia de privacidad de datos!",
-            "data_privacy_info": "Sus datos aún no han sido compartidos con terceros proveedores. Si usted procede a ver este video, el siguiente proveedor probablemente recolectará datos del usuario:",
-            "play_now": "Ver ahora",
-            "always_allow": "Permitir siempre contenido incrustado por proveedores externos (esta configuración se puede cambiar en cualquier momento)"
-        }
-    },
-    "notifications": {
-        "reason": {
-            "mentioned_in_post": "Le mencionó en una contribución …",
-            "mentioned_in_comment": "Le mencionó en un comentario …",
-            "commented_on_post": "Comentó su contribución ..."
-        },
-        "comment": "Comentario",
-        "title": "Notificaciones",
-        "pageLink": "Todas las notificaciones",
-        "post": "Contribución",
-        "user": "Usuario",
-        "content": "Contenido",
-        "filterLabel": {
-            "all": "Todas",
-            "read": "Leído",
-            "unread": "No leído"
-        },
-        "empty": "Lo sentimos, no tiene ninguna notificación en este momento."
-    },
-    "delete": {
-        "submit": "Borrar",
-        "cancel": "Cancelar",
-        "contribution": {
-            "title": "Borrar contribución",
-            "type": "Contribución",
-            "message": "¿Realmente desea eliminar la Contribución \"<b>{name}<\/b>\" ?",
-            "success": "¡Publicación eliminado con éxito!"
-        },
-        "comment": {
-            "title": "Eliminar comentario",
-            "type": "Comentario",
-            "message": "¿Realmente quieres borrar el comentario de \"<b>{name}<\/b>\" ?",
-            "success": "¡Comentario eliminado con éxito!"
-        }
-    },
-    "release": {
-        "submit": "Liberar",
-        "cancel": "Cancelar",
-        "success": "¡Liberado con éxito!",
-        "user": {
-            "title": "Liberar usuario",
-            "type": "Usuario",
-            "message": "¿Realmente quieres liberar al usuario \"<b>{name}<\/b>\"?",
-            "error": "¡Ya ha reportado el usuario!"
-        },
-        "contribution": {
-            "title": "Contribución de la versión ",
-            "type": "Contribución",
-            "message": "¿Realmente quieres liberar la contribución \"<b>{name}<\/b>\"?",
-            "error": "¡Ya ha reportado la contribución!"
-        },
-        "comment": {
-            "title": "Comentario de la versión",
-            "type": "Comentario",
-            "message": "¿Realmente quieres liberar el comentario de \"<b>{name}<\/b>\"?",
-            "error": "¡Ya ha reportado el comentario!"
-        }
-    },
-    "user": {
-        "avatar": {
-            "submitted": "Carga con éxito"
-        }
-    },
-    "code-of-conduct": {
-        "subheader": "para la red social de Human Connection gGmbH",
-        "preamble": {
-            "title": "Preámbulo",
-            "description": "Human Connection es una red de conocimiento y acción social sin fines de lucro de la próxima generación. Por la gente - para la gente. Código Abierto, justo y transparente. Por un cambio positivo a nivel local y global en todas las áreas de la vida. Rediseñamos completamente el intercambio público de conocimientos, ideas y proyectos. Las funciones de Human Connection unen a las personas - fuera de línea y en línea - para que podamos hacer del mundo un lugar mejor."
-        },
-        "purpose": {
-            "title": "Propósito",
-            "description": "Con este código de conducta regulamos los principios esenciales de comportamiento en nuestra red social. La Carta de Derechos Humanos de las Naciones Unidas es nuestra orientación y constituye el núcleo de nuestra comprensión de los valores. El código de conducta sirve como principios rectores para nuestra apariencia personal y la interacción entre nosotros. Cualquiera que esté activo como usuario de la Red de Human Connection, escriba artículos, comentarios o se ponga en contacto con otros usuarios, incluidos los que están fuera de la red, reconoce que estas normas de conducta son vinculantes."
-        },
-        "expected-behaviour": {
-            "title": "Comportamiento esperado",
-            "description": "Los siguientes comportamientos son esperados y solicitados de todos los miembros de la comunidad:",
-            "list": {
-                "0": "Ejercite la consideración y el respeto en su discurso y en sus acciones.",
-                "1": "Intento de colaboración antes del conflicto.",
-                "2": "Abstenerse de denigrar, discriminar o acosar la conducta y el habla.",
-                "3": "Tenga en cuenta su entorno y sus compañeros participantes. Alerte a los líderes de la comunidad si nota una situación peligrosa, alguien en apuros o violaciones de este Código de Conducta, incluso si parecen no tener consecuencias."
-            }
-        },
-        "unacceptable-behaviour": {
-            "title": "Comportamiento Inaceptable",
-            "description": "Los siguientes comportamientos son inaceptables dentro de nuestra comunidad:",
-            "list": {
-                "0": "Publicaciones, comentarios, expresiones o insultos discriminatorios, particularmente aquellos relacionados con género, orientación sexual, raza, religión, orientación política o filosófica o discapacidad.",
-                "1": "Publicación o enlace de material claramente pornográfico.",
-                "2": "Glorificación o trivialización de actos de violencia crueles o inhumanos.",
-                "3": "La divulgación de información personal de otros sin su consentimiento o amenaza de (\"doxing\").",
-                "4": "Intimidación intencional, acoso o persecución.",
-                "5": "Publicidad de productos y servicios con fines comerciales.",
-                "6": "Comportamiento criminal o violación de la ley alemana.",
-                "7": "Apoyar o alentar dicha conducta."
-            }
-        },
-        "consequences": {
-            "title": "Consecuencias de Comportamiento Inaceptable",
-            "description": "Si un miembro de la comunidad muestra un comportamiento inaceptable, los operadores, moderadores y administradores responsables de la red pueden tomar las medidas apropiadas, incluyendo pero no limitándose a:",
-            "list": {
-                "0": "Solicitud de cese inmediato de conducta inaceptable",
-                "1": "Bloquear o eliminar comentarios",
-                "2": "Exclusión temporal de la contribución respectiva",
-                "3": "Bloqueo o eliminación de contenido",
-                "4": "Retirada temporal de permisos de escritura",
-                "5": "Exclusión temporal de la red.",
-                "6": "Exclusión definitiva de la red",
-                "7": "Las violaciones de la ley alemana pueden ser denunciadas."
-            }
-        },
-        "get-help": "Si usted está sujeto a un comportamiento inaceptable, lo experimenta o tiene otras preocupaciones, por favor notifique a un organizador de la comunidad tan pronto como sea posible y enlace o apunte el contenido relevante:"
-    },
-    "termsAndConditions": {
-        "newTermsAndConditions": "Nuevos términos de uso",
-        "termsAndConditionsConfirmed": "He leído y acepto los <a href=\"\/terms-and-conditions\" target=\"_blank\">términos de uso<\/a>.",
-        "termsAndConditionsNewConfirmText": "¡Por favor, lea los nuevos términos de uso ahora!",
-        "termsAndConditionsNewConfirm": "He leído y acepto los nuevos términos de uso.",
-        "agree": "¡Estoy de acuerdo!",
-        "terms-of-service": {
-            "title": "Términos de uso",
-            "description": "Las siguientes condiciones de uso constituyen la base para el uso de nuestra red. Cuando se registre, deberá aceptarlos y le informaremos más adelante de cualquier cambio que se produzca. La Red de Human Connection es operada en Alemania y por lo tanto está sujeta a la ley alemana. El fuero competente es Kirchheim \/ Teck. Para más detalles, consulte nuestro pie de imprenta: <a href=\"https:\/\/human-connection.org\/en\/imprint\" target=\"_blank\" >https:\/\/human-connection.org\/en\/imprint<\/a> "
-        },
-        "use-and-license": {
-            "title": "Uso y Licencia",
-            "description": "Si cualquier contenido que nos envíe está protegido por derechos de propiedad intelectual, nos concede una licencia mundial no exclusiva, transferible, sublicenciable y no exclusiva para utilizar dicho contenido para su publicación en nuestra red. Esta licencia caduca cuando usted elimina su contenido o toda su cuenta. Recuerde que otros pueden compartir su contenido y que nosotros no podemos eliminarlo."
-        },
-        "privacy-statement": {
-            "title": "Protección de datos",
-            "description": "Nuestra red es una red de conocimiento y acción social. Por lo tanto, es especialmente importante para nosotros que el mayor número posible de contenidos sea accesible al público. En el curso del desarrollo de nuestra red habrá cada vez más la posibilidad de decidir sobre la visibilidad de los datos personales. Le informaremos sobre estas nuevas características. De lo contrario, siempre debe pensar en los datos personales que revela sobre usted (u otros). Esto se aplica en particular al contenido de los mensajes y comentarios, ya que éstos tienen un carácter ampliamente público. Más tarde habrá posibilidades de limitar la visibilidad de su perfil. Parte de los términos del servicio es nuestra declaración de privacidad, que le informa sobre las operaciones individuales de procesamiento de datos en nuestra red: <a href=\"https:\/\/human-connection.org\/datenschutz\/#netzwerk\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz\/#netzwerk<\/a> o <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz\/<\/a> Nuestra declaración de privacidad está adaptada a la situación legal y a las características de nuestra red y es siempre válida en la versión más actualizada."
-        },
-        "code-of-conduct": {
-            "title": "Código de conducta",
-            "description": "Nuestro código de conducta sirve como un manual para la apariencia personal y la interacción entre nosotros. Quien esté activo como usuario en la red de Human Connection, escriba artículos, haga comentarios o se ponga en contacto con otros usuarios, incluso fuera de la red, reconoce que estas normas de conducta son vinculantes. <a href=\"https:\/\/alpha.human-connection.org\/code-of-conduct\" target=\"_blank\">https:\/\/alpha.human-connection.org\/code-of-conduct<\/a>"
-        },
-        "moderation": {
-            "title": "Moderación",
-            "description": "Hasta que nuestras posibilidades financieras nos permitan implementar el sistema de moderación comunitaria, moderaremos con un sistema simplificado y con personal propio o posiblemente voluntario. Formamos a estos moderadores y por eso sólo ellos toman las decisiones adecuadas. Estos moderadores realizan su trabajo de forma anónima. Usted puede reportarnos contribuciones, comentarios y usuarios (por ejemplo, si proporcionan información en su perfil o tienen imágenes que violan estos Términos de Uso). Si nos informa de algo, puede darnos una razón y una breve explicación. A continuación, examinaremos su denuncia y le sancionaremos si es necesario, por ejemplo, bloqueando las contribuciones, los comentarios o los usuarios. Desafortunadamente, usted y la persona en cuestión no recibirán ninguna respuesta de nuestra parte en este momento, pero esto se encuentra en la fase de planificación. Independientemente de esto, nos reservamos el derecho de imponer sanciones en principio por razones que pueden no estar incluidas o no estar incluidas en nuestro Código de Conducta o en estas condiciones de servicio."
-        },
-        "errors-and-feedback": {
-            "title": "Errores y comentarios",
-            "description": "Hacemos todo lo posible para mantener nuestra red y los datos seguros y disponibles. Cada nueva versión del software pasa por pruebas automáticas y manuales. No obstante, pueden producirse errores imprevistos. Por lo tanto, estamos agradecidos por cualquier error reportado. Le invitamos a informar de cualquier error que haya descubierto enviando un correo electrónico a Soporte: support@human-connection.org"
-        },
-        "help-and-questions": {
-            "title": "Ayuda y preguntas",
-            "description": "Para ayuda y preguntas hemos compilado una colección completa de preguntas y respuestas frecuentes (FAQ) para usted. Puede encontrarlos aquí: <a href=\"https:\/\/support.human-connection.org\/kb\/\" target=\"_blank\" >https:\/\/support.human-connection.org\/kb\/<\/a>"
-        },
-        "addition": {
-            "title": "Además, regularmente celebramos eventos donde también puede dar impresiones y hacer preguntas. Puede encontrar un resumen actualizado aquí:",
-            "description": "<a href=\"https:\/\/human-connection.org\/events\/\" target=\"_blank\" > https:\/\/human-connection.org\/events\/ <\/a>"
-        },
-        "no-commercial-use": {
-            "title": "Sin uso comercial",
-            "description": "El uso de la red Human Connection no está permitido para fines comerciales. Esto incluye, pero no se limita a, publicitar productos con intención comercial, publicar enlaces de afiliados, solicitar donaciones directamente o brindar apoyo financiero para fines que no se reconocen como caritativos para fines fiscales."
-        }
+    "dashboard": {
+      "comments": "Comentarios",
+      "follows": "Sigue",
+      "invites": "Invita",
+      "name": "Tablero",
+      "notifications": "Notificaciones",
+      "organizations": "Organizaciones",
+      "posts": "Contribuciones",
+      "projects": "Proyectos",
+      "shouts": "Recomendaciones",
+      "users": "Usuarios"
     },
     "donations": {
-        "donations-for": "Donaciones para",
-        "donate-now": "Donar ahora",
-        "amount-of-total": "{amount} de {total} € recaudados"
+      "goal": "Donaciones mensuales necesarias",
+      "name": "Información de donaciones",
+      "progress": "Donaciones recogidas hasta ahora",
+      "successfulUpdate": "¡Información de donaciones actualizada con éxito!"
+    },
+    "hashtags": {
+      "name": "Hashtags",
+      "nameOfHashtag": "Nombre",
+      "number": "No.",
+      "tagCount": "Contribuciones",
+      "tagCountUnique": "Usuarios"
+    },
+    "invites": {
+      "description": "Las invitaciones son una manera maravillosa de tener a sus amigos en su red ...",
+      "name": "Invitar usuarios",
+      "title": "Invitar personas"
+    },
+    "name": "Admin",
+    "notifications": {
+      "name": "Notificaciones"
+    },
+    "organizations": {
+      "name": "Organizaciones"
+    },
+    "pages": {
+      "name": "Páginas"
+    },
+    "settings": {
+      "name": "Configuración"
+    },
+    "tags": {
+      "name": "Etiquetas",
+      "tagCount": "Contribuciones",
+      "tagCountUnique": "Usuarios"
+    },
+    "users": {
+      "empty": "No se han encontrado usuarios",
+      "form": {
+        "placeholder": "correo electrónico, nombre o descripción"
+      },
+      "name": "Usuarios",
+      "table": {
+        "columns": {
+          "createdAt": "Creado el",
+          "email": "Correo electrónico",
+          "name": "Nombre",
+          "number": "No.",
+          "role": "Rol",
+          "slug": "Alias"
+        }
+      }
     }
+  },
+  "code-of-conduct": {
+    "consequences": {
+      "description": "Si un miembro de la comunidad muestra un comportamiento inaceptable, los operadores, moderadores y administradores responsables de la red pueden tomar las medidas apropiadas, incluyendo pero no limitándose a:",
+      "list": {
+        "0": "Solicitud de cese inmediato de conducta inaceptable",
+        "1": "Bloquear o eliminar comentarios",
+        "2": "Exclusión temporal de la contribución respectiva",
+        "3": "Bloqueo o eliminación de contenido",
+        "4": "Retirada temporal de permisos de escritura",
+        "5": "Exclusión temporal de la red.",
+        "6": "Exclusión definitiva de la red",
+        "7": "Las violaciones de la ley alemana pueden ser denunciadas."
+      },
+      "title": "Consecuencias de Comportamiento Inaceptable"
+    },
+    "expected-behaviour": {
+      "description": "Los siguientes comportamientos son esperados y solicitados de todos los miembros de la comunidad:",
+      "list": {
+        "0": "Ejercite la consideración y el respeto en su discurso y en sus acciones.",
+        "1": "Intento de colaboración antes del conflicto.",
+        "2": "Abstenerse de denigrar, discriminar o acosar la conducta y el habla.",
+        "3": "Tenga en cuenta su entorno y sus compañeros participantes. Alerte a los líderes de la comunidad si nota una situación peligrosa, alguien en apuros o violaciones de este Código de Conducta, incluso si parecen no tener consecuencias."
+      },
+      "title": "Comportamiento esperado"
+    },
+    "get-help": "Si usted está sujeto a un comportamiento inaceptable, lo experimenta o tiene otras preocupaciones, por favor notifique a un organizador de la comunidad tan pronto como sea posible y enlace o apunte el contenido relevante:",
+    "preamble": {
+      "description": "Human Connection es una red de conocimiento y acción social sin fines de lucro de la próxima generación. Por la gente - para la gente. Código Abierto, justo y transparente. Por un cambio positivo a nivel local y global en todas las áreas de la vida. Rediseñamos completamente el intercambio público de conocimientos, ideas y proyectos. Las funciones de Human Connection unen a las personas - fuera de línea y en línea - para que podamos hacer del mundo un lugar mejor.",
+      "title": "Preámbulo"
+    },
+    "purpose": {
+      "description": "Con este código de conducta regulamos los principios esenciales de comportamiento en nuestra red social. La Carta de Derechos Humanos de las Naciones Unidas es nuestra orientación y constituye el núcleo de nuestra comprensión de los valores. El código de conducta sirve como principios rectores para nuestra apariencia personal y la interacción entre nosotros. Cualquiera que esté activo como usuario de la Red de Human Connection, escriba artículos, comentarios o se ponga en contacto con otros usuarios, incluidos los que están fuera de la red, reconoce que estas normas de conducta son vinculantes.",
+      "title": "Propósito"
+    },
+    "subheader": "para la red social de Human Connection gGmbH",
+    "unacceptable-behaviour": {
+      "description": "Los siguientes comportamientos son inaceptables dentro de nuestra comunidad:",
+      "list": {
+        "0": "Publicaciones, comentarios, expresiones o insultos discriminatorios, particularmente aquellos relacionados con género, orientación sexual, raza, religión, orientación política o filosófica o discapacidad.",
+        "1": "Publicación o enlace de material claramente pornográfico.",
+        "2": "Glorificación o trivialización de actos de violencia crueles o inhumanos.",
+        "3": "La divulgación de información personal de otros sin su consentimiento o amenaza de (\"doxing\").",
+        "4": "Intimidación intencional, acoso o persecución.",
+        "5": "Publicidad de productos y servicios con fines comerciales.",
+        "6": "Comportamiento criminal o violación de la ley alemana.",
+        "7": "Apoyar o alentar dicha conducta."
+      },
+      "title": "Comportamiento Inaceptable"
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "... este comentario ya no está disponible"
+    },
+    "delete": "Eliminar comentario",
+    "edit": "Editar comentario",
+    "edited": "editado",
+    "menu": {
+      "delete": "Borrar comentario",
+      "edit": "Editar comentario"
+    },
+    "show": {
+      "less": "mostrar menos",
+      "more": "mostrar más"
+    }
+  },
+  "common": {
+    "category": "Categoría ::: Categorías",
+    "comment": "Comentario ::: Comentarios",
+    "letsTalk": "Hablemos",
+    "loadMore": "cargar más",
+    "loading": "cargando",
+    "moreInfo": "Más información",
+    "name": "Nombre",
+    "organization": "Organización ::: Organizaciones",
+    "post": "Mensaje ::: Mensajes",
+    "project": "Proyecto ::: Proyectos",
+    "reportContent": "Informe",
+    "shout": "Grito ::: Gritos",
+    "tag": "Etiqueta ::: Etiquetas",
+    "takeAction": "Tomar acción",
+    "user": "Usuario ::: Usuarios",
+    "validations": {
+      "categories": "deben seleccionarse al menos una y como máximo tres categorías",
+      "email": "debe ser una dirección de correo electrónico válida",
+      "url": "debe ser una URL válida"
+    },
+    "versus": "Versus"
+  },
+  "components": {
+    "enter-nonce": {
+      "form": {
+        "description": "Abra su buzón de correo e introduzca el código que le enviamos.",
+        "next": "Continuar",
+        "nonce": "Introduzca el código",
+        "validations": {
+          "length": "debe tener exactamente 6 letras"
+        }
+      }
+    },
+    "password-reset": {
+      "change-password": {
+        "error": "Error al cambiar la contraseña. ¿Posiblemente un código de seguridad incorrecto?",
+        "help": "Si tiene algún problema, por favor envíenos un correo electrónico a:",
+        "success": "El cambio de contraseña ha sido un éxito!"
+      },
+      "request": {
+        "form": {
+          "description": "Se enviará un correo electrónico de restablecimiento de contraseña a la dirección de correo electrónico especificada.",
+          "submit": "Solicitar correo electrónico",
+          "submitted": "Se ha enviado un correo electrónico con más instrucciones a <b>{email}</b>."
+        },
+        "title": "Restablecer su contraseña"
+      }
+    },
+    "registration": {
+      "create-user-account": {
+        "error": "¡No se ha podido crear una cuenta de usuario!",
+        "help": "¿Tal vez el código de verificación era incorrecto o expiró? Si el problema persiste, por favor envíenos un correo electrónico a:",
+        "success": "¡Su cuenta de usuario ha sido creada!",
+        "title": "Crear una cuenta de usuario"
+      },
+      "signup": {
+        "form": {
+          "data-privacy": "He leido y entendido la <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >declaración de protección de datos</ds-text></a>",
+          "description": "Para empezar, introduzca su dirección de correo electrónico:",
+          "errors": {
+            "email-exists": "¡Ya hay una cuenta de usuario con esta dirección de correo electrónico!",
+            "invalid-invitation-token": "Parece que el código de invitación ya ha sido canjeado. Cada código sólo se puede utilizar una vez."
+          },
+          "invitation-code": "Su código de invitación es: <b>{code}</b>",
+          "minimum-age": "Tengo 18 años o más.",
+          "no-commercial": "No tengo intensiones comerciales y no represento una empresa u organización comercial.",
+          "no-political": "No estoy en la red en nombre de un partido o una organización política.",
+          "submit": "Crear una cuenta",
+          "success": "Se ha enviado un correo electrónico con un enlace de confirmación para el registro a <b>{email}</b>.",
+          "terms-and-condition": "Estoy de acuerdo con los <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" >términos de uso</ds-text></a>."
+        },
+        "title": "¡Únete a Human Connection!",
+        "unavailable": "Desafortunadamente, el registro público de cuentas de usuario en este servidor actualmente no es posible."
+      }
+    }
+  },
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": "{chosen} de {max} categorías seleccionadas"
+    },
+    "category": {
+      "name": {
+        "animal-protection": "Protección de animales",
+        "art-culture-sport": "Arte, Cultura y Deporte",
+        "consumption-sustainability": "Consumo y Sostenibilidad",
+        "cooperation-development": "Cooperación y Desarrollo",
+        "democracy-politics": "Democracia y Política",
+        "economy-finances": "Economía y Finanzas",
+        "education-sciences": "Educación y Ciencias",
+        "energy-technology": "Energía y Tecnología",
+        "environment-nature": "Medio ambiente y Naturaleza",
+        "freedom-of-speech": "Libertad de expresión",
+        "global-peace-nonviolence": "Paz Global y No-Violencia",
+        "happiness-values": "Felicidad y Valores",
+        "health-wellbeing": "Salud y Bienestar",
+        "human-rights-justice": "Derechos Humanos y Justicia",
+        "it-internet-data-privacy": "TI, Internet y privacidad de datos",
+        "just-for-fun": "Sólo por diversión"
+      }
+    },
+    "delete": "Eliminar contribución",
+    "edit": "Editar contribución",
+    "emotions-label": {
+      "angry": "Enfadado",
+      "cry": "Llorar",
+      "funny": "Gracioso",
+      "happy": "Feliz",
+      "surprised": "Sorprendido"
+    },
+    "filterALL": "Ver todas las contribuciones",
+    "filterFollow": "Filtrar las contribuciones de los usuarios que sigo",
+    "languageSelectLabel": "Idioma",
+    "languageSelectText": "Seleccione el idioma",
+    "newPost": "Crear una nueva contribución",
+    "success": "¡Guardado!",
+    "teaserImage": {
+      "cropperConfirm": "Confirmar"
+    },
+    "title": "Título"
+  },
+  "delete": {
+    "cancel": "Cancelar",
+    "comment": {
+      "message": "¿Realmente quieres borrar el comentario de \"<b>{name}</b>\" ?",
+      "success": "¡Comentario eliminado con éxito!",
+      "title": "Eliminar comentario",
+      "type": "Comentario"
+    },
+    "contribution": {
+      "message": "¿Realmente desea eliminar la Contribución \"<b>{name}</b>\" ?",
+      "success": "¡Publicación eliminado con éxito!",
+      "title": "Borrar contribución",
+      "type": "Contribución"
+    },
+    "submit": "Borrar"
+  },
+  "disable": {
+    "cancel": "Cancelar",
+    "comment": {
+      "message": "¿Realmente quieres deshabilitar el comentario de \"<b>{name}</b>\"?",
+      "title": "Desactivar comentario",
+      "type": "Comentario"
+    },
+    "contribution": {
+      "message": "¿Realmente quieres deshabilitar la contribución \"<b>{name}</b>\"?",
+      "title": "Deshabilitar contribución",
+      "type": "Contribución"
+    },
+    "submit": "Desactivar",
+    "success": "Discapacitado con éxito",
+    "user": {
+      "message": "¿Realmente quieres deshabilitar el usuario \"<b>{name}</b>\"?",
+      "title": "Desactivar usuario",
+      "type": "Usuario"
+    }
+  },
+  "donations": {
+    "amount-of-total": "{amount} de {total} € recaudados",
+    "donate-now": "Donar ahora",
+    "donations-for": "Donaciones para"
+  },
+  "editor": {
+    "embed": {
+      "always_allow": "Permitir siempre contenido incrustado por proveedores externos (esta configuración se puede cambiar en cualquier momento)",
+      "data_privacy_info": "Sus datos aún no han sido compartidos con terceros proveedores. Si usted procede a ver este video, el siguiente proveedor probablemente recolectará datos del usuario:",
+      "data_privacy_warning": "¡Advertencia de privacidad de datos!",
+      "play_now": "Ver ahora"
+    },
+    "hashtag": {
+      "addHashtag": "Nuevo hashtag",
+      "addLetter": "Escriba una letra",
+      "noHashtagsFound": "No se han encontrado hashtags"
+    },
+    "mention": {
+      "noUsersFound": "No se han encontrado usuarios"
+    },
+    "placeholder": "Deje sus pensamientos inspiradores...."
+  },
+  "filter-menu": {
+    "clearSearch": "Borrar búsqueda",
+    "hashtag-search": "Buscando a #{hashtag}",
+    "title": "Su burbuja de filtro"
+  },
+  "filter-posts": {
+    "categories": {
+      "all": "Todas",
+      "header": "Categorías de contenido"
+    },
+    "followers": {
+      "label": "Usuarios que sigo"
+    },
+    "general": {
+      "header": "Filtrar por...."
+    },
+    "language": {
+      "all": "Todos",
+      "header": "Idiomas"
+    }
+  },
+  "followButton": {
+    "follow": "Seguir",
+    "following": "Siguiendo"
+  },
+  "index": {
+    "change-filter-settings": "Cambie la configuración de sus filtros para obtener más resultados.",
+    "no-results": "No se han encontrado contribuciones."
+  },
+  "login": {
+    "copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
+    "email": "Su correo electrónico",
+    "failure": "Dirección de correo electrónico o contraseña incorrecta.",
+    "forgotPassword": "¿Olvidó su contraseña?",
+    "hello": "Hola",
+    "login": "Iniciar sesión",
+    "logout": "Cierre de sesión",
+    "moreInfo": "¿Qué es Human Connection?",
+    "moreInfoHint": "a la página de presentación",
+    "moreInfoURL": "https://human-connection.org/es/",
+    "no-account": "¿No tiene una cuenta?",
+    "password": "Su contraseña",
+    "register": "Regístrese",
+    "success": "¡Usted ha iniciado sesión!"
+  },
+  "maintenance": {
+    "explanation": "Actualmente estamos llevando a cabo algunos trabajos de mantenimiento planificados, por favor, inténtelo de nuevo más tarde.",
+    "questions": "Si tiene alguna pregunta o problema, por favor contáctenos por correo electrónico a",
+    "title": "Human Connection está en mantenimiento"
+  },
+  "moderation": {
+    "name": "Moderación",
+    "reports": {
+      "DecisionSuccess": "Decidido con éxito!",
+      "author": "Autor",
+      "content": "Contenido",
+      "decideButton": "Confirmar",
+      "decideModal": {
+        "Comment": {
+          "disable": {
+            "message": "¿Realmente quiere que el comentario \"<b>{nombre}</b>\" permanezca <b>desactivado</b>?",
+            "title": "Desactivar finalmente Comentario"
+          },
+          "enable": {
+            "message": "¿Realmente quiere que el comentario \"<b>{nombre}</b>\" permanezca <b>habilitado</b>?",
+            "title": "Finalmente Habilitar Comentario"
+          }
+        },
+        "Post": {
+          "disable": {
+            "message": "¿Realmente quiere que la entrada \"<b>{nombre}</b>\" permanezca <b>desactivada</b>?",
+            "title": "Finalmente Desactivar Contribución"
+          },
+          "enable": {
+            "message": "¿Realmente quiere que la contribución \"<b>{nombre}</b>\" permanezca <b>activada</b>?",
+            "title": "Finalmente Habilitar Contribución"
+          }
+        },
+        "User": {
+          "disable": {
+            "message": "¿Realmente quiere que el usuario \"<b>{nombre}</b>\" permanezca <b>desactivado</b>?",
+            "title": "Finalmente Deshabilitar Usuario"
+          },
+          "enable": {
+            "message": "¿Realmente quiere que el usuario \"<b>{nombre}</b>\" permanezca <b>habilitado</b>?",
+            "title": "Finalmente Habilitar Usuario"
+          }
+        },
+        "cancel": "Cancelar",
+        "submit": "Confirmar decisión"
+      },
+      "decided": "Decidido",
+      "decision": "Decisión",
+      "disabled": "Deshabilitado",
+      "disabledAt": "Deshabilitado el",
+      "disabledBy": "desactivado por",
+      "empty": "Felicitaciones, nada que moderar.",
+      "enabled": "Habilitado",
+      "enabledAt": "Habilitado el",
+      "enabledBy": "Habilitado por",
+      "filterLabel": {
+        "all": "Todos",
+        "closed": "Cerrado",
+        "reviewed": "Revisado",
+        "unreviewed": "Sin revisar"
+      },
+      "moreDetails": "Ver Detalles",
+      "name": "Informes",
+      "noDecision": "¡No hay decisión!",
+      "numberOfUsers": "{count} usuarios",
+      "previousDecision": "Decisión previa:",
+      "reasonCategory": "Categoría",
+      "reasonDescription": "Descripción",
+      "reportedOn": "Fecha",
+      "reporter": "reportado por",
+      "status": "Estado actual",
+      "submitter": "comunicado por"
+    }
+  },
+  "notifications": {
+    "comment": "Comentario",
+    "content": "Contenido",
+    "empty": "Lo sentimos, no tiene ninguna notificación en este momento.",
+    "filterLabel": {
+      "all": "Todas",
+      "read": "Leído",
+      "unread": "No leído"
+    },
+    "pageLink": "Todas las notificaciones",
+    "post": "Contribución",
+    "reason": {
+      "commented_on_post": "Comentó su contribución ...",
+      "mentioned_in_comment": "Le mencionó en un comentario …",
+      "mentioned_in_post": "Le mencionó en una contribución …"
+    },
+    "title": "Notificaciones",
+    "user": "Usuario"
+  },
+  "post": {
+    "comment": {
+      "submit": "Comentario",
+      "submitted": "Comentario enviado",
+      "updated": "Cambios guardados"
+    },
+    "edited": "editado",
+    "menu": {
+      "delete": "Borrar contribución",
+      "edit": "Editar contribución",
+      "pin": "Anclar contribución",
+      "pinnedSuccessfully": "¡Contribución anclado con éxito!",
+      "unpin": "Desanclar contribución",
+      "unpinnedSuccessfully": "¡Contribución desanclado con éxito!"
+    },
+    "moreInfo": {
+      "description": "Aquí puede encontrar más información sobre este tema.",
+      "name": "Más info",
+      "title": "Más información",
+      "titleOfCategoriesSection": "Categorías",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Contribuciones relacionadas"
+    },
+    "name": "Contribución",
+    "pinned": "Anuncio",
+    "takeAction": {
+      "name": "Tomar acción"
+    }
+  },
+  "profile": {
+    "commented": "Comentado",
+    "follow": "Seguir",
+    "followers": "Seguidores",
+    "following": "Siguiendo",
+    "invites": {
+      "description": "Introduzca la dirección de correo electrónico para la invitación.",
+      "emailPlaceholder": "Correo electrónico para invitar",
+      "title": "¡Invite a alguien a Human Connection!"
+    },
+    "memberSince": "Miembro desde",
+    "name": "Mi perfil",
+    "network": {
+      "andMore": "y {number} más ...",
+      "followedBy": "es seguido por:",
+      "followedByNobody": "no es seguido por nadie.",
+      "following": "está siguiendo:",
+      "followingNobody": "no sigue a nadie.",
+      "title": "Red"
+    },
+    "shouted": "Recomendado",
+    "socialMedia": "¿Dónde más puedo encontrar?",
+    "userAnonym": "Anónimo"
+  },
+  "quotes": {
+    "african": {
+      "author": "Proverbio africano",
+      "quote": "Muchas personas pequeñas en muchos lugares pequeños hacen muchas cosas pequeñas, que pueden alterar la faz del mundo."
+    }
+  },
+  "release": {
+    "cancel": "Cancelar",
+    "comment": {
+      "error": "¡Ya ha reportado el comentario!",
+      "message": "¿Realmente quieres liberar el comentario de \"<b>{name}</b>\"?",
+      "title": "Comentario de la versión",
+      "type": "Comentario"
+    },
+    "contribution": {
+      "error": "¡Ya ha reportado la contribución!",
+      "message": "¿Realmente quieres liberar la contribución \"<b>{name}</b>\"?",
+      "title": "Contribución de la versión ",
+      "type": "Contribución"
+    },
+    "submit": "Liberar",
+    "success": "¡Liberado con éxito!",
+    "user": {
+      "error": "¡Ya ha reportado el usuario!",
+      "message": "¿Realmente quieres liberar al usuario \"<b>{name}</b>\"?",
+      "title": "Liberar usuario",
+      "type": "Usuario"
+    }
+  },
+  "report": {
+    "cancel": "Cancelar",
+    "comment": {
+      "error": "¡Ya ha reportado al comentario!",
+      "message": "¿Realmente quieres reportar el comentario de \"<b>{name}</b>\"?",
+      "title": "Reportar comentario",
+      "type": "Comentario"
+    },
+    "contribution": {
+      "error": "¡Ya ha reportado la contribución!",
+      "message": "¿Realmente quieres informar al usuario de la contribución \"<b>{name}</b>\"?",
+      "title": "Informe Contribución",
+      "type": "Contribución"
+    },
+    "reason": {
+      "category": {
+        "invalid": "Por favor seleccione una categoría válida",
+        "label": "Seleccione una categoría:",
+        "options": {
+          "advert_products_services_commercial": "Publicidad de productos y servicios con fines comerciales.",
+          "criminal_behavior_violation_german_law": "Comportamiento criminal o violación de la ley alemana.",
+          "discrimination_etc": "Contribuciones discriminatorias, comentarios, expresiones o insultos.",
+          "doxing": "La divulgación de información personal de otros sin su consentimiento o amenaza de (\"doxing\").",
+          "glorific_trivia_of_cruel_inhuman_acts": "Glorificación o minimización de actos de violencia crueles o inhumanos.",
+          "intentional_intimidation_stalking_persecution": "Intimidación intencional, acoso o persecución.",
+          "other": "Otra ...",
+          "pornographic_content_links": "Publicación o enlace de material claramente pornográfico."
+        },
+        "placeholder": "Categoría ..."
+      },
+      "description": {
+        "label": "Por favor explique: ¿Por qué le gusta reportar esto?",
+        "placeholder": "Información adicional...."
+      }
+    },
+    "submit": "Informe",
+    "success": "¡Gracias por informar!",
+    "user": {
+      "error": "¡Ya reportó al usuario!",
+      "message": "¿Realmente quieres reportar al usuario \"<b>{name}</b>\"?",
+      "title": "Reportar usuario",
+      "type": "Usuario"
+    }
+  },
+  "search": {
+    "failed": "No se ha encontrado nada",
+    "hint": "¿Qué estás buscando?",
+    "placeholder": "Buscar"
+  },
+  "settings": {
+    "data": {
+      "labelBio": "Acerca de usted",
+      "labelCity": "Su ciudad o región",
+      "labelName": "Su nombre",
+      "labelSlug": "Su nombre de usuario único",
+      "name": "Sus datos",
+      "namePlaceholder": "Femanon Funny",
+      "success": "¡Sus datos han sido actualizados con éxito!"
+    },
+    "delete": {
+      "name": "Borrar cuenta"
+    },
+    "deleteUserAccount": {
+      "accountDescription": "Tenga en cuenta que su contribución y sus comentarios son importantes para nuestra comunidad. Si aún decide borrarlos, debe marcarlos a continuación.",
+      "accountWarning": "¡<b> NO PUEDE GESTIONAR </b> y <b> NO PUEDE RECUPERAR </b> su cuenta, contribuciones o comentarios después de eliminar su cuenta!",
+      "commentedCount": "Eliminar mis {count} comentarios",
+      "contributionsCount": "Eliminar mis {count} contribuciones",
+      "name": "Eliminar cuenta de usuario",
+      "pleaseConfirm": "<b class='is-danger'> ¡Acción destructiva! </b> Escriba <b> {confirm} </b> para confirmar",
+      "success": "¡Cuenta eliminada con éxito!"
+    },
+    "download": {
+      "name": "Descargar datos"
+    },
+    "email": {
+      "change-successful": "Su dirección de correo electrónico ha sido cambiada con éxito.",
+      "labelEmail": "Cambiar su dirección de correo electrónico",
+      "labelNewEmail": "Nueva dirección de correo electrónico",
+      "labelNonce": "Introduzca su código",
+      "name": "Su correo electrónico",
+      "submitted": "Se ha enviado un correo electrónico a <b>{email}</b> para verificar su dirección.",
+      "success": "Se ha registrado una nueva dirección de correo electrónico.",
+      "validation": {
+        "same-email": "Esta es su dirección de correo electrónico actual"
+      },
+      "verification-error": {
+        "explanation": "Esto puede tener diferentes causas:",
+        "message": "Su correo electrónico no se pudo cambiar.",
+        "reason": {
+          "invalid-nonce": "¿El código de confirmación no es válido?",
+          "no-email-request": "¿Está seguro de que ha solicitado un cambio de su dirección de correo electrónico?"
+        },
+        "support": "Si el problema persiste, póngase en contacto con nosotros por correo electrónico a"
+      }
+    },
+    "embeds": {
+      "info-description": "Aquí está la lista de proveedores de terceros cuyo contenido se puede mostrar como código de terceros, por ejemplo, en forma de vídeos incrustados.",
+      "name": "Proveedores externos",
+      "status": {
+        "change": {
+          "allow": "Seguro",
+          "deny": "No, gracias",
+          "question": "¿Debería mostrarse siempre el código fuente incrustado de terceros?"
+        },
+        "description": "Por defecto, el código incrustado de proveedores externos está",
+        "disabled": {
+          "off": "inicialmente sin mostrar",
+          "on": "mostrado inmediatamente"
+        }
+      }
+    },
+    "invites": {
+      "name": "Invita"
+    },
+    "languages": {
+      "name": "Idiomas"
+    },
+    "muted-users": {
+      "columns": {
+        "name": "Nombre",
+        "slug": "Alias",
+        "unmute": "Desbloquear"
+      },
+      "empty": "Hasta ahora, no ha bloqueado a nadie.",
+      "explanation": {
+        "intro": "Si otro usuario ha sido bloqueado por usted, esto es lo que sucede:",
+        "search": "Las contribuciones de personas bloqueadas desaparecen de los resultados de búsqueda.",
+        "your-perspective": "Las contribuciones de la persona bloqueada no aparecerán más en su canal de noticias."
+      },
+      "how-to": "Puede bloquear a otros usuarios en la página de perfil de aquellos a través del menú de contenido.",
+      "mute": "Bloquear usuario",
+      "name": "Usuarios bloqueados",
+      "unmute": "Desbloquear usuario",
+      "unmuted": "{name} está desbloqueado nuevamente"
+    },
+    "name": "Configuración",
+    "organizations": {
+      "name": "Mis organizaciones"
+    },
+    "privacy": {
+      "make-shouts-public": "Compartir artículos que he recomendado en mi perfil público",
+      "name": "Privacidad",
+      "success-update": "Configuración de privacidad guardada"
+    },
+    "security": {
+      "change-password": {
+        "button": "Cambiar contraseña",
+        "label-new-password": "Su nueva contraseña",
+        "label-new-password-confirm": "Confirmar nueva contraseña",
+        "label-old-password": "Su contraseña antigua",
+        "message-new-password-confirm-required": "Confirme su nueva contraseña",
+        "message-new-password-missmatch": "Vuelva a escribir la misma contraseña",
+        "message-new-password-required": "Introduzca una nueva contraseña",
+        "message-old-password-required": "Ingrese su contraseña anterior",
+        "passwordSecurity": "Seguridad de la contraseña",
+        "passwordStrength0": "Contraseña muy insegura",
+        "passwordStrength1": "Contraseña insegura",
+        "passwordStrength2": "Contraseña mediocre",
+        "passwordStrength3": "Contraseña segura",
+        "passwordStrength4": "Contraseña muy sólida",
+        "success": "¡Contraseña cambiada con éxito!"
+      },
+      "name": "Seguridad"
+    },
+    "social-media": {
+      "name": "Medios de comunicación social",
+      "placeholder": "Agregar una URL de Social-Media",
+      "requireUnique": "Ya ha añadido esta url",
+      "submit": "Añadir enlace",
+      "successAdd": "Social-Media agregó. Perfil actualizado!",
+      "successDelete": "Social-Media borrado. Perfil actualizado!"
+    },
+    "validation": {
+      "slug": {
+        "alreadyTaken": "Este nombre de usuario ya está en uso.",
+        "regex": "Los caracteres permitidos son solo letras minúsculas, números, guiones bajos y guiones."
+      }
+    }
+  },
+  "shoutButton": {
+    "shouted": "recomendado"
+  },
+  "site": {
+    "back-to-login": "Volver a la página de inicio de sesión",
+    "bank": "cuenta bancaria",
+    "code-of-conduct": "Código de conducta",
+    "contact": "Contacto",
+    "data-privacy": "Protección de datos",
+    "director": "Director General",
+    "error-occurred": "Se ha ocurrido un error.",
+    "faq": "Preguntas más frecuentes",
+    "germany": "Alemania",
+    "imprint": "Pie de imprenta",
+    "made": "Hecho con &#10084;",
+    "register": "Número de registro",
+    "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)",
+    "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)",
+    "termsAndConditions": "Términos y condiciones",
+    "thanks": "¡Gracias!",
+    "tribunal": "Tribunal de registro"
+  },
+  "store": {
+    "posts": {
+      "orderBy": {
+        "newest": {
+          "label": "Más reciente"
+        },
+        "oldest": {
+          "label": "Más antiguo"
+        }
+      }
+    }
+  },
+  "termsAndConditions": {
+    "addition": {
+      "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
+      "title": "Además, regularmente celebramos eventos donde también puede dar impresiones y hacer preguntas. Puede encontrar un resumen actualizado aquí:"
+    },
+    "agree": "¡Estoy de acuerdo!",
+    "code-of-conduct": {
+      "description": "Nuestro código de conducta sirve como un manual para la apariencia personal y la interacción entre nosotros. Quien esté activo como usuario en la red de Human Connection, escriba artículos, haga comentarios o se ponga en contacto con otros usuarios, incluso fuera de la red, reconoce que estas normas de conducta son vinculantes. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\">https://alpha.human-connection.org/code-of-conduct</a>",
+      "title": "Código de conducta"
+    },
+    "errors-and-feedback": {
+      "description": "Hacemos todo lo posible para mantener nuestra red y los datos seguros y disponibles. Cada nueva versión del software pasa por pruebas automáticas y manuales. No obstante, pueden producirse errores imprevistos. Por lo tanto, estamos agradecidos por cualquier error reportado. Le invitamos a informar de cualquier error que haya descubierto enviando un correo electrónico a Soporte: support@human-connection.org",
+      "title": "Errores y comentarios"
+    },
+    "help-and-questions": {
+      "description": "Para ayuda y preguntas hemos compilado una colección completa de preguntas y respuestas frecuentes (FAQ) para usted. Puede encontrarlos aquí: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" >https://support.human-connection.org/kb/</a>",
+      "title": "Ayuda y preguntas"
+    },
+    "moderation": {
+      "description": "Hasta que nuestras posibilidades financieras nos permitan implementar el sistema de moderación comunitaria, moderaremos con un sistema simplificado y con personal propio o posiblemente voluntario. Formamos a estos moderadores y por eso sólo ellos toman las decisiones adecuadas. Estos moderadores realizan su trabajo de forma anónima. Usted puede reportarnos contribuciones, comentarios y usuarios (por ejemplo, si proporcionan información en su perfil o tienen imágenes que violan estos Términos de Uso). Si nos informa de algo, puede darnos una razón y una breve explicación. A continuación, examinaremos su denuncia y le sancionaremos si es necesario, por ejemplo, bloqueando las contribuciones, los comentarios o los usuarios. Desafortunadamente, usted y la persona en cuestión no recibirán ninguna respuesta de nuestra parte en este momento, pero esto se encuentra en la fase de planificación. Independientemente de esto, nos reservamos el derecho de imponer sanciones en principio por razones que pueden no estar incluidas o no estar incluidas en nuestro Código de Conducta o en estas condiciones de servicio.",
+      "title": "Moderación"
+    },
+    "newTermsAndConditions": "Nuevos términos de uso",
+    "no-commercial-use": {
+      "description": "El uso de la red Human Connection no está permitido para fines comerciales. Esto incluye, pero no se limita a, publicitar productos con intención comercial, publicar enlaces de afiliados, solicitar donaciones directamente o brindar apoyo financiero para fines que no se reconocen como caritativos para fines fiscales.",
+      "title": "Sin uso comercial"
+    },
+    "privacy-statement": {
+      "description": "Nuestra red es una red de conocimiento y acción social. Por lo tanto, es especialmente importante para nosotros que el mayor número posible de contenidos sea accesible al público. En el curso del desarrollo de nuestra red habrá cada vez más la posibilidad de decidir sobre la visibilidad de los datos personales. Le informaremos sobre estas nuevas características. De lo contrario, siempre debe pensar en los datos personales que revela sobre usted (u otros). Esto se aplica en particular al contenido de los mensajes y comentarios, ya que éstos tienen un carácter ampliamente público. Más tarde habrá posibilidades de limitar la visibilidad de su perfil. Parte de los términos del servicio es nuestra declaración de privacidad, que le informa sobre las operaciones individuales de procesamiento de datos en nuestra red: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\">https://human-connection.org/datenschutz/#netzwerk</a> o <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Nuestra declaración de privacidad está adaptada a la situación legal y a las características de nuestra red y es siempre válida en la versión más actualizada.",
+      "title": "Protección de datos"
+    },
+    "terms-of-service": {
+      "description": "Las siguientes condiciones de uso constituyen la base para el uso de nuestra red. Cuando se registre, deberá aceptarlos y le informaremos más adelante de cualquier cambio que se produzca. La Red de Human Connection es operada en Alemania y por lo tanto está sujeta a la ley alemana. El fuero competente es Kirchheim / Teck. Para más detalles, consulte nuestro pie de imprenta: <a href=\"https://human-connection.org/en/imprint\" target=\"_blank\" >https://human-connection.org/en/imprint</a> ",
+      "title": "Términos de uso"
+    },
+    "termsAndConditionsConfirmed": "He leído y acepto los <a href=\"/terms-and-conditions\" target=\"_blank\">términos de uso</a>.",
+    "termsAndConditionsNewConfirm": "He leído y acepto los nuevos términos de uso.",
+    "termsAndConditionsNewConfirmText": "¡Por favor, lea los nuevos términos de uso ahora!",
+    "use-and-license": {
+      "description": "Si cualquier contenido que nos envíe está protegido por derechos de propiedad intelectual, nos concede una licencia mundial no exclusiva, transferible, sublicenciable y no exclusiva para utilizar dicho contenido para su publicación en nuestra red. Esta licencia caduca cuando usted elimina su contenido o toda su cuenta. Recuerde que otros pueden compartir su contenido y que nosotros no podemos eliminarlo.",
+      "title": "Uso y Licencia"
+    }
+  },
+  "user": {
+    "avatar": {
+      "submitted": "Carga con éxito"
+    }
+  }
 }
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 92ca5482e..ce0febf46 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -1,747 +1,747 @@
 {
-    "login": {
-        "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
-        "login": "Connexion",
-        "logout": "Déconnexion",
-        "email": "Votre mail",
-        "password": "Votre mot de passe",
-        "moreInfo": "Qu'est-ce que Human Connection?",
-        "hello": "Bonjour",
-        "forgotPassword": "Mot de passe oublié?",
-        "no-account": "Vous n'avez pas de compte?",
-        "register": "S'inscrire",
-        "moreInfoURL": "https:\/\/human-connection.org\/fr\/",
-        "moreInfoHint": "à la page de présentation",
-        "success": "Vous êtes connecté!",
-        "failure": "Adresse mail ou mot de passe incorrect."
+  "actions": {
+    "cancel": "Annuler",
+    "create": "Créer",
+    "delete": "Supprimer",
+    "edit": "Modifier",
+    "loadMore": "charger plus",
+    "loading": "chargement",
+    "save": "Sauvegarder"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Nom",
+      "name": "Catégories",
+      "postCount": "Postes"
     },
-    "profile": {
-        "name": "Mon profil",
-        "memberSince": "Membre depuis",
-        "follow": "Suivre",
-        "followers": "Suiveurs",
-        "following": "Suivant",
-        "shouted": "Recommandé",
-        "commented": "Commentais",
-        "userAnonym": "Anonyme",
-        "socialMedia": "Où d'autre puis-je trouver",
-        "network": {
-            "title": "Réseau",
-            "following": "suit:",
-            "followingNobody": "ne suit personne.",
-            "followedBy": "est suivi par:",
-            "followedByNobody": "n'est suivi par personne.",
-            "andMore": "et {number} plus…"
-        },
-        "invites": {
-            "title": "Invitez quelqu'un à Human Connection!",
-            "description": "Entrez leur adresse mail pour l'invitation.",
-            "emailPlaceholder": "Mail d'invitation"
-        }
-    },
-    "settings": {
-        "name": "Paramètres",
-        "data": {
-            "name": "Vos données",
-            "labelName": "Votre nom",
-            "labelCity": "Votre ville ou région",
-            "labelBio": "À propos de vous",
-            "labelSlug": "Votre nom d'utilisateur unique",
-            "namePlaceholder": "Fémanon Funny",
-            "success": "Vos données ont été mises à jour avec succès !"
-        },
-        "security": {
-            "name": "Sécurité",
-            "change-password": {
-                "button": "Modifier le mot de passe",
-                "success": "Mot de passe modifié avec succès !",
-                "label-old-password": "Votre ancien mot de passe",
-                "label-new-password": "Votre nouveau mot de passe",
-                "label-new-password-confirm": "Confirmez votre nouveau mot de passe",
-                "message-old-password-required": "Entrez votre ancien mot de passe",
-                "message-new-password-required": "Entrez un nouveau mot de passe",
-                "message-new-password-confirm-required": "Confirmez votre nouveau mot de passe",
-                "message-new-password-missmatch": "Tapez à nouveau le même mot de passe",
-                "passwordSecurity": "Sécurité par mot de passe",
-                "passwordStrength0": "Mot de passe très peu sûr",
-                "passwordStrength1": "Mot de passe non sécurisé",
-                "passwordStrength2": "Mot de passe médiocre",
-                "passwordStrength3": "Mot de passe fort",
-                "passwordStrength4": "Mot de passe très fort"
-            }
-        },
-        "invites": {
-            "name": "Invite"
-        },
-        "download": {
-            "name": "Télécharger les données"
-        },
-        "delete": {
-            "name": "Supprimer un compte"
-        },
-        "organizations": {
-            "name": "Mes organisations"
-        },
-        "languages": {
-            "name": "Langues"
-        },
-        "email": {
-            "validation": {
-                "same-email": "Voici votre adresse mail actuelle"
-            },
-            "name": "Votre mail",
-            "labelEmail": "Changer votre adresse mail",
-            "labelNewEmail": "Nouvelle adresse mail",
-            "labelNonce": "Entrez votre code",
-            "success": "Une nouvelle adresse mail a été enregistrée.",
-            "submitted": "Un mail pour vérifier votre adresse a été envoyé à <b>{email}<\/b>.",
-            "change-successful": "Votre adresse mail a été modifiée avec succès.",
-            "verification-error": {
-                "message": "Votre mail n'a pas pu être changé.",
-                "explanation": "Cela peut avoir différentes causes:",
-                "reason": {
-                    "invalid-nonce": "Le code de confirmation est-il invalide?",
-                    "no-email-request": "Êtes-vous certain d'avoir demandé un changement d'adresse mail?"
-                },
-                "support": "Si le problème persiste, veuillez nous contacter par mail à l'adresse suivante"
-            }
-        },
-        "validation": {
-            "slug": {
-                "regex": "Les caractères autorisés ne sont que les lettres minuscules, les chiffres, les traits de soulignement et les traits d'union.",
-                "alreadyTaken": "Ce nom d'utilisateur est déjà pris."
-            }
-        },
-        "deleteUserAccount": {
-            "name": "Supprimer un compte utilisateur",
-            "contributionsCount": "Supprimer mes {count} postes",
-            "commentedCount": "Supprimer mes {count} commentaires",
-            "accountDescription": "Sachez que vos postes et commentaires sont importants pour notre communauté. Si vous voulez quand même les supprimer, vous devez les marquer ci-dessous.",
-            "accountWarning": "Vous <b>NE POUVEZ PAS GÉRER<\/b> et <b>NE POUVEZ PAS RECOUVRIR<\/b> votre compte, vos messages ou vos commentaires après avoir supprimé votre compte !",
-            "success": "Compte supprimer avec succès!",
-            "pleaseConfirm": "<b class='is-danger'> Action destructive! <\/b> Saisissez <b> {confirm} <\/b> pour confirmer"
-        },
-        "embeds": {
-            "name": "Fournisseurs tiers",
-            "info-description": "Voici la liste des fournisseurs tiers dont le contenu peut être affiché sous forme de code tiers, par exemple sous la forme de vidéos intégrées.",
-            "status": {
-                "description": "Par défaut, le code incorporé des fournisseurs tiers est",
-                "disabled": {
-                    "off": "initialement non affiché",
-                    "on": "affiché immédiatement"
-                },
-                "change": {
-                    "question": "Est-ce que vous voulez que le code source intégrer vous soit toujours affiché?",
-                    "allow": "Sûr",
-                    "deny": "Non merci"
-                }
-            }
-        },
-        "social-media": {
-            "name": "Médias sociaux",
-            "placeholder": "Ajouter une URL pour les médias sociaux",
-            "requireUnique": "Vous avez déjà ajouté cette URL",
-            "submit": "Ajouter un lien",
-            "successAdd": "Les médias sociaux ont été ajoutés. Profil mis à jour !",
-            "successDelete": "Médias sociaux supprimé. Profil mis à jour !"
-        },
-        "muted-users": {
-            "name": "Utilisateurs bloqués",
-            "explanation": {
-                "intro": "Si vous avez bloqué un autre utilisateur, voici ce qui se passe:",
-                "your-perspective": "Les postes de la personne bloquée n'apparaîtront dans votre fil d'actualités.",
-                "search": "Les postes des personnes bloquées disparaissent de vos résultats de recherche."
-            },
-            "columns": {
-                "name": "Nom",
-                "slug": "Slug",
-                "unmute": ""
-            },
-            "empty": "Jusqu'à présent, vous n'avez bloqué personne.",
-            "how-to": "Vous pouvez bloquer d'autres utilisateurs sur leur page de profil via le menu de contenu.",
-            "mute": "Bloquer l'utilisateur",
-            "unmute": "Débloquer l'utilisateur",
-            "unmuted": "{name} est à nouveau débloqué"
-        },
-        "privacy": {
-            "name": "",
-            "make-shouts-public": "",
-            "success-update": ""
-        }
-    },
-    "admin": {
-        "name": "Admin",
-        "dashboard": {
-            "name": "Tableau de bord",
-            "users": "Utilisateurs",
-            "posts": "Postes",
-            "comments": "Commentaires",
-            "notifications": "Notifications",
-            "organizations": "Organisations",
-            "projects": "Projets",
-            "invites": "Invitations",
-            "follows": "Suit",
-            "shouts": "Cris"
-        },
-        "organizations": {
-            "name": "Organisations"
-        },
-        "users": {
-            "name": "Utilisateurs",
-            "form": {
-                "placeholder": "mail, nom ou description"
-            },
-            "table": {
-                "columns": {
-                    "number": "Num.",
-                    "name": "Nom",
-                    "email": "Mail",
-                    "slug": "Slug",
-                    "role": "Rôle",
-                    "createdAt": "Créé à"
-                }
-            },
-            "empty": "Aucun utilisateur trouvé"
-        },
-        "pages": {
-            "name": "Pages"
-        },
-        "notifications": {
-            "name": "Notifications"
-        },
-        "categories": {
-            "name": "Catégories",
-            "categoryName": "Nom",
-            "postCount": "Postes"
-        },
-        "tags": {
-            "name": "Étiquettes",
-            "tagCountUnique": "Utilisateurs",
-            "tagCount": "Postes"
-        },
-        "settings": {
-            "name": "Paramètres"
-        },
-        "hashtags": {
-            "name": "Hashtags",
-            "number": "Num.",
-            "nameOfHashtag": "Nom",
-            "tagCountUnique": "Utilisateurs",
-            "tagCount": "Postes"
-        },
-        "invites": {
-            "name": "Inviter des utilisateurs",
-            "title": "Inviter des gens",
-            "description": "Les invitations sont une merveilleuse façon d'avoir vos amis dans votre réseau..."
-        },
-        "donations": {
-            "name": "Informations sur les dons",
-            "goal": "Dons mensuels requis",
-            "progress": "Dons recueillis jusqu'à présent",
-            "successfulUpdate": "Les informations sur les dons ont été mises à jour avec succès !"
-        }
-    },
-    "post": {
-        "name": "Post",
-        "moreInfo": {
-            "name": "Plus d'infos",
-            "title": "Plus d'information",
-            "description": "Ici vous pouvez trouver plus d'informations à ce sujet.",
-            "titleOfCategoriesSection": "Catégories",
-            "titleOfHashtagsSection": "Hashtags",
-            "titleOfRelatedContributionsSection": "Articles Similaires"
-        },
-        "takeAction": {
-            "name": "Passez à l'action"
-        },
-        "pinned": "Annonce",
-        "menu": {
-            "edit": "Modifier le Post",
-            "delete": "Supprimer le Post",
-            "pin": "Épingler le Post",
-            "pinnedSuccessfully": "Poste épinglé avec succès!",
-            "unpin": "Retirer l'épingle du poste",
-            "unpinnedSuccessfully": "Épingle retirer du Post avec succès!"
-        },
-        "comment": {
-            "submit": "Commenté",
-            "submitted": "Commentaire soumis",
-            "updated": "Changements sauvegardés"
-        },
-        "edited": "édité"
-    },
-    "quotes": {
-        "african": {
-            "quote": "Beaucoup de petites personnes dans beaucoup de petits endroits font beaucoup de petites choses, qui peuvent changer la face du monde.",
-            "author": "Proverbe africain"
-        }
-    },
-    "common": {
-        "post": "Message ::: Messages",
-        "comment": "Commentaire ::: Commentaires",
-        "letsTalk": "Parlons-en",
-        "versus": "Versus",
-        "moreInfo": "Plus d'infos",
-        "takeAction": "Passer à l'action",
-        "shout": "Partage ::: Partages",
-        "user": "Utilisateur ::: Utilisateurs",
-        "category": "Catégorie ::: Catégories",
-        "organization": "Organisation ::: Organisations",
-        "project": "Projet ::: Projets",
-        "tag": "Tag ::: Tags",
-        "name": "Nom",
-        "loadMore": "charger plus",
-        "loading": "chargement",
-        "reportContent": "Signaler",
-        "validations": {
-            "email": "Doit être une adresse mail valide",
-            "url": "doit être une URL valide",
-            "categories": ""
-        }
-    },
-    "actions": {
-        "loading": "chargement",
-        "loadMore": "charger plus",
-        "create": "Créer",
-        "save": "Sauvegarder",
-        "edit": "Modifier",
-        "delete": "Supprimer",
-        "cancel": "Annuler"
-    },
-    "moderation": {
-        "name": "Modération",
-        "reports": {
-            "empty": "Félicitations, rien à modérer.",
-            "name": "Signalisations",
-            "reporter": "signalé par",
-            "submitter": "signalé par",
-            "disabledBy": "désactivé par",
-            "reasonCategory": "Catégorie",
-            "reasonDescription": "Description",
-            "createdAt": "Date"
-        }
-    },
-    "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": "Contribution",
-            "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>{name}<\/b> » ?"
-        },
-        "submit": "Désactiver",
-        "cancel": "Annuler",
-        "success": "Désactivé avec succès"
-    },
-    "report": {
-        "submit": "Envoyer le rapport",
-        "cancel": "Annuler",
-        "user": {
-            "title": "Signaler l'utilisateur",
-            "type": "Utilisateur",
-            "message": "Souhaitez-vous vraiment signaler l'utilisateur « <b> {name} <\/b> »?",
-            "error": "Vous avez déjà signalé l'utilisateur!"
-        },
-        "contribution": {
-            "title": "Signaler l'entrée",
-            "type": "Apport",
-            "message": "Souhaitez-vous vraiment signaler l'entrée « <b> {name} <\/b> »?",
-            "error": "Vous avez déjà rapporté la contribution!"
-        },
-        "comment": {
-            "title": "Signaler un commentaire",
-            "type": "Commentaire",
-            "message": "Souhaitez-vous vraiment signaler l'utilisateur « <b> {name} <\/b> »?",
-            "error": "Vous avez déjà rapporté le commentaire!"
-        },
-        "success": "Merci de nous avoir fait part de vos commentaires!",
-        "reason": {
-            "category": {
-                "label": "Sélectionnez une catégorie:",
-                "placeholder": "Catégorie...",
-                "options": {
-                    "discrimination_etc": "Posts, commentaires, expressions ou insultes discriminatoires.",
-                    "pornographic_content_links": "Publication ou partage de matériel clairement pornographique.",
-                    "glorific_trivia_of_cruel_inhuman_acts": "Glorification ou banalisation d'actes de violence cruels ou inhumains.",
-                    "doxing": "La divulgation de renseignements personnels sans le consentement ou la menace d' (\"doxing\").",
-                    "intentional_intimidation_stalking_persecution": "L'intimidation, le harcèlement ou la persécution intentionnelle.",
-                    "advert_products_services_commercial": "Publicité de produits et de services à des fins commerciaux.",
-                    "criminal_behavior_violation_german_law": "Comportement criminel ou violation du droit allemand.",
-                    "other": "Autres..."
-                },
-                "invalid": "Veuillez sélectionner une catégorie valide"
-            },
-            "description": {
-                "label": "S'il vous plaît expliquer: Pourquoi voulez-vous signaler cela?",
-                "placeholder": "Informations complémentaires..."
-            }
-        }
-    },
-    "contribution": {
-        "edit": "Rédiger l'apport",
-        "delete": "Supprimer l'entrée",
-        "title": "Titre",
-        "newPost": "Créer un nouveau Post",
-        "filterFollow": "Filtrer les contributions des utilisateurs que je suis",
-        "filterALL": "Voir toutes les contributions",
-        "success": "Enregistré!",
-        "languageSelectLabel": "Langue",
-        "categories": {
-            "infoSelectedNoOfMaxCategories": "{chosen} de {max} catégories sélectionnées"
-        },
-        "emotions-label": {
-            "funny": "Marrant",
-            "happy": "Heureux",
-            "surprised": "Surpris",
-            "cry": "Pleurer",
-            "angry": "En colère"
-        },
-        "category": {
-            "name": {
-                "freedom-of-speech": "Liberté d'expression",
-                "consumption-sustainability": "Consommation & Durabilité",
-                "global-peace-nonviolence": "Paix mondiale & Non-violence",
-                "just-for-fun": "Juste pour le Fun",
-                "happiness-values": "Bonheur & Valeurs",
-                "health-wellbeing": "Santé & Bien-être",
-                "environment-nature": "Environnement & Nature",
-                "animal-protection": "Protection des animaux",
-                "human-rights-justice": "Droits de l'homme & Justice",
-                "education-sciences": "Éducation & Sciences",
-                "cooperation-development": "Coopération & Développement",
-                "democracy-politics": "Démocratie & Politique",
-                "economy-finances": "Économie & Finances",
-                "energy-technology": "Énergie & Technologie",
-                "it-internet-data-privacy": "Informatique, Internet & Confidentialité des données",
-                "art-culture-sport": "Art, Culture & Sport"
-            }
-        },
-        "teaserImage": {
-            "cropperConfirm": "Confirmer"
-        },
-        "languageSelectText": ""
-    },
-    "comment": {
-        "edit": "Rédiger un commentaire",
-        "delete": "Supprimer le commentaire",
-        "content": {
-            "unavailable-placeholder": "...ce commentaire n'est plus disponible"
-        },
-        "menu": {
-            "edit": "Modifier le commentaire",
-            "delete": "Supprimer le commentaire"
-        },
-        "show": {
-            "more": "montrer plus",
-            "less": "montrer moins"
-        },
-        "edited": "édité"
-    },
-    "followButton": {
-        "follow": "Suivre",
-        "following": "Je suis les"
-    },
-    "shoutButton": {
-        "shouted": "recommandé"
-    },
-    "search": {
-        "placeholder": "Rechercher",
-        "hint": "Qu'est-ce que vous cherchez ?",
-        "failed": "Rien trouvé"
-    },
-    "components": {
-        "password-reset": {
-            "request": {
-                "title": "Réinitialiser votre mot de passe",
-                "form": {
-                    "description": "Un mail de réinitialisation de mot de passe sera envoyé à l'adresse mail indiquée.",
-                    "submit": "Demander mail",
-                    "submitted": "Un mail avec des instructions supplémentaires a été envoyé à <b>{email}<\/b>."
-                }
-            },
-            "change-password": {
-                "success": "La modification de votre mot de passe a réussi !",
-                "error": "La modification de votre mot de passe a échoué. Peut-être que le code de sécurité n'était pas correct ?",
-                "help": "En cas de problème, n'hésitez pas à nous demander de l'aide en nous envoyant un mail à :"
-            }
-        },
-        "enter-nonce": {
-            "form": {
-                "nonce": "Entrez votre code",
-                "description": "Ouvrez votre boîte de réception et entrez le code que nous vous avons envoyé.",
-                "next": "Continuer",
-                "validations": {
-                    "length": "doit comporter 6 caractères"
-                }
-            }
-        },
-        "registration": {
-            "signup": {
-                "unavailable": "Malheureusement, l'enregistrement public des comptes utilisateurs n'est pas encore disponible sur ce serveur.",
-                "title": "Rejoignez Human Connection!",
-                "form": {
-                    "description": "Pour commencer, entrez votre adresse mail:",
-                    "terms-and-condition": "Je confirme les <a href=\"\/terms-and-conditions\"> <ds-text bold color=\"primary\" > Conditions générales <\/ds-text> <\/a>.",
-                    "data-privacy": "J'ai lu et compris la <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"> <ds-text bold color=\"primary\" > Déclaration de confidentialité <\/ds-text> <\/a> ",
-                    "minimum-age": "J'ai 18 ans ou plus.",
-                    "invitation-code": "Votre code d'invitation est: <b> {code} <\/b>",
-                    "errors": {
-                        "email-exists": "Il existe déjà un compte utilisateur avec cette adresse mail!",
-                        "invalid-invitation-token": "On dirait que l'invitation a déjà été utilisée. Les liens d'invitation ne peuvent être utilisés qu'une seule fois."
-                    },
-                    "submit": "Créer un compte",
-                    "success": "Un mail avec un lien pour compléter votre inscription a été envoyé à <b>{email}<\/b>"
-                }
-            },
-            "create-user-account": {
-                "title": "Créer un compte utilisateur",
-                "success": "Votre compte a été créé!",
-                "error": "Compte d'utilisateur n'a pas pu être créé!",
-                "help": " Peut-être que la confirmation n'était pas valide? En cas de problème, n'hésitez pas à nous demander de l'aide en nous envoyant un mail à:"
-            }
-        }
-    },
-    "store": {
-        "posts": {
-            "orderBy": {
-                "newest": {
-                    "label": "Plus récent"
-                },
-                "oldest": {
-                    "label": "Le plus ancien"
-                }
-            }
-        }
-    },
-    "maintenance": {
-        "title": "Human Connection est en maintenance",
-        "explanation": "Pour l'instant, nous faisons de la maintenance programmée, veuillez réessayer plus tard.",
-        "questions": "Des questions ou des préoccupations, envoyez un mail à"
-    },
-    "index": {
-        "no-results": "Pas de contribution trouvée.",
-        "change-filter-settings": "Modifiez les paramètres de filtrage pour obtenir plus de résultats."
-    },
-    "filter-menu": {
-        "title": "Votre bulle de filtre",
-        "hashtag-search": "Recherche de #{hashtag}",
-        "clearSearch": "Réinitialiser la recherche"
-    },
-    "filter-posts": {
-        "categories": {
-            "header": "Catégories de contenu",
-            "all": "Toutes"
-        },
-        "general": {
-            "header": "Filtrer par ...."
-        },
-        "followers": {
-            "label": "Utilisateurs que je suis"
-        },
-        "language": {
-            "header": "Langues",
-            "all": "Tous"
-        }
-    },
-    "site": {
-        "thanks": "Merci!",
-        "error-occurred": "Une erreur s'est produite.",
-        "made": "Fabriqué avec &#10084;",
-        "imprint": "Mentions légales",
-        "termsAndConditions": "Conditions générales",
-        "data-privacy": "Protection des données",
-        "contact": "Contacter",
-        "tribunal": "Tribunal de registre",
-        "register": "Numéro de registre",
-        "director": "Directeur Général",
-        "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)",
-        "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)",
-        "bank": "compte bancaire",
-        "germany": "Allemagne",
-        "code-of-conduct": "Code de conduite",
-        "back-to-login": "Retour à la page de connexion",
-        "faq": "FAQ"
-    },
-    "editor": {
-        "placeholder": "Écrivez quelque chose d'inspirant...",
-        "mention": {
-            "noUsersFound": "Aucun utilisateur trouvé"
-        },
-        "hashtag": {
-            "noHashtagsFound": "Aucun hashtag trouvé",
-            "addHashtag": "Nouveau hashtag",
-            "addLetter": "Tapez une lettre"
-        },
-        "embed": {
-            "data_privacy_warning": "Attention à la confidentialité des données!",
-            "data_privacy_info": "Vos données n'ont pas encore été partagées avec des fournisseurs tiers. Si vous regardez cette vidéo, le fournisseur suivant recueillera probablement des données utilisateurs:",
-            "play_now": "Regarder maintenant",
-            "always_allow": "Autoriser toujours le contenu intégré par des fournisseurs tiers (ce paramètre peut être modifié à tout moment)"
-        }
-    },
-    "notifications": {
-        "reason": {
-            "mentioned_in_post": "Vous a mentionné dans un post…",
-            "mentioned_in_comment": "Vous a mentionné dans un commentaire…",
-            "commented_on_post": "Commenté sur votre post…"
-        },
-        "comment": "Commentaire",
-        "title": "Notifications",
-        "pageLink": "Toutes les notifications",
-        "post": "Post",
-        "user": "Utilisateur",
-        "content": "Contenu",
-        "filterLabel": {
-            "all": "Tous",
-            "read": "Lire",
-            "unread": "Non lu"
-        },
-        "empty": "Désolé, vous n'avez pas de notifications pour le moment."
-    },
-    "delete": {
-        "submit": "Supprimer",
-        "cancel": "Annuler",
-        "contribution": {
-            "title": "Supprimer la contribution",
-            "type": "Contribution",
-            "message": "Voulez-vous vraiment supprimer la contribution  \"<b>{name}<\/b>\"?",
-            "success": "Contribution supprimée avec succès !"
-        },
-        "comment": {
-            "title": "Supprimer un commentaire",
-            "type": "Commentaire",
-            "message": "Voulez-vous vraiment supprimer le commentaire de \"<b>{name}<\/b>\"?",
-            "success": "Commentaire supprimé avec succès !"
-        }
-    },
-    "release": {
-        "submit": "Relâchez",
-        "cancel": "Annuler",
-        "success": "Relâchez avec succès!",
-        "user": {
-            "title": "Validation par l'utilisateur",
-            "type": "Utilisateur",
-            "message": "Voulez-vous vraiment libérer l'utilisateur \"<b>{name}<\/b>\"?",
-            "error": "Vous avez déjà signalé l'utilisateur!"
-        },
-        "contribution": {
-            "title": "Versement de la contribution",
-            "type": "Contribution",
-            "message": "Voulez-vous vraiment débloquer la contribution \"<b>{name}<\/b>\"?",
-            "error": "Vous avez déjà signalé la contribution !!"
-        },
-        "comment": {
-            "title": "Publication des commentaires",
-            "type": "Commentaire",
-            "message": "Voulez-vous vraiment publier le commentaire de \"<b>{name}<\/b>\"?",
-            "error": "Vous avez déjà signalé le commentaire!"
-        }
-    },
-    "user": {
-        "avatar": {
-            "submitted": "Téléchargement réussi"
-        }
-    },
-    "code-of-conduct": {
-        "subheader": "pour le réseau social de la Human Connection gGmbH",
-        "preamble": {
-            "title": "Préambule",
-            "description": "Human Connection est un réseau de connaissances et d'action sociale à but non lucratif de la prochaine génération. Par les gens - pour les gens. Open Source, équitable et transparent. Pour un changement local et global positif dans tous les domaines de la vie. Nous redessinons complètement l'échange public de connaissances, d'idées et de projets. Les fonctions de Human Connection rassemblent les gens - hors ligne et en ligne - afin que nous puissions rendre le monde meilleur."
-        },
-        "purpose": {
-            "title": "Objectif",
-            "description": "Avec ce code de conduite, nous réglementons les principes essentiels de comportement dans notre réseau social. Nous nous orientons à la Charte des Droits de l'Homme, elle est le cœur de notre compréhension des valeurs. Le code de conduite sert de fil conducteur pour notre apparence personnelle et notre interaction les uns avec les autres. Toute personne active comme utilisateur sur le réseau Human Connection, écrit des articles, commente ou contacte d'autres utilisateurs, y compris ceux qui ne font pas partie du réseau, reconnaît ces règles comme contractuel."
-        },
-        "expected-behaviour": {
-            "title": "Comportement attendu",
-            "description": "Les comportements suivants sont attendus et exigés de tous les membres de la communauté :",
-            "list": {
-                "0": "Faites preuve de considération et de respect dans votre discours et vos actions.",
-                "1": "Tenter de collaborer avant le conflit.",
-                "2": "S'abstenir de tout comportement ou discours dégradant, discriminatoire ou harcelant.",
-                "3": "Soyez attentif à votre environnement et aux autres participants. Alertez les leaders de la communauté si vous remarquez une situation dangereuse, une personne en détresse ou une violation du Code de Conduite, même si elle vous semble sans importance."
-            }
-        },
-        "unacceptable-behaviour": {
-            "title": "Comportement inacceptable",
-            "description": "Les comportements suivants sont inacceptables dans notre communauté:",
-            "list": {
-                "0": "Les messages, commentaires, déclarations ou insultes discriminatoires, en particulier ceux relatifs au sexe, à l'orientation sexuelle, à la race, à la religion, à l'orientation politique ou philosophique ou au handicap.",
-                "1": "Publication ou partage de matériel clairement pornographique.",
-                "2": "Glorification ou banalisation d'actes de violence cruels ou inhumains.",
-                "3": "La divulgation de renseignements personnels sans le consentement ou la menace d' (\"doxing\").",
-                "4": "L'intimidation, le harcèlement ou la persécution intentionnelle.",
-                "5": "Publicité de produits et de services à des fins commerciaux.",
-                "6": "Comportement criminel ou violation du droit allemand.",
-                "7": "Cautionner ou encourager de tels comportements."
-            }
-        },
-        "consequences": {
-            "title": "Conséquences d'un comportement inacceptable",
-            "description": "Si un membre de la communauté présente un comportement inacceptable, les opérateurs, modérateurs et administrateurs responsables du réseau peuvent prendre les mesures appropriées, notamment:",
-            "list": {
-                "0": "Veuillez cesser immédiatement tout comportement inacceptable",
-                "1": "Verrouillage ou suppression des commentaires",
-                "2": "Exclusion temporaire du poste ou de la contribution en question",
-                "3": "Blocage ou suppression de contenu",
-                "4": "Retrait temporaire des droits d'écriture",
-                "5": "Exclusion temporaire du réseau",
-                "6": "Exclusion définitive du réseau",
-                "7": "Des violations du droit allemand peuvent être signalées."
-            }
-        },
-        "get-help": "Si vous êtes victime ou témoin d'un comportement inacceptable, ou si vous avez d'autres préoccupations, veuillez en aviser un organisateur communautaire dès que possible et établir un lien ou vous référer au contenu correspondant:"
-    },
-    "termsAndConditions": {
-        "newTermsAndConditions": "Nouvelles conditions générales",
-        "termsAndConditionsConfirmed": "J'ai lu et accepte les <a href=\"\/terms-and-conditions\" target=\"_blank\">conditions générales<\/a>.",
-        "termsAndConditionsNewConfirmText": "Veuillez lire les nouvelles conditions d'utilisation dès maintenant !",
-        "termsAndConditionsNewConfirm": "J'ai lu et accepté les nouvelles conditions générales.",
-        "agree": "J'accepte!",
-        "terms-of-service": {
-            "title": "Conditions d'utilisation",
-            "description": "Les conditions d'utilisation suivantes constituent la base de l'utilisation de notre réseau. Lorsque vous vous inscrivez, vous devez les accepter et nous vous informerons ultérieurement de tout changement qui pourrait survenir. Le réseau Human Connection Network est exploité en Allemagne et est donc soumis au droit allemand. Le tribunal compétent est celui de Kirchheim \/ Teck. Pour plus de détails, consultez notre site Internet: <a href=\"https:\/\/human-connection.org\/en\/imprint\" target=\"_blank\" >https:\/\/human-connection.org\/en\/imprint<\/a> "
-        },
-        "use-and-license": {
-            "title": "Utilisation et licence",
-            "description": "Si un contenu que vous nous publiez est protégé par des droits de propriété intellectuelle, vous nous accordez une licence mondiale non exclusive, transférable, transférable et pouvant faire l'objet d'une sous-licence pour utiliser ce contenu à des fins de publication sur notre réseau. Cette licence expire lorsque vous supprimez votre contenu ou l'ensemble de votre compte. Rappelez-vous que d'autres personnes peuvent partager votre contenu et que nous ne pouvons pas le supprimer."
-        },
-        "privacy-statement": {
-            "title": "Déclaration de confidentialité",
-            "description": "Notre réseau est un réseau de connaissances et d'action sociale. Il est donc particulièrement important pour nous qu'autant de contenu que possible soit accessible au public. Au cours du développement de notre réseau, il y aura de plus en plus la possibilité de décider de la visibilité des données personnelles. Nous vous informerons de ces nouvelles fonctionnalités. Sinon, vous devriez toujours penser aux données personnelles que vous divulguez à votre sujet (ou à celui d'autres personnes). Cela vaut en particulier pour le contenu des messages et des commentaires, qui ont un caractère largement public. Plus tard, il y aura des possibilités de limiter la visibilité de votre profil. Une partie des conditions d'utilisation est notre déclaration de confidentialité, qui vous informe sur les différentes opérations de traitement des données dans notre réseau: <a href=\"https:\/\/human-connection.org\/datenschutz\/#netzwerk\" target=\"_blank\"> https:\/\/human-connection.org\/datenschutz\/#netzwerk<\/a> ex: <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz\/<\/a> Notre déclaration de confidentialité est adaptée à la situation juridique et aux caractéristiques de notre réseau et est toujours valable dans la version la plus récente."
-        },
-        "code-of-conduct": {
-            "title": "Code de conduite",
-            "description": "Notre code de conduite sert de manuel pour l'apparence personnelle et l'interaction les uns avec les autres. Quiconque est actif en tant qu'utilisateur sur le réseau Human Connection, écrit des articles, commente ou établit des contacts avec d'autres utilisateurs, même en dehors du réseau, reconnaît que ces règles de conduite sont contractuel. <a href=\"https:\/\/alpha.human-connection.org\/code-of-conduct\" target=\"_blank\"> https:\/\/alpha.human-connection.org\/code-of-conduct <\/a>"
-        },
-        "moderation": {
-            "title": "Modération",
-            "description": "Jusqu'à ce que nos possibilités financières nous permettent de mettre en œuvre le système de modération communautaire, nous modérons avec un système simplifié et avec notre propre personnel ou éventuellement des bénévoles. Nous formons ces modérateurs et c'est pour cette raison qu'ils sont les seuls à prendre les décisions appropriées. Ces modérateurs effectuent leur travail de manière anonyme. Vous pouvez nous signaler des postes, commentaires et utilisateurs (par exemple, s'ils fournissent des informations dans leur profil ou s'ils ont des images qui violent ces Conditions d'utilisation). Si vous nous signalez quelque chose, vous pouvez nous donner une raison et une brève explication. Nous examinerons ensuite ce que vous nous avez signalé et vous sanctionnerons si nécessaire, par exemple en bloquant des contributions, des commentaires ou des utilisateurs. Malheureusement, vous et la personne concernée ne recevrez pas de commentaires de notre part pour le moment, mais c'est à l'étape de la planification. Indépendamment de cela, nous nous réservons le droit d'imposer des sanctions de principe pour des raisons qui ne figurent pas ou pas encore dans notre Code de conduite ou dans les présentes conditions de service."
-        },
-        "errors-and-feedback": {
-            "title": "Erreurs et Feedback",
-            "description": "Nous mettons tout en œuvre pour que notre réseau et nos données soient sécurisés et disponibles. Chaque nouvelle version du logiciel passe par des tests automatisés et manuels. Cependant, des erreurs imprévues peuvent survenir. Par conséquent, nous sommes reconnaissants pour tous les bugs signalés. Nous vous invitons à signaler les bugs que vous avez découverts en envoyant un mail à support@human-connection.org."
-        },
-        "help-and-questions": {
-            "title": "Aide et questions",
-            "description": "Pour obtenir de l'aide et des questions, nous avons compilé une foire aux questions (FAQ) complète pour vous. Vous pouvez les trouver ici: <a href=\"https:\/\/support.human-connection.org\/kb\/\" target=\"_blank\" >https:\/\/support.human-connection.org\/kb\/ <\/a>"
-        },
-        "addition": {
-            "title": "De plus, nous organisons régulièrement des événements où vous pouvez également partager vos impressions et poser vos questions. Ici, vous trouverez un aperçu actuel:",
-            "description": "<a href=\"https:\/\/human-connection.org\/events\/\" target=\"_blank\" > https:\/\/human-connection.org\/events\/ <\/a>"
-        }
+    "dashboard": {
+      "comments": "Commentaires",
+      "follows": "Suit",
+      "invites": "Invitations",
+      "name": "Tableau de bord",
+      "notifications": "Notifications",
+      "organizations": "Organisations",
+      "posts": "Postes",
+      "projects": "Projets",
+      "shouts": "Cris",
+      "users": "Utilisateurs"
     },
     "donations": {
-        "donations-for": "Dons pour",
-        "donate-now": "Faites un don",
-        "amount-of-total": "{amount} de {total} € collectés"
+      "goal": "Dons mensuels requis",
+      "name": "Informations sur les dons",
+      "progress": "Dons recueillis jusqu'à présent",
+      "successfulUpdate": "Les informations sur les dons ont été mises à jour avec succès !"
+    },
+    "hashtags": {
+      "name": "Hashtags",
+      "nameOfHashtag": "Nom",
+      "number": "Num.",
+      "tagCount": "Postes",
+      "tagCountUnique": "Utilisateurs"
+    },
+    "invites": {
+      "description": "Les invitations sont une merveilleuse façon d'avoir vos amis dans votre réseau...",
+      "name": "Inviter des utilisateurs",
+      "title": "Inviter des gens"
+    },
+    "name": "Admin",
+    "notifications": {
+      "name": "Notifications"
+    },
+    "organizations": {
+      "name": "Organisations"
+    },
+    "pages": {
+      "name": "Pages"
+    },
+    "settings": {
+      "name": "Paramètres"
+    },
+    "tags": {
+      "name": "Étiquettes",
+      "tagCount": "Postes",
+      "tagCountUnique": "Utilisateurs"
+    },
+    "users": {
+      "empty": "Aucun utilisateur trouvé",
+      "form": {
+        "placeholder": "mail, nom ou description"
+      },
+      "name": "Utilisateurs",
+      "table": {
+        "columns": {
+          "createdAt": "Créé à",
+          "email": "Mail",
+          "name": "Nom",
+          "number": "Num.",
+          "role": "Rôle",
+          "slug": "Slug"
+        }
+      }
     }
+  },
+  "code-of-conduct": {
+    "consequences": {
+      "description": "Si un membre de la communauté présente un comportement inacceptable, les opérateurs, modérateurs et administrateurs responsables du réseau peuvent prendre les mesures appropriées, notamment:",
+      "list": {
+        "0": "Veuillez cesser immédiatement tout comportement inacceptable",
+        "1": "Verrouillage ou suppression des commentaires",
+        "2": "Exclusion temporaire du poste ou de la contribution en question",
+        "3": "Blocage ou suppression de contenu",
+        "4": "Retrait temporaire des droits d'écriture",
+        "5": "Exclusion temporaire du réseau",
+        "6": "Exclusion définitive du réseau",
+        "7": "Des violations du droit allemand peuvent être signalées."
+      },
+      "title": "Conséquences d'un comportement inacceptable"
+    },
+    "expected-behaviour": {
+      "description": "Les comportements suivants sont attendus et exigés de tous les membres de la communauté :",
+      "list": {
+        "0": "Faites preuve de considération et de respect dans votre discours et vos actions.",
+        "1": "Tenter de collaborer avant le conflit.",
+        "2": "S'abstenir de tout comportement ou discours dégradant, discriminatoire ou harcelant.",
+        "3": "Soyez attentif à votre environnement et aux autres participants. Alertez les leaders de la communauté si vous remarquez une situation dangereuse, une personne en détresse ou une violation du Code de Conduite, même si elle vous semble sans importance."
+      },
+      "title": "Comportement attendu"
+    },
+    "get-help": "Si vous êtes victime ou témoin d'un comportement inacceptable, ou si vous avez d'autres préoccupations, veuillez en aviser un organisateur communautaire dès que possible et établir un lien ou vous référer au contenu correspondant:",
+    "preamble": {
+      "description": "Human Connection est un réseau de connaissances et d'action sociale à but non lucratif de la prochaine génération. Par les gens - pour les gens. Open Source, équitable et transparent. Pour un changement local et global positif dans tous les domaines de la vie. Nous redessinons complètement l'échange public de connaissances, d'idées et de projets. Les fonctions de Human Connection rassemblent les gens - hors ligne et en ligne - afin que nous puissions rendre le monde meilleur.",
+      "title": "Préambule"
+    },
+    "purpose": {
+      "description": "Avec ce code de conduite, nous réglementons les principes essentiels de comportement dans notre réseau social. Nous nous orientons à la Charte des Droits de l'Homme, elle est le cœur de notre compréhension des valeurs. Le code de conduite sert de fil conducteur pour notre apparence personnelle et notre interaction les uns avec les autres. Toute personne active comme utilisateur sur le réseau Human Connection, écrit des articles, commente ou contacte d'autres utilisateurs, y compris ceux qui ne font pas partie du réseau, reconnaît ces règles comme contractuel.",
+      "title": "Objectif"
+    },
+    "subheader": "pour le réseau social de la Human Connection gGmbH",
+    "unacceptable-behaviour": {
+      "description": "Les comportements suivants sont inacceptables dans notre communauté:",
+      "list": {
+        "0": "Les messages, commentaires, déclarations ou insultes discriminatoires, en particulier ceux relatifs au sexe, à l'orientation sexuelle, à la race, à la religion, à l'orientation politique ou philosophique ou au handicap.",
+        "1": "Publication ou partage de matériel clairement pornographique.",
+        "2": "Glorification ou banalisation d'actes de violence cruels ou inhumains.",
+        "3": "La divulgation de renseignements personnels sans le consentement ou la menace d' (\"doxing\").",
+        "4": "L'intimidation, le harcèlement ou la persécution intentionnelle.",
+        "5": "Publicité de produits et de services à des fins commerciaux.",
+        "6": "Comportement criminel ou violation du droit allemand.",
+        "7": "Cautionner ou encourager de tels comportements."
+      },
+      "title": "Comportement inacceptable"
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "...ce commentaire n'est plus disponible"
+    },
+    "delete": "Supprimer le commentaire",
+    "edit": "Rédiger un commentaire",
+    "edited": "édité",
+    "menu": {
+      "delete": "Supprimer le commentaire",
+      "edit": "Modifier le commentaire"
+    },
+    "show": {
+      "less": "montrer moins",
+      "more": "montrer plus"
+    }
+  },
+  "common": {
+    "category": "Catégorie ::: Catégories",
+    "comment": "Commentaire ::: Commentaires",
+    "letsTalk": "Parlons-en",
+    "loadMore": "charger plus",
+    "loading": "chargement",
+    "moreInfo": "Plus d'infos",
+    "name": "Nom",
+    "organization": "Organisation ::: Organisations",
+    "post": "Message ::: Messages",
+    "project": "Projet ::: Projets",
+    "reportContent": "Signaler",
+    "shout": "Partage ::: Partages",
+    "tag": "Tag ::: Tags",
+    "takeAction": "Passer à l'action",
+    "user": "Utilisateur ::: Utilisateurs",
+    "validations": {
+      "categories": "",
+      "email": "Doit être une adresse mail valide",
+      "url": "doit être une URL valide"
+    },
+    "versus": "Versus"
+  },
+  "components": {
+    "enter-nonce": {
+      "form": {
+        "description": "Ouvrez votre boîte de réception et entrez le code que nous vous avons envoyé.",
+        "next": "Continuer",
+        "nonce": "Entrez votre code",
+        "validations": {
+          "length": "doit comporter 6 caractères"
+        }
+      }
+    },
+    "password-reset": {
+      "change-password": {
+        "error": "La modification de votre mot de passe a échoué. Peut-être que le code de sécurité n'était pas correct ?",
+        "help": "En cas de problème, n'hésitez pas à nous demander de l'aide en nous envoyant un mail à :",
+        "success": "La modification de votre mot de passe a réussi !"
+      },
+      "request": {
+        "form": {
+          "description": "Un mail de réinitialisation de mot de passe sera envoyé à l'adresse mail indiquée.",
+          "submit": "Demander mail",
+          "submitted": "Un mail avec des instructions supplémentaires a été envoyé à <b>{email}</b>."
+        },
+        "title": "Réinitialiser votre mot de passe"
+      }
+    },
+    "registration": {
+      "create-user-account": {
+        "error": "Compte d'utilisateur n'a pas pu être créé!",
+        "help": " Peut-être que la confirmation n'était pas valide? En cas de problème, n'hésitez pas à nous demander de l'aide en nous envoyant un mail à:",
+        "success": "Votre compte a été créé!",
+        "title": "Créer un compte utilisateur"
+      },
+      "signup": {
+        "form": {
+          "data-privacy": "J'ai lu et compris la <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"> <ds-text bold color=\"primary\" > Déclaration de confidentialité </ds-text> </a> ",
+          "description": "Pour commencer, entrez votre adresse mail:",
+          "errors": {
+            "email-exists": "Il existe déjà un compte utilisateur avec cette adresse mail!",
+            "invalid-invitation-token": "On dirait que l'invitation a déjà été utilisée. Les liens d'invitation ne peuvent être utilisés qu'une seule fois."
+          },
+          "invitation-code": "Votre code d'invitation est: <b> {code} </b>",
+          "minimum-age": "J'ai 18 ans ou plus.",
+          "submit": "Créer un compte",
+          "success": "Un mail avec un lien pour compléter votre inscription a été envoyé à <b>{email}</b>",
+          "terms-and-condition": "Je confirme les <a href=\"/terms-and-conditions\"> <ds-text bold color=\"primary\" > Conditions générales </ds-text> </a>."
+        },
+        "title": "Rejoignez Human Connection!",
+        "unavailable": "Malheureusement, l'enregistrement public des comptes utilisateurs n'est pas encore disponible sur ce serveur."
+      }
+    }
+  },
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": "{chosen} de {max} catégories sélectionnées"
+    },
+    "category": {
+      "name": {
+        "animal-protection": "Protection des animaux",
+        "art-culture-sport": "Art, Culture & Sport",
+        "consumption-sustainability": "Consommation & Durabilité",
+        "cooperation-development": "Coopération & Développement",
+        "democracy-politics": "Démocratie & Politique",
+        "economy-finances": "Économie & Finances",
+        "education-sciences": "Éducation & Sciences",
+        "energy-technology": "Énergie & Technologie",
+        "environment-nature": "Environnement & Nature",
+        "freedom-of-speech": "Liberté d'expression",
+        "global-peace-nonviolence": "Paix mondiale & Non-violence",
+        "happiness-values": "Bonheur & Valeurs",
+        "health-wellbeing": "Santé & Bien-être",
+        "human-rights-justice": "Droits de l'homme & Justice",
+        "it-internet-data-privacy": "Informatique, Internet & Confidentialité des données",
+        "just-for-fun": "Juste pour le Fun"
+      }
+    },
+    "delete": "Supprimer l'entrée",
+    "edit": "Rédiger l'apport",
+    "emotions-label": {
+      "angry": "En colère",
+      "cry": "Pleurer",
+      "funny": "Marrant",
+      "happy": "Heureux",
+      "surprised": "Surpris"
+    },
+    "filterALL": "Voir toutes les contributions",
+    "filterFollow": "Filtrer les contributions des utilisateurs que je suis",
+    "languageSelectLabel": "Langue",
+    "languageSelectText": "",
+    "newPost": "Créer un nouveau Post",
+    "success": "Enregistré!",
+    "teaserImage": {
+      "cropperConfirm": "Confirmer"
+    },
+    "title": "Titre"
+  },
+  "delete": {
+    "cancel": "Annuler",
+    "comment": {
+      "message": "Voulez-vous vraiment supprimer le commentaire de \"<b>{name}</b>\"?",
+      "success": "Commentaire supprimé avec succès !",
+      "title": "Supprimer un commentaire",
+      "type": "Commentaire"
+    },
+    "contribution": {
+      "message": "Voulez-vous vraiment supprimer la contribution  \"<b>{name}</b>\"?",
+      "success": "Contribution supprimée avec succès !",
+      "title": "Supprimer la contribution",
+      "type": "Contribution"
+    },
+    "submit": "Supprimer"
+  },
+  "disable": {
+    "cancel": "Annuler",
+    "comment": {
+      "message": "Souhaitez-vous vraiment désactiver le commentaire de « <b>{name}</b> » ?",
+      "title": "Désactiver le commentaire",
+      "type": "Commentaire"
+    },
+    "contribution": {
+      "message": "Souhaitez-vous vraiment signaler l'entrée « <b> {name} </b> »?",
+      "title": "Désactiver l'apport",
+      "type": "Contribution"
+    },
+    "submit": "Désactiver",
+    "success": "Désactivé avec succès",
+    "user": {
+      "message": "Souhaitez-vous vraiment désactiver l'utilisateur « <b> {name} </b> »?",
+      "title": "Désactiver l'utilisateur",
+      "type": "Utilisateur"
+    }
+  },
+  "donations": {
+    "amount-of-total": "{amount} de {total} € collectés",
+    "donate-now": "Faites un don",
+    "donations-for": "Dons pour"
+  },
+  "editor": {
+    "embed": {
+      "always_allow": "Autoriser toujours le contenu intégré par des fournisseurs tiers (ce paramètre peut être modifié à tout moment)",
+      "data_privacy_info": "Vos données n'ont pas encore été partagées avec des fournisseurs tiers. Si vous regardez cette vidéo, le fournisseur suivant recueillera probablement des données utilisateurs:",
+      "data_privacy_warning": "Attention à la confidentialité des données!",
+      "play_now": "Regarder maintenant"
+    },
+    "hashtag": {
+      "addHashtag": "Nouveau hashtag",
+      "addLetter": "Tapez une lettre",
+      "noHashtagsFound": "Aucun hashtag trouvé"
+    },
+    "mention": {
+      "noUsersFound": "Aucun utilisateur trouvé"
+    },
+    "placeholder": "Écrivez quelque chose d'inspirant..."
+  },
+  "filter-menu": {
+    "clearSearch": "Réinitialiser la recherche",
+    "hashtag-search": "Recherche de #{hashtag}",
+    "title": "Votre bulle de filtre"
+  },
+  "filter-posts": {
+    "categories": {
+      "all": "Toutes",
+      "header": "Catégories de contenu"
+    },
+    "followers": {
+      "label": "Utilisateurs que je suis"
+    },
+    "general": {
+      "header": "Filtrer par ...."
+    },
+    "language": {
+      "all": "Tous",
+      "header": "Langues"
+    }
+  },
+  "followButton": {
+    "follow": "Suivre",
+    "following": "Je suis les"
+  },
+  "index": {
+    "change-filter-settings": "Modifiez les paramètres de filtrage pour obtenir plus de résultats.",
+    "no-results": "Pas de contribution trouvée."
+  },
+  "login": {
+    "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
+    "email": "Votre mail",
+    "failure": "Adresse mail ou mot de passe incorrect.",
+    "forgotPassword": "Mot de passe oublié?",
+    "hello": "Bonjour",
+    "login": "Connexion",
+    "logout": "Déconnexion",
+    "moreInfo": "Qu'est-ce que Human Connection?",
+    "moreInfoHint": "à la page de présentation",
+    "moreInfoURL": "https://human-connection.org/fr/",
+    "no-account": "Vous n'avez pas de compte?",
+    "password": "Votre mot de passe",
+    "register": "S'inscrire",
+    "success": "Vous êtes connecté!"
+  },
+  "maintenance": {
+    "explanation": "Pour l'instant, nous faisons de la maintenance programmée, veuillez réessayer plus tard.",
+    "questions": "Des questions ou des préoccupations, envoyez un mail à",
+    "title": "Human Connection est en maintenance"
+  },
+  "moderation": {
+    "name": "Modération",
+    "reports": {
+      "createdAt": "Date",
+      "disabledBy": "désactivé par",
+      "empty": "Félicitations, rien à modérer.",
+      "name": "Signalisations",
+      "reasonCategory": "Catégorie",
+      "reasonDescription": "Description",
+      "reporter": "signalé par",
+      "submitter": "signalé par"
+    }
+  },
+  "notifications": {
+    "comment": "Commentaire",
+    "content": "Contenu",
+    "empty": "Désolé, vous n'avez pas de notifications pour le moment.",
+    "filterLabel": {
+      "all": "Tous",
+      "read": "Lire",
+      "unread": "Non lu"
+    },
+    "pageLink": "Toutes les notifications",
+    "post": "Post",
+    "reason": {
+      "commented_on_post": "Commenté sur votre post…",
+      "mentioned_in_comment": "Vous a mentionné dans un commentaire…",
+      "mentioned_in_post": "Vous a mentionné dans un post…"
+    },
+    "title": "Notifications",
+    "user": "Utilisateur"
+  },
+  "post": {
+    "comment": {
+      "submit": "Commenté",
+      "submitted": "Commentaire soumis",
+      "updated": "Changements sauvegardés"
+    },
+    "edited": "édité",
+    "menu": {
+      "delete": "Supprimer le Post",
+      "edit": "Modifier le Post",
+      "pin": "Épingler le Post",
+      "pinnedSuccessfully": "Poste épinglé avec succès!",
+      "unpin": "Retirer l'épingle du poste",
+      "unpinnedSuccessfully": "Épingle retirer du Post avec succès!"
+    },
+    "moreInfo": {
+      "description": "Ici vous pouvez trouver plus d'informations à ce sujet.",
+      "name": "Plus d'infos",
+      "title": "Plus d'information",
+      "titleOfCategoriesSection": "Catégories",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Articles Similaires"
+    },
+    "name": "Post",
+    "pinned": "Annonce",
+    "takeAction": {
+      "name": "Passez à l'action"
+    }
+  },
+  "profile": {
+    "commented": "Commentais",
+    "follow": "Suivre",
+    "followers": "Suiveurs",
+    "following": "Suivant",
+    "invites": {
+      "description": "Entrez leur adresse mail pour l'invitation.",
+      "emailPlaceholder": "Mail d'invitation",
+      "title": "Invitez quelqu'un à Human Connection!"
+    },
+    "memberSince": "Membre depuis",
+    "name": "Mon profil",
+    "network": {
+      "andMore": "et {number} plus…",
+      "followedBy": "est suivi par:",
+      "followedByNobody": "n'est suivi par personne.",
+      "following": "suit:",
+      "followingNobody": "ne suit personne.",
+      "title": "Réseau"
+    },
+    "shouted": "Recommandé",
+    "socialMedia": "Où d'autre puis-je trouver",
+    "userAnonym": "Anonyme"
+  },
+  "quotes": {
+    "african": {
+      "author": "Proverbe africain",
+      "quote": "Beaucoup de petites personnes dans beaucoup de petits endroits font beaucoup de petites choses, qui peuvent changer la face du monde."
+    }
+  },
+  "release": {
+    "cancel": "Annuler",
+    "comment": {
+      "error": "Vous avez déjà signalé le commentaire!",
+      "message": "Voulez-vous vraiment publier le commentaire de \"<b>{name}</b>\"?",
+      "title": "Publication des commentaires",
+      "type": "Commentaire"
+    },
+    "contribution": {
+      "error": "Vous avez déjà signalé la contribution !!",
+      "message": "Voulez-vous vraiment débloquer la contribution \"<b>{name}</b>\"?",
+      "title": "Versement de la contribution",
+      "type": "Contribution"
+    },
+    "submit": "Relâchez",
+    "success": "Relâchez avec succès!",
+    "user": {
+      "error": "Vous avez déjà signalé l'utilisateur!",
+      "message": "Voulez-vous vraiment libérer l'utilisateur \"<b>{name}</b>\"?",
+      "title": "Validation par l'utilisateur",
+      "type": "Utilisateur"
+    }
+  },
+  "report": {
+    "cancel": "Annuler",
+    "comment": {
+      "error": "Vous avez déjà rapporté le commentaire!",
+      "message": "Souhaitez-vous vraiment signaler l'utilisateur « <b> {name} </b> »?",
+      "title": "Signaler un commentaire",
+      "type": "Commentaire"
+    },
+    "contribution": {
+      "error": "Vous avez déjà rapporté la contribution!",
+      "message": "Souhaitez-vous vraiment signaler l'entrée « <b> {name} </b> »?",
+      "title": "Signaler l'entrée",
+      "type": "Apport"
+    },
+    "reason": {
+      "category": {
+        "invalid": "Veuillez sélectionner une catégorie valide",
+        "label": "Sélectionnez une catégorie:",
+        "options": {
+          "advert_products_services_commercial": "Publicité de produits et de services à des fins commerciaux.",
+          "criminal_behavior_violation_german_law": "Comportement criminel ou violation du droit allemand.",
+          "discrimination_etc": "Posts, commentaires, expressions ou insultes discriminatoires.",
+          "doxing": "La divulgation de renseignements personnels sans le consentement ou la menace d' (\"doxing\").",
+          "glorific_trivia_of_cruel_inhuman_acts": "Glorification ou banalisation d'actes de violence cruels ou inhumains.",
+          "intentional_intimidation_stalking_persecution": "L'intimidation, le harcèlement ou la persécution intentionnelle.",
+          "other": "Autres...",
+          "pornographic_content_links": "Publication ou partage de matériel clairement pornographique."
+        },
+        "placeholder": "Catégorie..."
+      },
+      "description": {
+        "label": "S'il vous plaît expliquer: Pourquoi voulez-vous signaler cela?",
+        "placeholder": "Informations complémentaires..."
+      }
+    },
+    "submit": "Envoyer le rapport",
+    "success": "Merci de nous avoir fait part de vos commentaires!",
+    "user": {
+      "error": "Vous avez déjà signalé l'utilisateur!",
+      "message": "Souhaitez-vous vraiment signaler l'utilisateur « <b> {name} </b> »?",
+      "title": "Signaler l'utilisateur",
+      "type": "Utilisateur"
+    }
+  },
+  "search": {
+    "failed": "Rien trouvé",
+    "hint": "Qu'est-ce que vous cherchez ?",
+    "placeholder": "Rechercher"
+  },
+  "settings": {
+    "data": {
+      "labelBio": "À propos de vous",
+      "labelCity": "Votre ville ou région",
+      "labelName": "Votre nom",
+      "labelSlug": "Votre nom d'utilisateur unique",
+      "name": "Vos données",
+      "namePlaceholder": "Fémanon Funny",
+      "success": "Vos données ont été mises à jour avec succès !"
+    },
+    "delete": {
+      "name": "Supprimer un compte"
+    },
+    "deleteUserAccount": {
+      "accountDescription": "Sachez que vos postes et commentaires sont importants pour notre communauté. Si vous voulez quand même les supprimer, vous devez les marquer ci-dessous.",
+      "accountWarning": "Vous <b>NE POUVEZ PAS GÉRER</b> et <b>NE POUVEZ PAS RECOUVRIR</b> votre compte, vos messages ou vos commentaires après avoir supprimé votre compte !",
+      "commentedCount": "Supprimer mes {count} commentaires",
+      "contributionsCount": "Supprimer mes {count} postes",
+      "name": "Supprimer un compte utilisateur",
+      "pleaseConfirm": "<b class='is-danger'> Action destructive! </b> Saisissez <b> {confirm} </b> pour confirmer",
+      "success": "Compte supprimer avec succès!"
+    },
+    "download": {
+      "name": "Télécharger les données"
+    },
+    "email": {
+      "change-successful": "Votre adresse mail a été modifiée avec succès.",
+      "labelEmail": "Changer votre adresse mail",
+      "labelNewEmail": "Nouvelle adresse mail",
+      "labelNonce": "Entrez votre code",
+      "name": "Votre mail",
+      "submitted": "Un mail pour vérifier votre adresse a été envoyé à <b>{email}</b>.",
+      "success": "Une nouvelle adresse mail a été enregistrée.",
+      "validation": {
+        "same-email": "Voici votre adresse mail actuelle"
+      },
+      "verification-error": {
+        "explanation": "Cela peut avoir différentes causes:",
+        "message": "Votre mail n'a pas pu être changé.",
+        "reason": {
+          "invalid-nonce": "Le code de confirmation est-il invalide?",
+          "no-email-request": "Êtes-vous certain d'avoir demandé un changement d'adresse mail?"
+        },
+        "support": "Si le problème persiste, veuillez nous contacter par mail à l'adresse suivante"
+      }
+    },
+    "embeds": {
+      "info-description": "Voici la liste des fournisseurs tiers dont le contenu peut être affiché sous forme de code tiers, par exemple sous la forme de vidéos intégrées.",
+      "name": "Fournisseurs tiers",
+      "status": {
+        "change": {
+          "allow": "Sûr",
+          "deny": "Non merci",
+          "question": "Est-ce que vous voulez que le code source intégrer vous soit toujours affiché?"
+        },
+        "description": "Par défaut, le code incorporé des fournisseurs tiers est",
+        "disabled": {
+          "off": "initialement non affiché",
+          "on": "affiché immédiatement"
+        }
+      }
+    },
+    "invites": {
+      "name": "Invite"
+    },
+    "languages": {
+      "name": "Langues"
+    },
+    "muted-users": {
+      "columns": {
+        "name": "Nom",
+        "slug": "Slug",
+        "unmute": ""
+      },
+      "empty": "Jusqu'à présent, vous n'avez bloqué personne.",
+      "explanation": {
+        "intro": "Si vous avez bloqué un autre utilisateur, voici ce qui se passe:",
+        "search": "Les postes des personnes bloquées disparaissent de vos résultats de recherche.",
+        "your-perspective": "Les postes de la personne bloquée n'apparaîtront dans votre fil d'actualités."
+      },
+      "how-to": "Vous pouvez bloquer d'autres utilisateurs sur leur page de profil via le menu de contenu.",
+      "mute": "Bloquer l'utilisateur",
+      "name": "Utilisateurs bloqués",
+      "unmute": "Débloquer l'utilisateur",
+      "unmuted": "{name} est à nouveau débloqué"
+    },
+    "name": "Paramètres",
+    "organizations": {
+      "name": "Mes organisations"
+    },
+    "privacy": {
+      "make-shouts-public": "",
+      "name": "",
+      "success-update": ""
+    },
+    "security": {
+      "change-password": {
+        "button": "Modifier le mot de passe",
+        "label-new-password": "Votre nouveau mot de passe",
+        "label-new-password-confirm": "Confirmez votre nouveau mot de passe",
+        "label-old-password": "Votre ancien mot de passe",
+        "message-new-password-confirm-required": "Confirmez votre nouveau mot de passe",
+        "message-new-password-missmatch": "Tapez à nouveau le même mot de passe",
+        "message-new-password-required": "Entrez un nouveau mot de passe",
+        "message-old-password-required": "Entrez votre ancien mot de passe",
+        "passwordSecurity": "Sécurité par mot de passe",
+        "passwordStrength0": "Mot de passe très peu sûr",
+        "passwordStrength1": "Mot de passe non sécurisé",
+        "passwordStrength2": "Mot de passe médiocre",
+        "passwordStrength3": "Mot de passe fort",
+        "passwordStrength4": "Mot de passe très fort",
+        "success": "Mot de passe modifié avec succès !"
+      },
+      "name": "Sécurité"
+    },
+    "social-media": {
+      "name": "Médias sociaux",
+      "placeholder": "Ajouter une URL pour les médias sociaux",
+      "requireUnique": "Vous avez déjà ajouté cette URL",
+      "submit": "Ajouter un lien",
+      "successAdd": "Les médias sociaux ont été ajoutés. Profil mis à jour !",
+      "successDelete": "Médias sociaux supprimé. Profil mis à jour !"
+    },
+    "validation": {
+      "slug": {
+        "alreadyTaken": "Ce nom d'utilisateur est déjà pris.",
+        "regex": "Les caractères autorisés ne sont que les lettres minuscules, les chiffres, les traits de soulignement et les traits d'union."
+      }
+    }
+  },
+  "shoutButton": {
+    "shouted": "recommandé"
+  },
+  "site": {
+    "back-to-login": "Retour à la page de connexion",
+    "bank": "compte bancaire",
+    "code-of-conduct": "Code de conduite",
+    "contact": "Contacter",
+    "data-privacy": "Protection des données",
+    "director": "Directeur Général",
+    "error-occurred": "Une erreur s'est produite.",
+    "faq": "FAQ",
+    "germany": "Allemagne",
+    "imprint": "Mentions légales",
+    "made": "Fabriqué avec &#10084;",
+    "register": "Numéro de registre",
+    "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)",
+    "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)",
+    "termsAndConditions": "Conditions générales",
+    "thanks": "Merci!",
+    "tribunal": "Tribunal de registre"
+  },
+  "store": {
+    "posts": {
+      "orderBy": {
+        "newest": {
+          "label": "Plus récent"
+        },
+        "oldest": {
+          "label": "Le plus ancien"
+        }
+      }
+    }
+  },
+  "termsAndConditions": {
+    "addition": {
+      "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
+      "title": "De plus, nous organisons régulièrement des événements où vous pouvez également partager vos impressions et poser vos questions. Ici, vous trouverez un aperçu actuel:"
+    },
+    "agree": "J'accepte!",
+    "code-of-conduct": {
+      "description": "Notre code de conduite sert de manuel pour l'apparence personnelle et l'interaction les uns avec les autres. Quiconque est actif en tant qu'utilisateur sur le réseau Human Connection, écrit des articles, commente ou établit des contacts avec d'autres utilisateurs, même en dehors du réseau, reconnaît que ces règles de conduite sont contractuel. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct </a>",
+      "title": "Code de conduite"
+    },
+    "errors-and-feedback": {
+      "description": "Nous mettons tout en œuvre pour que notre réseau et nos données soient sécurisés et disponibles. Chaque nouvelle version du logiciel passe par des tests automatisés et manuels. Cependant, des erreurs imprévues peuvent survenir. Par conséquent, nous sommes reconnaissants pour tous les bugs signalés. Nous vous invitons à signaler les bugs que vous avez découverts en envoyant un mail à support@human-connection.org.",
+      "title": "Erreurs et Feedback"
+    },
+    "help-and-questions": {
+      "description": "Pour obtenir de l'aide et des questions, nous avons compilé une foire aux questions (FAQ) complète pour vous. Vous pouvez les trouver ici: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" >https://support.human-connection.org/kb/ </a>",
+      "title": "Aide et questions"
+    },
+    "moderation": {
+      "description": "Jusqu'à ce que nos possibilités financières nous permettent de mettre en œuvre le système de modération communautaire, nous modérons avec un système simplifié et avec notre propre personnel ou éventuellement des bénévoles. Nous formons ces modérateurs et c'est pour cette raison qu'ils sont les seuls à prendre les décisions appropriées. Ces modérateurs effectuent leur travail de manière anonyme. Vous pouvez nous signaler des postes, commentaires et utilisateurs (par exemple, s'ils fournissent des informations dans leur profil ou s'ils ont des images qui violent ces Conditions d'utilisation). Si vous nous signalez quelque chose, vous pouvez nous donner une raison et une brève explication. Nous examinerons ensuite ce que vous nous avez signalé et vous sanctionnerons si nécessaire, par exemple en bloquant des contributions, des commentaires ou des utilisateurs. Malheureusement, vous et la personne concernée ne recevrez pas de commentaires de notre part pour le moment, mais c'est à l'étape de la planification. Indépendamment de cela, nous nous réservons le droit d'imposer des sanctions de principe pour des raisons qui ne figurent pas ou pas encore dans notre Code de conduite ou dans les présentes conditions de service.",
+      "title": "Modération"
+    },
+    "newTermsAndConditions": "Nouvelles conditions générales",
+    "privacy-statement": {
+      "description": "Notre réseau est un réseau de connaissances et d'action sociale. Il est donc particulièrement important pour nous qu'autant de contenu que possible soit accessible au public. Au cours du développement de notre réseau, il y aura de plus en plus la possibilité de décider de la visibilité des données personnelles. Nous vous informerons de ces nouvelles fonctionnalités. Sinon, vous devriez toujours penser aux données personnelles que vous divulguez à votre sujet (ou à celui d'autres personnes). Cela vaut en particulier pour le contenu des messages et des commentaires, qui ont un caractère largement public. Plus tard, il y aura des possibilités de limiter la visibilité de votre profil. Une partie des conditions d'utilisation est notre déclaration de confidentialité, qui vous informe sur les différentes opérations de traitement des données dans notre réseau: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a> ex: <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Notre déclaration de confidentialité est adaptée à la situation juridique et aux caractéristiques de notre réseau et est toujours valable dans la version la plus récente.",
+      "title": "Déclaration de confidentialité"
+    },
+    "terms-of-service": {
+      "description": "Les conditions d'utilisation suivantes constituent la base de l'utilisation de notre réseau. Lorsque vous vous inscrivez, vous devez les accepter et nous vous informerons ultérieurement de tout changement qui pourrait survenir. Le réseau Human Connection Network est exploité en Allemagne et est donc soumis au droit allemand. Le tribunal compétent est celui de Kirchheim / Teck. Pour plus de détails, consultez notre site Internet: <a href=\"https://human-connection.org/en/imprint\" target=\"_blank\" >https://human-connection.org/en/imprint</a> ",
+      "title": "Conditions d'utilisation"
+    },
+    "termsAndConditionsConfirmed": "J'ai lu et accepte les <a href=\"/terms-and-conditions\" target=\"_blank\">conditions générales</a>.",
+    "termsAndConditionsNewConfirm": "J'ai lu et accepté les nouvelles conditions générales.",
+    "termsAndConditionsNewConfirmText": "Veuillez lire les nouvelles conditions d'utilisation dès maintenant !",
+    "use-and-license": {
+      "description": "Si un contenu que vous nous publiez est protégé par des droits de propriété intellectuelle, vous nous accordez une licence mondiale non exclusive, transférable, transférable et pouvant faire l'objet d'une sous-licence pour utiliser ce contenu à des fins de publication sur notre réseau. Cette licence expire lorsque vous supprimez votre contenu ou l'ensemble de votre compte. Rappelez-vous que d'autres personnes peuvent partager votre contenu et que nous ne pouvons pas le supprimer.",
+      "title": "Utilisation et licence"
+    }
+  },
+  "user": {
+    "avatar": {
+      "submitted": "Téléchargement réussi"
+    }
+  }
 }
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index d07f95086..1735f0e90 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -1,747 +1,747 @@
 {
-    "login": {
-        "copy": "Se sei gia registrato su Human Connection, accedi qui.",
-        "login": "Accesso",
-        "logout": "Logout",
-        "email": "La tua email",
-        "password": "La tua password",
-        "moreInfo": "Che cosa è Human Connection?",
-        "hello": "Ciao",
-        "forgotPassword": "",
-        "no-account": "",
-        "register": "",
-        "moreInfoURL": "",
-        "moreInfoHint": "",
-        "success": "",
-        "failure": ""
+  "actions": {
+    "cancel": "",
+    "create": "Crea",
+    "delete": "Cancella",
+    "edit": "Modifica",
+    "loadMore": "Carica di più",
+    "loading": "Caricamento in corso",
+    "save": "Salva"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Nome",
+      "name": "Categorie",
+      "postCount": "Messaggi"
     },
-    "profile": {
-        "name": "Il mio profilo",
-        "memberSince": "Membro dal",
-        "follow": "Seguire",
-        "followers": "Seguenti",
-        "following": "Seguendo",
-        "shouted": "Gridato",
-        "commented": "Commentato",
-        "userAnonym": "Anonymous",
-        "socialMedia": "",
-        "network": {
-            "title": "",
-            "following": "",
-            "followingNobody": "",
-            "followedBy": "",
-            "followedByNobody": "",
-            "andMore": ""
-        },
-        "invites": {
-            "title": "",
-            "description": "",
-            "emailPlaceholder": ""
-        }
-    },
-    "settings": {
-        "name": "Impostazioni",
-        "data": {
-            "name": "I tuoi dati",
-            "labelName": "Nome",
-            "labelCity": "La tua città o regione",
-            "labelBio": "Su di te",
-            "labelSlug": "",
-            "namePlaceholder": "Anonymous",
-            "success": ""
-        },
-        "security": {
-            "name": "Sicurezza",
-            "change-password": {
-                "button": "",
-                "success": "",
-                "label-old-password": "",
-                "label-new-password": "",
-                "label-new-password-confirm": "",
-                "message-old-password-required": "",
-                "message-new-password-required": "",
-                "message-new-password-confirm-required": "",
-                "message-new-password-missmatch": "",
-                "passwordSecurity": "",
-                "passwordStrength0": "",
-                "passwordStrength1": "",
-                "passwordStrength2": "",
-                "passwordStrength3": "",
-                "passwordStrength4": ""
-            }
-        },
-        "invites": {
-            "name": "Inviti"
-        },
-        "download": {
-            "name": "Scaricamento dati"
-        },
-        "delete": {
-            "name": "Elimina Account"
-        },
-        "organizations": {
-            "name": "Mie organizzazioni"
-        },
-        "languages": {
-            "name": "Lingue"
-        },
-        "email": {
-            "validation": {
-                "same-email": ""
-            },
-            "name": "",
-            "labelEmail": "",
-            "labelNewEmail": "",
-            "labelNonce": "",
-            "success": "",
-            "submitted": "",
-            "change-successful": "",
-            "verification-error": {
-                "message": "",
-                "explanation": "",
-                "reason": {
-                    "invalid-nonce": "",
-                    "no-email-request": ""
-                },
-                "support": ""
-            }
-        },
-        "validation": {
-            "slug": {
-                "regex": "",
-                "alreadyTaken": ""
-            }
-        },
-        "deleteUserAccount": {
-            "name": "Cancellare l'account utente",
-            "contributionsCount": "Cancellare i miei {count} messaggi",
-            "commentedCount": "Cancella i miei {count} commenti",
-            "accountDescription": "Essere consapevoli che i tuoi post e commenti sono importanti per la nostra comunità. Se cancelli il tuo account utente, tutto scomparirà per sempre - e sarebbe un vero peccato!",
-            "accountWarning": "Attenzione!Tu <b>Non puoi gestire</b> e <b>Non puoi recuperare il tuo account, i tuoi messaggi o commenti dopo aver cancellato il tuo account!",
-            "success": "Account eliminato con successo!",
-            "pleaseConfirm": "<b class='is-danger'>Azione distruttiva! </b> Digita <b>{conferma}</b> per confermare"
-        },
-        "embeds": {
-            "name": "",
-            "info-description": "Ecco l'elenco dei fornitori di terze parti i cui contenuti possono essere visualizzati come codice di terze parti, ad esempio sotto forma di video incorporati.",
-            "status": {
-                "description": "",
-                "disabled": {
-                    "off": "",
-                    "on": ""
-                },
-                "change": {
-                    "question": "",
-                    "allow": "",
-                    "deny": ""
-                }
-            }
-        },
-        "social-media": {
-            "name": "",
-            "placeholder": "",
-            "requireUnique": "",
-            "submit": "",
-            "successAdd": "Social media aggiunti. \nProfilo utente aggiornato ",
-            "successDelete": "Social media cancellati. Profilo utente aggiornato!"
-        },
-        "muted-users": {
-            "name": null,
-            "explanation": {
-                "intro": null,
-                "your-perspective": null,
-                "search": null
-            },
-            "columns": {
-                "name": null,
-                "slug": null,
-                "unmute": null
-            },
-            "empty": null,
-            "how-to": null,
-            "mute": null,
-            "unmute": null,
-            "unmuted": null
-        },
-        "privacy": {
-            "name": "",
-            "make-shouts-public": "",
-            "success-update": ""
-        }
-    },
-    "admin": {
-        "name": "Admin",
-        "dashboard": {
-            "name": "Cruscotto",
-            "users": "Utenti",
-            "posts": "Messaggi",
-            "comments": "Commenti",
-            "notifications": "Notifiche",
-            "organizations": "Organizzazioni",
-            "projects": "Progetti",
-            "invites": "Inviti",
-            "follows": "Segue",
-            "shouts": "Gridi"
-        },
-        "organizations": {
-            "name": "Organizzazioni"
-        },
-        "users": {
-            "name": "Utenti",
-            "form": {
-                "placeholder": ""
-            },
-            "table": {
-                "columns": {
-                    "number": "",
-                    "name": "",
-                    "email": "",
-                    "slug": "",
-                    "role": "",
-                    "createdAt": ""
-                }
-            },
-            "empty": ""
-        },
-        "pages": {
-            "name": "Pagine"
-        },
-        "notifications": {
-            "name": "Notifiche"
-        },
-        "categories": {
-            "name": "Categorie",
-            "categoryName": "Nome",
-            "postCount": "Messaggi"
-        },
-        "tags": {
-            "name": "Tag",
-            "tagCountUnique": "Utenti",
-            "tagCount": "Messaggi"
-        },
-        "settings": {
-            "name": "Impostazioni"
-        },
-        "hashtags": {
-            "name": "",
-            "number": "",
-            "nameOfHashtag": "",
-            "tagCountUnique": "",
-            "tagCount": ""
-        },
-        "invites": {
-            "name": "",
-            "title": "",
-            "description": ""
-        },
-        "donations": {
-            "name": "Info donazioni",
-            "goal": "Donazioni mensili necessarie",
-            "progress": "Donazioni raccolte finora",
-            "successfulUpdate": "Informazioni sulle donazioni aggiornate con successo!"
-        }
-    },
-    "post": {
-        "name": "Messaggio",
-        "moreInfo": {
-            "name": "Ulteriori informazioni",
-            "title": "",
-            "description": "",
-            "titleOfCategoriesSection": "",
-            "titleOfHashtagsSection": "",
-            "titleOfRelatedContributionsSection": ""
-        },
-        "takeAction": {
-            "name": "Agire"
-        },
-        "pinned": "",
-        "menu": {
-            "edit": "",
-            "delete": "",
-            "pin": "",
-            "pinnedSuccessfully": "",
-            "unpin": "",
-            "unpinnedSuccessfully": ""
-        },
-        "comment": {
-            "submit": "",
-            "submitted": "",
-            "updated": ""
-        },
-        "edited": ""
-    },
-    "quotes": {
-        "african": {
-            "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": "Discutiamo",
-        "versus": "Verso",
-        "moreInfo": "Ulteriori informazioni",
-        "takeAction": "Agire",
-        "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 in corso",
-        "reportContent": "",
-        "validations": {
-            "email": "",
-            "url": "",
-            "categories": ""
-        }
-    },
-    "actions": {
-        "loading": "Caricamento in corso",
-        "loadMore": "Carica di più",
-        "create": "Crea",
-        "save": "Salva",
-        "edit": "Modifica",
-        "delete": "Cancella",
-        "cancel": ""
-    },
-    "moderation": {
-        "name": "",
-        "reports": {
-            "empty": "",
-            "name": "",
-            "reporter": "",
-            "submitter": "",
-            "disabledBy": "",
-            "reasonCategory": "",
-            "reasonDescription": "",
-            "createdAt": ""
-        }
-    },
-    "disable": {
-        "user": {
-            "title": "",
-            "type": "",
-            "message": ""
-        },
-        "contribution": {
-            "title": "",
-            "type": "",
-            "message": ""
-        },
-        "comment": {
-            "title": "",
-            "type": "",
-            "message": ""
-        },
-        "submit": "",
-        "cancel": "",
-        "success": ""
-    },
-    "report": {
-        "submit": "",
-        "cancel": "",
-        "user": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "error": ""
-        },
-        "contribution": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "error": ""
-        },
-        "comment": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "error": ""
-        },
-        "success": "",
-        "reason": {
-            "category": {
-                "label": "",
-                "placeholder": "",
-                "options": {
-                    "discrimination_etc": "",
-                    "pornographic_content_links": "",
-                    "glorific_trivia_of_cruel_inhuman_acts": "",
-                    "doxing": "",
-                    "intentional_intimidation_stalking_persecution": "",
-                    "advert_products_services_commercial": "",
-                    "criminal_behavior_violation_german_law": "",
-                    "other": ""
-                },
-                "invalid": ""
-            },
-            "description": {
-                "label": "",
-                "placeholder": ""
-            }
-        }
-    },
-    "contribution": {
-        "edit": "",
-        "delete": "",
-        "title": "",
-        "newPost": "",
-        "filterFollow": "",
-        "filterALL": "",
-        "success": "",
-        "languageSelectLabel": "",
-        "categories": {
-            "infoSelectedNoOfMaxCategories": ""
-        },
-        "emotions-label": {
-            "funny": "",
-            "happy": "",
-            "surprised": "",
-            "cry": "",
-            "angry": ""
-        },
-        "category": {
-            "name": {
-                "freedom-of-speech": "",
-                "consumption-sustainability": "",
-                "global-peace-nonviolence": "",
-                "just-for-fun": "",
-                "happiness-values": "",
-                "health-wellbeing": "",
-                "environment-nature": "",
-                "animal-protection": "",
-                "human-rights-justice": "",
-                "education-sciences": "",
-                "cooperation-development": "",
-                "democracy-politics": "",
-                "economy-finances": "",
-                "energy-technology": "",
-                "it-internet-data-privacy": "",
-                "art-culture-sport": ""
-            }
-        },
-        "teaserImage": {
-            "cropperConfirm": "Confermare"
-        },
-        "languageSelectText": ""
-    },
-    "comment": {
-        "edit": "",
-        "delete": "",
-        "content": {
-            "unavailable-placeholder": ""
-        },
-        "menu": {
-            "edit": "",
-            "delete": ""
-        },
-        "show": {
-            "more": "",
-            "less": ""
-        },
-        "edited": ""
-    },
-    "followButton": {
-        "follow": "",
-        "following": ""
-    },
-    "shoutButton": {
-        "shouted": ""
-    },
-    "search": {
-        "placeholder": "",
-        "hint": "",
-        "failed": ""
-    },
-    "components": {
-        "password-reset": {
-            "request": {
-                "title": "",
-                "form": {
-                    "description": "",
-                    "submit": "",
-                    "submitted": ""
-                }
-            },
-            "change-password": {
-                "success": "",
-                "error": "Modifica della password non riuscita. Forse il codice di sicurezza non era corretto?",
-                "help": ""
-            }
-        },
-        "enter-nonce": {
-            "form": {
-                "nonce": "",
-                "description": "",
-                "next": "",
-                "validations": {
-                    "length": ""
-                }
-            }
-        },
-        "registration": {
-            "signup": {
-                "unavailable": "",
-                "title": "",
-                "form": {
-                    "description": "",
-                    "terms-and-condition": "",
-                    "data-privacy": "",
-                    "minimum-age": "",
-                    "invitation-code": "",
-                    "errors": {
-                        "email-exists": "",
-                        "invalid-invitation-token": "Sembra che l'invito sia già stato utilizzato. I link di invito possono essere utilizzati una sola volta."
-                    },
-                    "submit": "",
-                    "success": ""
-                }
-            },
-            "create-user-account": {
-                "title": "",
-                "success": "",
-                "error": "",
-                "help": ""
-            }
-        }
-    },
-    "store": {
-        "posts": {
-            "orderBy": {
-                "newest": {
-                    "label": ""
-                },
-                "oldest": {
-                    "label": ""
-                }
-            }
-        }
-    },
-    "maintenance": {
-        "title": "",
-        "explanation": "",
-        "questions": ""
-    },
-    "index": {
-        "no-results": "",
-        "change-filter-settings": ""
-    },
-    "filter-menu": {
-        "title": "",
-        "hashtag-search": "",
-        "clearSearch": ""
-    },
-    "filter-posts": {
-        "categories": {
-            "header": "",
-            "all": ""
-        },
-        "general": {
-            "header": ""
-        },
-        "followers": {
-            "label": ""
-        },
-        "language": {
-            "header": "",
-            "all": ""
-        }
-    },
-    "site": {
-        "thanks": "",
-        "error-occurred": "",
-        "made": "Con &#10084; fatto",
-        "imprint": "Impressum",
-        "termsAndConditions": "",
-        "data-privacy": "protezione dei dati",
-        "contact": "Contatto",
-        "tribunal": "registro tribunale",
-        "register": "numero di registro",
-        "director": "Direttore Generale",
-        "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)",
-        "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)",
-        "bank": "conto bancario",
-        "germany": "Germania",
-        "code-of-conduct": "",
-        "back-to-login": "",
-        "faq": ""
-    },
-    "editor": {
-        "placeholder": "",
-        "mention": {
-            "noUsersFound": ""
-        },
-        "hashtag": {
-            "noHashtagsFound": "",
-            "addHashtag": "",
-            "addLetter": ""
-        },
-        "embed": {
-            "data_privacy_warning": "",
-            "data_privacy_info": "I tuoi dati non sono ancora stati condivisi con fornitori terzi. Se continui a guardare questo video, il seguente fornitore probabilmente raccoglierà i dati dell'utente:",
-            "play_now": "",
-            "always_allow": ""
-        }
-    },
-    "notifications": {
-        "reason": {
-            "mentioned_in_post": "",
-            "mentioned_in_comment": "",
-            "commented_on_post": ""
-        },
-        "comment": "",
-        "title": "",
-        "pageLink": "",
-        "post": "",
-        "user": "",
-        "content": "",
-        "filterLabel": {
-            "all": "",
-            "read": "",
-            "unread": ""
-        },
-        "empty": ""
-    },
-    "delete": {
-        "submit": "",
-        "cancel": "",
-        "contribution": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "success": ""
-        },
-        "comment": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "success": ""
-        }
-    },
-    "release": {
-        "submit": "",
-        "cancel": "",
-        "success": "",
-        "user": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "error": ""
-        },
-        "contribution": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "error": ""
-        },
-        "comment": {
-            "title": "",
-            "type": "",
-            "message": "",
-            "error": ""
-        }
-    },
-    "user": {
-        "avatar": {
-            "submitted": ""
-        }
-    },
-    "code-of-conduct": {
-        "subheader": "",
-        "preamble": {
-            "title": "",
-            "description": "Human Connection è una rete di conoscenza e azione sociale senza scopo di lucro della prossima generazione. Dalle persone - per le persone. Open Source, equo e trasparente. Per un cambiamento locale e globale positivo in tutte le aree della vita. Ridisegniamo completamente lo scambio pubblico di conoscenze, idee e progetti. Le funzioni di Human Connection riuniscono le persone - offline e online - in modo che possiamo rendere il mondo un posto migliore."
-        },
-        "purpose": {
-            "title": "",
-            "description": "Con questo codice di condotta regoliamo i principi essenziali di comportamento nel nostro social network. La Carta dei diritti umani delle Nazioni Unite è il nostro orientamento e costituisce il cuore della nostra comprensione dei valori. Il codice di condotta funge da principio guida per il nostro aspetto personale e l'interazione reciproca. Chiunque sia attivo come utente nella rete di connessione umana, scrive articoli, commenti o contatta altri utenti, compresi quelli esterni alla rete, riconosce queste regole di condotta come vincolanti."
-        },
-        "expected-behaviour": {
-            "title": "",
-            "description": "",
-            "list": {
-                "0": "",
-                "1": "",
-                "2": "",
-                "3": "Fai attenzione a ciò che ti circonda e ai tuoi compagni partecipanti. Avvisare i leader della comunità se si nota una situazione pericolosa, qualcuno in difficoltà o violazioni del presente Codice di condotta, anche se sembrano insignificanti."
-            }
-        },
-        "unacceptable-behaviour": {
-            "title": "",
-            "description": "",
-            "list": {
-                "0": "Posti discriminatori, commenti, dichiarazioni o insulti, in particolare quelli relativi a genere, orientamento sessuale, razza, religione, orientamento politico o filosofico o disabilità.",
-                "1": "Pubblicazione o collegamento di materiale chiaramente pornografico.",
-                "2": "Glorificazione o banalizzazione di atti di violenza crudele o disumana.",
-                "3": "La divulgazione di informazioni personali altrui senza il loro consenso o minaccia di (\"doxing\").",
-                "4": "Intimidazione intenzionale, stalking o persecuzione.",
-                "5": "Pubblicità di prodotti e servizi a fini commerciali.",
-                "6": "Comportamento criminale o violazione della legge tedesca.",
-                "7": "Sostenere o incoraggiare tale condotta."
-            }
-        },
-        "consequences": {
-            "title": "Conseguenze di comportamenti inaccettabilil",
-            "description": "Se un membro della comunità manifesta comportamenti inaccettabili, gli operatori, i moderatori e gli amministratori responsabili della rete possono adottare le misure appropriate, inclusi ma non limitati a:",
-            "list": {
-                "0": "Richiesta di cessazione immediata di comportamenti inaccettabili",
-                "1": "Blocco o eliminazione di commenti",
-                "2": "Esclusione temporanea dal rispettivo posto o contributo",
-                "3": "Blocco o eliminazione di contenuti",
-                "4": "Revoca temporanea delle autorizzazioni di scrittura",
-                "5": "Esclusione temporanea dalla rete",
-                "6": "Esclusione definitiva dalla rete",
-                "7": "Violazioni della legge tedesca possono essere segnalate."
-            }
-        },
-        "get-help": "Se sei soggetto o testimone di un comportamento inaccettabile, o se hai altre preoccupazioni, ti preghiamo di avvisare al più presto un organizzatore della comunità e di fare riferimento al contenuto corrispondente:"
-    },
-    "termsAndConditions": {
-        "newTermsAndConditions": "Nuovi Termini e Condizioni",
-        "termsAndConditionsConfirmed": "Ho letto e confermato i <a href=\"\/terms-and-conditions\" target=\"_blank\"> Termini e condizioni <\/a> .",
-        "termsAndConditionsNewConfirmText": "Si prega di leggere le nuove condizioni d'uso ora!",
-        "termsAndConditionsNewConfirm": "Ho letto e accetto le nuove condizioni generali di contratto.",
-        "agree": "Sono d'accordo!",
-        "terms-of-service": {
-            "title": "Termini di servizio",
-            "description": "Le seguenti condizioni d'uso costituiscono la base per l'utilizzo della nostra rete. Quando ti registri, devi accettarli e ti informeremo in seguito di eventuali modifiche che potrebbero aver luogo. La rete di connessione umana è gestita in Germania ed è quindi soggetta alla legge tedesca. Il foro competente è Kirchheim \/ Teck. Per i dettagli, consulta la nostra impronta: <a href=\"https:\/\/human-connection.org\/imprint\" target=\"_blank\" > https:\/\/human-connection.org\/imprint <\/a>"
-        },
-        "use-and-license": {
-            "title": "Uso e licenza",
-            "description": "Se qualsiasi contenuto pubblicato su di noi è protetto da diritti di proprietà intellettuale, l'utente ci concede una licenza mondiale, non esclusiva, trasferibile e sub-licenziabile, per l'utilizzo di tali contenuti per la pubblicazione nella nostra rete. Questa licenza scade quando si elimina il contenuto o l'intero account. Ricorda che altri potrebbero condividere i tuoi contenuti e noi non possiamo cancellarli."
-        },
-        "privacy-statement": {
-            "title": "Informativa sulla Privacy",
-            "description": "La nostra rete è una rete di conoscenza e azione sociale. Per noi è quindi particolarmente importante che il maggior numero possibile di contenuti sia accessibile al pubblico. Nel corso dello sviluppo della nostra rete ci sarà sempre più la possibilità di decidere sulla visibilità dei dati personali. Ti informeremo su queste nuove funzionalità. Altrimenti, dovresti sempre pensare a quali dati personali divulghi su te stesso (o altri). Ciò vale in particolare per il contenuto di post e commenti, poiché questi hanno un carattere ampiamente pubblico. Successivamente ci saranno possibilità di limitare la visibilità del tuo profilo. Parte dei termini di servizio è la nostra informativa sulla privacy, che ti informa sulle singole operazioni di trattamento dei dati nella nostra rete: <a href=\"https:\/\/human-connection.org\/datenschutz\/#netzwerk\" target=\"_blank\"> https:\/\/human-connection.org\/datenschutz\/#netzwerk <\/a> bzw. <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"> https:\/\/human-connection.org\/datenschutz\/ <\/a> La nostra informativa sulla privacy è adattata alla situazione legale e caratteristiche della nostra rete ed è sempre valido nella versione più recente."
-        },
-        "code-of-conduct": {
-            "title": "Codice di condotta",
-            "description": "Il nostro codice di condotta funge da manuale per l'aspetto personale e l'interazione reciproca. Chiunque sia attivo come utente nella rete di Human Connection, scrive articoli, commenti o contatta altri utenti, anche al di fuori della rete, riconosce queste regole di condotta come vincolanti. <a href=\"https:\/\/alpha.human-connection.org\/code-of-conduct\" target=\"_blank\"> https:\/\/alpha.human-connection.org\/code-of-conduct <\/a>"
-        },
-        "moderation": {
-            "title": "Moderazione",
-            "description": "Fino a quando le nostre possibilità finanziarie ci permettono di implementare il sistema di moderazione comunitaria, abbiamo moderato con un sistema semplificato e con personale proprio o eventualmente volontario. Formiamo questi moderatori e per questo motivo solo loro prendono le decisioni appropriate. Questi moderatori svolgono il loro lavoro in forma anonima. È possibile segnalare a noi messaggi, commenti e utenti (ad esempio, se forniscono informazioni nel loro profilo o se hanno immagini che violano queste Condizioni d'uso). Se ci segnalate qualcosa, potete darci una ragione e una breve spiegazione. Dopodiché daremo un'occhiata a ciò che hai segnalato e, se necessario, ti sanzioneremo, ad esempio bloccando i contributi, i commenti o gli utenti. Purtroppo, lei e la persona interessata non riceverà alcun feedback da parte nostra in questo momento, ma questo è in fase di pianificazione. Indipendentemente da ciò, ci riserviamo il diritto di imporre sanzioni in linea di principio per motivi che non sono o non sono ancora elencati nel nostro Codice di condotta o nei presenti termini di servizio."
-        },
-        "errors-and-feedback": {
-            "title": "Errori e feedback",
-            "description": "Facciamo ogni sforzo per mantenere la nostra rete e i nostri dati al sicuro e disponibili. Ogni nuova versione del software viene sottoposta a test sia automatizzati che manuali. Tuttavia, possono verificarsi errori imprevisti. Pertanto, siamo grati per tutti i bug segnalati. Siete invitati a segnalare eventuali bug che si scopre inviando un'e-mail al supporto presso support@human-connection.org"
-        },
-        "help-and-questions": {
-            "title": "Aiuto e domande",
-            "description": "Per aiuto e domande abbiamo compilato per voi una raccolta completa di domande e risposte alle domande più frequenti (FAQ). Potete trovarli qui: <a href=\"https:\/\/support.human-connection.org\/kb\/\" target=\"_blank\" >https:<\/a>\/\/support.human-connection.org\/kb\/ "
-        },
-        "addition": {
-            "title": "Inoltre, teniamo regolarmente eventi in cui puoi anche condividere le tue impressioni e porre domande. Puoi trovare una panoramica attuale qui:",
-            "description": "Https:\/\/human-connection. org\/eventi\/"
-        }
+    "dashboard": {
+      "comments": "Commenti",
+      "follows": "Segue",
+      "invites": "Inviti",
+      "name": "Cruscotto",
+      "notifications": "Notifiche",
+      "organizations": "Organizzazioni",
+      "posts": "Messaggi",
+      "projects": "Progetti",
+      "shouts": "Gridi",
+      "users": "Utenti"
     },
     "donations": {
-        "donations-for": "Donazioni per",
-        "donate-now": "Dona ora",
-        "amount-of-total": "{amount} of {total} € collezionato"
+      "goal": "Donazioni mensili necessarie",
+      "name": "Info donazioni",
+      "progress": "Donazioni raccolte finora",
+      "successfulUpdate": "Informazioni sulle donazioni aggiornate con successo!"
+    },
+    "hashtags": {
+      "name": "",
+      "nameOfHashtag": "",
+      "number": "",
+      "tagCount": "",
+      "tagCountUnique": ""
+    },
+    "invites": {
+      "description": "",
+      "name": "",
+      "title": ""
+    },
+    "name": "Admin",
+    "notifications": {
+      "name": "Notifiche"
+    },
+    "organizations": {
+      "name": "Organizzazioni"
+    },
+    "pages": {
+      "name": "Pagine"
+    },
+    "settings": {
+      "name": "Impostazioni"
+    },
+    "tags": {
+      "name": "Tag",
+      "tagCount": "Messaggi",
+      "tagCountUnique": "Utenti"
+    },
+    "users": {
+      "empty": "",
+      "form": {
+        "placeholder": ""
+      },
+      "name": "Utenti",
+      "table": {
+        "columns": {
+          "createdAt": "",
+          "email": "",
+          "name": "",
+          "number": "",
+          "role": "",
+          "slug": ""
+        }
+      }
     }
+  },
+  "code-of-conduct": {
+    "consequences": {
+      "description": "Se un membro della comunità manifesta comportamenti inaccettabili, gli operatori, i moderatori e gli amministratori responsabili della rete possono adottare le misure appropriate, inclusi ma non limitati a:",
+      "list": {
+        "0": "Richiesta di cessazione immediata di comportamenti inaccettabili",
+        "1": "Blocco o eliminazione di commenti",
+        "2": "Esclusione temporanea dal rispettivo posto o contributo",
+        "3": "Blocco o eliminazione di contenuti",
+        "4": "Revoca temporanea delle autorizzazioni di scrittura",
+        "5": "Esclusione temporanea dalla rete",
+        "6": "Esclusione definitiva dalla rete",
+        "7": "Violazioni della legge tedesca possono essere segnalate."
+      },
+      "title": "Conseguenze di comportamenti inaccettabilil"
+    },
+    "expected-behaviour": {
+      "description": "",
+      "list": {
+        "0": "",
+        "1": "",
+        "2": "",
+        "3": "Fai attenzione a ciò che ti circonda e ai tuoi compagni partecipanti. Avvisare i leader della comunità se si nota una situazione pericolosa, qualcuno in difficoltà o violazioni del presente Codice di condotta, anche se sembrano insignificanti."
+      },
+      "title": ""
+    },
+    "get-help": "Se sei soggetto o testimone di un comportamento inaccettabile, o se hai altre preoccupazioni, ti preghiamo di avvisare al più presto un organizzatore della comunità e di fare riferimento al contenuto corrispondente:",
+    "preamble": {
+      "description": "Human Connection è una rete di conoscenza e azione sociale senza scopo di lucro della prossima generazione. Dalle persone - per le persone. Open Source, equo e trasparente. Per un cambiamento locale e globale positivo in tutte le aree della vita. Ridisegniamo completamente lo scambio pubblico di conoscenze, idee e progetti. Le funzioni di Human Connection riuniscono le persone - offline e online - in modo che possiamo rendere il mondo un posto migliore.",
+      "title": ""
+    },
+    "purpose": {
+      "description": "Con questo codice di condotta regoliamo i principi essenziali di comportamento nel nostro social network. La Carta dei diritti umani delle Nazioni Unite è il nostro orientamento e costituisce il cuore della nostra comprensione dei valori. Il codice di condotta funge da principio guida per il nostro aspetto personale e l'interazione reciproca. Chiunque sia attivo come utente nella rete di connessione umana, scrive articoli, commenti o contatta altri utenti, compresi quelli esterni alla rete, riconosce queste regole di condotta come vincolanti.",
+      "title": ""
+    },
+    "subheader": "",
+    "unacceptable-behaviour": {
+      "description": "",
+      "list": {
+        "0": "Posti discriminatori, commenti, dichiarazioni o insulti, in particolare quelli relativi a genere, orientamento sessuale, razza, religione, orientamento politico o filosofico o disabilità.",
+        "1": "Pubblicazione o collegamento di materiale chiaramente pornografico.",
+        "2": "Glorificazione o banalizzazione di atti di violenza crudele o disumana.",
+        "3": "La divulgazione di informazioni personali altrui senza il loro consenso o minaccia di (\"doxing\").",
+        "4": "Intimidazione intenzionale, stalking o persecuzione.",
+        "5": "Pubblicità di prodotti e servizi a fini commerciali.",
+        "6": "Comportamento criminale o violazione della legge tedesca.",
+        "7": "Sostenere o incoraggiare tale condotta."
+      },
+      "title": ""
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": ""
+    },
+    "delete": "",
+    "edit": "",
+    "edited": "",
+    "menu": {
+      "delete": "",
+      "edit": ""
+    },
+    "show": {
+      "less": "",
+      "more": ""
+    }
+  },
+  "common": {
+    "category": "Categoria ::: Categorie",
+    "comment": "Commento ::: Commenti",
+    "letsTalk": "Discutiamo",
+    "loadMore": "Caricare di più",
+    "loading": "Caricamento in corso",
+    "moreInfo": "Ulteriori informazioni",
+    "name": "Nome",
+    "organization": "Organizzazione ::: Organizzazioni",
+    "post": "Messaggio ::: Messaggi",
+    "project": "Progetto ::: Progetti",
+    "reportContent": "",
+    "shout": "Grido ::: Gridi",
+    "tag": "Tag ::: Tag",
+    "takeAction": "Agire",
+    "user": "Utente ::: Utenti",
+    "validations": {
+      "categories": "",
+      "email": "",
+      "url": ""
+    },
+    "versus": "Verso"
+  },
+  "components": {
+    "enter-nonce": {
+      "form": {
+        "description": "",
+        "next": "",
+        "nonce": "",
+        "validations": {
+          "length": ""
+        }
+      }
+    },
+    "password-reset": {
+      "change-password": {
+        "error": "Modifica della password non riuscita. Forse il codice di sicurezza non era corretto?",
+        "help": "",
+        "success": ""
+      },
+      "request": {
+        "form": {
+          "description": "",
+          "submit": "",
+          "submitted": ""
+        },
+        "title": ""
+      }
+    },
+    "registration": {
+      "create-user-account": {
+        "error": "",
+        "help": "",
+        "success": "",
+        "title": ""
+      },
+      "signup": {
+        "form": {
+          "data-privacy": "",
+          "description": "",
+          "errors": {
+            "email-exists": "",
+            "invalid-invitation-token": "Sembra che l'invito sia già stato utilizzato. I link di invito possono essere utilizzati una sola volta."
+          },
+          "invitation-code": "",
+          "minimum-age": "",
+          "submit": "",
+          "success": "",
+          "terms-and-condition": ""
+        },
+        "title": "",
+        "unavailable": ""
+      }
+    }
+  },
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": ""
+    },
+    "category": {
+      "name": {
+        "animal-protection": "",
+        "art-culture-sport": "",
+        "consumption-sustainability": "",
+        "cooperation-development": "",
+        "democracy-politics": "",
+        "economy-finances": "",
+        "education-sciences": "",
+        "energy-technology": "",
+        "environment-nature": "",
+        "freedom-of-speech": "",
+        "global-peace-nonviolence": "",
+        "happiness-values": "",
+        "health-wellbeing": "",
+        "human-rights-justice": "",
+        "it-internet-data-privacy": "",
+        "just-for-fun": ""
+      }
+    },
+    "delete": "",
+    "edit": "",
+    "emotions-label": {
+      "angry": "",
+      "cry": "",
+      "funny": "",
+      "happy": "",
+      "surprised": ""
+    },
+    "filterALL": "",
+    "filterFollow": "",
+    "languageSelectLabel": "",
+    "languageSelectText": "",
+    "newPost": "",
+    "success": "",
+    "teaserImage": {
+      "cropperConfirm": "Confermare"
+    },
+    "title": ""
+  },
+  "delete": {
+    "cancel": "",
+    "comment": {
+      "message": "",
+      "success": "",
+      "title": "",
+      "type": ""
+    },
+    "contribution": {
+      "message": "",
+      "success": "",
+      "title": "",
+      "type": ""
+    },
+    "submit": ""
+  },
+  "disable": {
+    "cancel": "",
+    "comment": {
+      "message": "",
+      "title": "",
+      "type": ""
+    },
+    "contribution": {
+      "message": "",
+      "title": "",
+      "type": ""
+    },
+    "submit": "",
+    "success": "",
+    "user": {
+      "message": "",
+      "title": "",
+      "type": ""
+    }
+  },
+  "donations": {
+    "amount-of-total": "{amount} of {total} € collezionato",
+    "donate-now": "Dona ora",
+    "donations-for": "Donazioni per"
+  },
+  "editor": {
+    "embed": {
+      "always_allow": "",
+      "data_privacy_info": "I tuoi dati non sono ancora stati condivisi con fornitori terzi. Se continui a guardare questo video, il seguente fornitore probabilmente raccoglierà i dati dell'utente:",
+      "data_privacy_warning": "",
+      "play_now": ""
+    },
+    "hashtag": {
+      "addHashtag": "",
+      "addLetter": "",
+      "noHashtagsFound": ""
+    },
+    "mention": {
+      "noUsersFound": ""
+    },
+    "placeholder": ""
+  },
+  "filter-menu": {
+    "clearSearch": "",
+    "hashtag-search": "",
+    "title": ""
+  },
+  "filter-posts": {
+    "categories": {
+      "all": "",
+      "header": ""
+    },
+    "followers": {
+      "label": ""
+    },
+    "general": {
+      "header": ""
+    },
+    "language": {
+      "all": "",
+      "header": ""
+    }
+  },
+  "followButton": {
+    "follow": "",
+    "following": ""
+  },
+  "index": {
+    "change-filter-settings": "",
+    "no-results": ""
+  },
+  "login": {
+    "copy": "Se sei gia registrato su Human Connection, accedi qui.",
+    "email": "La tua email",
+    "failure": "",
+    "forgotPassword": "",
+    "hello": "Ciao",
+    "login": "Accesso",
+    "logout": "Logout",
+    "moreInfo": "Che cosa è Human Connection?",
+    "moreInfoHint": "",
+    "moreInfoURL": "",
+    "no-account": "",
+    "password": "La tua password",
+    "register": "",
+    "success": ""
+  },
+  "maintenance": {
+    "explanation": "",
+    "questions": "",
+    "title": ""
+  },
+  "moderation": {
+    "name": "",
+    "reports": {
+      "createdAt": "",
+      "disabledBy": "",
+      "empty": "",
+      "name": "",
+      "reasonCategory": "",
+      "reasonDescription": "",
+      "reporter": "",
+      "submitter": ""
+    }
+  },
+  "notifications": {
+    "comment": "",
+    "content": "",
+    "empty": "",
+    "filterLabel": {
+      "all": "",
+      "read": "",
+      "unread": ""
+    },
+    "pageLink": "",
+    "post": "",
+    "reason": {
+      "commented_on_post": "",
+      "mentioned_in_comment": "",
+      "mentioned_in_post": ""
+    },
+    "title": "",
+    "user": ""
+  },
+  "post": {
+    "comment": {
+      "submit": "",
+      "submitted": "",
+      "updated": ""
+    },
+    "edited": "",
+    "menu": {
+      "delete": "",
+      "edit": "",
+      "pin": "",
+      "pinnedSuccessfully": "",
+      "unpin": "",
+      "unpinnedSuccessfully": ""
+    },
+    "moreInfo": {
+      "description": "",
+      "name": "Ulteriori informazioni",
+      "title": "",
+      "titleOfCategoriesSection": "",
+      "titleOfHashtagsSection": "",
+      "titleOfRelatedContributionsSection": ""
+    },
+    "name": "Messaggio",
+    "pinned": "",
+    "takeAction": {
+      "name": "Agire"
+    }
+  },
+  "profile": {
+    "commented": "Commentato",
+    "follow": "Seguire",
+    "followers": "Seguenti",
+    "following": "Seguendo",
+    "invites": {
+      "description": "",
+      "emailPlaceholder": "",
+      "title": ""
+    },
+    "memberSince": "Membro dal",
+    "name": "Il mio profilo",
+    "network": {
+      "andMore": "",
+      "followedBy": "",
+      "followedByNobody": "",
+      "following": "",
+      "followingNobody": "",
+      "title": ""
+    },
+    "shouted": "Gridato",
+    "socialMedia": "",
+    "userAnonym": "Anonymous"
+  },
+  "quotes": {
+    "african": {
+      "author": "Proverbio africano",
+      "quote": "Molte piccole persone in molti piccoli luoghi fanno molte piccole cose, che possono cambiare la faccia del mondo."
+    }
+  },
+  "release": {
+    "cancel": "",
+    "comment": {
+      "error": "",
+      "message": "",
+      "title": "",
+      "type": ""
+    },
+    "contribution": {
+      "error": "",
+      "message": "",
+      "title": "",
+      "type": ""
+    },
+    "submit": "",
+    "success": "",
+    "user": {
+      "error": "",
+      "message": "",
+      "title": "",
+      "type": ""
+    }
+  },
+  "report": {
+    "cancel": "",
+    "comment": {
+      "error": "",
+      "message": "",
+      "title": "",
+      "type": ""
+    },
+    "contribution": {
+      "error": "",
+      "message": "",
+      "title": "",
+      "type": ""
+    },
+    "reason": {
+      "category": {
+        "invalid": "",
+        "label": "",
+        "options": {
+          "advert_products_services_commercial": "",
+          "criminal_behavior_violation_german_law": "",
+          "discrimination_etc": "",
+          "doxing": "",
+          "glorific_trivia_of_cruel_inhuman_acts": "",
+          "intentional_intimidation_stalking_persecution": "",
+          "other": "",
+          "pornographic_content_links": ""
+        },
+        "placeholder": ""
+      },
+      "description": {
+        "label": "",
+        "placeholder": ""
+      }
+    },
+    "submit": "",
+    "success": "",
+    "user": {
+      "error": "",
+      "message": "",
+      "title": "",
+      "type": ""
+    }
+  },
+  "search": {
+    "failed": "",
+    "hint": "",
+    "placeholder": ""
+  },
+  "settings": {
+    "data": {
+      "labelBio": "Su di te",
+      "labelCity": "La tua città o regione",
+      "labelName": "Nome",
+      "labelSlug": "",
+      "name": "I tuoi dati",
+      "namePlaceholder": "Anonymous",
+      "success": ""
+    },
+    "delete": {
+      "name": "Elimina Account"
+    },
+    "deleteUserAccount": {
+      "accountDescription": "Essere consapevoli che i tuoi post e commenti sono importanti per la nostra comunità. Se cancelli il tuo account utente, tutto scomparirà per sempre - e sarebbe un vero peccato!",
+      "accountWarning": "Attenzione!Tu <b>Non puoi gestire</b> e <b>Non puoi recuperare il tuo account, i tuoi messaggi o commenti dopo aver cancellato il tuo account!",
+      "commentedCount": "Cancella i miei {count} commenti",
+      "contributionsCount": "Cancellare i miei {count} messaggi",
+      "name": "Cancellare l'account utente",
+      "pleaseConfirm": "<b class='is-danger'>Azione distruttiva! </b> Digita <b>{conferma}</b> per confermare",
+      "success": "Account eliminato con successo!"
+    },
+    "download": {
+      "name": "Scaricamento dati"
+    },
+    "email": {
+      "change-successful": "",
+      "labelEmail": "",
+      "labelNewEmail": "",
+      "labelNonce": "",
+      "name": "",
+      "submitted": "",
+      "success": "",
+      "validation": {
+        "same-email": ""
+      },
+      "verification-error": {
+        "explanation": "",
+        "message": "",
+        "reason": {
+          "invalid-nonce": "",
+          "no-email-request": ""
+        },
+        "support": ""
+      }
+    },
+    "embeds": {
+      "info-description": "Ecco l'elenco dei fornitori di terze parti i cui contenuti possono essere visualizzati come codice di terze parti, ad esempio sotto forma di video incorporati.",
+      "name": "",
+      "status": {
+        "change": {
+          "allow": "",
+          "deny": "",
+          "question": ""
+        },
+        "description": "",
+        "disabled": {
+          "off": "",
+          "on": ""
+        }
+      }
+    },
+    "invites": {
+      "name": "Inviti"
+    },
+    "languages": {
+      "name": "Lingue"
+    },
+    "muted-users": {
+      "columns": {
+        "name": null,
+        "slug": null,
+        "unmute": null
+      },
+      "empty": null,
+      "explanation": {
+        "intro": null,
+        "search": null,
+        "your-perspective": null
+      },
+      "how-to": null,
+      "mute": null,
+      "name": null,
+      "unmute": null,
+      "unmuted": null
+    },
+    "name": "Impostazioni",
+    "organizations": {
+      "name": "Mie organizzazioni"
+    },
+    "privacy": {
+      "make-shouts-public": "",
+      "name": "",
+      "success-update": ""
+    },
+    "security": {
+      "change-password": {
+        "button": "",
+        "label-new-password": "",
+        "label-new-password-confirm": "",
+        "label-old-password": "",
+        "message-new-password-confirm-required": "",
+        "message-new-password-missmatch": "",
+        "message-new-password-required": "",
+        "message-old-password-required": "",
+        "passwordSecurity": "",
+        "passwordStrength0": "",
+        "passwordStrength1": "",
+        "passwordStrength2": "",
+        "passwordStrength3": "",
+        "passwordStrength4": "",
+        "success": ""
+      },
+      "name": "Sicurezza"
+    },
+    "social-media": {
+      "name": "",
+      "placeholder": "",
+      "requireUnique": "",
+      "submit": "",
+      "successAdd": "Social media aggiunti. \nProfilo utente aggiornato ",
+      "successDelete": "Social media cancellati. Profilo utente aggiornato!"
+    },
+    "validation": {
+      "slug": {
+        "alreadyTaken": "",
+        "regex": ""
+      }
+    }
+  },
+  "shoutButton": {
+    "shouted": ""
+  },
+  "site": {
+    "back-to-login": "",
+    "bank": "conto bancario",
+    "code-of-conduct": "",
+    "contact": "Contatto",
+    "data-privacy": "protezione dei dati",
+    "director": "Direttore Generale",
+    "error-occurred": "",
+    "faq": "",
+    "germany": "Germania",
+    "imprint": "Impressum",
+    "made": "Con &#10084; fatto",
+    "register": "numero di registro",
+    "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)",
+    "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)",
+    "termsAndConditions": "",
+    "thanks": "",
+    "tribunal": "registro tribunale"
+  },
+  "store": {
+    "posts": {
+      "orderBy": {
+        "newest": {
+          "label": ""
+        },
+        "oldest": {
+          "label": ""
+        }
+      }
+    }
+  },
+  "termsAndConditions": {
+    "addition": {
+      "description": "Https://human-connection. org/eventi/",
+      "title": "Inoltre, teniamo regolarmente eventi in cui puoi anche condividere le tue impressioni e porre domande. Puoi trovare una panoramica attuale qui:"
+    },
+    "agree": "Sono d'accordo!",
+    "code-of-conduct": {
+      "description": "Il nostro codice di condotta funge da manuale per l'aspetto personale e l'interazione reciproca. Chiunque sia attivo come utente nella rete di Human Connection, scrive articoli, commenti o contatta altri utenti, anche al di fuori della rete, riconosce queste regole di condotta come vincolanti. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct </a>",
+      "title": "Codice di condotta"
+    },
+    "errors-and-feedback": {
+      "description": "Facciamo ogni sforzo per mantenere la nostra rete e i nostri dati al sicuro e disponibili. Ogni nuova versione del software viene sottoposta a test sia automatizzati che manuali. Tuttavia, possono verificarsi errori imprevisti. Pertanto, siamo grati per tutti i bug segnalati. Siete invitati a segnalare eventuali bug che si scopre inviando un'e-mail al supporto presso support@human-connection.org",
+      "title": "Errori e feedback"
+    },
+    "help-and-questions": {
+      "description": "Per aiuto e domande abbiamo compilato per voi una raccolta completa di domande e risposte alle domande più frequenti (FAQ). Potete trovarli qui: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" >https:</a>//support.human-connection.org/kb/ ",
+      "title": "Aiuto e domande"
+    },
+    "moderation": {
+      "description": "Fino a quando le nostre possibilità finanziarie ci permettono di implementare il sistema di moderazione comunitaria, abbiamo moderato con un sistema semplificato e con personale proprio o eventualmente volontario. Formiamo questi moderatori e per questo motivo solo loro prendono le decisioni appropriate. Questi moderatori svolgono il loro lavoro in forma anonima. È possibile segnalare a noi messaggi, commenti e utenti (ad esempio, se forniscono informazioni nel loro profilo o se hanno immagini che violano queste Condizioni d'uso). Se ci segnalate qualcosa, potete darci una ragione e una breve spiegazione. Dopodiché daremo un'occhiata a ciò che hai segnalato e, se necessario, ti sanzioneremo, ad esempio bloccando i contributi, i commenti o gli utenti. Purtroppo, lei e la persona interessata non riceverà alcun feedback da parte nostra in questo momento, ma questo è in fase di pianificazione. Indipendentemente da ciò, ci riserviamo il diritto di imporre sanzioni in linea di principio per motivi che non sono o non sono ancora elencati nel nostro Codice di condotta o nei presenti termini di servizio.",
+      "title": "Moderazione"
+    },
+    "newTermsAndConditions": "Nuovi Termini e Condizioni",
+    "privacy-statement": {
+      "description": "La nostra rete è una rete di conoscenza e azione sociale. Per noi è quindi particolarmente importante che il maggior numero possibile di contenuti sia accessibile al pubblico. Nel corso dello sviluppo della nostra rete ci sarà sempre più la possibilità di decidere sulla visibilità dei dati personali. Ti informeremo su queste nuove funzionalità. Altrimenti, dovresti sempre pensare a quali dati personali divulghi su te stesso (o altri). Ciò vale in particolare per il contenuto di post e commenti, poiché questi hanno un carattere ampiamente pubblico. Successivamente ci saranno possibilità di limitare la visibilità del tuo profilo. Parte dei termini di servizio è la nostra informativa sulla privacy, che ti informa sulle singole operazioni di trattamento dei dati nella nostra rete: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk </a> bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"> https://human-connection.org/datenschutz/ </a> La nostra informativa sulla privacy è adattata alla situazione legale e caratteristiche della nostra rete ed è sempre valido nella versione più recente.",
+      "title": "Informativa sulla Privacy"
+    },
+    "terms-of-service": {
+      "description": "Le seguenti condizioni d'uso costituiscono la base per l'utilizzo della nostra rete. Quando ti registri, devi accettarli e ti informeremo in seguito di eventuali modifiche che potrebbero aver luogo. La rete di connessione umana è gestita in Germania ed è quindi soggetta alla legge tedesca. Il foro competente è Kirchheim / Teck. Per i dettagli, consulta la nostra impronta: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" > https://human-connection.org/imprint </a>",
+      "title": "Termini di servizio"
+    },
+    "termsAndConditionsConfirmed": "Ho letto e confermato i <a href=\"/terms-and-conditions\" target=\"_blank\"> Termini e condizioni </a> .",
+    "termsAndConditionsNewConfirm": "Ho letto e accetto le nuove condizioni generali di contratto.",
+    "termsAndConditionsNewConfirmText": "Si prega di leggere le nuove condizioni d'uso ora!",
+    "use-and-license": {
+      "description": "Se qualsiasi contenuto pubblicato su di noi è protetto da diritti di proprietà intellettuale, l'utente ci concede una licenza mondiale, non esclusiva, trasferibile e sub-licenziabile, per l'utilizzo di tali contenuti per la pubblicazione nella nostra rete. Questa licenza scade quando si elimina il contenuto o l'intero account. Ricorda che altri potrebbero condividere i tuoi contenuti e noi non possiamo cancellarli.",
+      "title": "Uso e licenza"
+    }
+  },
+  "user": {
+    "avatar": {
+      "submitted": ""
+    }
+  }
 }
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index b780a1e36..128c9db88 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -1,176 +1,176 @@
 {
-  "site": {
-    "made": "Met &#10084; gemaakt",
-    "imprint": "Afdruk",
-    "termsAc": "Gebruiksvoorwaarden",
-    "data-privacy": "gegevensbescherming",
-    "contact": "contact",
-    "tribunal": "registerrechtbank",
-    "register": "inschrijfnummer",
-    "director": "Directeur",
-    "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).",
-    "responsible": "Verantwoordelijk volgens § 55 Abs. 2 RStV (Duitsland).",
-    "bank": "bankrekening",
-    "germany": "Duitsland"
-  },
-  "login": {
-    "copy": "Als u al een mini-aansluiting account heeft, log dan hier in.",
-    "login": "Inloggen",
-    "logout": "Uitloggen",
-    "email": "Uw E-mail",
-    "password": "Uw Wachtwoord",
-    "moreInfo": "Wat is Human Connection?",
-    "hello": "Hallo"
-  },
-  "profile": {
-    "name": "Mijn profiel",
-    "memberSince": "Lid sinds",
-    "follow": "Volgen",
-    "followers": "Volgelingen",
-    "following": "Volgt"
-  },
-  "settings": {
-    "name": "Instellingen",
-    "data": {
-      "name": "Uw gegevens"
-    },
-    "security": {
-      "name": "Veiligheid"
-    },
-    "invites": {
-      "name": "Uitnodigingen"
-    },
-    "download": {
-      "name": "Gegevens downloaden"
-    },
-    "delete": {
-      "name": "Account verwijderen"
-    },
-    "organizations": {
-      "name": "Mijn Organisaties"
-    },
-    "languages": {
-      "name": "Talen"
-    }
+  "actions": {
+    "cancel": "Annuleren"
   },
   "admin": {
-    "name": "Admin",
+    "categories": {
+      "categoryName": "Naam",
+      "name": "Categorieën",
+      "postCount": "Berichten"
+    },
     "dashboard": {
-      "name": "Dashboard",
-      "users": "Gebruikers",
-      "posts": "Berichten",
       "comments": "Opmerkingen",
+      "follows": "Volgt",
+      "invites": "Uitnodigingen",
+      "name": "Dashboard",
       "notifications": "Meldingen",
       "organizations": "Organisaties",
+      "posts": "Berichten",
       "projects": "Projecten",
-      "invites": "Uitnodigingen",
-      "follows": "Volgt",
-      "shouts": "Shouts"
+      "shouts": "Shouts",
+      "users": "Gebruikers"
+    },
+    "name": "Admin",
+    "notifications": {
+      "name": "Meldingen"
     },
     "organizations": {
       "name": "Organisaties"
     },
-    "users": {
-      "name": "Gebruikers"
-    },
     "pages": {
       "name": "Pages"
     },
-    "notifications": {
-      "name": "Meldingen"
-    },
-    "categories": {
-      "name": "Categorieën",
-      "categoryName": "Naam",
-      "postCount": "Berichten"
+    "settings": {
+      "name": "Instellingen"
     },
     "tags": {
       "name": "Tags",
-      "tagCountUnique": "Gebruikers",
-      "tagCount": "Berichten"
+      "tagCount": "Berichten",
+      "tagCountUnique": "Gebruikers"
     },
-    "settings": {
-      "name": "Instellingen"
+    "users": {
+      "name": "Gebruikers"
     }
   },
-  "post": {
-    "name": "Post",
-    "moreInfo": {
-      "name": "Meer info"
-    },
-    "takeAction": {
-      "name": "Onderneem actie"
-    }
-  },
-  "quotes": {
-    "african": {
-      "quote": "Veel kleine mensen op veel kleine plaatsen doen veel kleine dingen, die het gezicht van de wereld kunnen veranderen.",
-      "author": "Afrikaans spreekwoord"
-    }
+  "comment": {
+    "delete": "Commentaar verwijderen",
+    "edit": "Commentaar bewerken"
   },
   "common": {
-    "post": "Bericht ::: Berichten",
+    "category": "Categorie ::: Categorieën",
     "comment": "Opmerking ::: Opmerkingen",
     "letsTalk": "Laten we praten",
-    "versus": "Versus",
-    "moreInfo": "Meer info",
-    "takeAction": "Onderneem actie",
-    "shout": "Shout ::: Shouts",
-    "user": "Gebruiker ::: Gebruikers",
-    "category": "Categorie ::: Categorieën",
-    "organization": "Organisatie ::: Organisaties",
-    "project": "Project ::: Projecten",
-    "tag": "Tag ::: Tags",
-    "name": "Naam",
     "loadMore": "meer laden",
     "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"
+    "moreInfo": "Meer info",
+    "name": "Naam",
+    "organization": "Organisatie ::: Organisaties",
+    "post": "Bericht ::: Berichten",
+    "project": "Project ::: Projecten",
+    "reportContent": "Melden",
+    "shout": "Shout ::: Shouts",
+    "tag": "Tag ::: Tags",
+    "takeAction": "Onderneem actie",
+    "user": "Gebruiker ::: Gebruikers",
+    "versus": "Versus"
   },
   "contribution": {
-    "edit": "Bijdrage bewerken",
     "delete": "Bijdrage verwijderen",
+    "edit": "Bijdrage bewerken",
     "teaserImage": {
       "cropperConfirm": "Bevestigen"
     }
   },
-  "comment": {
-    "edit": "Commentaar bewerken",
-    "delete": "Commentaar verwijderen"
+  "disable": {
+    "comment": {
+      "message": "Wilt u de reactie van \" <b> {name} </b> \" echt uitschakelen ?",
+      "title": "Commentaar uitschakelen",
+      "type": "Melding"
+    }
   },
   "followButton": {
     "follow": "Volgen",
     "following": "Volgt"
   },
+  "login": {
+    "copy": "Als u al een mini-aansluiting account heeft, log dan hier in.",
+    "email": "Uw E-mail",
+    "hello": "Hallo",
+    "login": "Inloggen",
+    "logout": "Uitloggen",
+    "moreInfo": "Wat is Human Connection?",
+    "password": "Uw Wachtwoord"
+  },
+  "post": {
+    "moreInfo": {
+      "name": "Meer info"
+    },
+    "name": "Post",
+    "takeAction": {
+      "name": "Onderneem actie"
+    }
+  },
+  "profile": {
+    "follow": "Volgen",
+    "followers": "Volgelingen",
+    "following": "Volgt",
+    "memberSince": "Lid sinds",
+    "name": "Mijn profiel"
+  },
+  "quotes": {
+    "african": {
+      "author": "Afrikaans spreekwoord",
+      "quote": "Veel kleine mensen op veel kleine plaatsen doen veel kleine dingen, die het gezicht van de wereld kunnen veranderen."
+    }
+  },
+  "report": {
+    "cancel": "Annuleren",
+    "comment": {
+      "message": "Wilt u echt het commentaar van \"<b>{name}</b>\" melden?",
+      "title": "Reactie melden",
+      "type": "Melding"
+    },
+    "contribution": {
+      "message": "Wilt u echt het commentaar van \"<b>{name}</b>\" melden?",
+      "title": "Bijdrage melden",
+      "type": "Bijdrage"
+    },
+    "submit": "Verzenden",
+    "user": {
+      "message": "Wilt u echt het commentaar van \"<b>{name}</b>\" melden?",
+      "title": "Gebruiker melden",
+      "type": "Gebruiker"
+    }
+  },
+  "settings": {
+    "data": {
+      "name": "Uw gegevens"
+    },
+    "delete": {
+      "name": "Account verwijderen"
+    },
+    "download": {
+      "name": "Gegevens downloaden"
+    },
+    "invites": {
+      "name": "Uitnodigingen"
+    },
+    "languages": {
+      "name": "Talen"
+    },
+    "name": "Instellingen",
+    "organizations": {
+      "name": "Mijn Organisaties"
+    },
+    "security": {
+      "name": "Veiligheid"
+    }
+  },
   "shoutButton": {
     "shouted": "uitgeroepen"
+  },
+  "site": {
+    "bank": "bankrekening",
+    "contact": "contact",
+    "data-privacy": "gegevensbescherming",
+    "director": "Directeur",
+    "germany": "Duitsland",
+    "imprint": "Afdruk",
+    "made": "Met &#10084; gemaakt",
+    "register": "inschrijfnummer",
+    "responsible": "Verantwoordelijk volgens § 55 Abs. 2 RStV (Duitsland).",
+    "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).",
+    "termsAc": "Gebruiksvoorwaarden",
+    "tribunal": "registerrechtbank"
   }
 }
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 7207c1e71..3113e3f45 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -1,81 +1,191 @@
 {
-  "components": {
-    "password-reset": {
-      "request": {
-        "title": "Zresetuj hasło",
-        "form": {
-          "description": "Na podany adres e-mail zostanie wysłany email z resetem hasła.",
-          "submit": "Poproś o wiadomość e-mail",
-          "submitted": "Na adres <b>{email}</b> została wysłana wiadomość z dalszymi instrukcjami."
-        }
-      },
-      "change-password": {
-        "success": "Zmiana hasła zakończyła się sukcesem!",
-        "error": "Zmiana hasła nie powiodła się. Może kod bezpieczeństwa nie był poprawny?",
-        "help": "W przypadku problemów, zachęcamy do zwrócenia się o pomoc, wysyłając do nas wiadomość e-mail:"
-      }
+  "actions": {
+    "cancel": "Odwołaj",
+    "create": "Tworzenie",
+    "delete": "Usuń",
+    "edit": "Edycja",
+    "loadMore": "Obciążenie więcej",
+    "loading": "załadunek",
+    "save": "Oszczędzaj"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Nazwa",
+      "name": "Kategorie",
+      "postCount": "Stanowiska"
     },
+    "dashboard": {
+      "comments": "Komentarze",
+      "follows": "Podąża za",
+      "invites": "Zaprasza",
+      "name": "Tablica rozdzielcza",
+      "notifications": "Powiadomienia",
+      "organizations": "Organizacje",
+      "posts": "Stanowiska",
+      "projects": "Projekty",
+      "shouts": "Zalecane",
+      "users": "Użytkownicy"
+    },
+    "name": "Admin",
+    "notifications": {
+      "name": "Powiadomienia"
+    },
+    "organizations": {
+      "name": "Organizacje"
+    },
+    "pages": {
+      "name": "Strony"
+    },
+    "settings": {
+      "name": "Ustawienia"
+    },
+    "tags": {
+      "name": "Znaczniki",
+      "tagCount": "Stanowiska",
+      "tagCountUnique": "Użytkownicy"
+    },
+    "users": {
+      "name": "Użytkownicy"
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": " ...ten komentarz nie jest już dostępny."
+    },
+    "menu": {
+      "delete": "Usuń komentarz",
+      "edit": "Edytuj komentarz"
+    },
+    "show": {
+      "less": "Pokaż mniej",
+      "more": "Pokaż więcej"
+    }
+  },
+  "common": {
+    "category": "Kategoria ::: Kategorie",
+    "comment": "Komentarz ::: Komentarze",
+    "letsTalk": "Porozmawiajmy",
+    "loadMore": "Obciążenie więcej",
+    "loading": "załadunek",
+    "moreInfo": "Więcej informacji",
+    "name": "Nazwa",
+    "organization": "Organization ::: Organizations",
+    "post": "Poczta ::: Posty",
+    "project": "Projekt ::: Projekty",
+    "reportContent": "Sprawozdanie",
+    "shout": "przekazanie sprawy ::: Polecam tę stronę",
+    "tag": "Znacznik ::: Znaczniki",
+    "takeAction": "Podejmij działania",
+    "user": "Użytkownik ::: Użytkownicy",
+    "validations": {
+      "email": "musi być ważny adres e-mail."
+    },
+    "versus": "werset"
+  },
+  "components": {
     "enter-nonce": {
       "form": {
-        "nonce": "Wprowadź swój kod",
         "description": "Otwórz swoją skrzynkę odbiorczą i wpisz kod, który do Ciebie wysłaliśmy.",
         "next": "Kontynuuj",
+        "nonce": "Wprowadź swój kod",
         "validations": {
           "length": "musi mieć długość 6 znaków."
         }
       }
+    },
+    "password-reset": {
+      "change-password": {
+        "error": "Zmiana hasła nie powiodła się. Może kod bezpieczeństwa nie był poprawny?",
+        "help": "W przypadku problemów, zachęcamy do zwrócenia się o pomoc, wysyłając do nas wiadomość e-mail:",
+        "success": "Zmiana hasła zakończyła się sukcesem!"
+      },
+      "request": {
+        "form": {
+          "description": "Na podany adres e-mail zostanie wysłany email z resetem hasła.",
+          "submit": "Poproś o wiadomość e-mail",
+          "submitted": "Na adres <b>{email}</b> została wysłana wiadomość z dalszymi instrukcjami."
+        },
+        "title": "Zresetuj hasło"
+      }
     }
   },
-  "filter-menu": {
-    "title": "Twoja bańka filtrująca"
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": "{chosen} z {max} wybrane kategorie"
+    },
+    "filterALL": "Pokaż wszystkie wpisy",
+    "filterFollow": "Pokaż wpisy użytkowników, których śledzę",
+    "languageSelectLabel": "Język",
+    "newPost": "Utwórz nowy wpis",
+    "success": "Zapisano!",
+    "teaserImage": {
+      "cropperConfirm": "Potwierdzać"
+    }
   },
-  "site": {
-    "made": "Z &#10084; zrobiony",
-    "imprint": "Nadruk",
-    "termsAc": "Warunki użytkowania",
-    "data-privacy": "ochrona danych",
-    "contact": "Kontakt",
-    "tribunal": "sąd rejestrowy",
-    "register": "numer rejestracyjny",
-    "director": "Dyrektor zarządzający",
-    "taxident": "Numer identyfikacyjny podatku od wartości dodanej zgodnie z § 27 a Ustawa o podatku od wartości dodanej (Niemcy)",
-    "responsible": "Odpowiedzialny zgodnie z § 55 Abs. 2 RStV (Niemcy)",
-    "bank": "rachunek bankowy",
-    "germany": "Niemcy"
+  "delete": {
+    "cancel": "Odwołaj",
+    "comment": {
+      "message": "Czy na pewno chcesz ukryć komentarz użytkownika \" <b> {name} </b> \"?",
+      "title": "Usuń komentarz",
+      "type": "Komentarz"
+    },
+    "contribution": {
+      "message": "Czy na pewno chcesz ukryć wpis \" <b> {name} </b> \"?",
+      "success": "Wyślij pomyślnie usunięty!",
+      "title": "Ukryj wpis",
+      "type": "Wpis / Post"
+    },
+    "submit": "Usuń"
   },
-  "login": {
-    "copy": "Jeśli masz już konto Human Connection, zaloguj się tutaj.",
-    "login": "Logowanie",
-    "logout": "Wyloguj się",
-    "email": "Twój adres e-mail",
-    "password": "Twoje hasło",
-    "forgotPassword": "Zapomniałeś hasła?",
-    "moreInfo": "Co to jest Human Connection?",
-    "moreInfoURL": "https://human-connection.org/en/",
-    "moreInfoHint": "idź po więcej szczegółów",
-    "hello": "Cześć"
+  "disable": {
+    "cancel": "Anuluj",
+    "comment": {
+      "message": "Naprawdę chcesz wyłączyć komentarz \"<b>{name}</b>\"?",
+      "title": "Wyłącz komentarz",
+      "type": "Komentarz"
+    },
+    "contribution": {
+      "message": "Naprawdę chcesz unieszkodliwić ten wkład \"<b>{name}</b>\"?",
+      "title": "Wyłącz Wkład",
+      "type": "Wkład"
+    },
+    "submit": "Deaktywuj",
+    "success": "Zdeaktywowano",
+    "user": {
+      "message": "Czy naprawdę chcesz wyłączyć użytkownika  \"<b>{name}</b>\"?",
+      "title": "Wyłączenie użytkownika",
+      "type": "Użytkownik"
+    }
   },
   "editor": {
     "placeholder": "Napisz coś inspirującego..."
   },
-  "profile": {
-    "name": "Mój profil",
-    "memberSince": "Członek od",
-    "follow": "Obserwuj",
-    "followers": "Obserwujący",
-    "following": "Obserwowani",
-    "shouted": "Krzyknij",
-    "commented": "Skomentuj",
-    "userAnonym": "Anonymous",
-    "socialMedia": "Gdzie jeszcze mogę znaleźć",
-    "network": {
-      "title": "Sieć",
-      "following": "obserwuje:",
-      "followingNobody": "nikogo nie obserwuje.",
-      "followedBy": "jest obserwowany:",
-      "followedByNobody": "nikt go nie obserwuje.",
-      "and": "i",
-      "more": "więcej"
+  "filter-menu": {
+    "title": "Twoja bańka filtrująca"
+  },
+  "followButton": {
+    "follow": "naśladować",
+    "following": "w skutek"
+  },
+  "login": {
+    "copy": "Jeśli masz już konto Human Connection, zaloguj się tutaj.",
+    "email": "Twój adres e-mail",
+    "forgotPassword": "Zapomniałeś hasła?",
+    "hello": "Cześć",
+    "login": "Logowanie",
+    "logout": "Wyloguj się",
+    "moreInfo": "Co to jest Human Connection?",
+    "moreInfoHint": "idź po więcej szczegółów",
+    "moreInfoURL": "https://human-connection.org/en/",
+    "password": "Twoje hasło"
+  },
+  "moderation": {
+    "name": "Umiarkowanie",
+    "reports": {
+      "disabledBy": "deaktywowane przez",
+      "empty": "Gratulacje, moderacja nie jest potrzebna",
+      "name": "Raporty",
+      "submitter": "zgłoszone przez"
     }
   },
   "notifications": {
@@ -83,61 +193,147 @@
       "mentioned": "wspomiał o Tobie we wpisie"
     }
   },
+  "post": {
+    "comment": {
+      "submit": "Komentarz",
+      "submitted": "Komentarz dodany"
+    },
+    "menu": {
+      "delete": "Usuń wpis",
+      "edit": "Edytuj wpis"
+    },
+    "moreInfo": {
+      "name": "Więcej informacji"
+    },
+    "name": "Poczta",
+    "takeAction": {
+      "name": "Podejmij działanie"
+    }
+  },
+  "profile": {
+    "commented": "Skomentuj",
+    "follow": "Obserwuj",
+    "followers": "Obserwujący",
+    "following": "Obserwowani",
+    "memberSince": "Członek od",
+    "name": "Mój profil",
+    "network": {
+      "and": "i",
+      "followedBy": "jest obserwowany:",
+      "followedByNobody": "nikt go nie obserwuje.",
+      "following": "obserwuje:",
+      "followingNobody": "nikogo nie obserwuje.",
+      "more": "więcej",
+      "title": "Sieć"
+    },
+    "shouted": "Krzyknij",
+    "socialMedia": "Gdzie jeszcze mogę znaleźć",
+    "userAnonym": "Anonymous"
+  },
+  "quotes": {
+    "african": {
+      "author": "Afrykańskie przysłowie",
+      "quote": "Wielu małych ludzi w wielu małych miejscowościach robi wiele małych rzeczy, które mogą zmienić oblicze świata."
+    }
+  },
+  "release": {
+    "cancel": "Anuluj",
+    "comment": {
+      "message": "Czy na pewno chcesz zgłosić komentarz użytkownika \"<b> {name} </b>\"?",
+      "title": "Zgłoś komentarz",
+      "type": "Komentarz"
+    },
+    "contribution": {
+      "message": "Czy na pewno chcesz zgłosić wpis użytkownika \"<b> {name} </b>\"?",
+      "title": "Zgłoś wpis",
+      "type": "Wpis"
+    },
+    "submit": "Zgłoś",
+    "success": "Zgłoszono pomyślnie!",
+    "user": {
+      "message": "Czy na pewno chcesz zgłosić użytkownika \"<b> {name} </b>\"?",
+      "title": "Zgłoś użytkownika",
+      "type": "Użytkownik"
+    }
+  },
+  "report": {
+    "cancel": "Anuluj",
+    "comment": {
+      "error": "Zgłosiłeś już komentarz!",
+      "message": "Czy na pewno chcesz zgłosić komentarz użytkownika\" <b> {name} </b> \"?",
+      "title": "Sprawozdanie Komentarz",
+      "type": "Komentarz"
+    },
+    "contribution": {
+      "error": "Zgłosiłeś już ten wkład!",
+      "message": "Czy na pewno chcesz zgłosić ten wpis użytkownika \" <b> {name} </b> \"?",
+      "title": "Zgłoś wpis",
+      "type": "Wpis / Post"
+    },
+    "submit": "Wyślij raport",
+    "success": "Dziękujemy za Twoje zgłoszenie!",
+    "user": {
+      "error": "Zgłosiłeś już użytkownika!",
+      "message": "Czy na pewno chcesz zgłosić użytkownika \" <b> {name} </b> \"?",
+      "title": "Raport Użytkownik",
+      "type": "Użytkownik"
+    }
+  },
   "search": {
-    "placeholder": "Szukaj",
+    "failed": "Niczego nie znaleziono",
     "hint": "Czego szukasz?",
-    "failed": "Niczego nie znaleziono"
+    "placeholder": "Szukaj"
   },
   "settings": {
-    "name": "Ustawienia",
     "data": {
-      "name": "Twoje dane",
-      "labelName": "Twoje dane",
-      "namePlaceholder": "Anonymous",
-      "labelCity": "Twoje miasto lub region",
       "labelBio": "O Tobie",
+      "labelCity": "Twoje miasto lub region",
+      "labelName": "Twoje dane",
+      "name": "Twoje dane",
+      "namePlaceholder": "Anonymous",
       "success": "Twoje dane zostały pomyślnie zaktualizowane!"
     },
+    "deleteUserAccount": {
+      "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!",
+      "commentedCount": "Usuń {count} moich komentarzy",
+      "contributionsCount": "Usuń {count} moich postów",
+      "name": "Usuń dane",
+      "pleaseConfirm": "<b class='is-danger'>Uwaga, niebezpieczeństwo!</b> Wpisz <b>{confirm}</b>, aby potwierdzić",
+      "success": "Konto zostało usunięte"
+    },
+    "download": {
+      "name": "Pobierz dane"
+    },
+    "invites": {
+      "name": "Zaproszenia"
+    },
+    "languages": {
+      "name": "Języki"
+    },
+    "name": "Ustawienia",
+    "organizations": {
+      "name": "My Organizations"
+    },
     "security": {
-      "name": "Bezpieczeństwo",
       "change-password": {
         "button": "Zmień hasło",
-        "success": "Hasło zostało zmienione!",
-        "label-old-password": "Stare hasło",
         "label-new-password": "Nowe hasło",
         "label-new-password-confirm": "Potwierdź nowe hasło",
-        "message-old-password-required": "Podaj stare hasło",
-        "message-new-password-required": "Wprowadź nowe hasło",
+        "label-old-password": "Stare hasło",
         "message-new-password-confirm-required": "Potwierdź nowe hasło",
         "message-new-password-missmatch": "Wpisz to samo hasło ponownie",
+        "message-new-password-required": "Wprowadź nowe hasło",
+        "message-old-password-required": "Podaj stare hasło",
         "passwordSecurity": "Siła hasła",
         "passwordStrength0": "Hasło bardzo słabe",
         "passwordStrength1": "Hasło słabe",
         "passwordStrength2": "Hasło średnie",
         "passwordStrength3": "Hasło silne",
-        "passwordStrength4": "Hasło bardzo silne"
-      }
-    },
-    "invites": {
-      "name": "Zaproszenia"
-    },
-    "download": {
-      "name": "Pobierz dane"
-    },
-    "deleteUserAccount": {
-      "name": "Usuń dane",
-      "contributionsCount": "Usuń {count} moich postów",
-      "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",
-      "pleaseConfirm": "<b class='is-danger'>Uwaga, niebezpieczeństwo!</b> Wpisz <b>{confirm}</b>, aby potwierdzić"
-    },
-    "organizations": {
-      "name": "My Organizations"
-    },
-    "languages": {
-      "name": "Języki"
+        "passwordStrength4": "Hasło bardzo silne",
+        "success": "Hasło zostało zmienione!"
+      },
+      "name": "Bezpieczeństwo"
     },
     "social-media": {
       "name": "Media społecznościowe",
@@ -147,223 +343,26 @@
       "successDelete": "Usunięto społeczność. Profil zaktualizowany!"
     }
   },
-  "admin": {
-    "name": "Admin",
-    "dashboard": {
-      "name": "Tablica rozdzielcza",
-      "users": "Użytkownicy",
-      "posts": "Stanowiska",
-      "comments": "Komentarze",
-      "notifications": "Powiadomienia",
-      "organizations": "Organizacje",
-      "projects": "Projekty",
-      "invites": "Zaprasza",
-      "follows": "Podąża za",
-      "shouts": "Zalecane"
-    },
-    "organizations": {
-      "name": "Organizacje"
-    },
-    "users": {
-      "name": "Użytkownicy"
-    },
-    "pages": {
-      "name": "Strony"
-    },
-    "notifications": {
-      "name": "Powiadomienia"
-    },
-    "categories": {
-      "name": "Kategorie",
-      "categoryName": "Nazwa",
-      "postCount": "Stanowiska"
-    },
-    "tags": {
-      "name": "Znaczniki",
-      "tagCountUnique": "Użytkownicy",
-      "tagCount": "Stanowiska"
-    },
-    "settings": {
-      "name": "Ustawienia"
-    }
-  },
-  "post": {
-    "name": "Poczta",
-    "moreInfo": {
-      "name": "Więcej informacji"
-    },
-    "takeAction": {
-      "name": "Podejmij działanie"
-    },
-    "menu": {
-      "edit": "Edytuj wpis",
-      "delete": "Usuń wpis"
-    },
-    "comment": {
-      "submit": "Komentarz",
-      "submitted": "Komentarz dodany"
-    }
-  },
-  "comment": {
-    "content": {
-      "unavailable-placeholder": " ...ten komentarz nie jest już dostępny."
-    },
-    "menu": {
-      "edit": "Edytuj komentarz",
-      "delete": "Usuń komentarz"
-    },
-    "show": {
-      "more": "Pokaż więcej",
-      "less": "Pokaż mniej"
-    }
-
-  },
-  "quotes": {
-    "african": {
-      "quote": "Wielu małych ludzi w wielu małych miejscowościach robi wiele małych rzeczy, które mogą zmienić oblicze świata.",
-      "author": "Afrykańskie przysłowie"
-    }
-  },
-  "common": {
-    "post": "Poczta ::: Posty",
-    "comment": "Komentarz ::: Komentarze",
-    "letsTalk": "Porozmawiajmy",
-    "versus": "werset",
-    "moreInfo": "Więcej informacji",
-    "takeAction": "Podejmij działania",
-    "shout": "przekazanie sprawy ::: Polecam tę stronę",
-    "user": "Użytkownik ::: Użytkownicy",
-    "category": "Kategoria ::: Kategorie",
-    "organization": "Organization ::: Organizations",
-    "project": "Projekt ::: Projekty",
-    "tag": "Znacznik ::: Znaczniki",
-    "name": "Nazwa",
-    "loadMore": "Obciążenie więcej",
-    "loading": "załadunek",
-    "reportContent": "Sprawozdanie",
-    "validations": {
-      "email": "musi być ważny adres e-mail."
-    }
-  },
-  "actions": {
-    "loading": "załadunek",
-    "loadMore": "Obciążenie więcej",
-    "create": "Tworzenie",
-    "save": "Oszczędzaj",
-    "edit": "Edycja",
-    "delete": "Usuń",
-    "cancel": "Odwołaj"
-  },
-  "moderation": {
-    "name": "Umiarkowanie",
-    "reports": {
-      "empty": "Gratulacje, moderacja nie jest potrzebna",
-      "name": "Raporty",
-      "submitter": "zgłoszone przez",
-      "disabledBy": "deaktywowane przez"
-    }
-  },
-  "disable": {
-    "submit": "Deaktywuj",
-    "cancel": "Anuluj",
-    "success": "Zdeaktywowano",
-    "user": {
-      "title": "Wyłączenie użytkownika",
-      "type": "Użytkownik",
-      "message": "Czy naprawdę chcesz wyłączyć użytkownika  \"<b>{name}</b>\"?"
-    },
-    "contribution": {
-      "title": "Wyłącz Wkład",
-      "type": "Wkład",
-      "message": "Naprawdę chcesz unieszkodliwić ten wkład \"<b>{name}</b>\"?"
-    },
-    "comment": {
-      "title": "Wyłącz komentarz",
-      "type": "Komentarz",
-      "message": "Naprawdę chcesz wyłączyć komentarz \"<b>{name}</b>\"?"
-    }
-  },
-  "delete": {
-    "submit": "Usuń",
-    "cancel": "Odwołaj",
-    "contribution": {
-      "title": "Ukryj wpis",
-      "type": "Wpis / Post",
-      "message": "Czy na pewno chcesz ukryć wpis \" <b> {name} </b> \"?",
-      "success": "Wyślij pomyślnie usunięty!"
-    },
-    "comment": {
-      "title": "Usuń komentarz",
-      "type": "Komentarz",
-      "message": "Czy na pewno chcesz ukryć komentarz użytkownika \" <b> {name} </b> \"?"
-    }
-  },
-  "report": {
-    "submit": "Wyślij raport",
-    "cancel": "Anuluj",
-    "success": "Dziękujemy za Twoje zgłoszenie!",
-    "user": {
-      "title": "Raport Użytkownik",
-      "type": "Użytkownik",
-      "message": "Czy na pewno chcesz zgłosić użytkownika \" <b> {name} </b> \"?",
-      "error": "Zgłosiłeś już użytkownika!"
-    },
-    "contribution": {
-      "title": "Zgłoś wpis",
-      "type": "Wpis / Post",
-      "message": "Czy na pewno chcesz zgłosić ten wpis użytkownika \" <b> {name} </b> \"?",
-      "error": "Zgłosiłeś już ten wkład!"
-    },
-    "comment": {
-      "title": "Sprawozdanie Komentarz",
-      "type": "Komentarz",
-      "message": "Czy na pewno chcesz zgłosić komentarz użytkownika\" <b> {name} </b> \"?",
-      "error": "Zgłosiłeś już komentarz!"
-    }
-  },
-  "followButton": {
-    "follow": "naśladować",
-    "following": "w skutek"
-  },
   "shoutButton": {
     "shouted": "krzyczeć"
   },
-  "release": {
-    "submit": "Zgłoś",
-    "cancel": "Anuluj",
-    "success": "Zgłoszono pomyślnie!",
-    "user": {
-      "title": "Zgłoś użytkownika",
-      "type": "Użytkownik",
-      "message": "Czy na pewno chcesz zgłosić użytkownika \"<b> {name} </b>\"?"
-    },
-    "contribution": {
-      "title": "Zgłoś wpis",
-      "type": "Wpis",
-      "message": "Czy na pewno chcesz zgłosić wpis użytkownika \"<b> {name} </b>\"?"
-    },
-    "comment": {
-      "title": "Zgłoś komentarz",
-      "type": "Komentarz",
-      "message": "Czy na pewno chcesz zgłosić komentarz użytkownika \"<b> {name} </b>\"?"
-    }
+  "site": {
+    "bank": "rachunek bankowy",
+    "contact": "Kontakt",
+    "data-privacy": "ochrona danych",
+    "director": "Dyrektor zarządzający",
+    "germany": "Niemcy",
+    "imprint": "Nadruk",
+    "made": "Z &#10084; zrobiony",
+    "register": "numer rejestracyjny",
+    "responsible": "Odpowiedzialny zgodnie z § 55 Abs. 2 RStV (Niemcy)",
+    "taxident": "Numer identyfikacyjny podatku od wartości dodanej zgodnie z § 27 a Ustawa o podatku od wartości dodanej (Niemcy)",
+    "termsAc": "Warunki użytkowania",
+    "tribunal": "sąd rejestrowy"
   },
   "user": {
     "avatar": {
       "submitted": "Przesłano pomyślnie"
     }
-  },
-  "contribution": {
-    "newPost": "Utwórz nowy wpis",
-    "filterFollow": "Pokaż wpisy użytkowników, których śledzę",
-    "filterALL": "Pokaż wszystkie wpisy",
-    "success": "Zapisano!",
-    "languageSelectLabel": "Język",
-    "categories": {
-      "infoSelectedNoOfMaxCategories": "{chosen} z {max} wybrane kategorie"
-    },
-    "teaserImage": {
-      "cropperConfirm": "Potwierdzać"
-    }
   }
 }
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 29fe301c8..c6a6a17dd 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -1,747 +1,747 @@
 {
-    "login": {
-        "copy": "Se você já tem uma conta no Human Connection, entre aqui.",
-        "login": "Entrar",
-        "logout": "Sair",
-        "email": "Seu email",
-        "password": "Sua senha",
-        "moreInfo": "O que é a Human Connection?",
-        "hello": "Olá",
-        "forgotPassword": "Esqueceu a sua senha?",
-        "no-account": "Ainda não tem uma conta?",
-        "register": "Cadastrar-se",
-        "moreInfoURL": "https:\/\/human-connection.org\/en\/",
-        "moreInfoHint": "para a página de apresentação",
-        "success": "Você está conectado!",
-        "failure": "Endereço de e-mail ou senha incorretos."
+  "actions": {
+    "cancel": "Cancelar",
+    "create": "Criar",
+    "delete": "Apagar",
+    "edit": "Editar",
+    "loadMore": "Carregar mais",
+    "loading": "Carregando",
+    "save": "Salvar"
+  },
+  "admin": {
+    "categories": {
+      "categoryName": "Nome",
+      "name": "Categorias",
+      "postCount": "Postagens"
     },
-    "profile": {
-        "name": "Meu perfil",
-        "memberSince": "Membro desde",
-        "follow": "Seguir",
-        "followers": "Seguidores",
-        "following": "Seguindo",
-        "shouted": "Aclamou",
-        "commented": "Comentou",
-        "userAnonym": "Anonymous",
-        "socialMedia": "Onde mais posso encontrar",
-        "network": {
-            "title": "Rede",
-            "following": "está seguindo:",
-            "followingNobody": "não segue ninguém.",
-            "followedBy": "é seguido por:",
-            "followedByNobody": "não é seguido por ninguém.",
-            "andMore": "e {number} mais …"
-        },
-        "invites": {
-            "title": "Convidar alguém para Human Connection!",
-            "description": "Digite o endereço de e-mail para o convite.",
-            "emailPlaceholder": "E-mail para convidar"
-        }
-    },
-    "settings": {
-        "name": "Configurações",
-        "data": {
-            "name": "Seus dados",
-            "labelName": "Seu nome",
-            "labelCity": "Sua cidade ou estado",
-            "labelBio": "Sobre você",
-            "labelSlug": "Seu nome de usuário exclusivo",
-            "namePlaceholder": "Anonymous",
-            "success": "Seus dados foram atualizados com sucesso!"
-        },
-        "security": {
-            "name": "Segurança",
-            "change-password": {
-                "button": "Modificar senha",
-                "success": "Senha modificada com sucesso!",
-                "label-old-password": "Sua senha antiga",
-                "label-new-password": "Sua nova senha",
-                "label-new-password-confirm": "Confirme sua nova senha",
-                "message-old-password-required": "Digite sua senha antiga",
-                "message-new-password-required": "Digite uma nova senha",
-                "message-new-password-confirm-required": "Confirme sua nova senha",
-                "message-new-password-missmatch": "Digite a mesma senha novamente",
-                "passwordSecurity": "Segurança da senha",
-                "passwordStrength0": "Senha muito insegura",
-                "passwordStrength1": "Senha insegura",
-                "passwordStrength2": "Senha medíocre",
-                "passwordStrength3": "Senha forte",
-                "passwordStrength4": "Senha muito forte"
-            }
-        },
-        "invites": {
-            "name": "Convites"
-        },
-        "download": {
-            "name": "Baixar dados"
-        },
-        "delete": {
-            "name": "Apagar conta"
-        },
-        "organizations": {
-            "name": "Minhas Organizações"
-        },
-        "languages": {
-            "name": "Idiomas"
-        },
-        "email": {
-            "validation": {
-                "same-email": "Este é o seu endereço de e-mail atual"
-            },
-            "name": "Seu email",
-            "labelEmail": "Alterar o seu endereço de e-mail",
-            "labelNewEmail": "Novo endereço de e-mail",
-            "labelNonce": "Digite o seu código",
-            "success": "Um novo endereço de e-mail foi registrado.",
-            "submitted": "Um e-mail para verificar o seu endereço foi enviado para <b>{email}<\/b>.",
-            "change-successful": "O seu endereço de e-mail foi alterado com sucesso.",
-            "verification-error": {
-                "message": "O seu e-mail não pode ser alterado.",
-                "explanation": "Isto pode ter diferentes causas:",
-                "reason": {
-                    "invalid-nonce": "O código de confirmação esta inválido?",
-                    "no-email-request": "Você tem certeza de que solicitou uma alteração no seu endereço de e-mail?"
-                },
-                "support": "Se o problema persistir, por favor contacte-nos por e-mail"
-            }
-        },
-        "validation": {
-            "slug": {
-                "regex": "Os caracteres permitidos são apenas letras minúsculas, números, sublinhados e hífens.",
-                "alreadyTaken": "Este nome de usuário já está registrado."
-            }
-        },
-        "deleteUserAccount": {
-            "name": "Deletar dados",
-            "contributionsCount": "Deletar minhas {count} publicações",
-            "commentedCount": "Deletar meus {count} comentários",
-            "accountDescription": "Esteja ciente de que o suas Publicações e Comentários são importantes para a nossa comunidade. Se você ainda optar por excluí-los, você tem que marcá-los abaixo.",
-            "accountWarning": "Você <b>NÃO PODE GERENCIAR<\/b> e <b>NÃO PODE RECUPERAR<\/b> sua conta, Publicações, ou Comentários após excluir sua conta!",
-            "success": "Conta eliminada com sucesso!",
-            "pleaseConfirm": "<b class='is-danger'>Ação destrutiva!<\/b> Digitar <b>{confirm}<\/b> para confirmar"
-        },
-        "embeds": {
-            "name": "Fornecedores de terceiros",
-            "info-description": "Se você concordar, as publicações da seguinte lista de provedores incluirão automaticamente código de terceiros de outros provedores (terceiros) na forma de vídeos, imagens ou texto incorporados.",
-            "status": {
-                "description": "Como padrão para você, o código incorporado de provedores de terceiros é",
-                "disabled": {
-                    "off": "não exibido inicialmente",
-                    "on": "exibido imediatamente"
-                },
-                "change": {
-                    "question": "O código-fonte incorporado de terceiros deve sempre ser exibido para você?",
-                    "allow": "Certeza",
-                    "deny": "Não, obrigado"
-                }
-            }
-        },
-        "social-media": {
-            "name": "Mídias sociais",
-            "placeholder": "Sua url de mídia social",
-            "requireUnique": "Você já adicionou esta url",
-            "submit": "Adicionar link",
-            "successAdd": "Mídias sociais adicionadas. Perfil de usuário atualizado!",
-            "successDelete": "Mídias sociais removidas. Perfil de usuário atualizado!"
-        },
-        "muted-users": {
-            "name": "Usuários bloqueados",
-            "explanation": {
-                "intro": "Se outro usuário foi bloqueado por você, isto é o que acontece:",
-                "your-perspective": "As mensagens da pessoa bloqueada não aparecerão mais no seu feed de notícias.",
-                "search": "Publicações de pessoas bloqueadas desaparecem dos resultados da sua pesquisa."
-            },
-            "columns": {
-                "name": "Nome",
-                "slug": "Slug",
-                "unmute": "Desbloquear"
-            },
-            "empty": "Até agora, você não bloqueou ninguém.",
-            "how-to": "Você pode bloquear outros usuários em suas páginas de perfil através do menu de conteúdo.",
-            "mute": "Bloquear usuário",
-            "unmute": "Desbloquear usuário",
-            "unmuted": "{name} está desbloqueado novamente"
-        },
-        "privacy": {
-            "name": "Privacidade",
-            "make-shouts-public": "Compartilhar postagens que eu recomendei no meu perfil público",
-            "success-update": "Configurações de privacidade salvas"
-        }
-    },
-    "admin": {
-        "name": "Administração",
-        "dashboard": {
-            "name": "Painel de controle",
-            "users": "Usuários",
-            "posts": "Postagens",
-            "comments": "Comentários",
-            "notifications": "Notificações",
-            "organizations": "Organizações",
-            "projects": "Projetos",
-            "invites": "Convites",
-            "follows": "Segue",
-            "shouts": "Aclamações"
-        },
-        "organizations": {
-            "name": "Organizações"
-        },
-        "users": {
-            "name": "Usuários",
-            "form": {
-                "placeholder": "e-mail, nome ou descrição"
-            },
-            "table": {
-                "columns": {
-                    "number": "N.º",
-                    "name": "Nome",
-                    "email": "E-mail",
-                    "slug": "Slug",
-                    "role": "Função",
-                    "createdAt": "Criado em"
-                }
-            },
-            "empty": "Nenhum usuário encontrado"
-        },
-        "pages": {
-            "name": "Páginas"
-        },
-        "notifications": {
-            "name": "Notificações"
-        },
-        "categories": {
-            "name": "Categorias",
-            "categoryName": "Nome",
-            "postCount": "Postagens"
-        },
-        "tags": {
-            "name": "Etiquetas",
-            "tagCountUnique": "Usuários",
-            "tagCount": "Postagens"
-        },
-        "settings": {
-            "name": "Configurações"
-        },
-        "hashtags": {
-            "name": "Hashtags",
-            "number": "Não.",
-            "nameOfHashtag": "Nome",
-            "tagCountUnique": "Usuários",
-            "tagCount": "Publicações"
-        },
-        "invites": {
-            "name": "Convidar usuários",
-            "title": "Convidar pessoas",
-            "description": "Convites são uma maneira maravilhosa de ter seus amigos em sua rede …"
-        },
-        "donations": {
-            "name": "Informações sobre Doações",
-            "goal": "Doações mensais necessárias",
-            "progress": "Doações arrecadadas até o momento",
-            "successfulUpdate": "Informações sobre doações atualizadas com sucesso!"
-        }
-    },
-    "post": {
-        "name": "Postar",
-        "moreInfo": {
-            "name": "Mais informações",
-            "title": "Mais informações",
-            "description": "Aqui você pode encontrar mais informações sobre este tópico.",
-            "titleOfCategoriesSection": "Categorias",
-            "titleOfHashtagsSection": "Hashtags",
-            "titleOfRelatedContributionsSection": "Publicações relacionadas"
-        },
-        "takeAction": {
-            "name": "Tomar uma ação"
-        },
-        "pinned": "Anúncio",
-        "menu": {
-            "edit": "Editar publicação",
-            "delete": "Excluir publicação",
-            "pin": "Fixar publicação",
-            "pinnedSuccessfully": "Publicação fixada com sucesso!",
-            "unpin": "Desafixar publicação",
-            "unpinnedSuccessfully": "Publicação desafixada com sucesso!"
-        },
-        "comment": {
-            "submit": "Commentar",
-            "submitted": "Comentário Enviado",
-            "updated": "Alterações salvas"
-        },
-        "edited": "editado"
-    },
-    "quotes": {
-        "african": {
-            "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": "Postagem ::: Postagens",
-        "comment": "Comentário ::: Comentários",
-        "letsTalk": "Vamos Conversar",
-        "versus": "Contra",
-        "moreInfo": "Mais informações",
-        "takeAction": "Tomar uma ação",
-        "shout": "Aclamação ::: Aclamações",
-        "user": "Usuário ::: Usuários",
-        "category": "Categoria ::: Categorias",
-        "organization": "Organização ::: Organizações",
-        "project": "Projeto ::: Projetos",
-        "tag": "Etiqueta ::: Etiquetas",
-        "name": "Nome",
-        "loadMore": "Carregar mais",
-        "loading": "Carregando",
-        "reportContent": "Denunciar",
-        "validations": {
-            "email": "deve ser um endereço de e-mail válido",
-            "url": "deve ser uma URL válida",
-            "categories": "devem ser seleccionadas, no mínimo uma e, no máximo três categorias"
-        }
-    },
-    "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",
-            "submitter": "denunciado por",
-            "disabledBy": "desativado por",
-            "reasonCategory": "Categoria",
-            "reasonDescription": "Descrição",
-            "createdAt": "Data"
-        }
-    },
-    "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> \"?"
-        },
-        "submit": "Desativar",
-        "cancel": "Cancelar",
-        "success": "Desativado com sucesso!"
-    },
-    "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> \"?",
-            "error": "Você já denunciou o usuário!"
-        },
-        "contribution": {
-            "title": "Denunciar Contribuição",
-            "type": "Contribuição",
-            "message": "Você realmente deseja denunciar a contribuição \" <b> {name} <\/b> \"?",
-            "error": "Você já denunciou a contribuição!"
-        },
-        "comment": {
-            "title": "Denunciar Comentário",
-            "type": "Comentário",
-            "message": "Você realmente deseja denunciar o comentário de \"<b>{name}<\/b>\"?",
-            "error": "Você já denunciou o comentário!"
-        },
-        "success": "Obrigado por denunciar!",
-        "reason": {
-            "category": {
-                "label": "Selecione uma categoria:",
-                "placeholder": "Categoria …",
-                "options": {
-                    "discrimination_etc": "Mensagens, comentários, afirmações ou insultos discriminatórios.",
-                    "pornographic_content_links": "Publicação ou vinculação de material claramente pornográfico.",
-                    "glorific_trivia_of_cruel_inhuman_acts": "Glorificação ou banalização de atos de violência cruel ou desumana.",
-                    "doxing": "A divulgação de informações pessoais de terceiros sem o seu consentimento ou ameaça de (\"doxing\").",
-                    "intentional_intimidation_stalking_persecution": "Intimidação intencional, assédio ou perseguição.",
-                    "advert_products_services_commercial": "Publicidade de produtos e serviços com intenção comercial.",
-                    "criminal_behavior_violation_german_law": "Comportamento criminoso ou violação da lei alemã.",
-                    "other": "Outros …"
-                },
-                "invalid": "Selecione uma categoria válida"
-            },
-            "description": {
-                "label": "Por favor, explique: Por que você gostaria de denunciar isso?",
-                "placeholder": "Informações adicionais …"
-            }
-        }
-    },
-    "contribution": {
-        "edit": "Editar Contribuição",
-        "delete": "Apagar Contribuição",
-        "title": "Título",
-        "newPost": "Criar uma nova publicação",
-        "filterFollow": "Filtrar contribuições de usuários que eu sigo",
-        "filterALL": "Ver todas as contribuições",
-        "success": "Salvo!",
-        "languageSelectLabel": "Idioma",
-        "categories": {
-            "infoSelectedNoOfMaxCategories": "{chosen} of {max} categorias selecionadas"
-        },
-        "emotions-label": {
-            "funny": "Engraçado",
-            "happy": "Feliz",
-            "surprised": "Surpreso",
-            "cry": "Chorando",
-            "angry": "Irritado"
-        },
-        "category": {
-            "name": {
-                "freedom-of-speech": "Liberdade de expressão",
-                "consumption-sustainability": "Consumo e Sustentabilidade",
-                "global-peace-nonviolence": "Paz Mundial e Não-Violência",
-                "just-for-fun": "Só por diversão",
-                "happiness-values": "Felicidade e Valores",
-                "health-wellbeing": "Saúde e Bem-estar",
-                "environment-nature": "Meio Ambiente e Natureza",
-                "animal-protection": "Proteção Animal",
-                "human-rights-justice": "Direitos Humanos e Justiça",
-                "education-sciences": "Educação e Ciências",
-                "cooperation-development": "Cooperação e Desenvolvimento",
-                "democracy-politics": "Democracia e Política",
-                "economy-finances": "Economia e Finanças",
-                "energy-technology": "Energia e tecnologia",
-                "it-internet-data-privacy": "TI, Internet e Privacidade de Dados",
-                "art-culture-sport": "Arte, Cultura e Esporte"
-            }
-        },
-        "teaserImage": {
-            "cropperConfirm": "Confirmar"
-        },
-        "languageSelectText": "Selecionar Idioma"
-    },
-    "comment": {
-        "edit": "Editar Comentário",
-        "delete": "Apagar Comentário",
-        "content": {
-            "unavailable-placeholder": "…esse comentário não está mais disponível"
-        },
-        "menu": {
-            "edit": "Editar Comentário",
-            "delete": "Apagar Comentário"
-        },
-        "show": {
-            "more": "mostrar mais",
-            "less": "mostrar menos"
-        },
-        "edited": "editado"
-    },
-    "followButton": {
-        "follow": "Seguir",
-        "following": "Seguindo"
-    },
-    "shoutButton": {
-        "shouted": "aclamou"
-    },
-    "search": {
-        "placeholder": "Buscar",
-        "hint": "O que você está buscando?",
-        "failed": "Nada encontrado"
-    },
-    "components": {
-        "password-reset": {
-            "request": {
-                "title": "Redefinir sua senha",
-                "form": {
-                    "description": "Um e-mail de redefinição de senha será enviado ao endereço de e-mail fornecido.",
-                    "submit": "Solicitar e-mail",
-                    "submitted": "Um e-mail com mais instruções foi enviado para <b>{email}<\/b>"
-                }
-            },
-            "change-password": {
-                "success": "A alteração da sua senha foi bem-sucedida!",
-                "error": "A alteração da sua senha falhou. Talvez o código de segurança não estava correto?",
-                "help": "Em caso de problemas, sinta-se à vontade para pedir ajuda, enviando um e-mail para:"
-            }
-        },
-        "enter-nonce": {
-            "form": {
-                "nonce": "Digite seu código",
-                "description": "Abra a sua caixa de entrada e digite o código que lhe enviamos.",
-                "next": "Continue",
-                "validations": {
-                    "length": "deve ter 6 caracteres"
-                }
-            }
-        },
-        "registration": {
-            "signup": {
-                "unavailable": "Infelizmente, o registo público para usuário não está disponível neste servidor.",
-                "title": "Junte-se à Human Connection!",
-                "form": {
-                    "description": "Para começar, digite seu endereço de e-mail:",
-                    "terms-and-condition": "Eu concordo com os <a href=\"\/terms-and-conditions\"><ds-text bold color=\"primary\" > Termos e condições<\/ds-text><\/a>.",
-                    "data-privacy": "Eu li e entendi o <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"><ds-text bold color=\"primary\" >Política de Privacidade<\/ds-text><\/a> ",
-                    "minimum-age": "Tenho 18 anos ou mais.",
-                    "invitation-code": "O seu código de convite é: <b>{code}<\/b>",
-                    "errors": {
-                        "email-exists": "Já existe uma conta de usuário com este endereço de e-mail!",
-                        "invalid-invitation-token": "Parece que o convite já foi usado. Os links para convites só podem ser usados uma vez."
-                    },
-                    "submit": "Criar uma conta",
-                    "success": "Um e-mail com um link para completar o seu registo foi enviado para <b>{email}<\/b>"
-                }
-            },
-            "create-user-account": {
-                "title": "Criar uma conta de usuário",
-                "success": "A sua conta foi criada!",
-                "error": "Nenhuma conta de usuário pode ser criada!",
-                "help": " Talvez a confirmação tenha sido inválida? Em caso de problemas, sinta-se à vontade para pedir ajuda, enviando um e-mail para:"
-            }
-        }
-    },
-    "store": {
-        "posts": {
-            "orderBy": {
-                "newest": {
-                    "label": "Mais recentes"
-                },
-                "oldest": {
-                    "label": "Mais antigos"
-                }
-            }
-        }
-    },
-    "maintenance": {
-        "title": "Human Connection está em manutenção",
-        "explanation": "No momento estamos em manutenção, por favor tente novamente mais tarde.",
-        "questions": "Qualquer dúvida, envie um e-mail para"
-    },
-    "index": {
-        "no-results": "Nenhuma contribuição encontrada.",
-        "change-filter-settings": "Altere suas configurações de filtro para obter mais resultados."
-    },
-    "filter-menu": {
-        "title": "Sua bolha de filtro",
-        "hashtag-search": "Procurando por #{hashtag}",
-        "clearSearch": "Limpar pesquisa"
-    },
-    "filter-posts": {
-        "categories": {
-            "header": "Categorias de Conteúdo",
-            "all": "Todos"
-        },
-        "general": {
-            "header": "Filtrar por …"
-        },
-        "followers": {
-            "label": "Usuários que eu sigo"
-        },
-        "language": {
-            "header": "Idiomas",
-            "all": "Todos"
-        }
-    },
-    "site": {
-        "thanks": "Obrigado(a)!",
-        "error-occurred": "Ocorreu um erro.",
-        "made": "Feito com &#10084;",
-        "imprint": "Impressão",
-        "termsAndConditions": "Termos e Condições",
-        "data-privacy": "Proteção de Dados",
-        "contact": "Contato",
-        "tribunal": "tribunal de registo",
-        "register": "número de registo",
-        "director": "Diretor Administrativo",
-        "taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)",
-        "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ",
-        "bank": "conta bancária",
-        "germany": "Alemanha",
-        "code-of-conduct": "Codigo de Conduto",
-        "back-to-login": "Voltar para o Login",
-        "faq": "FAQ"
-    },
-    "editor": {
-        "placeholder": " Escreva algo inspirador…",
-        "mention": {
-            "noUsersFound": "Nenhum usuário encontrado"
-        },
-        "hashtag": {
-            "noHashtagsFound": "Nenhuma hashtag encontrada",
-            "addHashtag": "Nova hashtag",
-            "addLetter": "Digite uma letra"
-        },
-        "embed": {
-            "data_privacy_warning": "Aviso de Privacidade de Dados!",
-            "data_privacy_info": "Seus dados ainda não foram compartilhados com terceiros. Se continuar assistindo este vídeo, o seguinte fornecedor irá provavelmente recolher dados do utilizador:",
-            "play_now": "Assista agora",
-            "always_allow": "Sempre permita conteúdo incorporado por provedores de terceiros (esta configuração pode ser alterada a qualquer momento)"
-        }
-    },
-    "notifications": {
-        "reason": {
-            "mentioned_in_post": "Mencinou você em um post …",
-            "mentioned_in_comment": "Mentionou você em um comentário …",
-            "commented_on_post": "Comentou no seu post …"
-        },
-        "comment": "Comentário",
-        "title": "Notificações",
-        "pageLink": "Todas as notificações",
-        "post": "Post",
-        "user": "Usuário",
-        "content": "Conteúdo",
-        "filterLabel": {
-            "all": "Todos",
-            "read": "Lido",
-            "unread": "Não lido"
-        },
-        "empty": "Desculpe, não tem nenhuma notificação neste momento."
-    },
-    "delete": {
-        "submit": "Excluir",
-        "cancel": "Cancelar",
-        "contribution": {
-            "title": "Excluir publicação",
-            "type": "Contribuição",
-            "message": "Você realmente deseja excluir a publicação \"<b>{name}<\/b>\"?",
-            "success": "Publicação  excluída com êxito!"
-        },
-        "comment": {
-            "title": "Excluir Comentário",
-            "type": "Comentário",
-            "message": "Você realmente deseja excluir o comentário \"<b>{name}<\/b>\"?",
-            "success": "Comentário excluído com sucesso!"
-        }
-    },
-    "release": {
-        "submit": "Liberar",
-        "cancel": "Cancelar",
-        "success": "Liberado com sucesso!",
-        "user": {
-            "title": "Liberar usuário",
-            "type": "Usuário",
-            "message": "Você realmente quer liberar o usuário \"<b>{name}<\/b>\"?",
-            "error": "Você já denunciou o usuário!"
-        },
-        "contribution": {
-            "title": "Liberar contribuição ",
-            "type": "Contribuição",
-            "message": "Você realmente quer liberar a contribuição \"<b>{name}<\/b>\"?",
-            "error": "Você já denunciou a contribuição!"
-        },
-        "comment": {
-            "title": "Liberar Comentário ",
-            "type": "Comentário",
-            "message": "Você realmente quer liberar o comentário de \"<b>{name}<\/b>\"?",
-            "error": "Você já denunciou o comentário!"
-        }
-    },
-    "user": {
-        "avatar": {
-            "submitted": "Carregado com sucesso!"
-        }
-    },
-    "code-of-conduct": {
-        "subheader": "para a rede social da Human Connection gGmbH",
-        "preamble": {
-            "title": "Introdução",
-            "description": "A Human Connection é uma rede de conhecimento e ação social sem fins lucrativos da próxima geração. Feito por pessoas - para pessoas. Open Source, justo e transparente. Para uma mudança local e global positiva em todas as áreas da vida. Redesenhamos completamente a troca pública de conhecimentos, idéias e projetos. As funções da Human Connection reúnem as pessoas - offline e online - para que possamos fazer do mundo um lugar melhor."
-        },
-        "purpose": {
-            "title": "Propósito",
-            "description": "Com este código de conduta, regulamentamos os princípios essenciais para o comportamento em nossa rede social. A Carta dos Direitos Humanos das Nações Unidas é a nossa orientação e forma o coração da nossa compreensão dos valores. O código de conduta serve como princípios orientadores para a nossa aparência pessoal e interação uns com os outros. Qualquer pessoa ativa como usuário da Human Connection Network, que escreve artigos, comentários ou  se conecta com outros usuários, incluindo aqueles fora da rede, reconhece estas regras de conduta como obrigatórias."
-        },
-        "expected-behaviour": {
-            "title": "Comportamentos esperados",
-            "description": "Os seguintes comportamentos são esperados e solicitados a todos os membros da comunidade:",
-            "list": {
-                "0": "Exercitar ponderação e respeito no seu discurso e ações.",
-                "1": "Tente a colaboração antes do conflito.",
-                "2": "Evite comportamentos e discursos humilhantes, discriminatórios ou assediadores.",
-                "3": "Esteja atento ao que o rodeia e aos outros participantes. Alerte os líderes comunitários se você perceber uma situação perigosa, alguém em perigo ou violações deste Código de Conduta, mesmo que pareçam inconsequentes."
-            }
-        },
-        "unacceptable-behaviour": {
-            "title": "Comportamentos Inaceitáveis",
-            "description": "Os seguintes comportamentos são inaceitáveis dentro da nossa comunidade:",
-            "list": {
-                "0": "Mensagens, comentários, afirmações ou insultos discriminatórios, particularmente aqueles relacionados a gênero, orientação sexual, raça, religião, orientação política ou filosófica ou deficiência.",
-                "1": "Publicar ou vincular material claramente pornográfico.",
-                "2": "Glorificação ou banalização de atos de violência cruel ou desumana.",
-                "3": "A divulgação de informações pessoais de terceiros sem o seu consentimento ou ameaça de (\"doxing\").",
-                "4": "Intimidação intencional, assédio ou perseguição.",
-                "5": "Publicidade de produtos e serviços com intenção comercial.",
-                "6": "Comportamento criminoso ou violação da lei alemã.",
-                "7": "Apoiar ou incentivar tal conduta."
-            }
-        },
-        "consequences": {
-            "title": "Consequências de um comportamento inaceitável",
-            "description": "Se um membro da comunidade apresentar um comportamento inaceitável, os operadores, moderadores e administradores responsáveis da rede podem tomar medidas adequadas, incluindo, entre outras:",
-            "list": {
-                "0": "Pedido de suspensão imediata de uma conduta inaceitável",
-                "1": "Bloquear ou excluir comentários",
-                "2": "Exclusão temporária da respectiva publicação ou contribuição",
-                "3": "Bloquear ou eliminar conteúdo",
-                "4": "Retirada temporária de permissão de escrita",
-                "5": "Exclusão temporária da rede",
-                "6": "Exclusão definitiva da rede",
-                "7": "Violações da lei alemã podem ser denunciadas"
-            }
-        },
-        "get-help": "Se você for vítima ou testemunhar um comportamento inaceitável, ou tiver qualquer outra preocupação, por favor notifique um organizador da comunidade o mais rápido possível e inclua o link ou mencione o conteúdo correspondente:"
-    },
-    "termsAndConditions": {
-        "newTermsAndConditions": "Novos Termos e Condições",
-        "termsAndConditionsConfirmed": "Eu li e confirmei os <a href=\"\/terms-and-conditions\" target=\"_blank\">Terms and Conditions<\/a>.",
-        "termsAndConditionsNewConfirmText": "Por favor, leia os novos termos de uso agora!",
-        "termsAndConditionsNewConfirm": "Eu li e concordo com os novos termos de condições.",
-        "agree": "Eu concordo!",
-        "terms-of-service": {
-            "title": "Termos do Serviço",
-            "description": "As seguintes condições de utilização constituem a base para a utilização da nossa rede. Ao registar-se, deve aceitar os termos de utilização e informaremos mais tarde sobre quaisquer alterações que possam ocorrer. A Human Connection Network é operada na Alemanha e, portanto, está sujeita à lei alemã. O local de jurisdição é Kirchheim \/ Teck. Para mais detalhes, veja a nossa impressão: <a href=\"https:\/\/human-connection.org\/imprint\" target=\"_blank\" >https:\/\/human-connection.org\/imprint<\/a> "
-        },
-        "use-and-license": {
-            "title": "Uso e Licença",
-            "description": "Se qualquer conteúdo que você publicar para nós for protegido por direitos de propriedade intelectual, você nos concede uma licença não exclusiva, transferível, sublicenciável e mundial para usar tal conteúdo para postar em nossa rede. Esta licença expira quando você exclui seu conteúdo ou toda a sua conta. Lembre-se de que outros podem compartilhar seu conteúdo e nós não podemos excluí-lo."
-        },
-        "privacy-statement": {
-            "title": "Política de Privacidade",
-            "description": "Nossa rede é uma rede social de conhecimento e ação. Portanto, é particularmente importante para nós que o máximo de conteúdo possível seja acessível ao público. No decurso do desenvolvimento da nossa rede, haverá cada vez mais a possibilidade de decidir sobre a visibilidade dos dados pessoais. Iremos informá-lo sobre estas novas funcionalidades. Caso contrário, você deve sempre pensar sobre quais dados pessoais você divulga sobre si mesmo (ou outros). Isto aplica-se em particular ao conteúdo das mensagens e comentários, uma vez que estes têm um carácter largamente público. Mais tarde, haverá possibilidades de limitar a visibilidade do seu perfil. Parte dos termos de serviço é a nossa declaração de privacidade, que o informa sobre as operações individuais de processamento de dados na nossa rede: <a href=\"https:\/\/human-connection.org\/datenschutz\/#netzwerk\" target=\"_blank\"> https:\/\/human-connection.org\/datenschutz\/#netzwerk<\/a>  bzw. <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz\/<\/a> Nossa declaração de privacidade é adaptada à situação legal e às características de nossa rede e é sempre válida na versão mais atual."
-        },
-        "code-of-conduct": {
-            "title": "Código de Conduta",
-            "description": "Nosso código de conduta serve como um manual de aparência pessoal e interação entre si. Quem quer que seja ativo como utilizador na rede Human Connection, escreva artigos, comentários ou faça contato com outros utilizadores, mesmo fora da rede, reconhece estas regras de conduta como sendo vinculativas. <a href=\"https:\/\/alpha.human-connection.org\/code-of-conduct\" target=\"_blank\"> https:\/\/alpha.human-connection.org\/code-of-conduct<\/a>"
-        },
-        "moderation": {
-            "title": "Moderação",
-            "description": "Até que nossas possibilidades financeiras nos permitam implementar o sistema de moderação comunitária, moderamos com um sistema simplificado e com pessoal próprio ou possivelmente voluntário. Nós treinamos esses moderadores e por isso só eles tomam as decisões apropriadas. Estes moderadores realizam o seu trabalho de forma anônima. Você pode denunciar mensagens, comentários e usuários para nós (por exemplo, se eles fornecem informações em seu perfil ou têm imagens que violam estes Termos de Uso). Se você relatar algo para nós, você precisa dar uma razão e pode dar uma breve explicação. Em seguida, analisaremos o que você denunciou e o sancionaremos, se necessário, por exemplo, bloqueando contribuições, comentários ou usuários. Infelizmente, você e a pessoa em questão não receberão qualquer feedback da nossa parte neste momento, mas isto está na fase de planeamento. Independentemente disso, reservamo-nos o direito de impor sanções em princípio por razões que podem ou não estar listadas no nosso Código de Conduta ou nestes termos de serviço."
-        },
-        "errors-and-feedback": {
-            "title": "Erros e Feedback",
-            "description": "Fazemos todos os esforços para manter a nossa rede e dados seguros e disponíveis. Cada nova versão do software passa por testes automatizados e manuais. No entanto, podem ocorrer erros imprevistos. Portanto, somos gratos por quaisquer erros reportados. Você é bem-vindo para relatar quaisquer erros que você descobrir enviando um e-mail para o Suporte em support@human-connection.org."
-        },
-        "help-and-questions": {
-            "title": "Ajuda e Perguntas",
-            "description": "Para ajuda e perguntas, nós compilamos uma coleção abrangente de perguntas e respostas frequentes (FAQ) para você. Você pode encontrá-las aqui: <a href=\"https:\/\/support.human-connection.org\/kb\/\" target=\"_blank\" > https:\/\/support.human-connection.org\/kb\/ <\/a>"
-        },
-        "addition": {
-            "title": "Além disso, realizamos regularmente eventos onde você também pode compartilhar suas impressões e fazer perguntas. Você pode encontrar uma visão geral atual aqui:",
-            "description": "<a href=\"https:\/\/human-connection.org\/events\/\" target=\"_blank\" > https:\/\/human-connection.org\/events\/ <\/a>"
-        }
+    "dashboard": {
+      "comments": "Comentários",
+      "follows": "Segue",
+      "invites": "Convites",
+      "name": "Painel de controle",
+      "notifications": "Notificações",
+      "organizations": "Organizações",
+      "posts": "Postagens",
+      "projects": "Projetos",
+      "shouts": "Aclamações",
+      "users": "Usuários"
     },
     "donations": {
-        "donations-for": "Doações para",
-        "donate-now": "Doe agora",
-        "amount-of-total": "{amount} dos {total} € foram coletados"
+      "goal": "Doações mensais necessárias",
+      "name": "Informações sobre Doações",
+      "progress": "Doações arrecadadas até o momento",
+      "successfulUpdate": "Informações sobre doações atualizadas com sucesso!"
+    },
+    "hashtags": {
+      "name": "Hashtags",
+      "nameOfHashtag": "Nome",
+      "number": "Não.",
+      "tagCount": "Publicações",
+      "tagCountUnique": "Usuários"
+    },
+    "invites": {
+      "description": "Convites são uma maneira maravilhosa de ter seus amigos em sua rede …",
+      "name": "Convidar usuários",
+      "title": "Convidar pessoas"
+    },
+    "name": "Administração",
+    "notifications": {
+      "name": "Notificações"
+    },
+    "organizations": {
+      "name": "Organizações"
+    },
+    "pages": {
+      "name": "Páginas"
+    },
+    "settings": {
+      "name": "Configurações"
+    },
+    "tags": {
+      "name": "Etiquetas",
+      "tagCount": "Postagens",
+      "tagCountUnique": "Usuários"
+    },
+    "users": {
+      "empty": "Nenhum usuário encontrado",
+      "form": {
+        "placeholder": "e-mail, nome ou descrição"
+      },
+      "name": "Usuários",
+      "table": {
+        "columns": {
+          "createdAt": "Criado em",
+          "email": "E-mail",
+          "name": "Nome",
+          "number": "N.º",
+          "role": "Função",
+          "slug": "Slug"
+        }
+      }
     }
+  },
+  "code-of-conduct": {
+    "consequences": {
+      "description": "Se um membro da comunidade apresentar um comportamento inaceitável, os operadores, moderadores e administradores responsáveis da rede podem tomar medidas adequadas, incluindo, entre outras:",
+      "list": {
+        "0": "Pedido de suspensão imediata de uma conduta inaceitável",
+        "1": "Bloquear ou excluir comentários",
+        "2": "Exclusão temporária da respectiva publicação ou contribuição",
+        "3": "Bloquear ou eliminar conteúdo",
+        "4": "Retirada temporária de permissão de escrita",
+        "5": "Exclusão temporária da rede",
+        "6": "Exclusão definitiva da rede",
+        "7": "Violações da lei alemã podem ser denunciadas"
+      },
+      "title": "Consequências de um comportamento inaceitável"
+    },
+    "expected-behaviour": {
+      "description": "Os seguintes comportamentos são esperados e solicitados a todos os membros da comunidade:",
+      "list": {
+        "0": "Exercitar ponderação e respeito no seu discurso e ações.",
+        "1": "Tente a colaboração antes do conflito.",
+        "2": "Evite comportamentos e discursos humilhantes, discriminatórios ou assediadores.",
+        "3": "Esteja atento ao que o rodeia e aos outros participantes. Alerte os líderes comunitários se você perceber uma situação perigosa, alguém em perigo ou violações deste Código de Conduta, mesmo que pareçam inconsequentes."
+      },
+      "title": "Comportamentos esperados"
+    },
+    "get-help": "Se você for vítima ou testemunhar um comportamento inaceitável, ou tiver qualquer outra preocupação, por favor notifique um organizador da comunidade o mais rápido possível e inclua o link ou mencione o conteúdo correspondente:",
+    "preamble": {
+      "description": "A Human Connection é uma rede de conhecimento e ação social sem fins lucrativos da próxima geração. Feito por pessoas - para pessoas. Open Source, justo e transparente. Para uma mudança local e global positiva em todas as áreas da vida. Redesenhamos completamente a troca pública de conhecimentos, idéias e projetos. As funções da Human Connection reúnem as pessoas - offline e online - para que possamos fazer do mundo um lugar melhor.",
+      "title": "Introdução"
+    },
+    "purpose": {
+      "description": "Com este código de conduta, regulamentamos os princípios essenciais para o comportamento em nossa rede social. A Carta dos Direitos Humanos das Nações Unidas é a nossa orientação e forma o coração da nossa compreensão dos valores. O código de conduta serve como princípios orientadores para a nossa aparência pessoal e interação uns com os outros. Qualquer pessoa ativa como usuário da Human Connection Network, que escreve artigos, comentários ou  se conecta com outros usuários, incluindo aqueles fora da rede, reconhece estas regras de conduta como obrigatórias.",
+      "title": "Propósito"
+    },
+    "subheader": "para a rede social da Human Connection gGmbH",
+    "unacceptable-behaviour": {
+      "description": "Os seguintes comportamentos são inaceitáveis dentro da nossa comunidade:",
+      "list": {
+        "0": "Mensagens, comentários, afirmações ou insultos discriminatórios, particularmente aqueles relacionados a gênero, orientação sexual, raça, religião, orientação política ou filosófica ou deficiência.",
+        "1": "Publicar ou vincular material claramente pornográfico.",
+        "2": "Glorificação ou banalização de atos de violência cruel ou desumana.",
+        "3": "A divulgação de informações pessoais de terceiros sem o seu consentimento ou ameaça de (\"doxing\").",
+        "4": "Intimidação intencional, assédio ou perseguição.",
+        "5": "Publicidade de produtos e serviços com intenção comercial.",
+        "6": "Comportamento criminoso ou violação da lei alemã.",
+        "7": "Apoiar ou incentivar tal conduta."
+      },
+      "title": "Comportamentos Inaceitáveis"
+    }
+  },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "…esse comentário não está mais disponível"
+    },
+    "delete": "Apagar Comentário",
+    "edit": "Editar Comentário",
+    "edited": "editado",
+    "menu": {
+      "delete": "Apagar Comentário",
+      "edit": "Editar Comentário"
+    },
+    "show": {
+      "less": "mostrar menos",
+      "more": "mostrar mais"
+    }
+  },
+  "common": {
+    "category": "Categoria ::: Categorias",
+    "comment": "Comentário ::: Comentários",
+    "letsTalk": "Vamos Conversar",
+    "loadMore": "Carregar mais",
+    "loading": "Carregando",
+    "moreInfo": "Mais informações",
+    "name": "Nome",
+    "organization": "Organização ::: Organizações",
+    "post": "Postagem ::: Postagens",
+    "project": "Projeto ::: Projetos",
+    "reportContent": "Denunciar",
+    "shout": "Aclamação ::: Aclamações",
+    "tag": "Etiqueta ::: Etiquetas",
+    "takeAction": "Tomar uma ação",
+    "user": "Usuário ::: Usuários",
+    "validations": {
+      "categories": "devem ser seleccionadas, no mínimo uma e, no máximo três categorias",
+      "email": "deve ser um endereço de e-mail válido",
+      "url": "deve ser uma URL válida"
+    },
+    "versus": "Contra"
+  },
+  "components": {
+    "enter-nonce": {
+      "form": {
+        "description": "Abra a sua caixa de entrada e digite o código que lhe enviamos.",
+        "next": "Continue",
+        "nonce": "Digite seu código",
+        "validations": {
+          "length": "deve ter 6 caracteres"
+        }
+      }
+    },
+    "password-reset": {
+      "change-password": {
+        "error": "A alteração da sua senha falhou. Talvez o código de segurança não estava correto?",
+        "help": "Em caso de problemas, sinta-se à vontade para pedir ajuda, enviando um e-mail para:",
+        "success": "A alteração da sua senha foi bem-sucedida!"
+      },
+      "request": {
+        "form": {
+          "description": "Um e-mail de redefinição de senha será enviado ao endereço de e-mail fornecido.",
+          "submit": "Solicitar e-mail",
+          "submitted": "Um e-mail com mais instruções foi enviado para <b>{email}</b>"
+        },
+        "title": "Redefinir sua senha"
+      }
+    },
+    "registration": {
+      "create-user-account": {
+        "error": "Nenhuma conta de usuário pode ser criada!",
+        "help": " Talvez a confirmação tenha sido inválida? Em caso de problemas, sinta-se à vontade para pedir ajuda, enviando um e-mail para:",
+        "success": "A sua conta foi criada!",
+        "title": "Criar uma conta de usuário"
+      },
+      "signup": {
+        "form": {
+          "data-privacy": "Eu li e entendi o <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Política de Privacidade</ds-text></a> ",
+          "description": "Para começar, digite seu endereço de e-mail:",
+          "errors": {
+            "email-exists": "Já existe uma conta de usuário com este endereço de e-mail!",
+            "invalid-invitation-token": "Parece que o convite já foi usado. Os links para convites só podem ser usados uma vez."
+          },
+          "invitation-code": "O seu código de convite é: <b>{code}</b>",
+          "minimum-age": "Tenho 18 anos ou mais.",
+          "submit": "Criar uma conta",
+          "success": "Um e-mail com um link para completar o seu registo foi enviado para <b>{email}</b>",
+          "terms-and-condition": "Eu concordo com os <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Termos e condições</ds-text></a>."
+        },
+        "title": "Junte-se à Human Connection!",
+        "unavailable": "Infelizmente, o registo público para usuário não está disponível neste servidor."
+      }
+    }
+  },
+  "contribution": {
+    "categories": {
+      "infoSelectedNoOfMaxCategories": "{chosen} of {max} categorias selecionadas"
+    },
+    "category": {
+      "name": {
+        "animal-protection": "Proteção Animal",
+        "art-culture-sport": "Arte, Cultura e Esporte",
+        "consumption-sustainability": "Consumo e Sustentabilidade",
+        "cooperation-development": "Cooperação e Desenvolvimento",
+        "democracy-politics": "Democracia e Política",
+        "economy-finances": "Economia e Finanças",
+        "education-sciences": "Educação e Ciências",
+        "energy-technology": "Energia e tecnologia",
+        "environment-nature": "Meio Ambiente e Natureza",
+        "freedom-of-speech": "Liberdade de expressão",
+        "global-peace-nonviolence": "Paz Mundial e Não-Violência",
+        "happiness-values": "Felicidade e Valores",
+        "health-wellbeing": "Saúde e Bem-estar",
+        "human-rights-justice": "Direitos Humanos e Justiça",
+        "it-internet-data-privacy": "TI, Internet e Privacidade de Dados",
+        "just-for-fun": "Só por diversão"
+      }
+    },
+    "delete": "Apagar Contribuição",
+    "edit": "Editar Contribuição",
+    "emotions-label": {
+      "angry": "Irritado",
+      "cry": "Chorando",
+      "funny": "Engraçado",
+      "happy": "Feliz",
+      "surprised": "Surpreso"
+    },
+    "filterALL": "Ver todas as contribuições",
+    "filterFollow": "Filtrar contribuições de usuários que eu sigo",
+    "languageSelectLabel": "Idioma",
+    "languageSelectText": "Selecionar Idioma",
+    "newPost": "Criar uma nova publicação",
+    "success": "Salvo!",
+    "teaserImage": {
+      "cropperConfirm": "Confirmar"
+    },
+    "title": "Título"
+  },
+  "delete": {
+    "cancel": "Cancelar",
+    "comment": {
+      "message": "Você realmente deseja excluir o comentário \"<b>{name}</b>\"?",
+      "success": "Comentário excluído com sucesso!",
+      "title": "Excluir Comentário",
+      "type": "Comentário"
+    },
+    "contribution": {
+      "message": "Você realmente deseja excluir a publicação \"<b>{name}</b>\"?",
+      "success": "Publicação  excluída com êxito!",
+      "title": "Excluir publicação",
+      "type": "Contribuição"
+    },
+    "submit": "Excluir"
+  },
+  "disable": {
+    "cancel": "Cancelar",
+    "comment": {
+      "message": "Você realmente deseja desativar o comentário de \" <b> {name} </b> \"?",
+      "title": "Desativar comentário",
+      "type": "Comentário"
+    },
+    "contribution": {
+      "message": "Você realmente deseja desativar a contribuição \" <b> {name} </b> \"?",
+      "title": "Desativar Contribuição",
+      "type": "Contribuição"
+    },
+    "submit": "Desativar",
+    "success": "Desativado com sucesso!",
+    "user": {
+      "message": "Você realmente deseja desativar o usuário \" <b> {name} </b> \"?",
+      "title": "Desativar usuário",
+      "type": "Usuário"
+    }
+  },
+  "donations": {
+    "amount-of-total": "{amount} dos {total} € foram coletados",
+    "donate-now": "Doe agora",
+    "donations-for": "Doações para"
+  },
+  "editor": {
+    "embed": {
+      "always_allow": "Sempre permita conteúdo incorporado por provedores de terceiros (esta configuração pode ser alterada a qualquer momento)",
+      "data_privacy_info": "Seus dados ainda não foram compartilhados com terceiros. Se continuar assistindo este vídeo, o seguinte fornecedor irá provavelmente recolher dados do utilizador:",
+      "data_privacy_warning": "Aviso de Privacidade de Dados!",
+      "play_now": "Assista agora"
+    },
+    "hashtag": {
+      "addHashtag": "Nova hashtag",
+      "addLetter": "Digite uma letra",
+      "noHashtagsFound": "Nenhuma hashtag encontrada"
+    },
+    "mention": {
+      "noUsersFound": "Nenhum usuário encontrado"
+    },
+    "placeholder": " Escreva algo inspirador…"
+  },
+  "filter-menu": {
+    "clearSearch": "Limpar pesquisa",
+    "hashtag-search": "Procurando por #{hashtag}",
+    "title": "Sua bolha de filtro"
+  },
+  "filter-posts": {
+    "categories": {
+      "all": "Todos",
+      "header": "Categorias de Conteúdo"
+    },
+    "followers": {
+      "label": "Usuários que eu sigo"
+    },
+    "general": {
+      "header": "Filtrar por …"
+    },
+    "language": {
+      "all": "Todos",
+      "header": "Idiomas"
+    }
+  },
+  "followButton": {
+    "follow": "Seguir",
+    "following": "Seguindo"
+  },
+  "index": {
+    "change-filter-settings": "Altere suas configurações de filtro para obter mais resultados.",
+    "no-results": "Nenhuma contribuição encontrada."
+  },
+  "login": {
+    "copy": "Se você já tem uma conta no Human Connection, entre aqui.",
+    "email": "Seu email",
+    "failure": "Endereço de e-mail ou senha incorretos.",
+    "forgotPassword": "Esqueceu a sua senha?",
+    "hello": "Olá",
+    "login": "Entrar",
+    "logout": "Sair",
+    "moreInfo": "O que é a Human Connection?",
+    "moreInfoHint": "para a página de apresentação",
+    "moreInfoURL": "https://human-connection.org/en/",
+    "no-account": "Ainda não tem uma conta?",
+    "password": "Sua senha",
+    "register": "Cadastrar-se",
+    "success": "Você está conectado!"
+  },
+  "maintenance": {
+    "explanation": "No momento estamos em manutenção, por favor tente novamente mais tarde.",
+    "questions": "Qualquer dúvida, envie um e-mail para",
+    "title": "Human Connection está em manutenção"
+  },
+  "moderation": {
+    "name": "Moderação",
+    "reports": {
+      "createdAt": "Data",
+      "disabledBy": "desativado por",
+      "empty": "Parabéns, nada a moderar.",
+      "name": "Denúncias",
+      "reasonCategory": "Categoria",
+      "reasonDescription": "Descrição",
+      "reporter": "Denunciado por",
+      "submitter": "denunciado por"
+    }
+  },
+  "notifications": {
+    "comment": "Comentário",
+    "content": "Conteúdo",
+    "empty": "Desculpe, não tem nenhuma notificação neste momento.",
+    "filterLabel": {
+      "all": "Todos",
+      "read": "Lido",
+      "unread": "Não lido"
+    },
+    "pageLink": "Todas as notificações",
+    "post": "Post",
+    "reason": {
+      "commented_on_post": "Comentou no seu post …",
+      "mentioned_in_comment": "Mentionou você em um comentário …",
+      "mentioned_in_post": "Mencinou você em um post …"
+    },
+    "title": "Notificações",
+    "user": "Usuário"
+  },
+  "post": {
+    "comment": {
+      "submit": "Commentar",
+      "submitted": "Comentário Enviado",
+      "updated": "Alterações salvas"
+    },
+    "edited": "editado",
+    "menu": {
+      "delete": "Excluir publicação",
+      "edit": "Editar publicação",
+      "pin": "Fixar publicação",
+      "pinnedSuccessfully": "Publicação fixada com sucesso!",
+      "unpin": "Desafixar publicação",
+      "unpinnedSuccessfully": "Publicação desafixada com sucesso!"
+    },
+    "moreInfo": {
+      "description": "Aqui você pode encontrar mais informações sobre este tópico.",
+      "name": "Mais informações",
+      "title": "Mais informações",
+      "titleOfCategoriesSection": "Categorias",
+      "titleOfHashtagsSection": "Hashtags",
+      "titleOfRelatedContributionsSection": "Publicações relacionadas"
+    },
+    "name": "Postar",
+    "pinned": "Anúncio",
+    "takeAction": {
+      "name": "Tomar uma ação"
+    }
+  },
+  "profile": {
+    "commented": "Comentou",
+    "follow": "Seguir",
+    "followers": "Seguidores",
+    "following": "Seguindo",
+    "invites": {
+      "description": "Digite o endereço de e-mail para o convite.",
+      "emailPlaceholder": "E-mail para convidar",
+      "title": "Convidar alguém para Human Connection!"
+    },
+    "memberSince": "Membro desde",
+    "name": "Meu perfil",
+    "network": {
+      "andMore": "e {number} mais …",
+      "followedBy": "é seguido por:",
+      "followedByNobody": "não é seguido por ninguém.",
+      "following": "está seguindo:",
+      "followingNobody": "não segue ninguém.",
+      "title": "Rede"
+    },
+    "shouted": "Aclamou",
+    "socialMedia": "Onde mais posso encontrar",
+    "userAnonym": "Anonymous"
+  },
+  "quotes": {
+    "african": {
+      "author": "Provérbio africano",
+      "quote": "Muitas pessoas pequenas, em muitos lugares pequenos, fazem muitas coisas pequenas, que podem mudar a face do mundo."
+    }
+  },
+  "release": {
+    "cancel": "Cancelar",
+    "comment": {
+      "error": "Você já denunciou o comentário!",
+      "message": "Você realmente quer liberar o comentário de \"<b>{name}</b>\"?",
+      "title": "Liberar Comentário ",
+      "type": "Comentário"
+    },
+    "contribution": {
+      "error": "Você já denunciou a contribuição!",
+      "message": "Você realmente quer liberar a contribuição \"<b>{name}</b>\"?",
+      "title": "Liberar contribuição ",
+      "type": "Contribuição"
+    },
+    "submit": "Liberar",
+    "success": "Liberado com sucesso!",
+    "user": {
+      "error": "Você já denunciou o usuário!",
+      "message": "Você realmente quer liberar o usuário \"<b>{name}</b>\"?",
+      "title": "Liberar usuário",
+      "type": "Usuário"
+    }
+  },
+  "report": {
+    "cancel": "Cancelar",
+    "comment": {
+      "error": "Você já denunciou o comentário!",
+      "message": "Você realmente deseja denunciar o comentário de \"<b>{name}</b>\"?",
+      "title": "Denunciar Comentário",
+      "type": "Comentário"
+    },
+    "contribution": {
+      "error": "Você já denunciou a contribuição!",
+      "message": "Você realmente deseja denunciar a contribuição \" <b> {name} </b> \"?",
+      "title": "Denunciar Contribuição",
+      "type": "Contribuição"
+    },
+    "reason": {
+      "category": {
+        "invalid": "Selecione uma categoria válida",
+        "label": "Selecione uma categoria:",
+        "options": {
+          "advert_products_services_commercial": "Publicidade de produtos e serviços com intenção comercial.",
+          "criminal_behavior_violation_german_law": "Comportamento criminoso ou violação da lei alemã.",
+          "discrimination_etc": "Mensagens, comentários, afirmações ou insultos discriminatórios.",
+          "doxing": "A divulgação de informações pessoais de terceiros sem o seu consentimento ou ameaça de (\"doxing\").",
+          "glorific_trivia_of_cruel_inhuman_acts": "Glorificação ou banalização de atos de violência cruel ou desumana.",
+          "intentional_intimidation_stalking_persecution": "Intimidação intencional, assédio ou perseguição.",
+          "other": "Outros …",
+          "pornographic_content_links": "Publicação ou vinculação de material claramente pornográfico."
+        },
+        "placeholder": "Categoria …"
+      },
+      "description": {
+        "label": "Por favor, explique: Por que você gostaria de denunciar isso?",
+        "placeholder": "Informações adicionais …"
+      }
+    },
+    "submit": "Enviar denúncia",
+    "success": "Obrigado por denunciar!",
+    "user": {
+      "error": "Você já denunciou o usuário!",
+      "message": "Você realmente deseja denunciar o usuário \" <b> {name} </b> \"?",
+      "title": "Denunciar usuário",
+      "type": "Usuário"
+    }
+  },
+  "search": {
+    "failed": "Nada encontrado",
+    "hint": "O que você está buscando?",
+    "placeholder": "Buscar"
+  },
+  "settings": {
+    "data": {
+      "labelBio": "Sobre você",
+      "labelCity": "Sua cidade ou estado",
+      "labelName": "Seu nome",
+      "labelSlug": "Seu nome de usuário exclusivo",
+      "name": "Seus dados",
+      "namePlaceholder": "Anonymous",
+      "success": "Seus dados foram atualizados com sucesso!"
+    },
+    "delete": {
+      "name": "Apagar conta"
+    },
+    "deleteUserAccount": {
+      "accountDescription": "Esteja ciente de que o suas Publicações e Comentários são importantes para a nossa comunidade. Se você ainda optar por excluí-los, você tem que marcá-los abaixo.",
+      "accountWarning": "Você <b>NÃO PODE GERENCIAR</b> e <b>NÃO PODE RECUPERAR</b> sua conta, Publicações, ou Comentários após excluir sua conta!",
+      "commentedCount": "Deletar meus {count} comentários",
+      "contributionsCount": "Deletar minhas {count} publicações",
+      "name": "Deletar dados",
+      "pleaseConfirm": "<b class='is-danger'>Ação destrutiva!</b> Digitar <b>{confirm}</b> para confirmar",
+      "success": "Conta eliminada com sucesso!"
+    },
+    "download": {
+      "name": "Baixar dados"
+    },
+    "email": {
+      "change-successful": "O seu endereço de e-mail foi alterado com sucesso.",
+      "labelEmail": "Alterar o seu endereço de e-mail",
+      "labelNewEmail": "Novo endereço de e-mail",
+      "labelNonce": "Digite o seu código",
+      "name": "Seu email",
+      "submitted": "Um e-mail para verificar o seu endereço foi enviado para <b>{email}</b>.",
+      "success": "Um novo endereço de e-mail foi registrado.",
+      "validation": {
+        "same-email": "Este é o seu endereço de e-mail atual"
+      },
+      "verification-error": {
+        "explanation": "Isto pode ter diferentes causas:",
+        "message": "O seu e-mail não pode ser alterado.",
+        "reason": {
+          "invalid-nonce": "O código de confirmação esta inválido?",
+          "no-email-request": "Você tem certeza de que solicitou uma alteração no seu endereço de e-mail?"
+        },
+        "support": "Se o problema persistir, por favor contacte-nos por e-mail"
+      }
+    },
+    "embeds": {
+      "info-description": "Se você concordar, as publicações da seguinte lista de provedores incluirão automaticamente código de terceiros de outros provedores (terceiros) na forma de vídeos, imagens ou texto incorporados.",
+      "name": "Fornecedores de terceiros",
+      "status": {
+        "change": {
+          "allow": "Certeza",
+          "deny": "Não, obrigado",
+          "question": "O código-fonte incorporado de terceiros deve sempre ser exibido para você?"
+        },
+        "description": "Como padrão para você, o código incorporado de provedores de terceiros é",
+        "disabled": {
+          "off": "não exibido inicialmente",
+          "on": "exibido imediatamente"
+        }
+      }
+    },
+    "invites": {
+      "name": "Convites"
+    },
+    "languages": {
+      "name": "Idiomas"
+    },
+    "muted-users": {
+      "columns": {
+        "name": "Nome",
+        "slug": "Slug",
+        "unmute": "Desbloquear"
+      },
+      "empty": "Até agora, você não bloqueou ninguém.",
+      "explanation": {
+        "intro": "Se outro usuário foi bloqueado por você, isto é o que acontece:",
+        "search": "Publicações de pessoas bloqueadas desaparecem dos resultados da sua pesquisa.",
+        "your-perspective": "As mensagens da pessoa bloqueada não aparecerão mais no seu feed de notícias."
+      },
+      "how-to": "Você pode bloquear outros usuários em suas páginas de perfil através do menu de conteúdo.",
+      "mute": "Bloquear usuário",
+      "name": "Usuários bloqueados",
+      "unmute": "Desbloquear usuário",
+      "unmuted": "{name} está desbloqueado novamente"
+    },
+    "name": "Configurações",
+    "organizations": {
+      "name": "Minhas Organizações"
+    },
+    "privacy": {
+      "make-shouts-public": "Compartilhar postagens que eu recomendei no meu perfil público",
+      "name": "Privacidade",
+      "success-update": "Configurações de privacidade salvas"
+    },
+    "security": {
+      "change-password": {
+        "button": "Modificar senha",
+        "label-new-password": "Sua nova senha",
+        "label-new-password-confirm": "Confirme sua nova senha",
+        "label-old-password": "Sua senha antiga",
+        "message-new-password-confirm-required": "Confirme sua nova senha",
+        "message-new-password-missmatch": "Digite a mesma senha novamente",
+        "message-new-password-required": "Digite uma nova senha",
+        "message-old-password-required": "Digite sua senha antiga",
+        "passwordSecurity": "Segurança da senha",
+        "passwordStrength0": "Senha muito insegura",
+        "passwordStrength1": "Senha insegura",
+        "passwordStrength2": "Senha medíocre",
+        "passwordStrength3": "Senha forte",
+        "passwordStrength4": "Senha muito forte",
+        "success": "Senha modificada com sucesso!"
+      },
+      "name": "Segurança"
+    },
+    "social-media": {
+      "name": "Mídias sociais",
+      "placeholder": "Sua url de mídia social",
+      "requireUnique": "Você já adicionou esta url",
+      "submit": "Adicionar link",
+      "successAdd": "Mídias sociais adicionadas. Perfil de usuário atualizado!",
+      "successDelete": "Mídias sociais removidas. Perfil de usuário atualizado!"
+    },
+    "validation": {
+      "slug": {
+        "alreadyTaken": "Este nome de usuário já está registrado.",
+        "regex": "Os caracteres permitidos são apenas letras minúsculas, números, sublinhados e hífens."
+      }
+    }
+  },
+  "shoutButton": {
+    "shouted": "aclamou"
+  },
+  "site": {
+    "back-to-login": "Voltar para o Login",
+    "bank": "conta bancária",
+    "code-of-conduct": "Codigo de Conduto",
+    "contact": "Contato",
+    "data-privacy": "Proteção de Dados",
+    "director": "Diretor Administrativo",
+    "error-occurred": "Ocorreu um erro.",
+    "faq": "FAQ",
+    "germany": "Alemanha",
+    "imprint": "Impressão",
+    "made": "Feito com &#10084;",
+    "register": "número de registo",
+    "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ",
+    "taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)",
+    "termsAndConditions": "Termos e Condições",
+    "thanks": "Obrigado(a)!",
+    "tribunal": "tribunal de registo"
+  },
+  "store": {
+    "posts": {
+      "orderBy": {
+        "newest": {
+          "label": "Mais recentes"
+        },
+        "oldest": {
+          "label": "Mais antigos"
+        }
+      }
+    }
+  },
+  "termsAndConditions": {
+    "addition": {
+      "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
+      "title": "Além disso, realizamos regularmente eventos onde você também pode compartilhar suas impressões e fazer perguntas. Você pode encontrar uma visão geral atual aqui:"
+    },
+    "agree": "Eu concordo!",
+    "code-of-conduct": {
+      "description": "Nosso código de conduta serve como um manual de aparência pessoal e interação entre si. Quem quer que seja ativo como utilizador na rede Human Connection, escreva artigos, comentários ou faça contato com outros utilizadores, mesmo fora da rede, reconhece estas regras de conduta como sendo vinculativas. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
+      "title": "Código de Conduta"
+    },
+    "errors-and-feedback": {
+      "description": "Fazemos todos os esforços para manter a nossa rede e dados seguros e disponíveis. Cada nova versão do software passa por testes automatizados e manuais. No entanto, podem ocorrer erros imprevistos. Portanto, somos gratos por quaisquer erros reportados. Você é bem-vindo para relatar quaisquer erros que você descobrir enviando um e-mail para o Suporte em support@human-connection.org.",
+      "title": "Erros e Feedback"
+    },
+    "help-and-questions": {
+      "description": "Para ajuda e perguntas, nós compilamos uma coleção abrangente de perguntas e respostas frequentes (FAQ) para você. Você pode encontrá-las aqui: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
+      "title": "Ajuda e Perguntas"
+    },
+    "moderation": {
+      "description": "Até que nossas possibilidades financeiras nos permitam implementar o sistema de moderação comunitária, moderamos com um sistema simplificado e com pessoal próprio ou possivelmente voluntário. Nós treinamos esses moderadores e por isso só eles tomam as decisões apropriadas. Estes moderadores realizam o seu trabalho de forma anônima. Você pode denunciar mensagens, comentários e usuários para nós (por exemplo, se eles fornecem informações em seu perfil ou têm imagens que violam estes Termos de Uso). Se você relatar algo para nós, você precisa dar uma razão e pode dar uma breve explicação. Em seguida, analisaremos o que você denunciou e o sancionaremos, se necessário, por exemplo, bloqueando contribuições, comentários ou usuários. Infelizmente, você e a pessoa em questão não receberão qualquer feedback da nossa parte neste momento, mas isto está na fase de planeamento. Independentemente disso, reservamo-nos o direito de impor sanções em princípio por razões que podem ou não estar listadas no nosso Código de Conduta ou nestes termos de serviço.",
+      "title": "Moderação"
+    },
+    "newTermsAndConditions": "Novos Termos e Condições",
+    "privacy-statement": {
+      "description": "Nossa rede é uma rede social de conhecimento e ação. Portanto, é particularmente importante para nós que o máximo de conteúdo possível seja acessível ao público. No decurso do desenvolvimento da nossa rede, haverá cada vez mais a possibilidade de decidir sobre a visibilidade dos dados pessoais. Iremos informá-lo sobre estas novas funcionalidades. Caso contrário, você deve sempre pensar sobre quais dados pessoais você divulga sobre si mesmo (ou outros). Isto aplica-se em particular ao conteúdo das mensagens e comentários, uma vez que estes têm um carácter largamente público. Mais tarde, haverá possibilidades de limitar a visibilidade do seu perfil. Parte dos termos de serviço é a nossa declaração de privacidade, que o informa sobre as operações individuais de processamento de dados na nossa rede: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a>  bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Nossa declaração de privacidade é adaptada à situação legal e às características de nossa rede e é sempre válida na versão mais atual.",
+      "title": "Política de Privacidade"
+    },
+    "terms-of-service": {
+      "description": "As seguintes condições de utilização constituem a base para a utilização da nossa rede. Ao registar-se, deve aceitar os termos de utilização e informaremos mais tarde sobre quaisquer alterações que possam ocorrer. A Human Connection Network é operada na Alemanha e, portanto, está sujeita à lei alemã. O local de jurisdição é Kirchheim / Teck. Para mais detalhes, veja a nossa impressão: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> ",
+      "title": "Termos do Serviço"
+    },
+    "termsAndConditionsConfirmed": "Eu li e confirmei os <a href=\"/terms-and-conditions\" target=\"_blank\">Terms and Conditions</a>.",
+    "termsAndConditionsNewConfirm": "Eu li e concordo com os novos termos de condições.",
+    "termsAndConditionsNewConfirmText": "Por favor, leia os novos termos de uso agora!",
+    "use-and-license": {
+      "description": "Se qualquer conteúdo que você publicar para nós for protegido por direitos de propriedade intelectual, você nos concede uma licença não exclusiva, transferível, sublicenciável e mundial para usar tal conteúdo para postar em nossa rede. Esta licença expira quando você exclui seu conteúdo ou toda a sua conta. Lembre-se de que outros podem compartilhar seu conteúdo e nós não podemos excluí-lo.",
+      "title": "Uso e Licença"
+    }
+  },
+  "user": {
+    "avatar": {
+      "submitted": "Carregado com sucesso!"
+    }
+  }
 }
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 64af8f693..1d3605db2 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -4,8 +4,8 @@
     "create": "Создать",
     "delete": "Удалить",
     "edit": "Редактировать",
-    "loading": "загрузка",
     "loadMore": "Загрузить ещё",
+    "loading": "загрузка",
     "save": "Сохранить"
   },
   "admin": {
@@ -150,8 +150,8 @@
     "category": "Категория ::: Категории ::: Категории",
     "comment": "Комментарий::: Комментарии::: Комментарии",
     "letsTalk": "Давай поговорим",
-    "loading": "загрузка",
     "loadMore": "Загрузить ещё",
+    "loading": "загрузка",
     "moreInfo": "Больше информации",
     "name": "Имя",
     "organization": "Организация ::: Организации ::: Организации",
@@ -190,7 +190,7 @@
         "form": {
           "description": "На указанный адрес электронной почты будет отправлено сообщение с инструкциями для сброса пароля.",
           "submit": "Отправить запрос",
-          "submitted": "На адрес <b>{email}<\/b>было отправлено электронное письмо с дальнейшими инструкциями"
+          "submitted": "На адрес <b>{email}</b>было отправлено электронное письмо с дальнейшими инструкциями"
         },
         "title": "Сбросить пароль"
       }
@@ -204,19 +204,19 @@
       },
       "signup": {
         "form": {
-          "data-privacy": "Я прочитал и понял <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"><ds-text bold color=\"primary\" >Заявление о конфиденциальности<\/ds-text><\/a>",
+          "data-privacy": "Я прочитал и понял <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Заявление о конфиденциальности</ds-text></a>",
           "description": "Для начала работы введите свой адрес электронной почты:",
           "errors": {
             "email-exists": "Уже есть учетная запись пользователя с этим адресом электронной почты!",
             "invalid-invitation-token": "Похоже, что приглашение уже было использовано. Ссылку из приглашения можно использовать только один раз."
           },
-          "invitation-code": "Код приглашения: <b>{code}<\/b>",
+          "invitation-code": "Код приглашения: <b>{code}</b>",
           "minimum-age": "Мне 18 лет или более",
           "no-commercial": "У меня нет коммерческих намерений, и я не представляю коммерческое предприятие или организацию.",
           "no-political": "Я не от имени какой-либо партии или политической организации в сети.",
           "submit": "Создать учетную запись",
-          "success": "Письмо со ссылкой для завершения регистрации было отправлено на <b> {email} <\/b>",
-          "terms-and-condition": "Принимаю <a href=\"\/terms-and-conditions\"><ds-text bold color=\"primary\" >Условия и положения<\/ds-text><\/a>."
+          "success": "Письмо со ссылкой для завершения регистрации было отправлено на <b> {email} </b>",
+          "terms-and-condition": "Принимаю <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" >Условия и положения</ds-text></a>."
         },
         "title": "Присоединяйся к Human Connection!",
         "unavailable": "К сожалению, публичная регистрация пользователей на этом сервере сейчас недоступна."
@@ -270,13 +270,13 @@
   "delete": {
     "cancel": "Отменить",
     "comment": {
-      "message": "Вы уверены, что хотите удалить комментарий \"<b>{name}<\/b>\"?",
+      "message": "Вы уверены, что хотите удалить комментарий \"<b>{name}</b>\"?",
       "success": "Комментарий успешно удален!",
       "title": "Удалить комментарий",
       "type": "Комментарий"
     },
     "contribution": {
-      "message": "Вы уверены, что хотите удалить пост \"<b>{name}<\/b>\"?",
+      "message": "Вы уверены, что хотите удалить пост \"<b>{name}</b>\"?",
       "success": "Пост успешно удален!",
       "title": "Удалить пост",
       "type": "Пост"
@@ -286,19 +286,19 @@
   "disable": {
     "cancel": "Отменить",
     "comment": {
-      "message": "Вы действительно хотите отключить комментарий от «<b>{name}<\/b>»?",
+      "message": "Вы действительно хотите отключить комментарий от «<b>{name}</b>»?",
       "title": "Отключить комментарий",
       "type": "Комментарий"
     },
     "contribution": {
-      "message": "Вы действительно хотите отключить пост «<b>{name}<\/b>»?",
+      "message": "Вы действительно хотите отключить пост «<b>{name}</b>»?",
       "title": "Отключить пост",
       "type": "Пост"
     },
     "submit": "Отключить",
     "success": "Успешно отключен",
     "user": {
-      "message": "Вы действительно хотите отключить пользователя «<b>{name}<\/b>»?",
+      "message": "Вы действительно хотите отключить пользователя «<b>{name}</b>»?",
       "title": "Отключить пользователя",
       "type": "Пользователь"
     }
@@ -364,7 +364,7 @@
     "logout": "Выйти",
     "moreInfo": "Что такое Human Connection?",
     "moreInfoHint": "на страницу проекта",
-    "moreInfoURL": "https:\/\/human-connection.org\/en\/",
+    "moreInfoURL": "https://human-connection.org/en/",
     "no-account": "У вас нет аккаунта?",
     "password": "Пароль",
     "register": "Зарегистрируйтесь",
@@ -378,46 +378,46 @@
   "moderation": {
     "name": "Модерация",
     "reports": {
+      "DecisionSuccess": "Решил успешно!",
       "author": "Автор",
       "content": "Содержа́ние",
       "decideButton": "Подтвердить",
-      "decided": "Решил",
       "decideModal": {
-        "cancel": "Отменить",
         "Comment": {
           "disable": {
-            "message": "Вы действительно хотите, чтобы комментарий \"<b>{name}<\/b>\" остановиться и <b>отключен<\/b>?",
+            "message": "Вы действительно хотите, чтобы комментарий \"<b>{name}</b>\" остановиться и <b>отключен</b>?",
             "title": "Окончательно отключить комментарий"
           },
           "enable": {
-            "message": "Вы действительно хотите, чтобы комментарий \"<b>{name}<\/b>\" остановиться и <b>включен<\/b>?",
+            "message": "Вы действительно хотите, чтобы комментарий \"<b>{name}</b>\" остановиться и <b>включен</b>?",
             "title": "Окончательно включить комментарий"
           }
         },
         "Post": {
           "disable": {
-            "message": "Вы действительно хотите, чтобы пост \"<b>{name}<\/b>\" остановиться и <b>отключен<\/b>?",
+            "message": "Вы действительно хотите, чтобы пост \"<b>{name}</b>\" остановиться и <b>отключен</b>?",
             "title": "Окончательно отключить пост"
           },
           "enable": {
-            "message": "Вы действительно хотите, чтобы пост \"<b>{name}<\/b>\" остановиться и <b>включен<\/b>?",
+            "message": "Вы действительно хотите, чтобы пост \"<b>{name}</b>\" остановиться и <b>включен</b>?",
             "title": "Окончательно включить пост"
           }
         },
-        "submit": "Подтвердить решение",
         "User": {
           "disable": {
-            "message": "Вы действительно хотите, чтобы пользователь \"<b>{name}<\/b>\" остановиться и <b>отключен<\/b>?",
+            "message": "Вы действительно хотите, чтобы пользователь \"<b>{name}</b>\" остановиться и <b>отключен</b>?",
             "title": "Окончательно отключить пользователя"
           },
           "enable": {
-            "message": "Вы уверены, что хотите поделиться пользователем \"<b>{name}<\/b>\"?",
+            "message": "Вы уверены, что хотите поделиться пользователем \"<b>{name}</b>\"?",
             "title": "Окончательно включить пост"
           }
-        }
+        },
+        "cancel": "Отменить",
+        "submit": "Подтвердить решение"
       },
+      "decided": "Решил",
       "decision": "Решение",
-      "DecisionSuccess": "Решил успешно!",
       "disabled": "Отключен",
       "disabledAt": "Отключено на",
       "disabledBy": "Отключил(а)",
@@ -526,13 +526,13 @@
     "cancel": "Отменить",
     "comment": {
       "error": "Вы уже сообщили о комментарии!",
-      "message": "Вы уверены, что хотите показать комментарий \"<b>{name}<\/b>\"?",
+      "message": "Вы уверены, что хотите показать комментарий \"<b>{name}</b>\"?",
       "title": "Показать комментарий",
       "type": "Комментарий"
     },
     "contribution": {
       "error": "Вы уже сообщили о посте!",
-      "message": "Вы уверены, что хотите показать пост \"<b>{name}<\/b>\"?",
+      "message": "Вы уверены, что хотите показать пост \"<b>{name}</b>\"?",
       "title": "Показать пост",
       "type": "Пост"
     },
@@ -540,7 +540,7 @@
     "success": "Успешно показан!",
     "user": {
       "error": "Вы уже сообщили о пользователе!",
-      "message": "Вы уверены, что хотите показать пользователя \"<b>{name}<\/b>\"?",
+      "message": "Вы уверены, что хотите показать пользователя \"<b>{name}</b>\"?",
       "title": "Показать пользователя",
       "type": "Пользователь"
     }
@@ -549,13 +549,13 @@
     "cancel": "Отменить",
     "comment": {
       "error": "Вы уже сообщили о посте!",
-      "message": "Вы действительно хотите сообщить о посте \"<b> {name} <\/b>\"?",
+      "message": "Вы действительно хотите сообщить о посте \"<b> {name} </b>\"?",
       "title": "Пожаловаться на комментарий",
       "type": "Комментарий"
     },
     "contribution": {
       "error": "Вы уже сообщили о посте!",
-      "message": "Вы действительно хотите сообщить о посте \"<b>{name}<\/b>\"?",
+      "message": "Вы действительно хотите сообщить о посте \"<b>{name}</b>\"?",
       "title": "Пожаловаться на пост",
       "type": "Пожаловаться на пост"
     },
@@ -584,7 +584,7 @@
     "success": "Спасибо за сообщение!",
     "user": {
       "error": "Вы уже сообщили о пользователе!",
-      "message": "Вы действительно хотите сообщить о пользователе \"<b>{name}<\/b>\"?",
+      "message": "Вы действительно хотите сообщить о пользователе \"<b>{name}</b>\"?",
       "title": "Пожаловаться на пользователя",
       "type": "Пользователь"
     }
@@ -595,24 +595,6 @@
     "placeholder": "Поиск"
   },
   "settings": {
-    "muted-users": {
-      "mute": "Блокировать",
-      "columns": {
-        "name": "Имя",
-        "slug": "Псевдоним",
-        "unmute": "Разблокировать"
-      },
-      "empty": "Вы пока никого не блокировали.",
-      "explanation": {
-        "intro": "Если блокируете другого пользователя, происходит следующее:",
-        "search": "Посты заблокированных пользователей не отображаются в результатах поиска.",
-        "your-perspective": "Посты заблокированного пользователя не отображаются в персональной ленте."
-      },
-      "how-to": "Вы можете блокировать других пользователей на странице их профиля с помощью меню профиля.",
-      "name": "Заблокированные пользователи",
-      "unmute": "Разблокировать пользователей",
-      "unmuted": "{name} - снова разблокирован"
-    },
     "data": {
       "labelBio": "О себе",
       "labelCity": "Город или регион",
@@ -627,11 +609,11 @@
     },
     "deleteUserAccount": {
       "accountDescription": "Обратите внимание, что ваши посты и комментарии важны для сообщества. Если вы все равно хотите их удалить, то вы должны отметить соответствующие опции ниже.",
-      "accountWarning": "Вы <b>НЕ СМОЖЕТЕ<\/b> восстановить свой аккаунт, посты или комментарии после удаления.",
+      "accountWarning": "Вы <b>НЕ СМОЖЕТЕ</b> восстановить свой аккаунт, посты или комментарии после удаления.",
       "commentedCount": "Удалить мои комментарии: {count}",
       "contributionsCount": "Удалить мои посты: {count}",
       "name": "Удалить данные",
-      "pleaseConfirm": "<b class='is-danger'>Разрушительное действие!<\/b> Введите <b>{confirm}<\/b> для подтверждения.",
+      "pleaseConfirm": "<b class='is-danger'>Разрушительное действие!</b> Введите <b>{confirm}</b> для подтверждения.",
       "success": "Аккаунт успешно удален!"
     },
     "download": {
@@ -643,7 +625,7 @@
       "labelNewEmail": "Новый адрес электронной почты",
       "labelNonce": "Введите свой код",
       "name": "Электронная почта",
-      "submitted": "Электронное письмо с подтверждением отправлено на <b>{email}<\/b>.",
+      "submitted": "Электронное письмо с подтверждением отправлено на <b>{email}</b>.",
       "success": "Новый адрес электронной почты был зарегистрирован.",
       "validation": {
         "same-email": "Это текущий адрес электронной почты."
@@ -680,6 +662,24 @@
     "languages": {
       "name": "Языки"
     },
+    "muted-users": {
+      "columns": {
+        "name": "Имя",
+        "slug": "Псевдоним",
+        "unmute": "Разблокировать"
+      },
+      "empty": "Вы пока никого не блокировали.",
+      "explanation": {
+        "intro": "Если блокируете другого пользователя, происходит следующее:",
+        "search": "Посты заблокированных пользователей не отображаются в результатах поиска.",
+        "your-perspective": "Посты заблокированного пользователя не отображаются в персональной ленте."
+      },
+      "how-to": "Вы можете блокировать других пользователей на странице их профиля с помощью меню профиля.",
+      "mute": "Блокировать",
+      "name": "Заблокированные пользователи",
+      "unmute": "Разблокировать пользователей",
+      "unmuted": "{name} - снова разблокирован"
+    },
     "name": "Настройки",
     "organizations": {
       "name": "Мои организации"
@@ -760,12 +760,12 @@
   },
   "termsAndConditions": {
     "addition": {
-      "description": "<a href=\"https:\/\/human-connection.org\/events\/\" target=\"_blank\" > https:\/\/human-connection.org\/events\/ <\/a>",
+      "description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
       "title": "Кроме того, мы регулярно проводим мероприятия, где вы также можете\\nподелиться своими впечатлениями и задать вопросы. Информацию о текущих событиях можно найти здесь:"
     },
     "agree": "Я согласен(на)!",
     "code-of-conduct": {
-      "description": "Наш кодекс поведения служит руководством для личного поведения и взаимодействия друг с другом. Каждый пользователь социальной сети Human Connection, который пишет статьи, комментирует или вступает в контакт с другими пользователями, даже за пределами сети, признает эти правила поведения обязательными. <a href=\"https:\/\/alpha.human-connection.org\/code-of-conduct\" target=\"_blank\"> https:\/\/alpha.human-connection.org\/code-of-conduct<\/a>",
+      "description": "Наш кодекс поведения служит руководством для личного поведения и взаимодействия друг с другом. Каждый пользователь социальной сети Human Connection, который пишет статьи, комментирует или вступает в контакт с другими пользователями, даже за пределами сети, признает эти правила поведения обязательными. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
       "title": "Кодекс поведения"
     },
     "errors-and-feedback": {
@@ -773,7 +773,7 @@
       "title": "Ошибки и обратная связь"
     },
     "help-and-questions": {
-      "description": "Для справки и вопросов мы собрали для вас исчерпывающую подборку часто задаваемых вопросов и ответов (FAQ). Вы можете найти их здесь: <a href=\"https:\/\/support.human-connection.org\/kb\/\" target=\"_blank\" > https:\/\/support.human-connection.org\/kb\/ <\/a>",
+      "description": "Для справки и вопросов мы собрали для вас исчерпывающую подборку часто задаваемых вопросов и ответов (FAQ). Вы можете найти их здесь: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
       "title": "Помощь и вопросы"
     },
     "moderation": {
@@ -786,14 +786,14 @@
       "title": "Нет коммерческого использования"
     },
     "privacy-statement": {
-      "description": "Наша сеть — это социальная сеть знаний и действий. Поэтому для нас особенно важно, чтобы как можно больше контента было общедоступным. В процессе развития нашей сети будет добавлено больше возможностей для управления видимостью личных данных. Об этих новых функциях мы сообщим дополнительно. В противном случае вы должны думать о том, какие личные данные вы раскрываете о себе (или других). Это особенно актуально для содержания постов и комментариев, поскольку они имеют в основном общедоступный характер. Позже появятся возможности ограничения видимости вашего профиля.  Часть условий использования — это наша политика конфиденциальности, которая информирует вас об обработке персональных данных в нашей сети: <a href=\"https:\/\/human-connection.org\/datenschutz\/#netzwerk\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz\/#netzwerk<\/a> или <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\">https:\/\/human-connection.org\/datenschutz<\/a>. Наше заявление о конфиденциальности корректируется в соответствии с законодательством и характеристиками нашей сети и является действительной в настоящей версии.",
+      "description": "Наша сеть — это социальная сеть знаний и действий. Поэтому для нас особенно важно, чтобы как можно больше контента было общедоступным. В процессе развития нашей сети будет добавлено больше возможностей для управления видимостью личных данных. Об этих новых функциях мы сообщим дополнительно. В противном случае вы должны думать о том, какие личные данные вы раскрываете о себе (или других). Это особенно актуально для содержания постов и комментариев, поскольку они имеют в основном общедоступный характер. Позже появятся возможности ограничения видимости вашего профиля.  Часть условий использования — это наша политика конфиденциальности, которая информирует вас об обработке персональных данных в нашей сети: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\">https://human-connection.org/datenschutz/#netzwerk</a> или <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz</a>. Наше заявление о конфиденциальности корректируется в соответствии с законодательством и характеристиками нашей сети и является действительной в настоящей версии.",
       "title": "Заявление о конфиденциальности"
     },
     "terms-of-service": {
-      "description": "Следующие условия использования являются основой для использования нашей сети. При регистрации вы должны принять их, а мы при необходимости сообщим вам об изменениях. Сеть Human Connection работает в Германии и поэтому регулируется немецким законодательством. Место юрисдикции - Kirchheim \/ Teck. Подробности в выходных данных: <a href=\"https:\/\/human-connection.org\/en\/imprint\" target=\"_blank\" >https:\/\/human-connection.org\/en\/imprint<\/a>.",
+      "description": "Следующие условия использования являются основой для использования нашей сети. При регистрации вы должны принять их, а мы при необходимости сообщим вам об изменениях. Сеть Human Connection работает в Германии и поэтому регулируется немецким законодательством. Место юрисдикции - Kirchheim / Teck. Подробности в выходных данных: <a href=\"https://human-connection.org/en/imprint\" target=\"_blank\" >https://human-connection.org/en/imprint</a>.",
       "title": "Условия обслуживания"
     },
-    "termsAndConditionsConfirmed": "Я прочитал(а) и подтверждаю <a href=\"\/terms-and-conditions\" target=\"_blank\">Условия и положения<\/a>.",
+    "termsAndConditionsConfirmed": "Я прочитал(а) и подтверждаю <a href=\"/terms-and-conditions\" target=\"_blank\">Условия и положения</a>.",
     "termsAndConditionsNewConfirm": "Я прочитал(а) и согласен(на) с новыми условиями.",
     "termsAndConditionsNewConfirmText": "Пожалуйста, ознакомьтесь с новыми условиями использования!",
     "use-and-license": {
diff --git a/webapp/package.json b/webapp/package.json
index 6914053b9..4ea5fd676 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -18,6 +18,7 @@
     "generate:maintenance": "nuxt generate -c nuxt.config.maintenance.js",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue .",
+    "locales": "../scripts/sort-translations.sh",
     "precommit": "yarn lint",
     "test": "jest",
     "test:unit:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --no-cache --runInBand"

From 069e67f9426890e80b3c52884ea3b97046e508e4 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 12 Feb 2020 15:10:20 +0100
Subject: [PATCH 167/171] chore(ci): Check missing translations keys

---
 .travis.yml                                        |  3 ++-
 scripts/translations/missing-keys.sh               | 14 ++++++++++++++
 .../{sort-translations.sh => translations/sort.sh} |  0
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 scripts/translations/missing-keys.sh
 rename scripts/{sort-translations.sh => translations/sort.sh} (100%)

diff --git a/.travis.yml b/.travis.yml
index f8c869972..7cfb983cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,8 @@ script:
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
   - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
   # Miscellaneous
-  - ./scripts/sort-translations.sh
+  - ./scripts/translations/sort.sh
+  - ./scripts/translations/missing-keys.sh
   # Backend
   - docker-compose exec backend yarn run lint
   - docker-compose exec backend yarn run test --ci --verbose=false --coverage
diff --git a/scripts/translations/missing-keys.sh b/scripts/translations/missing-keys.sh
new file mode 100755
index 000000000..d2de1105f
--- /dev/null
+++ b/scripts/translations/missing-keys.sh
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+ROOT_DIR=$(dirname "$0")/..
+english="$ROOT_DIR/webapp/locales/en.json"
+german="$ROOT_DIR/webapp/locales/de.json"
+listPaths="jq -c 'path(..)|[.[]|tostring]|join(\".\")'"
+if eval "diff -q <( $listPaths < $english ) <( $listPaths < $german  )";
+then
+  : # all good
+else
+  eval "diff -y <( $listPaths < $english ) <( $listPaths < $german  )";
+  printf "\nEnglish and German translation keys do not match, see diff above.\n"
+  exit 1
+fi
diff --git a/scripts/sort-translations.sh b/scripts/translations/sort.sh
similarity index 100%
rename from scripts/sort-translations.sh
rename to scripts/translations/sort.sh

From 3a3343029858f9230ac1badc3a583f80c834ae53 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Feb 2020 13:54:38 +0100
Subject: [PATCH 168/171] path set correctly for subfolder of translation
 scripts

---
 scripts/translations/missing-keys.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/translations/missing-keys.sh b/scripts/translations/missing-keys.sh
index d2de1105f..105804900 100755
--- a/scripts/translations/missing-keys.sh
+++ b/scripts/translations/missing-keys.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-ROOT_DIR=$(dirname "$0")/..
+ROOT_DIR=$(dirname "$0")/../..
 english="$ROOT_DIR/webapp/locales/en.json"
 german="$ROOT_DIR/webapp/locales/de.json"
 listPaths="jq -c 'path(..)|[.[]|tostring]|join(\".\")'"

From 934c9906cc37f692226ce6d29f0212b0e9aedfa5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Feb 2020 16:21:21 +0100
Subject: [PATCH 169/171] sorting keys, comparing de and en locales, yarn run
 locales

---
 scripts/translations/missing-keys.sh | 11 +++++++----
 scripts/translations/sort.sh         |  4 ++--
 scripts/translations/sort_filter.jq  | 13 +++++++++++++
 webapp/locales/de.json               | 14 +++++++-------
 webapp/locales/en.json               | 14 +++++++-------
 webapp/locales/es.json               | 14 +++++++-------
 webapp/locales/fr.json               |  4 ++--
 webapp/locales/it.json               |  4 ++--
 webapp/locales/nl.json               |  2 +-
 webapp/locales/pl.json               |  4 ++--
 webapp/locales/pt.json               |  4 ++--
 webapp/locales/ru.json               | 14 +++++++-------
 webapp/package.json                  |  2 +-
 13 files changed, 60 insertions(+), 44 deletions(-)
 create mode 100644 scripts/translations/sort_filter.jq

diff --git a/scripts/translations/missing-keys.sh b/scripts/translations/missing-keys.sh
index 105804900..aaeb1ac87 100755
--- a/scripts/translations/missing-keys.sh
+++ b/scripts/translations/missing-keys.sh
@@ -1,14 +1,17 @@
 #! /usr/bin/env bash
 
 ROOT_DIR=$(dirname "$0")/../..
-english="$ROOT_DIR/webapp/locales/en.json"
-german="$ROOT_DIR/webapp/locales/de.json"
+
+sorting="jq -f $ROOT_DIR/scripts/translations/sort_filter.jq"
+english="$sorting $ROOT_DIR/webapp/locales/en.json"
+german="$sorting $ROOT_DIR/webapp/locales/de.json"
 listPaths="jq -c 'path(..)|[.[]|tostring]|join(\".\")'"
-if eval "diff -q <( $listPaths < $english ) <( $listPaths < $german  )";
+diffString="<( $english | $listPaths ) <( $german | $listPaths )"
+if eval "diff -q $diffString";
 then
   : # all good
 else
-  eval "diff -y <( $listPaths < $english ) <( $listPaths < $german  )";
+  eval "diff -y $diffString | grep '[|<>]'";
   printf "\nEnglish and German translation keys do not match, see diff above.\n"
   exit 1
 fi
diff --git a/scripts/translations/sort.sh b/scripts/translations/sort.sh
index f2a5edebb..35496f27e 100755
--- a/scripts/translations/sort.sh
+++ b/scripts/translations/sort.sh
@@ -1,12 +1,12 @@
 #! /usr/bin/env bash
 
-ROOT_DIR=$(dirname "$0")/..
+ROOT_DIR=$(dirname "$0")/../..
 tmp=$(mktemp)
 exit_code=0
 
 for locale_file in $ROOT_DIR/webapp/locales/*.json
 do
-  jq --sort-keys . $locale_file > "$tmp"
+  jq -f $(dirname "$0")/sort_filter.jq $locale_file > "$tmp"
   if [ "$*" == "--fix" ]
   then
     mv "$tmp" $locale_file
diff --git a/scripts/translations/sort_filter.jq b/scripts/translations/sort_filter.jq
new file mode 100644
index 000000000..9d108f8f0
--- /dev/null
+++ b/scripts/translations/sort_filter.jq
@@ -0,0 +1,13 @@
+def walk(f):
+  . as $in
+  | if type == "object" then
+      reduce keys_unsorted[] as $key
+        ( {}; . + { ($key):  ($in[$key] | walk(f)) } ) | f
+  elif type == "array" then map( walk(f) ) | f
+  else f
+  end;
+
+def keys_sort_by(f):
+  to_entries | sort_by(.key|f ) | from_entries;
+
+walk(if type == "object" then keys_sort_by(ascii_upcase) else . end)
\ No newline at end of file
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b70227557..659eb624d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -4,8 +4,8 @@
     "create": "Erstellen",
     "delete": "Löschen",
     "edit": "Bearbeiten",
-    "loadMore": "mehr laden",
     "loading": "wird geladen",
+    "loadMore": "mehr laden",
     "save": "Speichern"
   },
   "admin": {
@@ -143,8 +143,8 @@
     "category": "Kategorie ::: Kategorien",
     "comment": "Kommentar ::: Kommentare",
     "letsTalk": "Miteinander reden",
-    "loadMore": "mehr laden",
     "loading": "wird geladen",
+    "loadMore": "mehr laden",
     "moreInfo": "Mehr Info",
     "name": "Name",
     "organization": "Organisation ::: Organisationen",
@@ -371,11 +371,12 @@
   "moderation": {
     "name": "Moderation",
     "reports": {
-      "DecisionSuccess": "Erfolgreich entschieden!",
       "author": "Autor",
       "content": "Inhalt",
       "decideButton": "Bestätige",
+      "decided": "Entschieden",
       "decideModal": {
+        "cancel": "Abbruch",
         "Comment": {
           "disable": {
             "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?",
@@ -396,6 +397,7 @@
             "title": "Entsperre den Beitrag abschließend"
           }
         },
+        "submit": "Bestätige Entscheidung",
         "User": {
           "disable": {
             "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?",
@@ -405,12 +407,10 @@
             "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?",
             "title": "Entsperre den Benutzer abschließend"
           }
-        },
-        "cancel": "Abbruch",
-        "submit": "Bestätige Entscheidung"
+        }
       },
-      "decided": "Entschieden",
       "decision": "Entscheidung",
+      "DecisionSuccess": "Erfolgreich entschieden!",
       "disabled": "Gesperrt",
       "disabledAt": "Gesperrt am",
       "disabledBy": "Gesperrt von",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8944985d4..fcc8004e6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -4,8 +4,8 @@
     "create": "Create",
     "delete": "Delete",
     "edit": "Edit",
-    "loadMore": "load more",
     "loading": "loading",
+    "loadMore": "load more",
     "save": "Save"
   },
   "admin": {
@@ -143,8 +143,8 @@
     "category": "Category ::: Categories",
     "comment": "Comment ::: Comments",
     "letsTalk": "Let`s Talk",
-    "loadMore": "load more",
     "loading": "loading",
+    "loadMore": "load more",
     "moreInfo": "More Info",
     "name": "Name",
     "organization": "Organization ::: Organizations",
@@ -371,11 +371,12 @@
   "moderation": {
     "name": "Moderation",
     "reports": {
-      "DecisionSuccess": "Decided successfully!",
       "author": "Author",
       "content": "Content",
       "decideButton": "Confirm",
+      "decided": "Decided",
       "decideModal": {
+        "cancel": "Cancel",
         "Comment": {
           "disable": {
             "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>disabled</b>?",
@@ -396,6 +397,7 @@
             "title": "Finally Enable Post"
           }
         },
+        "submit": "Confirm decision",
         "User": {
           "disable": {
             "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>disabled</b>?",
@@ -405,12 +407,10 @@
             "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>enabled</b>?",
             "title": "Finally Enable User"
           }
-        },
-        "cancel": "Cancel",
-        "submit": "Confirm decision"
+        }
       },
-      "decided": "Decided",
       "decision": "Decision",
+      "DecisionSuccess": "Decided successfully!",
       "disabled": "Disabled",
       "disabledAt": "Disabled at",
       "disabledBy": "Disabled by",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 177ca0a64..e4315734a 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -4,8 +4,8 @@
     "create": "Crear",
     "delete": "Borrar",
     "edit": "Edite",
-    "loadMore": "cargar más",
     "loading": "cargamento",
+    "loadMore": "cargar más",
     "save": "Guardar"
   },
   "admin": {
@@ -150,8 +150,8 @@
     "category": "Categoría ::: Categorías",
     "comment": "Comentario ::: Comentarios",
     "letsTalk": "Hablemos",
-    "loadMore": "cargar más",
     "loading": "cargando",
+    "loadMore": "cargar más",
     "moreInfo": "Más información",
     "name": "Nombre",
     "organization": "Organización ::: Organizaciones",
@@ -378,11 +378,12 @@
   "moderation": {
     "name": "Moderación",
     "reports": {
-      "DecisionSuccess": "Decidido con éxito!",
       "author": "Autor",
       "content": "Contenido",
       "decideButton": "Confirmar",
+      "decided": "Decidido",
       "decideModal": {
+        "cancel": "Cancelar",
         "Comment": {
           "disable": {
             "message": "¿Realmente quiere que el comentario \"<b>{nombre}</b>\" permanezca <b>desactivado</b>?",
@@ -403,6 +404,7 @@
             "title": "Finalmente Habilitar Contribución"
           }
         },
+        "submit": "Confirmar decisión",
         "User": {
           "disable": {
             "message": "¿Realmente quiere que el usuario \"<b>{nombre}</b>\" permanezca <b>desactivado</b>?",
@@ -412,12 +414,10 @@
             "message": "¿Realmente quiere que el usuario \"<b>{nombre}</b>\" permanezca <b>habilitado</b>?",
             "title": "Finalmente Habilitar Usuario"
           }
-        },
-        "cancel": "Cancelar",
-        "submit": "Confirmar decisión"
+        }
       },
-      "decided": "Decidido",
       "decision": "Decisión",
+      "DecisionSuccess": "Decidido con éxito!",
       "disabled": "Deshabilitado",
       "disabledAt": "Deshabilitado el",
       "disabledBy": "desactivado por",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index ce0febf46..fbe5477a7 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -4,8 +4,8 @@
     "create": "Créer",
     "delete": "Supprimer",
     "edit": "Modifier",
-    "loadMore": "charger plus",
     "loading": "chargement",
+    "loadMore": "charger plus",
     "save": "Sauvegarder"
   },
   "admin": {
@@ -150,8 +150,8 @@
     "category": "Catégorie ::: Catégories",
     "comment": "Commentaire ::: Commentaires",
     "letsTalk": "Parlons-en",
-    "loadMore": "charger plus",
     "loading": "chargement",
+    "loadMore": "charger plus",
     "moreInfo": "Plus d'infos",
     "name": "Nom",
     "organization": "Organisation ::: Organisations",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 1735f0e90..f387a114f 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -4,8 +4,8 @@
     "create": "Crea",
     "delete": "Cancella",
     "edit": "Modifica",
-    "loadMore": "Carica di più",
     "loading": "Caricamento in corso",
+    "loadMore": "Carica di più",
     "save": "Salva"
   },
   "admin": {
@@ -150,8 +150,8 @@
     "category": "Categoria ::: Categorie",
     "comment": "Commento ::: Commenti",
     "letsTalk": "Discutiamo",
-    "loadMore": "Caricare di più",
     "loading": "Caricamento in corso",
+    "loadMore": "Caricare di più",
     "moreInfo": "Ulteriori informazioni",
     "name": "Nome",
     "organization": "Organizzazione ::: Organizzazioni",
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 128c9db88..64643133c 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -50,8 +50,8 @@
     "category": "Categorie ::: Categorieën",
     "comment": "Opmerking ::: Opmerkingen",
     "letsTalk": "Laten we praten",
-    "loadMore": "meer laden",
     "loading": "inlading",
+    "loadMore": "meer laden",
     "moreInfo": "Meer info",
     "name": "Naam",
     "organization": "Organisatie ::: Organisaties",
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 3113e3f45..1d78ede01 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -4,8 +4,8 @@
     "create": "Tworzenie",
     "delete": "Usuń",
     "edit": "Edycja",
-    "loadMore": "Obciążenie więcej",
     "loading": "załadunek",
+    "loadMore": "Obciążenie więcej",
     "save": "Oszczędzaj"
   },
   "admin": {
@@ -65,8 +65,8 @@
     "category": "Kategoria ::: Kategorie",
     "comment": "Komentarz ::: Komentarze",
     "letsTalk": "Porozmawiajmy",
-    "loadMore": "Obciążenie więcej",
     "loading": "załadunek",
+    "loadMore": "Obciążenie więcej",
     "moreInfo": "Więcej informacji",
     "name": "Nazwa",
     "organization": "Organization ::: Organizations",
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index c6a6a17dd..5da36dfe9 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -4,8 +4,8 @@
     "create": "Criar",
     "delete": "Apagar",
     "edit": "Editar",
-    "loadMore": "Carregar mais",
     "loading": "Carregando",
+    "loadMore": "Carregar mais",
     "save": "Salvar"
   },
   "admin": {
@@ -150,8 +150,8 @@
     "category": "Categoria ::: Categorias",
     "comment": "Comentário ::: Comentários",
     "letsTalk": "Vamos Conversar",
-    "loadMore": "Carregar mais",
     "loading": "Carregando",
+    "loadMore": "Carregar mais",
     "moreInfo": "Mais informações",
     "name": "Nome",
     "organization": "Organização ::: Organizações",
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 1d3605db2..97eaff8f1 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -4,8 +4,8 @@
     "create": "Создать",
     "delete": "Удалить",
     "edit": "Редактировать",
-    "loadMore": "Загрузить ещё",
     "loading": "загрузка",
+    "loadMore": "Загрузить ещё",
     "save": "Сохранить"
   },
   "admin": {
@@ -150,8 +150,8 @@
     "category": "Категория ::: Категории ::: Категории",
     "comment": "Комментарий::: Комментарии::: Комментарии",
     "letsTalk": "Давай поговорим",
-    "loadMore": "Загрузить ещё",
     "loading": "загрузка",
+    "loadMore": "Загрузить ещё",
     "moreInfo": "Больше информации",
     "name": "Имя",
     "organization": "Организация ::: Организации ::: Организации",
@@ -378,11 +378,12 @@
   "moderation": {
     "name": "Модерация",
     "reports": {
-      "DecisionSuccess": "Решил успешно!",
       "author": "Автор",
       "content": "Содержа́ние",
       "decideButton": "Подтвердить",
+      "decided": "Решил",
       "decideModal": {
+        "cancel": "Отменить",
         "Comment": {
           "disable": {
             "message": "Вы действительно хотите, чтобы комментарий \"<b>{name}</b>\" остановиться и <b>отключен</b>?",
@@ -403,6 +404,7 @@
             "title": "Окончательно включить пост"
           }
         },
+        "submit": "Подтвердить решение",
         "User": {
           "disable": {
             "message": "Вы действительно хотите, чтобы пользователь \"<b>{name}</b>\" остановиться и <b>отключен</b>?",
@@ -412,12 +414,10 @@
             "message": "Вы уверены, что хотите поделиться пользователем \"<b>{name}</b>\"?",
             "title": "Окончательно включить пост"
           }
-        },
-        "cancel": "Отменить",
-        "submit": "Подтвердить решение"
+        }
       },
-      "decided": "Решил",
       "decision": "Решение",
+      "DecisionSuccess": "Решил успешно!",
       "disabled": "Отключен",
       "disabledAt": "Отключено на",
       "disabledBy": "Отключил(а)",
diff --git a/webapp/package.json b/webapp/package.json
index 4ea5fd676..e29a90e50 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -18,7 +18,7 @@
     "generate:maintenance": "nuxt generate -c nuxt.config.maintenance.js",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue .",
-    "locales": "../scripts/sort-translations.sh",
+    "locales": "../scripts/translations/missing-keys.sh && ../scripts/translations/sort.sh",
     "precommit": "yarn lint",
     "test": "jest",
     "test:unit:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --no-cache --runInBand"

From 05424f49b454e1292d400b06a7c3513c6eee4ffc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Feb 2020 19:16:30 +0100
Subject: [PATCH 170/171] locales are normalized

---
 webapp/locales/de.json | 26 +++++++++++---------------
 webapp/locales/en.json | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 659eb624d..181e10a98 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -318,6 +318,17 @@
     },
     "placeholder": "Schreib etwas Inspirierendes …"
   },
+  "error-pages": {
+    "403-default": "Kein Zugang zu dieser Seite",
+    "404-default": "Diese Seite konnte nicht gefunden werden",
+    "500-default": "Internal Server Error",
+    "503-default": "Dienst steht nicht zur Verfügung",
+    "back-to-index": "Zurück zur Startseite",
+    "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden",
+    "default": "Ein Fehler ist aufgetreten",
+    "post-not-found": "Dieser Beitrag konnte nicht gefunden werden",
+    "profile-not-found": "Dieses Profil konnte nicht gefunden werden"
+  },
   "filter-menu": {
     "clearSearch": "Suche löschen",
     "hashtag-search": "Suche nach #{hashtag}",
@@ -784,21 +795,6 @@
       "description": "Unser Verhaltenskodex dient als Leitfaden für das persönliche Auftreten und den Umgang miteinander. Wer als Nutzer im Human Connection-Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
       "title": "Verhaltenscodex"
     },
-    "donations": {
-        "donations-for": "Spenden für",
-        "donate-now": "Jetzt spenden",
-        "amount-of-total": "{amount} von {total} € erreicht"
-    },
-    "error-pages" : {
-	"profile-not-found": "Dieses Profil konnte nicht gefunden werden",
-	"back-to-index": "Zurück zur Startseite",
-	"post-not-found": "Dieser Beitrag konnte nicht gefunden werden",
-	"cannot-edit-post": "Dieser Beitrag kann nicht editiert werden",
-	"403-default": "Kein Zugang zu dieser Seite",
-	"404-default": "Diese Seite konnte nicht gefunden werden",
-	"500-default": "Internal Server Error",
-	"503-default": "Dienst steht nicht zur Verfügung",
-	"default": "Ein Fehler ist aufgetreten"
     "errors-and-feedback": {
       "description": "Wir sind sehr bemüht, unser Netzwerk und unsere Daten sicher und abrufbar zu erhalten. Jede neue Version der Software durchläuft sowohl automatisierte als auch manuelle Tests. Es können jedoch unvorhergesehene Fehler auftreten. Deshalb sind wir dankbar für jeden gemeldeten Fehler. Du kannst gerne jeden von Dir entdeckten Fehler dem Support/der Hilfe-Assistenz mitteilen: support@human-connection.org",
       "title": "Fehler und Rückmeldungen"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index fcc8004e6..07f2563a2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -318,6 +318,17 @@
     },
     "placeholder": "Leave your inspirational thoughts …"
   },
+  "error-pages": {
+    "403-default": "Not authorized to this page",
+    "404-default": "This page could not be found",
+    "500-default": "Internal Server Error",
+    "503-default": "Service Unavailable",
+    "back-to-index": "Back to index page",
+    "cannot-edit-post": "This post cannot be edited",
+    "default": "An error occurred",
+    "post-not-found": "This post could not be found",
+    "profile-not-found": "This profile could not be found"
+  },
   "filter-menu": {
     "clearSearch": "Clear search",
     "hashtag-search": "Searching for #{hashtag}",
@@ -821,16 +832,5 @@
     "avatar": {
       "submitted": "Upload successful!"
     }
-  },
-  "error-pages" : {
-    "profile-not-found": "This profile could not be found",
-    "back-to-index": "Back to index page",
-    "post-not-found": "This post could not be found",
-    "cannot-edit-post": "This post cannot be edited",
-    "404-default": "This page could not be found",
-    "403-default": "Not authorized to this page",
-    "500-default": "Internal Server Error",
-    "503-default": "Service Unavailable",
-    "default": "An error occurred"
   }
 }

From 132029460afb622ee6b902704437e7b7a901a97e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 18 Feb 2020 23:41:00 +0000
Subject: [PATCH 171/171] build(deps): [security] bump yarn from 1.17.3 to
 1.22.0 in /webapp

Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.17.3 to 1.22.0. **This update includes a security fix.**
- [Release notes](https://github.com/yarnpkg/yarn/releases)
- [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yarnpkg/yarn/compare/v1.17.3...v1.22.0)

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

diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 863f59205..f221498e4 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -17199,9 +17199,9 @@ yargs@~1.2.6:
     minimist "^0.1.0"
 
 yarn@^1.15.0:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.17.3.tgz#60e0b77d079eb78e753bb616f7592b51b6a9adce"
-  integrity sha512-CgA8o7nRZaQvmeF/WBx2FC7f9W/0X59T2IaLYqgMo6637wfp5mMEsM3YXoJtKUspnpmDJKl/gGFhnqS+sON7hA==
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.0.tgz#acf82906e36bcccd1ccab1cfb73b87509667c881"
+  integrity sha512-KMHP/Jq53jZKTY9iTUt3dIVl/be6UPs2INo96+BnZHLKxYNTfwMmlgHTaMWyGZoO74RI4AIFvnWhYrXq2USJkg==
 
 yn@^3.0.0:
   version "3.1.0"