diff --git a/backend/Dockerfile b/backend/Dockerfile
index 6d3095648..d24f2747e 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.3.1-alpine as base
+FROM node:12.4-alpine as base
LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
EXPOSE 4000
diff --git a/backend/package.json b/backend/package.json
index edbeabd48..b710d1c9b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -44,7 +44,7 @@
"dependencies": {
"activitystrea.ms": "~2.1.3",
"apollo-cache-inmemory": "~1.6.0",
- "apollo-client": "~2.5.1",
+ "apollo-client": "~2.6.1",
"apollo-link-context": "~1.0.14",
"apollo-link-http": "~1.5.14",
"apollo-server": "~2.6.1",
@@ -61,7 +61,7 @@
"graphql-custom-directives": "~0.2.14",
"graphql-iso-date": "~3.6.1",
"graphql-middleware": "~3.0.2",
- "graphql-shield": "~5.3.5",
+ "graphql-shield": "~5.3.6",
"graphql-tag": "~2.10.1",
"graphql-yoga": "~1.17.4",
"helmet": "~3.18.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index d56871d83..03a8260ba 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1119,10 +1119,10 @@
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
-"@types/yup@0.26.13":
- version "0.26.13"
- resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.13.tgz#0aeeba85231a34ddc68c74b3a2c64eeb2ccf68bf"
- integrity sha512-sMMtb+c2xxf/FcK0kW36+0uuSWpNwvCBZYI7vpnD9J9Z6OYk09P4TmDkMWV+NWdi9Nzt2tUJjtpnPpkiUklBaw==
+"@types/yup@0.26.14":
+ version "0.26.14"
+ resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.14.tgz#d31f3b9a04039cca70ebb4db4d6c7fc3f694e80b"
+ integrity sha512-OcBtVLHvYULVSltpuBdhFiVOKoSsOS58D872HydO93oBf3OdGq5zb+LnqGo18TNNSV2aW8hjIdS6H+wp68zFtQ==
"@types/zen-observable@^0.5.3":
version "0.5.4"
@@ -1307,34 +1307,25 @@ apollo-cache-inmemory@~1.6.0:
ts-invariant "^0.4.0"
tslib "^1.9.3"
-apollo-cache@1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
- integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
+apollo-cache@1.3.1, apollo-cache@^1.3.0:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.1.tgz#c015f93a9a7f32b3eeea0c471addd6e854da754c"
+ integrity sha512-BJ/Mehr3u6XCaHYSmgZ6DM71Fh30OkW6aEr828WjHvs+7i0RUuP51/PM7K6T0jPXtuw7UbArFFPZZsNgXnyyJA==
dependencies:
- apollo-utilities "^1.2.1"
+ apollo-utilities "^1.3.1"
tslib "^1.9.3"
-apollo-cache@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.0.tgz#de5c907cbd329440c9b0aafcbe8436391b9e6142"
- integrity sha512-voPlvSIDA2pY3+7QwtXPs7o5uSNAVjUKwimyHWoiW0MIZtPxawtOV/Y+BL85R227JqcjPic1El+QToVR8l4ytQ==
- dependencies:
- apollo-utilities "^1.3.0"
- tslib "^1.9.3"
-
-apollo-client@~2.5.1:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
- integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
+apollo-client@~2.6.1:
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.1.tgz#fcf328618d6ad82b750a988bec113fe6edc8ba94"
+ integrity sha512-Tb6ZthPZUHlGqeoH1WC8Qg/tLnkk9H5+xj4e5nzOAC6dCOW3pVU9tYXscrWdmZ65UDUg1khvTNjrQgPhdf4aTQ==
dependencies:
"@types/zen-observable" "^0.8.0"
- apollo-cache "1.2.1"
+ apollo-cache "1.3.1"
apollo-link "^1.0.0"
- apollo-link-dedup "^1.0.0"
- apollo-utilities "1.2.1"
+ apollo-utilities "1.3.1"
symbol-observable "^1.0.2"
- ts-invariant "^0.2.1"
+ ts-invariant "^0.4.0"
tslib "^1.9.3"
zen-observable "^0.8.0"
@@ -1398,13 +1389,6 @@ apollo-link-context@~1.0.14:
apollo-link "^1.2.11"
tslib "^1.9.3"
-apollo-link-dedup@^1.0.0:
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.11.tgz#6f34ea748d2834850329ad03111ef18445232b05"
- integrity sha512-RcvkXR0CNbQcsw6LdrPksGa+9YjZ1ghk0k2PKal6rSBCyyqzokcBawXOtoMN8q+0FLR1dGs5GnAQVeucQuY28g==
- dependencies:
- apollo-link "^1.2.4"
-
apollo-link-http-common@^0.2.13:
version "0.2.13"
resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz#c688f6baaffdc7b269b2db7ae89dae7c58b5b350"
@@ -1423,7 +1407,7 @@ apollo-link-http@~1.5.14:
apollo-link-http-common "^0.2.13"
tslib "^1.9.3"
-apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3, apollo-link@^1.2.4:
+apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3:
version "1.2.11"
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -1575,21 +1559,13 @@ apollo-upload-server@^7.0.0:
http-errors "^1.7.0"
object-path "^0.11.4"
-apollo-utilities@1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
- integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
- dependencies:
- fast-json-stable-stringify "^2.0.0"
- ts-invariant "^0.2.1"
- tslib "^1.9.3"
-
-apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.0.tgz#9803724c07ac94ca11dc26397edb58735d2b0211"
- integrity sha512-wQjV+FdWcTWmWUFlChG5rS0vHKy5OsXC6XlV9STRstQq6VbXANwHy6DHnTEQAfLXWAbNcPgBu+nBUpR3dFhwrA==
+apollo-utilities@1.3.1, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.1.tgz#4c45f9b52783c324e2beef822700bdea374f82d1"
+ integrity sha512-P5cJ75rvhm9hcx9V/xCW0vlHhRd0S2icEcYPoRYNTc5djbynpuO+mQuJ4zMHgjNDpvvDxDfZxXTJ6ZUuJZodiQ==
dependencies:
fast-json-stable-stringify "^2.0.0"
+ lodash.isequal "^4.5.0"
ts-invariant "^0.4.0"
tslib "^1.9.3"
@@ -3789,12 +3765,12 @@ graphql-request@~1.8.2:
dependencies:
cross-fetch "2.2.2"
-graphql-shield@~5.3.5:
- version "5.3.5"
- resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.5.tgz#cba409f4c1714e107212cff0a1cb2d934273392b"
- integrity sha512-3kmL9x+b85NK2ipH3VGudUgUo1vXy0Z44WXhnGi3b0T0peg53DOSlXBbZOO4PNh1AcULnUjYf+DpDrP8Uc97Gw==
+graphql-shield@~5.3.6:
+ version "5.3.6"
+ resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.6.tgz#20061b02f77056c0870a623c530ef28a1bf4fff4"
+ integrity sha512-ihw/i4X+d1kpj1SVA6iBkVl2DZhPsI+xV08geR2TX3FWhpU7zakk/16yBzDRJTTCUgKsWfgyebrgIBsuhTwMnA==
dependencies:
- "@types/yup" "0.26.13"
+ "@types/yup" "0.26.14"
lightercollective "^0.3.0"
object-hash "^1.3.1"
yup "^0.27.0"
@@ -5254,6 +5230,11 @@ lodash.isboolean@^3.0.3:
resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
+lodash.isequal@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+ integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
lodash.isinteger@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -7560,13 +7541,6 @@ trunc-text@1.0.1:
resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.1.tgz#58f876d8ac59b224b79834bb478b8656e69622b5"
integrity sha1-WPh22KxZsiS3mDS7R4uGVuaWIrU=
-ts-invariant@^0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz#3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"
- integrity sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==
- dependencies:
- tslib "^1.9.3"
-
ts-invariant@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0"
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
index db4dfd2e7..c70367005 100755
--- a/scripts/docker_push.sh
+++ b/scripts/docker_push.sh
@@ -3,8 +3,8 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-backend:latest $TRAVIS_BUILD_DIR/backend
docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web:latest $TRAVIS_BUILD_DIR/webapp
docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/neo4j:latest $TRAVIS_BUILD_DIR/neo4j
-docker build -t humanconnection/nitro-maintenance-worker:latest $TRAVIS_BUILD_DIR/deployment/legacy-migration/maintenance-worker
+docker build -t humanconnection/maintenance-worker:latest $TRAVIS_BUILD_DIR/deployment/legacy-migration/maintenance-worker
docker push humanconnection/nitro-backend:latest
docker push humanconnection/nitro-web:latest
docker push humanconnection/neo4j:latest
-docker push humanconnection/nitro-maintenance-worker:latest
+docker push humanconnection/maintenance-worker:latest
\ No newline at end of file
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index fc3b17779..feba44c36 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.3.1-alpine as base
+FROM node:12.4-alpine as base
LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
EXPOSE 3000
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fb33e2fd8..909659366 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -160,6 +160,11 @@
}
},
"common": {
+ "your": {
+ "post": "Dein Beitrag ::: Deine Beiträge",
+ "comment": "Dein Kommentar ::: Deine Kommentare",
+ "shouted": "Deine Empfehlung ::: Deine Empfehlungen"
+ },
"post": "Beitrag ::: Beiträge",
"comment": "Kommentar ::: Kommentare",
"letsTalk": "Miteinander reden",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8330f97b2..bd517a7ce 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -160,6 +160,11 @@
}
},
"common": {
+ "your": {
+ "post": "Your Post ::: Your Posts",
+ "comment": "Your Comment ::: Your Comments",
+ "shout": "Your Shout ::: Your Shouts"
+ },
"post": "Post ::: Posts",
"comment": "Comment ::: Comments",
"letsTalk": "Let`s Talk",
diff --git a/webapp/package.json b/webapp/package.json
index 880db60d1..492cd094d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -56,7 +56,7 @@
"@nuxtjs/style-resources": "~0.1.2",
"accounting": "~0.4.1",
"apollo-cache-inmemory": "~1.5.1",
- "apollo-client": "~2.6.0",
+ "apollo-client": "~2.6.1",
"cookie-universal-nuxt": "~2.0.14",
"cross-env": "~5.2.0",
"date-fns": "2.0.0-alpha.27",
@@ -64,7 +64,7 @@
"graphql": "~14.3.1",
"jsonwebtoken": "~8.5.1",
"linkify-it": "~2.1.0",
- "nuxt": "~2.8.0",
+ "nuxt": "~2.8.1",
"nuxt-dropzone": "^1.0.2",
"nuxt-env": "~0.1.0",
"stack-utils": "^1.0.2",
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 7aef41715..9a7af82ac 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -137,7 +137,15 @@
-
+
@@ -147,28 +155,43 @@
-
-
-
+
-
+
- -->
-
-
-
+
-
+
- -->
+
@@ -343,6 +366,14 @@ export default {