From 870fe89a80ca031782629a60aff3ccfbe134797c Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Sep 2022 19:49:24 +0200 Subject: [PATCH] refactor rebranding --- branding/assets/styles/import/_branding.scss | 5 +++++ branding/constants/headerMenu.js | 12 ++++++++++++ branding/constants/logos.js | 1 + docker-compose.ocelotsocial-branded.yml | 4 ++++ docker-compose.yml | 4 ++++ docker/webapp.Dockerfile | 2 ++ 6 files changed, 28 insertions(+) create mode 100644 branding/assets/styles/import/_branding.scss create mode 100644 branding/constants/headerMenu.js diff --git a/branding/assets/styles/import/_branding.scss b/branding/assets/styles/import/_branding.scss new file mode 100644 index 0000000..7505859 --- /dev/null +++ b/branding/assets/styles/import/_branding.scss @@ -0,0 +1,5 @@ +/* + * + * Here, all SCSS variables and classes can be adapted to your custom design. + * +*/ \ No newline at end of file diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js new file mode 100644 index 0000000..33cba8d --- /dev/null +++ b/branding/constants/headerMenu.js @@ -0,0 +1,12 @@ +export default { + MENU: [ + // { + // name: 'Beiträge', + // path: '/#', + // }, + // { + // name: 'Über Yunite', + // url: 'https://yunite.org', + // }, + ], +} diff --git a/branding/constants/logos.js b/branding/constants/logos.js index d093c7b..2bea199 100644 --- a/branding/constants/logos.js +++ b/branding/constants/logos.js @@ -2,6 +2,7 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_HEADER_WIDTH: '130px', LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg', diff --git a/docker-compose.ocelotsocial-branded.yml b/docker-compose.ocelotsocial-branded.yml index b8c3ce4..0c42d62 100644 --- a/docker-compose.ocelotsocial-branded.yml +++ b/docker-compose.ocelotsocial-branded.yml @@ -21,6 +21,8 @@ services: - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" # - WEBSOCKETS_URI=ws://backend:4000/graphql # is not working and not given in Docker YAML in main repo - PUBLIC_REGISTRATION=true + - INVITE_REGISTRATION=true + - CATEGORIES_ACTIVE=true ######################################################## # BACKEND ############################################## @@ -47,6 +49,8 @@ services: - EMAIL_DEFAULT_SENDER=info@wir.social # - PRODUCTION_DB_CLEAN_ALLOW=false # only true for production environments on staging servers - PUBLIC_REGISTRATION=true + - INVITE_REGISTRATION=true + - CATEGORIES_ACTIVE=true - SMTP_USERNAME=${SMTP_USERNAME} - SMTP_PASSWORD=${SMTP_PASSWORD} - SMTP_HOST=mailserver diff --git a/docker-compose.yml b/docker-compose.yml index 285a0d3..535d485 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,8 @@ services: - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" # - WEBSOCKETS_URI=ws://backend:4000/graphql # is not working and not given in Docker YAML in main repo - PUBLIC_REGISTRATION=true + - INVITE_REGISTRATION=true + - CATEGORIES_ACTIVE=true ######################################################## # BACKEND ############################################## @@ -56,6 +58,8 @@ services: - EMAIL_DEFAULT_SENDER=info@wir.social # - PRODUCTION_DB_CLEAN_ALLOW=false # only true for production environments on staging servers - PUBLIC_REGISTRATION=true + - INVITE_REGISTRATION=true + - CATEGORIES_ACTIVE=true - SMTP_USERNAME=${SMTP_USERNAME} - SMTP_PASSWORD=${SMTP_PASSWORD} - SMTP_HOST=mailserver diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index 1d7ee67..81748e0 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -13,6 +13,7 @@ FROM $APP_IMAGE_CODE as code COPY branding/static/ static/ COPY branding/constants/ constants/ COPY branding/locales/ locales/ +COPY branding/assets/styles/imports/ assets/styles/imports/ ################################################################################## # BUILD ########################################################################## @@ -41,6 +42,7 @@ COPY --from=build ${DOCKER_WORKDIR}/config/ ./config/ COPY --from=build ${DOCKER_WORKDIR}/constants ./constants COPY --from=build ${DOCKER_WORKDIR}/static ./static COPY --from=build ${DOCKER_WORKDIR}/locales ./locales +COPY --from=build ${DOCKER_WORKDIR}/assets/styles/imports ./assets/styles/imports # Copy package.json for script definitions (lock file should not be needed) COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json