Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 18-release-v2.1.X-XXX-fixes-groups-page

# Conflicts:
#	branding/constants/headerMenu.js
#	branding/constants/links.js
#	branding/constants/logos.js
#	package.json

TODO-next-update.md

@@ -2,17 +2,32 @@
 
 When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings …
 
-## This Latest Version >= 2.0.0 with 'ocelotDockerVersionTag' 2.0.0-250
+## Version >= 2.2.0 with 'ocelotDockerVersionTag' 2.2.0-267
+
+### Main Code PR – feat: 🍰 Footer And Header Links Configurable To Have External Link Target #5590
+
+- You have to add property `target` to all array elements with value `url` to your preferred value in `branding/constants/headerMenu.js` originally in main code file `webapp/constants/headerMenu.js`.
+- You have to move value of all `externalLink` to new property `externalLink.url` and set new property `externalLink.target` to your preferred value in `branding/constants/links.js` originally in main code file `webapp/constants/links.js`.
+
+### Main Code PR – feat: 🍰 Make Donation Progress Bar Color Configurable #5593
+
+- You have to set `PROGRESS_BAR_COLOR_TYPE` in `branding/constants/donation.js` originally in main code file `webapp/constants/donation.js` to your preferred value.
+
+### Main Code PR – feat: 🍰 Header Logo Routing Update #5579
+
+- You have to move value of `LOGO_HEADER_CLICK.externalLink` to new property `LOGO_HEADER_CLICK.externalLink.url` and set new property `LOGO_HEADER_CLICK.externalLink.target` to your preferred value in `branding/constants/logos.js` originally in main code file `webapp/constants/logos.js`.
+
+## Version >= 2.0.0 with 'ocelotDockerVersionTag' 2.0.0-250
 
 ### Main Code PR – feat: 🍰 Implement LOGO_HEADER_CLICK As Configuration #5525
 
-- 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.
+- You have to set `LOGO_HEADER_CLICK` in `branding/constants/logos.js` originally in main code file `webapp/constants/logos.js` to your preferred 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.
+- 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 preferred value.
 
-## This Latest Version >= 1.1.0 with 'ocelotDockerVersionTag' 1.1.0-205
+## Version >= 1.1.0 with 'ocelotDockerVersionTag' 1.1.0-205
 
 ### Deployment/Rebranding PR – chore: 🍰 Release v1.1.0 - Implement Categories Again #63
 
@@ -23,20 +38,42 @@ When you overtake this deploy and rebrand repo to your network you have to recog
 
 ### Deployment/Rebranding PR – chore: 🍰 Implement PRODUCTION_DB_CLEAN_ALLOW for Staging Production Environments #56
 
-- Copy `PRODUCTION_DB_CLEAN_ALLOW` from `deployment/kubernetes/values.template.yaml` to `values.yaml` and set it to `false` for production envireonments and only for several stage test servers to `true`.
+- Copy `PRODUCTION_DB_CLEAN_ALLOW` from `deployment/kubernetes/values.template.yaml` to `values.yaml` and set it to `false` for production environments and only for several stage test servers to `true`.
 
 ### Deployment/Rebranding PR – chore: [WIP] 🍰 Refine docs, first step #46
 
