From 0ec33fe3a3e57b526927304d8690a97176b35a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 9 Aug 2021 11:53:45 +0200 Subject: [PATCH] Try to implement the logo on maintenance page, uncommented and hints --- docker-compose.override.yml | 5 +++++ webapp/Dockerfile.maintenance | 2 ++ webapp/components/Logo/Logo.vue | 2 +- webapp/maintenance/source/pages/index.vue | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 5fceb2776..15cf00e7a 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -60,6 +60,11 @@ services: networks: - external-net +# the following network from the main YAML gives the warning `WARNING: Some networks were defined but are not used by any service: internal-net` and should be removed +# but removing is not possible yet, it seems: https://github.com/docker/compose/issues/3729#issuecomment-623154878 +# networks: +# internal-net: + volumes: webapp_node_modules: backend_node_modules: diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index dcc06ad61..d9fa6fe43 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -57,8 +57,10 @@ COPY package.json yarn.lock ./ RUN yarn install --production=false --frozen-lockfile --non-interactive COPY assets assets +# COPY components/_new/generic/ components/_new/generic COPY components/LocaleSwitch/ components/LocaleSwitch COPY components/Dropdown.vue components/Dropdown.vue +# COPY components/Logo/ components/Logo COPY layouts/blank.vue layouts/blank.vue COPY locales locales COPY mixins mixins diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index c93d74f81..ed5c147e8 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -71,7 +71,7 @@ export default { maintenance: { path: logos.LOGO_MAINTENACE_RESET_PATH, alt: 'Under Maintenance', - widthDefault: '75%', + widthDefault: '200px', }, } return { diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue index e6ee49455..7f27e58d1 100644 --- a/webapp/maintenance/source/pages/index.vue +++ b/webapp/maintenance/source/pages/index.vue @@ -11,13 +11,14 @@ - + Under maintenance + @@ -46,11 +47,13 @@ import emails from '~/constants/emails.js' // import links from '~/constants/links.js' import metadata from '~/constants/metadata.js' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' +// import Logo from '~/components/Logo/Logo' export default { layout: 'blank', components: { LocaleSwitch, + // Logo, }, data() { // return { links, metadata, supportEmail: emails.SUPPORT_EMAIL }