From 7bd345ceec827ff55a9837349278b9e8befc6f11 Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Fri, 28 Dec 2018 20:10:01 +0100
Subject: [PATCH 01/38] WIP - First attemplte of Pluralization

---
 locales/de.json      |  2 +-
 locales/en.json      | 19 ++++++++++++++++++-
 pages/post/_slug.vue | 18 +++++++++---------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/locales/de.json b/locales/de.json
index bb879f4ea..56a6b0fe1 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -94,4 +94,4 @@
       "author": "Afrikanisches Sprichwort"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/locales/en.json b/locales/en.json
index a36bdda3c..d5db12591 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,4 +1,21 @@
 {
+  "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 ::: Names",
+    "loadMore": "load more",
+    "loading": "loading"
+  },
   "login": {
     "copy": "If you already have a human-connection account, login here.",
     "login": "Login",
@@ -94,4 +111,4 @@
       "author": "African proverb"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/pages/post/_slug.vue b/pages/post/_slug.vue
index b3e6e2ea8..0d147532c 100644
--- a/pages/post/_slug.vue
+++ b/pages/post/_slug.vue
@@ -18,33 +18,33 @@
 
 <script>
 export default {
-  data() {
-    return {
-      routes: [
+  computed: {
+    routes() {
+      return [
         {
-          name: 'Post',
+          name: this.$t('common.post', null, 1),
           path: `/post/${this.$route.params.slug}`,
           children: [
             {
-              name: 'Kommentare',
+              name: this.$t('common.comment', null, 2),
               path: `/post/${this.$route.params.slug}#comments`
             },
             {
-              name: 'Miteinander reden',
+              name: this.$t('common.letsTalk'),
               path: `/post/${this.$route.params.slug}#lets-talk`
             },
             {
-              name: 'Versus',
+              name: this.$t('common.versus'),
               path: `/post/${this.$route.params.slug}#versus`
             }
           ]
         },
         {
-          name: 'Mehr Info',
+          name: this.$t('common.moreInfo'),
           path: `/post/${this.$route.params.slug}/more-info`
         },
         {
-          name: 'Aktiv werden',
+          name: this.$t('common.takeAction'),
           path: `/post/${this.$route.params.slug}/take-action`
         }
       ]

From 5778ef3bc0be9a86c22024c8be28890728716845 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 3 Jan 2019 19:25:20 -0200
Subject: [PATCH 02/38] Multistage build docker

---
 .dockerignore |  5 +++++
 Dockerfile    | 30 ++++++++++++++++++------------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 9f734654d..4ab35e506 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,3 +11,8 @@ scripts/
 .env
 
 cypress/
+
+README.md 
+screenshot*.png
+lokalise.png
+.editorconfig
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 8ebbb0393..ad59965f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM node:10-alpine
+FROM node:10-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 the app port
-EXPOSE 3000
-
+ARG BUILD_COMMIT
+ENV BUILD_COMMIT=$BUILD_COMMIT
 ARG WORKDIR=/nitro-web
 RUN mkdir -p $WORKDIR
 WORKDIR $WORKDIR
@@ -11,18 +11,24 @@ WORKDIR $WORKDIR
 # See: https://github.com/nodejs/docker-node/pull/367#issuecomment-430807898
 RUN apk --no-cache add git
 
-# Install Web Application
-COPY package.json .
-COPY yarn.lock .
+COPY package.json yarn.lock ./
 COPY styleguide/ ./styleguide
-RUN yarn install --production=false --frozen-lockfile --non-interactive
 
-# Install and build Styleguide
-COPY styleguide/ ./styleguide
+FROM base as builder
+RUN yarn install --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
-    && yarn run styleguide:build
+    && yarn run styleguide:build 
+COPY . . 
+RUN yarn run build
 
-COPY . .
-RUN ["yarn", "run", "build"]
+FROM base as production
+ENV NODE_ENV=production
+ADD package.json ./
+ADD nuxt.config.js ./
+COPY --from=builder ./nitro-web/node_modules ./node_modules/
+COPY --from=builder /nitro-web/.nuxt/ ./.nuxt
+COPY --from=builder ./nitro-web/static ./static/
+
+EXPOSE 3000
 CMD ["yarn", "run", "start"]

From e88b674a29d81509520a1c1169bfa33d47d6a3d1 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 3 Jan 2019 20:22:29 -0200
Subject: [PATCH 03/38] Configure docker-compose, travis multistage build

---
 .travis.yml                 | 4 ++--
 docker-compose.override.yml | 3 +++
 docker-compose.travis.yml   | 8 ++++++++
 docker-compose.yml          | 4 +++-
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 docker-compose.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 0ad6b5e30..90191674c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ before_install:
   - sudo mv docker-compose /usr/local/bin
 
 install:
-  - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/nitro-web .
-  - docker-compose -f docker-compose.yml up -d
+  - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web .
+  - docker-compose -f docker-compose.travis.yml up -d
   - git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
   - git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
   - docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 4188b42ce..0438f5fbb 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -2,6 +2,9 @@ version: '3.7'
 
 services:
   webapp:
+    build:
+      context: .
+      target: builder
     volumes:
       - .:/nitro-web
       - node_modules:/nitro-web/node_modules
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
new file mode 100644
index 000000000..ab752a230
--- /dev/null
+++ b/docker-compose.travis.yml
@@ -0,0 +1,8 @@
+version: "3.7"
+
+services:
+  backend:
+    image: humanconnection/nitro-web:builder
+    build:
+      context: .
+      target: builder
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index f7c697889..c8bba8595 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,9 @@ version: '3.7'
 services:
   webapp:
     image: humanconnection/nitro-web:latest
-    build: .
+    build:
+      context: .
+      target: production
     ports:
       - 3000:3000
       - 8080:8080

From c575565f8cd562d3b66765ad5bb7b880ce4ce68b Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 3 Jan 2019 21:06:28 -0200
Subject: [PATCH 04/38] Copy plugins from builder

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index ad59965f8..d9b679111 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ FROM base as production
 ENV NODE_ENV=production
 ADD package.json ./
 ADD nuxt.config.js ./
+COPY --from=builder ./nitro-web/plugins ./plugins/
 COPY --from=builder ./nitro-web/node_modules ./node_modules/
 COPY --from=builder /nitro-web/.nuxt/ ./.nuxt
 COPY --from=builder ./nitro-web/static ./static/

From 744362a4d7a492ab6a047f9b63d4fcfa85521464 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 3 Jan 2019 22:37:48 -0200
Subject: [PATCH 05/38] Link docker-compose to docker-compose.travis

---
 .travis.yml               | 2 +-
 docker-compose.travis.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90191674c..d92b68c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
 
 install:
   - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web .
-  - docker-compose -f docker-compose.travis.yml up -d
+  - docker-compose -f docker-compose.yml -f docker-compose.travis.yml up -d
   - git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
   - git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
   - docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index ab752a230..80942a27a 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -2,7 +2,6 @@ version: "3.7"
 
 services:
   backend:
-    image: humanconnection/nitro-web:builder
     build:
       context: .
       target: builder
\ No newline at end of file

From 014392a7a5e4b511f3251d9aa33dbb34f1e665b7 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 15:06:59 -0200
Subject: [PATCH 06/38] Add missing up in docker-compose up

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d92b68c35..c959673b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
 
 install:
   - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web .
-  - docker-compose -f docker-compose.yml -f docker-compose.travis.yml up -d
+  - docker-compose -f docker-compose.yml up -f docker-compose.travis.yml up -d
   - git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
   - git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
   - docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d

From b8fb1bd1c0acd9472c404678c627e55bac68647a Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 15:15:06 -0200
Subject: [PATCH 07/38] Revert docker-compose up command in travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c959673b7..d92b68c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
 
 install:
   - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web .
-  - docker-compose -f docker-compose.yml up -f docker-compose.travis.yml up -d
+  - docker-compose -f docker-compose.yml -f docker-compose.travis.yml up -d
   - git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
   - git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
   - docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d

From 9b3161ae1567340528d58f731d0d7878517f1c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 4 Jan 2019 19:18:53 +0100
Subject: [PATCH 08/38] Fix copy+paste error `backend`=>`webapp`

@mattwr18 ouch, that was a hard to spot error. It struck my eye when I
was switching back and forth between `docker-compose.override.yml` and
`docker-compose.travis.yml`.
---
 Dockerfile                | 4 ++--
 docker-compose.travis.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9b679111..e28629294 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,8 @@ FROM base as builder
 RUN yarn install --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
-    && yarn run styleguide:build 
-COPY . . 
+    && yarn run styleguide:build
+COPY . .
 RUN yarn run build
 
 FROM base as production
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index 80942a27a..0c3293127 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 
 services:
-  backend:
+  webapp:
     build:
       context: .
-      target: builder
\ No newline at end of file
+      target: builder

From 00d1ca0129db6b5251c567cede25b82711204ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 4 Jan 2019 19:52:52 +0100
Subject: [PATCH 09/38] Put CMD in base section in Dockerfile

This should fix our build server. Probably the container immediately
exited on Travis which is using the `builder` stage for testing.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e28629294..e7cf44f50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apk --no-cache add git
 
 COPY package.json yarn.lock ./
 COPY styleguide/ ./styleguide
+CMD ["yarn", "run", "start"]
 
 FROM base as builder
 RUN yarn install --frozen-lockfile --non-interactive
@@ -32,4 +33,3 @@ COPY --from=builder /nitro-web/.nuxt/ ./.nuxt
 COPY --from=builder ./nitro-web/static ./static/
 
 EXPOSE 3000
-CMD ["yarn", "run", "start"]

From 9541b81b08b31082399d2b57a7fd66f27caef7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 4 Jan 2019 20:08:13 +0100
Subject: [PATCH 10/38] Add folder `/server` to docker stage `production`

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index e7cf44f50..03a572077 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apk --no-cache add git
 
 COPY package.json yarn.lock ./
 COPY styleguide/ ./styleguide
+COPY server/ ./server
 CMD ["yarn", "run", "start"]
 
 FROM base as builder

From 3e3065c4a4d52079562cc3f8b0266b8bc677065e Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 19:46:07 -0200
Subject: [PATCH 11/38] Refactor multistage build names, copy locales in base

---
 Dockerfile                  | 21 ++++++++++-----------
 docker-compose.override.yml |  2 +-
 docker-compose.travis.yml   |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03a572077..8e06ecbd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,13 +11,14 @@ WORKDIR $WORKDIR
 # See: https://github.com/nodejs/docker-node/pull/367#issuecomment-430807898
 RUN apk --no-cache add git
 
-COPY package.json yarn.lock ./
-COPY styleguide/ ./styleguide
-COPY server/ ./server
+COPY locales ./locales
+COPY styleguide ./styleguide
+COPY server ./server
+COPY package.json yarn.lock nuxt.config.js ./
 CMD ["yarn", "run", "start"]
 
-FROM base as builder
-RUN yarn install --frozen-lockfile --non-interactive
+FROM base as build-and-test
+RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
     && yarn run styleguide:build
@@ -26,11 +27,9 @@ RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
-ADD package.json ./
-ADD nuxt.config.js ./
-COPY --from=builder ./nitro-web/plugins ./plugins/
-COPY --from=builder ./nitro-web/node_modules ./node_modules/
-COPY --from=builder /nitro-web/.nuxt/ ./.nuxt
-COPY --from=builder ./nitro-web/static ./static/
+COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
+COPY --from=build-and-test ./nitro-web/plugins ./plugins
+COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
+COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 0438f5fbb..bb7a6c1d1 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -4,7 +4,7 @@ services:
   webapp:
     build:
       context: .
-      target: builder
+      target: build-and-test
     volumes:
       - .:/nitro-web
       - node_modules:/nitro-web/node_modules
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index 0c3293127..ced9719a2 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -4,4 +4,4 @@ services:
   webapp:
     build:
       context: .
-      target: builder
+      target: build-and-test

From 40aedb12ee22df55e4addbc95d190f85692257b1 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 20:12:20 -0200
Subject: [PATCH 12/38] Initialize eslint

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8e06ecbd6..6f5f6ec02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ FROM base as build-and-test
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
-    && yarn run styleguide:build
+    && yarn run styleguide:build && eslint --init
 COPY . .
 RUN yarn run build
 

From 11a7f0a41abc6229ff2a94c147fad37d85a06fc5 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 20:29:45 -0200
Subject: [PATCH 13/38] Copy eslint config, test files

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6f5f6ec02..5b03c8373 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,14 +14,14 @@ RUN apk --no-cache add git
 COPY locales ./locales
 COPY styleguide ./styleguide
 COPY server ./server
-COPY package.json yarn.lock nuxt.config.js ./
+COPY package.json yarn.lock .eslintrc.js .eslintignore store/auth.test.js components/Badges.spec.js nuxt.config.js ./
 CMD ["yarn", "run", "start"]
 
 FROM base as build-and-test
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
-    && yarn run styleguide:build && eslint --init
+    && yarn run styleguide:build
 COPY . .
 RUN yarn run build
 

From beac045d5fa21799872bcd68a7d8bf7a5705edc6 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 20:42:01 -0200
Subject: [PATCH 14/38] Copy components and store, remove in production

Needed to run tests
---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5b03c8373..882b1cb73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,9 @@ RUN apk --no-cache add git
 COPY locales ./locales
 COPY styleguide ./styleguide
 COPY server ./server
-COPY package.json yarn.lock .eslintrc.js .eslintignore store/auth.test.js components/Badges.spec.js nuxt.config.js ./
+COPY components ./components
+COPY store ./store
+COPY package.json yarn.lock .eslintrc.js .eslintignore nuxt.config.js ./
 CMD ["yarn", "run", "start"]
 
 FROM base as build-and-test
@@ -27,6 +29,7 @@ RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
+RUN rm -rf ./nitro-web/components ./nitro-web/store
 COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
 COPY --from=build-and-test ./nitro-web/plugins ./plugins
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt

From 9f8a292c7e39030a4fb05622c8830e5dbff967db Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 20:59:33 -0200
Subject: [PATCH 15/38] Fix lint issues

---
 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 55660d366..e48200a96 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -1,6 +1,6 @@
 import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
 import find from 'lodash/find'
-import { eq } from 'semver';
+import { eq } from 'semver'
 
 /* global cy */
 
@@ -73,7 +73,6 @@ Given('my user account has the role {string}', role => {
   // TODO: use db factories instead of seed data
 })
 
-
 When('I log out', logout)
 
 When('I visit the {string} page', page => {

From 124f8be370d2569fa4901f3d45df971b7ef2aa75 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Sat, 5 Jan 2019 14:25:31 -0200
Subject: [PATCH 16/38] Copy everything over in the base image

---
 Dockerfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 882b1cb73..3eacaa0fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,7 @@ WORKDIR $WORKDIR
 # See: https://github.com/nodejs/docker-node/pull/367#issuecomment-430807898
 RUN apk --no-cache add git
 
-COPY locales ./locales
-COPY styleguide ./styleguide
-COPY server ./server
-COPY components ./components
-COPY store ./store
-COPY package.json yarn.lock .eslintrc.js .eslintignore nuxt.config.js ./
+COPY . .
 CMD ["yarn", "run", "start"]
 
 FROM base as build-and-test

From 890d22421cbf36eeac6536cecfa68bc4d6cdcc26 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Sat, 5 Jan 2019 15:46:56 -0200
Subject: [PATCH 17/38] Change node env to test for build-and-test

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3eacaa0fe..27aa21a9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ COPY . .
 CMD ["yarn", "run", "start"]
 
 FROM base as build-and-test
+ENV NODE_ENV=test
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
@@ -24,7 +25,6 @@ RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
-RUN rm -rf ./nitro-web/components ./nitro-web/store
 COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
 COPY --from=build-and-test ./nitro-web/plugins ./plugins
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt

From ab541300acef5a0949ec7db30aed72e17c8df53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 7 Jan 2019 16:55:57 +0100
Subject: [PATCH 18/38] Remove probably unused semver dependency

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

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index e48200a96..78266d96e 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -1,6 +1,5 @@
 import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
 import find from 'lodash/find'
-import { eq } from 'semver'
 
 /* global cy */
 

From 3afc0e5a32ceb054f6f1dde88c45d18f90e6bb2b Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Mon, 7 Jan 2019 18:52:26 +0100
Subject: [PATCH 19/38] More translations applied

---
 components/Author.vue   |  6 +++---
 locales/de.json         |  4 +++-
 locales/en.json         | 21 +++------------------
 pages/profile/_slug.vue |  6 +++---
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/components/Author.vue b/components/Author.vue
index 53379afa8..4ad1e6583 100644
--- a/components/Author.vue
+++ b/components/Author.vue
@@ -61,7 +61,7 @@
           <ds-space margin="small">
             <ds-number
               :count="fanCount"
-              label="Folgen"
+              :label="$t('profile.followers')"
               size="x-large"
             />
           </ds-space>
@@ -70,7 +70,7 @@
           <ds-space margin="small">
             <ds-number
               :count="author.contributionsCount"
-              label="Beiträge"
+              :label="$t('common.post', null, author.contributionsCount)"
             />
           </ds-space>
         </ds-flex-item>
@@ -78,7 +78,7 @@
           <ds-space margin="small">
             <ds-number
               :count="author.commentsCount"
-              label="Kommentare"
+              :label="$t('common.comment', null, author.commentsCount)"
             />
           </ds-space>
         </ds-flex-item>
diff --git a/locales/de.json b/locales/de.json
index 07db79693..d248e2e4b 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -13,7 +13,9 @@
     "memberSince": "Mitglied seit",
     "follow": "Folgen",
     "followers": "Folgen",
-    "following": "Folgt"
+    "following": "Folgt",
+    "shouted": "Empfohlen",
+    "commented": "Kommentiert"
   },
   "settings": {
     "name": "Einstellungen",
diff --git a/locales/en.json b/locales/en.json
index 70356095c..d34631b47 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,21 +1,4 @@
 {
-  "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 ::: Names",
-    "loadMore": "load more",
-    "loading": "loading"
-  },
   "login": {
     "copy": "If you already have a human-connection account, login here.",
     "login": "Login",
@@ -30,7 +13,9 @@
     "memberSince": "Member since",
     "follow": "Follow",
     "followers": "Followers",
-    "following": "Following"
+    "following": "Following",
+    "shouted": "Shouted",
+    "commented": "Commented"
   },
   "settings": {
     "name": "Settings",
diff --git a/pages/profile/_slug.vue b/pages/profile/_slug.vue
index c1ab8c2a6..a6eb83158 100644
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@@ -183,7 +183,7 @@
                   <ds-space margin="small">
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
-                      <ds-number label="Beiträge">
+                      <ds-number :label="$t('common.post', null, user.contributionsCount)">
                         <hc-count-to
                           slot="count"
                           :end-val="user.contributionsCount"
@@ -196,7 +196,7 @@
                   <ds-space margin="small">
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
-                      <ds-number label="Kommentiert">
+                      <ds-number :label="$t('profile.commented')">
                         <hc-count-to
                           slot="count"
                           :end-val="user.commentsCount"
@@ -209,7 +209,7 @@
                   <ds-space margin="small">
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
-                      <ds-number label="Empfohlen">
+                      <ds-number :label="$t('profile.shouted')">
                         <hc-count-to
                           slot="count"
                           :end-val="user.shoutedCount"

From 9172cd253248cb85dbe841a74fd6165276e42815 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 8 Jan 2019 09:23:56 -0200
Subject: [PATCH 20/38] Change node env to test in travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index d92b68c35..6936774db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ services:
 
 env:
   - DOCKER_COMPOSE_VERSION=1.23.2
+  - NODE_ENV=test
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose

From 648e53456cc3b98b0c3b014905495116e4286aff Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 8 Jan 2019 09:37:30 -0200
Subject: [PATCH 21/38] Set node env to test in package.json

---
 .travis.yml  | 1 -
 package.json | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6936774db..d92b68c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ services:
 
 env:
   - DOCKER_COMPOSE_VERSION=1.23.2
-  - NODE_ENV=test
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
diff --git a/package.json b/package.json
index f316df396..70edc4bcb 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
     "build": "nuxt build",
     "start": "cross-env node server/index.js",
     "generate": "nuxt generate",
-    "lint": "eslint --ext .js,.vue .",
+    "lint": "set NODE_ENV=test && eslint --ext .js,.vue .",
     "styleguide": "cd ./styleguide && yarn dev",
     "styleguide:build": "cd ./styleguide && yarn build:lib && cd ../",
-    "test": "jest",
+    "test": "set NODE_ENV=test && jest",
     "precommit": "yarn lint"
   },
   "cypress-cucumber-preprocessor": {

From ebc143f4555c73280a2c80faf830d871fdb43719 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 8 Jan 2019 09:50:48 -0200
Subject: [PATCH 22/38] Add node env correctly in travis.yml and echo

---
 .travis.yml  | 3 ++-
 package.json | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d92b68c35..918cdac9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ services:
   - docker
 
 env:
-  - DOCKER_COMPOSE_VERSION=1.23.2
+  - DOCKER_COMPOSE_VERSION=1.23.2 NODE_ENV=test
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
@@ -27,6 +27,7 @@ install:
   - yarn add cypress-cucumber-preprocessor
 
 script:
+  - echo $NODE_ENV
   - docker-compose exec webapp yarn run lint
   - docker-compose exec webapp yarn run test
   - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null
diff --git a/package.json b/package.json
index 70edc4bcb..f316df396 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
     "build": "nuxt build",
     "start": "cross-env node server/index.js",
     "generate": "nuxt generate",
-    "lint": "set NODE_ENV=test && eslint --ext .js,.vue .",
+    "lint": "eslint --ext .js,.vue .",
     "styleguide": "cd ./styleguide && yarn dev",
     "styleguide:build": "cd ./styleguide && yarn build:lib && cd ../",
-    "test": "set NODE_ENV=test && jest",
+    "test": "jest",
     "precommit": "yarn lint"
   },
   "cypress-cucumber-preprocessor": {

From a4ae2aa35b03f457433989298383bf8ae11c1e43 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 8 Jan 2019 10:31:49 -0200
Subject: [PATCH 23/38] Add environment variable to commands

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 918cdac9d..46a173ae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ services:
   - docker
 
 env:
-  - DOCKER_COMPOSE_VERSION=1.23.2 NODE_ENV=test
+  - DOCKER_COMPOSE_VERSION=1.23.2
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
@@ -27,9 +27,8 @@ install:
   - yarn add cypress-cucumber-preprocessor
 
 script:
-  - echo $NODE_ENV
-  - docker-compose exec webapp yarn run lint
-  - docker-compose exec webapp yarn run test
+  - docker-compose exec -e NODE_ENV=test webapp yarn run lint
+  - docker-compose exec -e NODE_ENV=test webapp yarn run test
   - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null
   - wait-on http://localhost:3000
   - cypress run --record --key $CYPRESS_TOKEN

From c96e29bfcb0b71a59ed96572a5c19a46c0d3a641 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 8 Jan 2019 11:22:51 -0200
Subject: [PATCH 24/38] Clean up Dockerfile

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 27aa21a9b..35d8baaa5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,8 @@ WORKDIR $WORKDIR
 RUN apk --no-cache add git
 
 COPY . .
-CMD ["yarn", "run", "start"]
 
 FROM base as build-and-test
-ENV NODE_ENV=test
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
@@ -31,3 +29,4 @@ COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
 COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000
+CMD ["yarn", "run", "start"]

From 39f581aefb59528bd6f1cd0d718c40dd7d65dc06 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 8 Jan 2019 20:39:45 -0200
Subject: [PATCH 25/38] Remove redundant copies, run yarn install in production
 image

---
 Dockerfile   |  4 +---
 package.json |  2 +-
 yarn.lock    | 23 ++++++++++++++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 35d8baaa5..4e9714532 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,10 +23,8 @@ RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
-COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
-COPY --from=build-and-test ./nitro-web/plugins ./plugins
+RUN yarn install --frozen-lockfile --non-interactive
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
-COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000
 CMD ["yarn", "run", "start"]
diff --git a/package.json b/package.json
index f316df396..ed036ea1d 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "jsonwebtoken": "^8.3.0",
     "nuxt": "^2.0.0",
     "nuxt-env": "^0.0.4",
+    "nuxt-sass-resources-loader": "^2.0.5",
     "v-tooltip": "^2.0.0-rc.33",
     "vue-count-to": "^1.0.13",
     "vue-izitoast": "1.1.2",
@@ -72,7 +73,6 @@
     "jest": "^23.6.0",
     "node-sass": "^4.11.0",
     "nodemon": "^1.18.9",
-    "nuxt-sass-resources-loader": "^2.0.5",
     "prettier": "1.14.3",
     "sass-loader": "^7.1.0",
     "vue-jest": "^3.0.2",
diff --git a/yarn.lock b/yarn.lock
index 800a9deff..aabbf9fae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2777,6 +2777,11 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
   integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
@@ -7177,6 +7182,13 @@ json5@^0.5.0, json5@^0.5.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 json5@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
@@ -7382,7 +7394,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1.0:
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
@@ -7391,6 +7403,15 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
+loader-utils@^1.0.4:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"

From a6fc71914543e688640d1853c8ad59c31cdccb8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Wed, 9 Jan 2019 04:44:05 +0000
Subject: [PATCH 26/38] Bump cookie-universal-nuxt from 2.0.12 to 2.0.14

Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.12 to 2.0.14.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.12...v2.0.14)

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

diff --git a/package.json b/package.json
index f316df396..a60c6f4a3 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@nuxtjs/axios": "^5.3.6",
     "@nuxtjs/dotenv": "^1.3.0",
     "accounting": "^0.4.1",
-    "cookie-universal-nuxt": "^2.0.12",
+    "cookie-universal-nuxt": "^2.0.14",
     "cross-env": "^5.2.0",
     "date-fns": "^2.0.0-alpha.26",
     "express": "^4.16.3",
diff --git a/yarn.lock b/yarn.lock
index 800a9deff..ecd24a977 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3793,18 +3793,18 @@ 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.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.0.12.tgz#061bb1864d2dd010fad1c484ae982da42954bfd9"
-  integrity sha512-qZu3rOgsDjWqgq9dU+zCQl3RpsZeevI/c6fN+wgTRsQdSe8MSwYWpl+6Pitu0mXgZKVJ8e+JA3s3jDVoXV5szg==
+cookie-universal-nuxt@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.0.14.tgz#6fdf8e928eadd7611c04a57614fe2e29b60eb971"
+  integrity sha512-ih9Z0Z2K6eLaugTttGCVN85nogKseIFF/dqup3klvYC4mQS3+1IloqBqzTL/N7degBBAols2oppwYNDmaRtVig==
   dependencies:
     "@types/cookie" "^0.3.1"
-    cookie-universal "^2.0.12"
+    cookie-universal "^2.0.14"
 
-cookie-universal@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.0.12.tgz#3627a56045a84c1c53618d38bd30b278db5633f4"
-  integrity sha512-/3ch/W145NHVmX2Oenykb3U/Knmu/78JJZxGY2qw28mIr/Ueve6D+A3BySAncvqIgNUy7lIgmAUjf1hV4D4d/A==
+cookie-universal@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.0.14.tgz#1b4f27cffccfc2e47703fa235c1f67f931213041"
+  integrity sha512-m6J0DQa4/RQvXhzUG37EY1ynK3Uq1BKzp5hotST9olrzjrRx+B0vNPx7azg0/X0XrYQvL7MMbPXwou8m0BNDwg==
   dependencies:
     "@types/cookie" "^0.3.1"
     cookie "^0.3.1"

From 1a234e70f8a28fb361def63a7c6048e6d99e341c Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 9 Jan 2019 18:54:42 -0200
Subject: [PATCH 27/38] Copy over styleguide/dist

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 4e9714532..afba80104 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ FROM base as production
 ENV NODE_ENV=production
 RUN yarn install --frozen-lockfile --non-interactive
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
+COPY --from=build-and-test ./styleguide/dist ./styleguide/dist
 
 EXPOSE 3000
 CMD ["yarn", "run", "start"]

From cca09415c3625c59d55eaebab7e5e85cac46a00e Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 9 Jan 2019 19:14:38 -0200
Subject: [PATCH 28/38] Fix copy path

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index afba80104..a50e03715 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,14 +18,13 @@ RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
     && yarn run styleguide:build
-COPY . .
 RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
 RUN yarn install --frozen-lockfile --non-interactive
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
-COPY --from=build-and-test ./styleguide/dist ./styleguide/dist
+COPY --from=build-and-test ./nitro-web/styleguide/dist ./styleguide/dist
 
 EXPOSE 3000
 CMD ["yarn", "run", "start"]

From 0acca8c73ffc2d9ac9246959657b1aebc5a3b199 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 9 Jan 2019 19:15:48 -0200
Subject: [PATCH 29/38] Add copy everything in build and test

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index a50e03715..1affdf80f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,7 @@ RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
     && yarn run styleguide:build
+COPY . .
 RUN yarn run build
 
 FROM base as production

From 19a298d7f6ed515ab543b2a6ca3ab5fc22c50774 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 9 Jan 2019 19:36:37 -0200
Subject: [PATCH 30/38] Add back static and plugins copy from build and test

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 1affdf80f..8f8b8a8c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,8 @@ ENV NODE_ENV=production
 RUN yarn install --frozen-lockfile --non-interactive
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
 COPY --from=build-and-test ./nitro-web/styleguide/dist ./styleguide/dist
+COPY --from=build-and-test ./nitro-web/plugins ./plugins
+COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000
 CMD ["yarn", "run", "start"]

From b17107438cbdedcb32d23bda408a85e4e8a1fe58 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 9 Jan 2019 19:52:38 -0200
Subject: [PATCH 31/38] Revert to passing build

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8f8b8a8c4..75237af56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN apk --no-cache add git
 COPY . .
 
 FROM base as build-and-test
+ENV NODE_ENV=test
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
@@ -23,10 +24,9 @@ RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
-RUN yarn install --frozen-lockfile --non-interactive
-COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
-COPY --from=build-and-test ./nitro-web/styleguide/dist ./styleguide/dist
+COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
 COPY --from=build-and-test ./nitro-web/plugins ./plugins
+COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
 COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000

From 6948c147e28d3e05bd930dd753e5081a4273df3e Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 9 Jan 2019 20:05:04 -0200
Subject: [PATCH 32/38] Remove un-needed copies

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75237af56..8f7df318b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,20 +14,16 @@ RUN apk --no-cache add git
 COPY . .
 
 FROM base as build-and-test
-ENV NODE_ENV=test
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
     && yarn run styleguide:build
-COPY . .
 RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
 COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
-COPY --from=build-and-test ./nitro-web/plugins ./plugins
 COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
-COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000
 CMD ["yarn", "run", "start"]

From a7010d32cfcd275e548f6b06de9ea88b86ec107e Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Thu, 10 Jan 2019 09:47:35 +0100
Subject: [PATCH 33/38] Improve Dropdown

---
 assets/styles/main.scss | 20 ++++++++++++++++++++
 components/Dropdown.vue | 21 +++++++++++++++++++++
 layouts/blank.vue       |  1 +
 layouts/default.vue     |  1 +
 4 files changed, 43 insertions(+)

diff --git a/assets/styles/main.scss b/assets/styles/main.scss
index e9254c4b9..91b040f54 100644
--- a/assets/styles/main.scss
+++ b/assets/styles/main.scss
@@ -126,3 +126,23 @@ hr {
   background-color: $color-neutral-80;
   height: 1px !important;
 }
+
+#overlay {
+  display: block;
+  opacity: 0;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  position: fixed;
+  background: rgba(0, 0, 0, 0.15);
+  z-index: 99;
+  pointer-events: none;
+  transition: opacity 150ms ease-out;
+  transition-delay: 50ms;
+
+  .dropdown-open & {
+    opacity: 1;
+    transition-delay: 0;
+  }
+}
diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index f47c1cabb..1440170f3 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -36,6 +36,27 @@ export default {
       isPopoverOpen: false
     }
   },
+  watch: {
+    isPopoverOpen: {
+      immediate: true,
+      handler(isOpen) {
+        console.log('isOpen', isOpen)
+        try {
+          if (isOpen) {
+            setTimeout(() => {
+              document
+                .getElementsByTagName('body')[0]
+                .classList.add('dropdown-open')
+            }, 10)
+          } else {
+            document
+              .getElementsByTagName('body')[0]
+              .classList.remove('dropdown-open')
+          }
+        } catch (err) {}
+      }
+    }
+  },
   beforeDestroy() {
     clearTimeout(mouseEnterTimer)
     clearTimeout(mouseLeaveTimer)
diff --git a/layouts/blank.vue b/layouts/blank.vue
index 23a783ac6..140ec9f6e 100644
--- a/layouts/blank.vue
+++ b/layouts/blank.vue
@@ -5,6 +5,7 @@
         <nuxt />
       </div>
     </ds-container>
+    <div id="overlay" />
   </div>
 </template>
 
diff --git a/layouts/default.vue b/layouts/default.vue
index 6bf42691e..e38eaeda8 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -72,6 +72,7 @@
         <nuxt />
       </div>
     </ds-container>
+    <div id="overlay" />
   </div>
 </template>
 

From 78978e9bdba43e01287c041b497cdb8513d5a94b Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Thu, 10 Jan 2019 10:29:02 +0100
Subject: [PATCH 34/38] Added disabled, isOpen, openMenu, closeMenu to Dropdown

---
 components/Dropdown.vue | 60 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index 1440170f3..d354dd257 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -3,10 +3,16 @@
     :open.sync="isPopoverOpen"
     :open-group="Math.random().toString()"
     :placement="placement"
+    :disabled="disabled"
     trigger="manual"
     :offset="offset"
   >
-    <slot :toggleMenu="toggleMenu" />
+    <slot
+      :toggleMenu="toggleMenu"
+      :openMenu="openMenu"
+      :closeMenu="closeMenu"
+      :isOpen="isOpen"
+    />
     <div
       slot="popover"
       @mouseover="popoverMouseEnter"
@@ -15,6 +21,9 @@
       <slot
         name="popover"
         :toggleMenu="toggleMenu"
+        :openMenu="openMenu"
+        :closeMenu="closeMenu"
+        :isOpen="isOpen"
       />
     </div>
   </v-popover>
@@ -29,6 +38,7 @@ let mouseLeaveTimer = null
 export default {
   props: {
     placement: { type: String, default: 'bottom-end' },
+    disabled: { type: Boolean, default: false },
     offset: { type: [String, Number], default: '16' }
   },
   data() {
@@ -36,6 +46,11 @@ export default {
       isPopoverOpen: false
     }
   },
+  computed: {
+    isOpen() {
+      return this.isPopoverOpen
+    }
+  },
   watch: {
     isPopoverOpen: {
       immediate: true,
@@ -43,11 +58,13 @@ export default {
         console.log('isOpen', isOpen)
         try {
           if (isOpen) {
-            setTimeout(() => {
-              document
-                .getElementsByTagName('body')[0]
-                .classList.add('dropdown-open')
-            }, 10)
+            this.$nextTick(() => {
+              setTimeout(() => {
+                document
+                  .getElementsByTagName('body')[0]
+                  .classList.add('dropdown-open')
+              }, 20)
+            })
           } else {
             document
               .getElementsByTagName('body')[0]
@@ -63,9 +80,37 @@ export default {
   },
   methods: {
     toggleMenu() {
+      if (this.disabled) {
+        return
+      }
+      clearTimeout(mouseEnterTimer)
+      clearTimeout(mouseLeaveTimer)
       this.isPopoverOpen = !this.isPopoverOpen
     },
+    openMenu(useTimeout) {
+      if (this.disabled) {
+        return
+      }
+      if (useTimeout) {
+        this.popoverMouseEnter()
+      } else {
+        this.isPopoverOpen = true
+      }
+    },
+    closeMenu(useTimeout) {
+      if (this.disabled) {
+        return
+      }
+      if (useTimeout) {
+        this.popoveMouseLeave()
+      } else {
+        this.isPopoverOpen = false
+      }
+    },
     popoverMouseEnter() {
+      if (this.disabled) {
+        return
+      }
       clearTimeout(mouseEnterTimer)
       clearTimeout(mouseLeaveTimer)
       if (!this.isPopoverOpen) {
@@ -75,6 +120,9 @@ export default {
       }
     },
     popoveMouseLeave() {
+      if (this.disabled) {
+        return
+      }
       clearTimeout(mouseEnterTimer)
       clearTimeout(mouseLeaveTimer)
       if (this.isPopoverOpen) {

From e9ac233d6c97b63da4bd9fa7e20f618b1dddf424 Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Thu, 10 Jan 2019 10:29:21 +0100
Subject: [PATCH 35/38] Use Dropdown in Author Component

---
 components/Author.vue | 248 ++++++++++++++++++++----------------------
 1 file changed, 117 insertions(+), 131 deletions(-)

diff --git a/components/Author.vue b/components/Author.vue
index 4ad1e6583..377b74b7f 100644
--- a/components/Author.vue
+++ b/components/Author.vue
@@ -1,127 +1,127 @@
 <template>
-  <v-popover
-    :open.sync="isPopoverOpen"
+  <dropdown
     :disabled="!hasAuthor || !showAuthorPopover"
-    :open-group="Math.random().toString()"
     placement="top-start"
-    trigger="manual"
     offset="0"
   >
-    <a
-      v-router-link
-      :href="author.slug ? $router.resolve({ name: 'profile-slug', params: { slug: author.slug } }).href : null"
-      style="white-space: nowrap; display: flex; align-items: center;"
-      @mouseover="popoverMouseEnter"
-      @mouseleave="popoveMouseLeave"
+    <template
+      slot="default"
+      slot-scope="{openMenu, closeMenu, isOpen}"
     >
-      <div style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;">
-        <ds-avatar
-          :image="author.avatar"
-          :name="author.name"
-          style="display: inline-block; vertical-align: middle;"
-          size="32px"
-        />
-      </div>
-      <div style="display: inline-block; height: 100%; vertical-align: middle;">
-        <b
-          class="username"
-          style="vertical-align: middle;"
-        >
-          {{ author.name | truncate(trunc, 18) }}
-        </b>
-        <template v-if="post.createdAt">
-          <br>
-          <ds-text
-            size="small"
-            color="soft"
-          >
-            {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
-          </ds-text>
-        </template>
-      </div>
-    </a>
-    <div
-      slot="popover"
-      style="min-width: 250px;"
-      @mouseover="popoverMouseEnter"
-      @mouseleave="popoveMouseLeave"
-    >
-      <!--<ds-avatar
-        :image="author.avatar"
-        :name="author.name || 'Anonymus'"
-        class="profile-avatar"
-        size="90px" />-->
-      <hc-badges
-        v-if="author.badges && author.badges.length"
-        :badges="author.badges"
-        style="margin-bottom: -10px"
-      />
-      <ds-flex>
-        <ds-flex-item class="ds-tab-nav-item">
-          <ds-space margin="small">
-            <ds-number
-              :count="fanCount"
-              :label="$t('profile.followers')"
-              size="x-large"
-            />
-          </ds-space>
-        </ds-flex-item>
-        <ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active">
-          <ds-space margin="small">
-            <ds-number
-              :count="author.contributionsCount"
-              :label="$t('common.post', null, author.contributionsCount)"
-            />
-          </ds-space>
-        </ds-flex-item>
-        <ds-flex-item class="ds-tab-nav-item">
-          <ds-space margin="small">
-            <ds-number
-              :count="author.commentsCount"
-              :label="$t('common.comment', null, author.commentsCount)"
-            />
-          </ds-space>
-        </ds-flex-item>
-      </ds-flex>
-      <!--<ds-text
-        color="soft"
-        size="small">
-        <ds-icon name="map-marker" /> Hamburg, Deutschland
-      </ds-text>-->
-      <ds-flex
-        v-if="!itsMe"
-        gutter="x-small"
-        style="margin-bottom: 0;"
+      <a
+        v-router-link
+        :href="author.slug ? $router.resolve({ name: 'profile-slug', params: { slug: author.slug } }).href : null"
+        :class="['author', isOpen && 'active']"
+        @mouseover="openMenu(true)"
+        @mouseleave="closeMenu(true)"
       >
-        <ds-flex-item :width="{base: 3}">
-          <hc-follow-button
-            :follow-id="author.id"
-            @update="voted = true"
+        <div style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;">
+          <ds-avatar
+            :image="author.avatar"
+            :name="author.name"
+            style="display: inline-block; vertical-align: middle;"
+            size="32px"
           />
-        </ds-flex-item>
-        <ds-flex-item :width="{base: 1}">
-          <ds-button full-width>
-            <ds-icon name="user-times" />
-          </ds-button>
-        </ds-flex-item>
-      </ds-flex>
-      <!--<ds-space margin-bottom="x-small" />-->
-    </div>
-  </v-popover>
+        </div>
+        <div style="display: inline-block; height: 100%; vertical-align: middle;">
+          <b
+            class="username"
+            style="vertical-align: middle;"
+          >
+            {{ author.name | truncate(trunc, 18) }}
+          </b>
+          <template v-if="post.createdAt">
+            <br>
+            <ds-text
+              size="small"
+              color="soft"
+            >
+              {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
+            </ds-text>
+          </template>
+        </div>
+      </a>
+    </template>
+    <template
+      slot="popover"
+    >
+      <div style="min-width: 250px">
+        <!--<ds-avatar
+          :image="author.avatar"
+          :name="author.name || 'Anonymus'"
+          class="profile-avatar"
+          size="90px" />-->
+        <hc-badges
+          v-if="author.badges && author.badges.length"
+          :badges="author.badges"
+          style="margin-bottom: -10px"
+        />
+        <ds-flex>
+          <ds-flex-item class="ds-tab-nav-item">
+            <ds-space margin="small">
+              <ds-number
+                :count="fanCount"
+                :label="$t('profile.followers')"
+                size="x-large"
+              />
+            </ds-space>
+          </ds-flex-item>
+          <ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active">
+            <ds-space margin="small">
+              <ds-number
+                :count="author.contributionsCount"
+                :label="$t('common.post', null, author.contributionsCount)"
+              />
+            </ds-space>
+          </ds-flex-item>
+          <ds-flex-item class="ds-tab-nav-item">
+            <ds-space margin="small">
+              <ds-number
+                :count="author.commentsCount"
+                :label="$t('common.comment', null, author.commentsCount)"
+              />
+            </ds-space>
+          </ds-flex-item>
+        </ds-flex>
+        <!--<ds-text
+          color="soft"
+          size="small">
+          <ds-icon name="map-marker" /> Hamburg, Deutschland
+        </ds-text>-->
+        <ds-flex
+          v-if="!itsMe"
+          gutter="x-small"
+          style="margin-bottom: 0;"
+        >
+          <ds-flex-item :width="{base: 3}">
+            <hc-follow-button
+              :follow-id="author.id"
+              @update="voted = true"
+            />
+          </ds-flex-item>
+          <ds-flex-item :width="{base: 1}">
+            <ds-button full-width>
+              <ds-icon name="user-times" />
+            </ds-button>
+          </ds-flex-item>
+        </ds-flex>
+        <!--<ds-space margin-bottom="x-small" />-->
+      </div>
+    </template>
+  </dropdown>
 </template>
 
 <script>
 import HcFollowButton from '~/components/FollowButton.vue'
 import HcBadges from '~/components/Badges.vue'
-
-let mouseEnterTimer = null
-let mouseLeaveTimer = null
+import Dropdown from '~/components/Dropdown'
 
 export default {
   name: 'HcAuthor',
   components: {
     HcFollowButton,
-    HcBadges
+    HcBadges,
+    Dropdown
   },
   props: {
     post: { type: Object, default: null },
@@ -130,7 +130,6 @@ export default {
   },
   data() {
     return {
-      isPopoverOpen: false,
       voted: false
     }
   },
@@ -156,30 +155,6 @@ export default {
     hasAuthor() {
       return Boolean(this.post && this.post.author)
     }
-  },
-  beforeDestroy() {
-    clearTimeout(mouseEnterTimer)
-    clearTimeout(mouseLeaveTimer)
-  },
-  methods: {
-    popoverMouseEnter() {
-      clearTimeout(mouseEnterTimer)
-      clearTimeout(mouseLeaveTimer)
-      if (!this.isPopoverOpen) {
-        mouseEnterTimer = setTimeout(() => {
-          this.isPopoverOpen = true
-        }, 500)
-      }
-    },
-    popoveMouseLeave() {
-      clearTimeout(mouseEnterTimer)
-      clearTimeout(mouseLeaveTimer)
-      if (this.isPopoverOpen) {
-        mouseLeaveTimer = setTimeout(() => {
-          this.isPopoverOpen = false
-        }, 300)
-      }
-    }
   }
 }
 </script>
@@ -191,4 +166,15 @@ export default {
   margin-top: -45px;
   border: #fff 5px solid;
 }
+.author {
+  white-space: nowrap;
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  &:hover,
+  &.active {
+    z-index: 999;
+  }
+}
 </style>

From 4676f5af5c60acc52ea31194c2e1413263b873cd Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Thu, 10 Jan 2019 12:01:27 +0100
Subject: [PATCH 36/38] Fixed is-exact usage ofr user menu and optimized
 Dropdown internals

---
 components/Dropdown.vue                       | 24 +++++++++----------
 layouts/default.vue                           | 23 +++++++++++++-----
 .../components/navigation/Menu/MenuItem.vue   |  4 ++++
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index d354dd257..1cfe84c2b 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -55,7 +55,6 @@ export default {
     isPopoverOpen: {
       immediate: true,
       handler(isOpen) {
-        console.log('isOpen', isOpen)
         try {
           if (isOpen) {
             this.$nextTick(() => {
@@ -80,18 +79,14 @@ export default {
   },
   methods: {
     toggleMenu() {
-      if (this.disabled) {
-        return
-      }
-      clearTimeout(mouseEnterTimer)
-      clearTimeout(mouseLeaveTimer)
-      this.isPopoverOpen = !this.isPopoverOpen
+      this.isPopoverOpen ? this.closeMenu(false) : this.openMenu(false)
     },
     openMenu(useTimeout) {
       if (this.disabled) {
         return
       }
-      if (useTimeout) {
+      this.clearTimeouts()
+      if (useTimeout === true) {
         this.popoverMouseEnter()
       } else {
         this.isPopoverOpen = true
@@ -101,7 +96,8 @@ export default {
       if (this.disabled) {
         return
       }
-      if (useTimeout) {
+      this.clearTimeouts()
+      if (useTimeout === true) {
         this.popoveMouseLeave()
       } else {
         this.isPopoverOpen = false
@@ -111,8 +107,7 @@ export default {
       if (this.disabled) {
         return
       }
-      clearTimeout(mouseEnterTimer)
-      clearTimeout(mouseLeaveTimer)
+      this.clearTimeouts()
       if (!this.isPopoverOpen) {
         mouseEnterTimer = setTimeout(() => {
           this.isPopoverOpen = true
@@ -123,13 +118,16 @@ export default {
       if (this.disabled) {
         return
       }
-      clearTimeout(mouseEnterTimer)
-      clearTimeout(mouseLeaveTimer)
+      this.clearTimeouts()
       if (this.isPopoverOpen) {
         mouseLeaveTimer = setTimeout(() => {
           this.isPopoverOpen = false
         }, 300)
       }
+    },
+    clearTimeouts() {
+      clearTimeout(mouseEnterTimer)
+      clearTimeout(mouseLeaveTimer)
     }
   }
 }
diff --git a/layouts/default.vue b/layouts/default.vue
index e38eaeda8..f79b00db5 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -26,7 +26,7 @@
                   <a
                     class="avatar-menu-trigger"
                     :href="$router.resolve({name: 'profile-slug', params: {slug: user.slug}}).href"
-                    @click.prevent="toggleMenu()"
+                    @click.prevent="toggleMenu"
                   >
                     <ds-avatar
                       :image="user.avatar"
@@ -37,7 +37,7 @@
                 </template>
                 <template
                   slot="popover"
-                  slot-scope="{toggleMenu}"
+                  slot-scope="{closeMenu}"
                 >
                   <div class="avatar-menu-popover">
                     {{ $t('login.hello') }} <b>{{ user.name }}</b>
@@ -50,13 +50,16 @@
                         slot-scope="item"
                         :route="item.route"
                         :parents="item.parents"
-                        @click.native="toggleMenu"
+                        @click.native="closeMenu(false)"
                       >
                         <ds-icon :name="item.route.icon" /> {{ item.route.name }}
                       </ds-menu-item>
                     </ds-menu>
                     <ds-space margin="xx-small" />
-                    <nuxt-link :to="{ name: 'logout'}">
+                    <nuxt-link
+                      :to="{ name: 'logout'}"
+                      style="margin-left: 0"
+                    >
                       <ds-icon name="sign-out" /> {{ $t('login.logout') }}
                     </nuxt-link>
                   </div>
@@ -122,6 +125,10 @@ export default {
   },
   methods: {
     isExact(url) {
+      if (url.indexOf('/profile') === 0) {
+        // do only match own profile
+        this.$route.path === url
+      }
       return this.$route.path.indexOf(url) === 0
     }
   }
@@ -148,10 +155,14 @@ export default {
   padding-bottom: 0.5rem;
 
   nav {
-    margin-left: -15px;
-    margin-right: -15px;
+    margin-left: -16px;
+    margin-right: -10px;
     padding-top: 1rem;
     padding-bottom: 1rem;
+
+    a {
+      padding-left: 12px;
+    }
   }
 }
 </style>
diff --git a/styleguide/src/system/components/navigation/Menu/MenuItem.vue b/styleguide/src/system/components/navigation/Menu/MenuItem.vue
index 83ce8fa2c..0926d0803 100644
--- a/styleguide/src/system/components/navigation/Menu/MenuItem.vue
+++ b/styleguide/src/system/components/navigation/Menu/MenuItem.vue
@@ -14,6 +14,10 @@
     <component
       v-if="route"
       class="ds-menu-item-link"
+      :class="[
+        isExact && 'router-active-link',
+        isExact && 'router-link-exact-active'
+      ]"
       v-bind="bindings"
       :exact="isExact"
       :is="linkTag"

From 6b4601e9d14d63362877e293b7219d23cf1b4ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Thu, 10 Jan 2019 02:15:00 +0100
Subject: [PATCH 37/38] Try to help @mattwr18

I give up now after numerous attempts to reduce the docker image size.
The only thing left is that I've put the NODE_ENV=.. configuration in
the docker-compose.X.yml files, I think that's slightly cleaner
---
 .travis.yml                 | 6 +++---
 docker-compose.override.yml | 2 ++
 docker-compose.travis.yml   | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46a173ae7..1bb87acfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,9 @@ install:
   - yarn add cypress-cucumber-preprocessor
 
 script:
-  - docker-compose exec -e NODE_ENV=test webapp yarn run lint
-  - docker-compose exec -e NODE_ENV=test webapp yarn run test
-  - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null
+  - docker-compose exec webapp yarn run lint
+  - docker-compose exec webapp yarn run test
+  - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed
   - wait-on http://localhost:3000
   - cypress run --record --key $CYPRESS_TOKEN
 
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index bb7a6c1d1..c0c893848 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -2,6 +2,8 @@ version: '3.7'
 
 services:
   webapp:
+    environment:
+      - NODE_ENV=development
     build:
       context: .
       target: build-and-test
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index ced9719a2..cf15e6916 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -2,6 +2,8 @@ version: "3.7"
 
 services:
   webapp:
+    environment:
+      - NODE_ENV=test
     build:
       context: .
       target: build-and-test

From 521a868ca88a802d539c2ba792721031eb048cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 11 Jan 2019 01:14:48 +0100
Subject: [PATCH 38/38] Revert "Try to help @mattwr18"

This reverts commit 6b4601e9d14d63362877e293b7219d23cf1b4ecd.

@mattwr18 for reasons I don't understand, our build server hangs
https://travis-ci.com/Human-Connection/Nitro-Web/builds/96979338

Honestly, I start to think this is a bug in `docker-compose`
---
 .travis.yml                 | 6 +++---
 docker-compose.override.yml | 2 --
 docker-compose.travis.yml   | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1bb87acfd..46a173ae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,9 @@ install:
   - yarn add cypress-cucumber-preprocessor
 
 script:
-  - docker-compose exec webapp yarn run lint
-  - docker-compose exec webapp yarn run test
-  - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed
+  - docker-compose exec -e NODE_ENV=test webapp yarn run lint
+  - docker-compose exec -e NODE_ENV=test webapp yarn run test
+  - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null
   - wait-on http://localhost:3000
   - cypress run --record --key $CYPRESS_TOKEN
 
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index c0c893848..bb7a6c1d1 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -2,8 +2,6 @@ version: '3.7'
 
 services:
   webapp:
-    environment:
-      - NODE_ENV=development
     build:
       context: .
       target: build-and-test
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index cf15e6916..ced9719a2 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -2,8 +2,6 @@ version: "3.7"
 
 services:
   webapp:
-    environment:
-      - NODE_ENV=test
     build:
       context: .
       target: build-and-test