From 9d522353cc36c52b15d57c71c83bbe9c459625a3 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 24 Oct 2019 11:07:13 +0200 Subject: [PATCH 1/3] fix: import missing files in maintenance image @ogerly the maintenance page needs just two components of the webapp folder. For that reason we import only these. If you add imports to `LocaleSwitch` component, you need to copy those files in the Dockerfile. --- webapp/Dockerfile.maintenance | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index b32bca8e1..0e4a618ed 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,5 +1,5 @@ FROM node:12.13.0-alpine as build -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)" +LABEL Description="Maintenance page 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 CMD ["yarn", "run", "start"] @@ -19,6 +19,7 @@ RUN yarn install --production=false --frozen-lockfile --non-interactive COPY assets assets COPY components/LocaleSwitch/ components/LocaleSwitch +COPY graphql graphql COPY components/Dropdown.vue components/Dropdown.vue COPY layouts/blank.vue layouts/blank.vue COPY locales locales From 821ea6d6711744face1366227070f8786dec52cb Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Thu, 24 Oct 2019 12:45:55 +0200 Subject: [PATCH 2/3] Update LocaleSwitch with guard clause - return if there is no currentUser - do not copy graphql directory as there is no need to send messages to backend --- webapp/Dockerfile.maintenance | 1 - webapp/components/LocaleSwitch/LocaleSwitch.vue | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index 0e4a618ed..7daf4f822 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -19,7 +19,6 @@ RUN yarn install --production=false --frozen-lockfile --non-interactive COPY assets assets COPY components/LocaleSwitch/ components/LocaleSwitch -COPY graphql graphql COPY components/Dropdown.vue components/Dropdown.vue COPY layouts/blank.vue layouts/blank.vue COPY locales locales diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue index 307425aca..38334621e 100644 --- a/webapp/components/LocaleSwitch/LocaleSwitch.vue +++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue @@ -33,12 +33,12 @@