-- Commit: `Update cert-manager apiVersion "cert-manager.io/v1alpha2" to "cert-manager.io/v1"
+Upgrade the cert-manager, but install CRDs of the version 1.0.0-alpha to actually be able to upgrade ocelot. Then uninstall the legacy CRDs and install the correct ones.
-  - Check for `kubectl` and `helm` versions.
+
+```bash
+# upgrade cert-manager to 1.9.1
+> helm upgrade --set installCRDs=true --version 1.9.1 --namespace cert-manager cert-manager jetstack/cert-manager
+# apply legacy CRDs
+> kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.0.0-alpha.1/cert-manager.crds.yaml
+# upgrade ocelot
+> helm upgrade ocelot ./
+# delete legacy CRDs
+> kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v1.0.0-alpha.1/cert-manager.crds.yaml
+# apply CRDs for cert-manager 1.9.1
+> kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.9.1/cert-manager.crds.yaml
+```
+
+Background: We had to upgrade cert-manager due to an external dependency - therefore we had to update cert-manager apiVersion `cert-manager.io/v1alpha2` to `cert-manager.io/v1`.
+
+The error occurring when not doing this is the following:
+
+```bash
+Error: UPGRADE FAILED: unable to build kubernetes objects from current release manifest: [resource mapping not found for name: "letsencrypt-production" namespace: "" from "": no matches for kind "ClusterIssuer" in version "cert-manager.io/v1alpha2"
+ensure CRDs are installed first, resource mapping not found for name: "letsencrypt-staging" namespace: "" from "": no matches for kind "ClusterIssuer" in version "cert-manager.io/v1alpha2"
+ensure CRDs are installed first]
+```
 
 ## Version >= 1.0.8 with 'ocelotDockerVersionTag' 1.0.8-182
 
 ### PR – feat: 🍰 Configure Cookie Expire Time #43
 
-- You have to add the `COOKIE_EXPIRE_TIME` from the `deployment/kubernetes/values.template.yaml` to your `deployment/kubernetes/values.yaml` and set it to your prevered value.
+- You have to add the `COOKIE_EXPIRE_TIME` from the `deployment/kubernetes/values.template.yaml` to your `deployment/kubernetes/values.yaml` and set it to your preferred value.
 - Correct `locale` cookie exploration time in data privacy.
 
 ## Version 1.0.7 with 'ocelotDockerVersionTag' 1.0.7-171
 
-- No informations.
+- No information.

branding/constants/donation.js

@@ -0,0 +1 @@
+export const PROGRESS_BAR_COLOR_TYPE = 'uni' // 'gradient' is the other option

branding/constants/headerMenu.js

@@ -11,10 +11,12 @@ export default {
     {
       nameIdent: 'yuniteRebranding.header.topics',
       url: 'https://yunite.org/themen/',
+      target: '',
     },
     {
       nameIdent: 'yuniteRebranding.header.about',
       url: 'https://yunite.org',
+      target: '',
     },
   ],
 }

branding/constants/links.js

@@ -3,7 +3,11 @@
 import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
-  externalLink: 'https://yunite.org', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://yunite.org',
+    target: '',
+  },
 
   internalPage: {
     // footerIdent: 'site.made', // localized string identifier, if undefined default is used
@@ -16,8 +20,11 @@ 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
+  // if defined it's dominating
-  externalLink: 'https://yunite.org/spenden/', // if string is defined and not empty it's dominating
+  externalLink: {
+    url: 'https://yunite.org/spenden/',
+    target: '',
+  },
 
   internalPage: {
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
@@ -30,8 +37,11 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
   },
 })
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
-  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  // if defined it's dominating
-  externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating
+  externalLink: {
+    url: 'https://yunite.org/impressum/',
+    target: '',
+  },
 
   internalPage: {
     footerIdent: 'yuniteRebranding.footer.imprint', // localized string identifier, if undefined default is used
@@ -44,7 +54,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
   },
 })
 const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
-  // externalLink: null, // if string is defined and not empty it's dominating
+  // externalLink: null, // if defined it's dominating
 
   internalPage: {
     // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
@@ -57,7 +67,11 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri
   },
 })
 const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
-  externalLink: 'https://yunite.org/ueber-yunite/unsere-werte/', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://yunite.org/ueber-yunite/unsere-werte/',
+    target: '',
+  },
 
   internalPage: {
     // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
@@ -70,7 +84,11 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
   },
 })
 const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
-  externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://yunite.org/datenschutz/',
+    target: '',
+  },
 
   internalPage: {
     footerIdent: 'yuniteRebranding.footer.dataPrivacy', // localized string identifier, if undefined default is used
@@ -83,7 +101,11 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
   },
 })
 const FAQ = defaultPageParamsPages.FAQ.overwrite({
-  externalLink: 'https://yunite.org/ueber-yunite/faq-hilfe/', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://yunite.org/ueber-yunite/faq-hilfe/',
+    target: '',
+  },
 
   internalPage: {
     // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
@@ -96,7 +118,11 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
   },
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
-  // externalLink: '', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://yunite.org/ueber-yunite/faq-hilfe/',
+    target: '',
+  },
 
   internalPage: {
     // footerIdent: 'site.support', // localized string identifier, if undefined default is used

branding/constants/logos.js

@@ -4,7 +4,10 @@ export default {
   LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
   LOGO_HEADER_WIDTH: '47px',
   LOGO_HEADER_CLICK: {
-    externalLink: 'https://yunite.org',
+    externalLink: {
+      url: 'https://yunite.org',
+      target: '',
+    },
     internalPath: null,
   },
   LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg',

deployment/kubernetes/Backup.md

@@ -17,7 +17,7 @@ $ kubectl config use-context <your-context>
 $ kubectl -n default get pods -o wide
 ```
 
-The very first step is to put the webside into **maintenance mode**.
+The very first step is to put the website into **maintenance mode**.
 
 ### Set Maintenance Mode
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "yunite.me",
-  "version": "2.1.0",
+  "version": "2.2.0",
-  "ocelotDockerVersionTag": "2.1.0-253",
+  "ocelotDockerVersionTag": "2.2.0-267",
   "dockerOrganisation": "tirokk",
   "description": "yunite.me – Alternatives Netzwerk für eine freie und bunte Zukunft",
   "author": "yunite – Verein für Vernetzung und Kooperation",