diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 91ca808e8..403292450 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: ocelot.social publish branded CI on: push: branches: - # - master + - master - 5059-epic-groups # for testing while developing jobs: diff --git a/TODO-next-update.md b/TODO-next-update.md index 844dde5a1..bdf632325 100644 --- a/TODO-next-update.md +++ b/TODO-next-update.md @@ -2,15 +2,19 @@ When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings … -## This Latest Version >= 1.1.1 with 'ocelotDockerVersionTag' 1.1.1-231 +## This Latest Version >= 2.0.0 with 'ocelotDockerVersionTag' 2.0.0-250 -### Yunite Deployment/Rebranding PR – chore: 🍰 Release v1.1.1-231 - New Group Features #14 +### Main Code PR – feat: 🍰 Implement LOGO_HEADER_CLICK As Configuration #5525 -- You have to add the file `webapp/constants/groups.js` as `branding/constants/groups.js` which should include `SHOW_GROUP_BUTTON_IN_HEADER` set to your needs. +- You have to set `LOGO_HEADER_CLICK` in `branding/constants/logos.js` originally in main code file `webapp/constants/logos.js` to your prevered value. + +### Main Code Issue – 🌟 [EPIC] Release v2.0.0 – Beta Test → Final #5547 + +- You have to set `SHOW_GROUP_BUTTON_IN_HEADER` in `branding/constants/groups.js` originally in main code file `webapp/constants/groups.js` to your prevered value. ## This Latest Version >= 1.1.0 with 'ocelotDockerVersionTag' 1.1.0-205 -### Deployment/Rebranding PR – chore: 🍰 Release v1.1.0 - Implement Categories Again #63 +### Deployment/Rebranding PR – chore: 🍰 Release v1.1.0 - Implement Categories Again #63 - You have to add the `CATEGORIES_ACTIVE` from the `deployment/kubernetes/values.template.yaml` to your `deployment/kubernetes/values.yaml` and set it to your preferred value. - Make sure the correct categories are in your Neo4j database on the server. diff --git a/branding/constants/groups.js b/branding/constants/groups.js index 3b00b2433..f54a3bc08 100644 --- a/branding/constants/groups.js +++ b/branding/constants/groups.js @@ -1,5 +1,5 @@ // this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js` -export const GROUPNAME_MIN_LENGTH = 3 -export const GROUPNAME_MAX_LENGTH = 50 -export const GROUPDESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags +export const NAME_LENGTH_MIN = 3 +export const NAME_LENGTH_MAX = 50 +export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags export const SHOW_GROUP_BUTTON_IN_HEADER = false diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index e6d76d8be..48f9fd29f 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -1,15 +1,19 @@ export default { MENU: [ { - name: 'Beiträge', - path: '/#', + nameIdent: 'yuniteRebranding.header.newsFeed', + path: '/', }, { - name: 'Gruppen', + nameIdent: 'yuniteRebranding.header.myGroups', path: '/my-groups', }, { - name: 'Über Yunite', + nameIdent: 'yuniteRebranding.header.topics', + url: 'https://yunite.org/themen/', + }, + { + nameIdent: 'yuniteRebranding.header.about', url: 'https://yunite.org', }, ], diff --git a/branding/constants/links.js b/branding/constants/links.js index 7e89159eb..aa9e3a129 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -17,7 +17,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ }) const DONATE = defaultPageParamsPages.DONATE.overwrite({ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - externalLink: 'https://yunite.org/brand-guidelines/', // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/spenden/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.donate', // localized string identifier, if undefined default is used @@ -34,7 +34,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating internalPage: { - // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used + footerIdent: 'yuniteRebranding.footer.imprint', // localized string identifier, if undefined default is used // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used hasContainer: true, @@ -73,7 +73,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty it's dominating internalPage: { - // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used + footerIdent: 'yuniteRebranding.footer.dataPrivacy', // localized string identifier, if undefined default is used // headTitleIdent: 'site.data-privacy', // localized string identifier, if undefined default is used // headlineIdent: 'site.data-privacy', // localized string identifier, on null it's hidden, if undefined default is used hasContainer: true, @@ -124,11 +124,11 @@ export default { SUPPORT, FOOTER_LINK_LIST: [ - ORGANIZATION, + // ORGANIZATION, // TERMS_AND_CONDITIONS, - CODE_OF_CONDUCT, + // CODE_OF_CONDUCT, DATA_PRIVACY, - FAQ, + // FAQ, // DONATE, // SUPPORT, IMPRINT, diff --git a/branding/constants/logos.js b/branding/constants/logos.js index 75ac91b30..a78a67218 100644 --- a/branding/constants/logos.js +++ b/branding/constants/logos.js @@ -3,6 +3,10 @@ export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', LOGO_HEADER_WIDTH: '47px', + LOGO_HEADER_CLICK: { + externalLink: 'https://yunite.org', + internalPath: null, + }, 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/branding/locales/de.json b/branding/locales/de.json new file mode 100644 index 000000000..c27e5af24 --- /dev/null +++ b/branding/locales/de.json @@ -0,0 +1,14 @@ +{ + "yuniteRebranding": { + "header": { + "about": "Über Yunite", + "myGroups": "Gruppen", + "newsFeed": "Beiträge", + "topics": "Themen" + }, + "footer": { + "dataPrivacy": "Datenschutz", + "imprint": "Impressum" + } + } +} diff --git a/branding/locales/en.json b/branding/locales/en.json new file mode 100644 index 000000000..93609ee38 --- /dev/null +++ b/branding/locales/en.json @@ -0,0 +1,14 @@ +{ + "yuniteRebranding": { + "header": { + "about": "About Yunite", + "myGroups": "Groups", + "newsFeed": "News Feed", + "topics": "Topics" + }, + "footer": { + "dataPrivacy": "Data privacy", + "imprint": "Imprint" + } + } +} diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index 81748e08f..ba7cbffb0 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -10,11 +10,18 @@ ARG APP_IMAGE_CODE=${APP_IMAGE}:${APP_IMAGE_TAG_CODE} FROM $APP_IMAGE_CODE as code # copy public constants into the Docker image to brand it +COPY tools/ tools/ COPY branding/static/ static/ COPY branding/constants/ constants/ -COPY branding/locales/ locales/ +COPY branding/locales/html/ locales/html/ +# COPY branding/locales/index.js locales/index.js +COPY branding/locales/*.json locales/tmp/ COPY branding/assets/styles/imports/ assets/styles/imports/ +RUN apk add --no-cache bash jq + +RUN tools/merge-locales.sh + ################################################################################## # BUILD ########################################################################## ################################################################################## diff --git a/package.json b/package.json index 1dd33f47e..0b00d4628 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "yunite.net", - "version": "1.1.1", - "ocelotDockerVersionTag": "1.1.1-231", + "version": "2.0.0", + "ocelotDockerVersionTag": "2.0.0-250", "dockerOrganisation": "tirokk", "description": "yunite.net Branded", "author": "yunite.net Community", diff --git a/tools/merge-locales.sh b/tools/merge-locales.sh new file mode 100755 index 000000000..21d263265 --- /dev/null +++ b/tools/merge-locales.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +for locale in `ls locales/*.json`; +do + file=$(basename $locale); + if [ -f locales/tmp/$file ]; then + jq -s '.[0] * .[1]' $locale locales/tmp/$file > locales/tmp/tmp.json; + mv locales/tmp/tmp.json $locale; + fi; +done; + +rm -r locales/tmp/