diff --git a/branding/constants/emails.js b/branding/constants/emails.js
index 54e7bbf..f5bd9a4 100644
--- a/branding/constants/emails.js
+++ b/branding/constants/emails.js
@@ -1,4 +1,8 @@
+// this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
export default {
- SUPPORT: 'hello@ocelot.social',
- MODERATION: 'hello@ocelot.social',
+ SUPPORT_EMAIL: 'hello@ocelot.social',
+ MODERATION_EMAIL: 'hello@ocelot.social',
+ // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails!
+ ORGANIZATION_LINK: 'https://ocelot.social',
+ SUPPORT_LINK: 'https://ocelot.social',
}
diff --git a/branding/constants/links.js b/branding/constants/links.js
index b111726..b2dc4f6 100644
--- a/branding/constants/links.js
+++ b/branding/constants/links.js
@@ -1,17 +1,136 @@
-// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
+// this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
+
+import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
+
+const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
+ externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.made', // localized string identifier, if undefined default is used
+ // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
+ // headlineIdent: 'site.made', // localized string identifier, on null it's hidden, if undefined default is used
+ hasContainer: true,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+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://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
+ // headTitleIdent: 'site.donate', // localized string identifier, if undefined default is used
+ // headlineIdent: 'site.donate', // localized string identifier, on null it's hidden, if undefined default is used
+ hasContainer: true,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
+ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+ externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.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,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
+ // externalLink: null, // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
+ // headTitleIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
+ // headlineIdent: 'site.termsAndConditions', // localized string identifier, on null it's hidden, if undefined default is used
+ hasContainer: true,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
+ // externalLink: null, // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
+ // headTitleIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
+ // headlineIdent: 'site.code-of-conduct', // localized string identifier, on null it's hidden, if undefined default is used
+ hasContainer: true,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
+ // externalLink: null, // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.data-privacy', // 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,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+const FAQ = defaultPageParamsPages.FAQ.overwrite({
+ externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
+ // headTitleIdent: 'site.faq', // localized string identifier, if undefined default is used
+ // headlineIdent: 'site.faq', // on null default is used, on empty string it's hidden
+ hasContainer: true,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
+ externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+
+ internalPage: {
+ // footerIdent: 'site.support', // localized string identifier, if undefined default is used
+ // headTitleIdent: 'site.support', // localized string identifier, if undefined default is used
+ // headlineIdent: 'site.support', // on null default is used, on empty string it's hidden
+ hasContainer: true,
+ hasBaseCard: true,
+ hasLoginInHeader: true,
+ // in case internal page content is here 'branding/locales/html/'
+ },
+})
+
export default {
LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
- // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
+ // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
- SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
+ ORGANIZATION,
+ DONATE,
+ IMPRINT,
+ TERMS_AND_CONDITIONS,
+ CODE_OF_CONDUCT,
+ DATA_PRIVACY,
+ FAQ,
+ SUPPORT,
- // on null or empty strings internal pages are used, see 'webapp/locales/html/'
- ORGANIZATION: 'https://ocelot.social',
- DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
- IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
- TERMS_AND_CONDITIONS: null,
- CODE_OF_CONDUCT: null,
- DATA_PRIVACY: null,
- FAQ: 'https://ocelot.social',
+ FOOTER_LINK_LIST: [
+ ORGANIZATION,
+ TERMS_AND_CONDITIONS,
+ CODE_OF_CONDUCT,
+ DATA_PRIVACY,
+ FAQ,
+ DONATE,
+ IMPRINT,
+ SUPPORT,
+ ],
}
diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html
index e890fcc..ba039b5 100644
--- a/branding/locales/html/de/code-of-conduct.html
+++ b/branding/locales/html/de/code-of-conduct.html
@@ -1,7 +1,6 @@
-
Ich bin der Inhalt vom Verhaltenskodex.
Neu gebrandet …
diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html
index 094f1e7..a00b03c 100644
--- a/branding/locales/html/de/data-privacy.html
+++ b/branding/locales/html/de/data-privacy.html
@@ -1,7 +1,6 @@
-
Das hier wäre der Inhalt der Datenschutzbestimmungen.
Neu gebrandet …
diff --git a/branding/locales/html/de/donate.html b/branding/locales/html/de/donate.html
new file mode 100644
index 0000000..d4b14a1
--- /dev/null
+++ b/branding/locales/html/de/donate.html
@@ -0,0 +1,6 @@
+
+
+
+Hier steht was zu den Spenden.
+
+Neu gebrandet …
diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html
index 7a0f5a1..24e0ced 100644
--- a/branding/locales/html/de/faq.html
+++ b/branding/locales/html/de/faq.html
@@ -1,7 +1,6 @@
-
Hier stehen die FAQs.
Neu gebrandet …
diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html
index 8a902f6..521c527 100644
--- a/branding/locales/html/de/imprint.html
+++ b/branding/locales/html/de/imprint.html
@@ -1,7 +1,6 @@
-
Ich bin das Impressum.
Neu gebrandet …
diff --git a/branding/locales/html/de/organization.html b/branding/locales/html/de/organization.html
index 7ecd439..ed7c97b 100644
--- a/branding/locales/html/de/organization.html
+++ b/branding/locales/html/de/organization.html
@@ -1,7 +1,6 @@
-
Hier wird das Netzwerk beschrieben.
Neu gebrandet …
diff --git a/branding/locales/html/de/support.html b/branding/locales/html/de/support.html
index 6dab2b2..6282306 100644
--- a/branding/locales/html/de/support.html
+++ b/branding/locales/html/de/support.html
@@ -1,7 +1,6 @@
-
Ich bin der Inhalt vom Support.
Neu gebrandet …
diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html
index 38cc15a..74396a6 100644
--- a/branding/locales/html/de/terms-and-conditions.html
+++ b/branding/locales/html/de/terms-and-conditions.html
@@ -1,7 +1,6 @@
-
Ich bin der Inhalt der Seite "Nutzungsbedingungen".
Neu gebrandet …
diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html
index fe10442..75128e8 100644
--- a/branding/locales/html/en/code-of-conduct.html
+++ b/branding/locales/html/en/code-of-conduct.html
@@ -1,7 +1,6 @@
-
I am the content of the code of conduct.
Rebranded …
diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html
index 981c746..31a1169 100644
--- a/branding/locales/html/en/data-privacy.html
+++ b/branding/locales/html/en/data-privacy.html
@@ -1,7 +1,6 @@
-
This would be our data privacy section.
Rebranded …
diff --git a/branding/locales/html/en/donate.html b/branding/locales/html/en/donate.html
new file mode 100644
index 0000000..a3e7daf
--- /dev/null
+++ b/branding/locales/html/en/donate.html
@@ -0,0 +1,6 @@
+
+
+
+Here's what it says about donations.
+
+Rebranded …
diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html
index 33d6d27..08d3cee 100644
--- a/branding/locales/html/en/faq.html
+++ b/branding/locales/html/en/faq.html
@@ -1,7 +1,6 @@
-
Here are the FAQs.
Rebranded …
diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html
index 5f42e2e..fbae0bd 100644
--- a/branding/locales/html/en/imprint.html
+++ b/branding/locales/html/en/imprint.html
@@ -1,7 +1,6 @@
-
I am the imprint.
Rebranded …
diff --git a/branding/locales/html/en/organization.html b/branding/locales/html/en/organization.html
index 7c972d2..99a8bbb 100644
--- a/branding/locales/html/en/organization.html
+++ b/branding/locales/html/en/organization.html
@@ -1,7 +1,6 @@
-
Here the network is described.
Rebranded …
diff --git a/branding/locales/html/en/support.html b/branding/locales/html/en/support.html
index b54197d..30f8535 100644
--- a/branding/locales/html/en/support.html
+++ b/branding/locales/html/en/support.html
@@ -1,7 +1,6 @@
-
I am the content of the support.
Rebranded …
diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html
index 030a96c..50f354b 100644
--- a/branding/locales/html/en/terms-and-conditions.html
+++ b/branding/locales/html/en/terms-and-conditions.html
@@ -1,7 +1,6 @@
-
I am the content of the page "Terms And Conditions".
Rebranded …
diff --git a/docker/backend.Dockerfile b/docker/backend.Dockerfile
index 91e57b0..319c7d0 100644
--- a/docker/backend.Dockerfile
+++ b/docker/backend.Dockerfile
@@ -10,7 +10,7 @@ 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 branding/constants/links.js src/config/
+COPY branding/constants/emails.js src/config/
COPY branding/constants/logos.js src/config/
COPY branding/constants/metadata.js src/config/
@@ -33,7 +33,6 @@ FROM $APP_IMAGE_BASE as branded
# Copy "binary"-files from build image
COPY --from=build ${DOCKER_WORKDIR}/dist ./dist
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
-# Copy static files # Wolle comment overfluid here?
# TODO - externalize the uploads so we can copy the whole folder
COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/
COPY --from=build ${DOCKER_WORKDIR}/public/providers.json ./public/providers.json
diff --git a/docker/maintenance.Dockerfile b/docker/maintenance.Dockerfile
index eeda31f..e7771c5 100644
--- a/docker/maintenance.Dockerfile
+++ b/docker/maintenance.Dockerfile
@@ -34,4 +34,3 @@ FROM nginx:alpine as branded
COPY --from=build ./app/dist/ /usr/share/nginx/html/
RUN rm /etc/nginx/conf.d/default.conf
COPY --from=code ./app/maintenance/nginx/custom.conf /etc/nginx/conf.d/
-