From 5ce8b9e237ca3dcabf6ebbcefa91b6fe88c9a89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 19 Jul 2021 15:22:55 +0200 Subject: [PATCH 01/11] Refine HTML of internal pages and their templates --- branding/locales/html/de/code-of-conduct.html | 3 ++- branding/locales/html/de/data-privacy.html | 3 ++- branding/locales/html/de/faq.html | 3 ++- branding/locales/html/de/imprint.html | 3 ++- branding/locales/html/de/terms-and-conditions.html | 3 ++- branding/locales/html/en/code-of-conduct.html | 3 ++- branding/locales/html/en/data-privacy.html | 3 ++- branding/locales/html/en/faq.html | 3 ++- branding/locales/html/en/imprint.html | 3 ++- branding/locales/html/en/terms-and-conditions.html | 3 ++- branding/templates/locales/html/de/code-of-conduct.html | 2 +- 11 files changed, 21 insertions(+), 11 deletions(-) diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index 5e096fe..fd0b011 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -1,6 +1,7 @@ - + +

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 0472a68..2de7663 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -1,6 +1,7 @@ - + +

Das hier wäre der Inhalt der Datenschutzbestimmungen


Neu gebrandet …

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index e2f6fcb..8380fc3 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -1,6 +1,7 @@ - + +

Hier stehen die FAQs


Neu gebrandet …

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 4c64c8c..110868f 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -1,6 +1,7 @@ - + +

Ich bin das Impressum


Neu gebrandet …

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html index 7589244..988c104 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -1,6 +1,7 @@ - + +

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 7a93d97..609ffd4 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -1,6 +1,7 @@ - + +

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 ccbd2c3..0905a50 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -1,6 +1,7 @@ - + +

This would be our data privacy section


Rebranded …

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index ada798d..905c1c5 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -1,6 +1,7 @@ - + +

Here are the FAQs


Rebranded …

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 3e021cb..05a0a9a 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -1,6 +1,7 @@ - + +

I am the imprint


Rebranded …

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html index 1da118d..0109e1c 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -1,6 +1,7 @@ - + +

I am the content of the page "terms and conditions"


Rebranded …

diff --git a/branding/templates/locales/html/de/code-of-conduct.html b/branding/templates/locales/html/de/code-of-conduct.html index 65af881..0934ad2 100644 --- a/branding/templates/locales/html/de/code-of-conduct.html +++ b/branding/templates/locales/html/de/code-of-conduct.html @@ -1,5 +1,5 @@ - + From e9638147d1ac2bc612026dca315970166ed870c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 19 Jul 2021 15:31:32 +0200 Subject: [PATCH 02/11] Add comment to 'links.js' --- branding/constants/links.js | 1 + 1 file changed, 1 insertion(+) diff --git a/branding/constants/links.js b/branding/constants/links.js index 6b945a5..70586f2 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -4,6 +4,7 @@ export default { SUPPORT: 'https://ocelot.social', // on null or empty strings internal imprint is used, see 'webapp/locales/html/' + // you can find and store templates at 'master/branding/templates/' 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, From 74852aa2d15408677d5ce59ebc34c15e02f867b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 10:43:49 +0200 Subject: [PATCH 03/11] Add dot at line end of HTML internal pages --- branding/locales/html/de/code-of-conduct.html | 2 +- branding/locales/html/de/data-privacy.html | 2 +- branding/locales/html/de/faq.html | 2 +- branding/locales/html/de/imprint.html | 2 +- branding/locales/html/de/terms-and-conditions.html | 2 +- branding/locales/html/en/code-of-conduct.html | 2 +- branding/locales/html/en/data-privacy.html | 2 +- branding/locales/html/en/faq.html | 2 +- branding/locales/html/en/imprint.html | 2 +- branding/locales/html/en/terms-and-conditions.html | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index fd0b011..18f28be 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -2,6 +2,6 @@
-

Ich bin der Inhalt vom Verhaltenskodex

+

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 2de7663..e0df6d3 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -2,6 +2,6 @@
-

Das hier wäre der Inhalt der Datenschutzbestimmungen

+

Das hier wäre der Inhalt der Datenschutzbestimmungen.


Neu gebrandet …

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index 8380fc3..e7b6ab9 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -2,6 +2,6 @@
-

Hier stehen die FAQs

+

Hier stehen die FAQs.


Neu gebrandet …

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 110868f..17a15c5 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -2,6 +2,6 @@
-

Ich bin das Impressum

+

Ich bin das Impressum.


Neu gebrandet …

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html index 988c104..49a09ca 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -2,6 +2,6 @@
-

Ich bin der Inhalt der Seite "Nutzungsbedingungen"

+

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 609ffd4..936ebde 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -2,6 +2,6 @@
-

I am the content of the code of conduct

+

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 0905a50..dec4735 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -2,6 +2,6 @@
-

This would be our data privacy section

+

This would be our data privacy section.


Rebranded …

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index 905c1c5..b5905c6 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -2,6 +2,6 @@
-

Here are the FAQs

+

Here are the FAQs.


Rebranded …

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 05a0a9a..6c496ad 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -2,6 +2,6 @@
-

I am the imprint

+

I am the imprint.


Rebranded …

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html index 0109e1c..a959ee9 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -2,6 +2,6 @@
-

I am the content of the page "terms and conditions"

+

I am the content of the page "Terms And Conditions".


Rebranded …

From 2f045553d41799b66b2dfd4f69d49fad619f83a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 11:34:30 +0200 Subject: [PATCH 04/11] Implement HTML internal support and organization pages --- branding/constants/links.js | 11 ++++++----- branding/locales/html/de/code-of-conduct.html | 4 ++-- branding/locales/html/de/data-privacy.html | 4 ++-- branding/locales/html/de/faq.html | 4 ++-- branding/locales/html/de/imprint.html | 4 ++-- branding/locales/html/de/organization.html | 7 +++++++ branding/locales/html/de/support.html | 7 +++++++ branding/locales/html/de/terms-and-conditions.html | 4 ++-- branding/locales/html/en/code-of-conduct.html | 4 ++-- branding/locales/html/en/data-privacy.html | 4 ++-- branding/locales/html/en/faq.html | 4 ++-- branding/locales/html/en/imprint.html | 4 ++-- branding/locales/html/en/organization.html | 7 +++++++ branding/locales/html/en/support.html | 7 +++++++ branding/locales/html/en/terms-and-conditions.html | 4 ++-- 15 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 branding/locales/html/de/organization.html create mode 100644 branding/locales/html/de/support.html create mode 100644 branding/locales/html/en/organization.html create mode 100644 branding/locales/html/en/support.html diff --git a/branding/constants/links.js b/branding/constants/links.js index 70586f2..4a55fc5 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,10 +1,11 @@ -// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding +// 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/ export default { + LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization' + SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support' + + // on null or empty strings internal pages are used, see 'webapp/locales/html/' + // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ ORGANIZATION: 'https://ocelot.social', - SUPPORT: 'https://ocelot.social', - - // on null or empty strings internal imprint is used, see 'webapp/locales/html/' - // you can find and store templates at 'master/branding/templates/' 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, diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index 18f28be..e890fcc 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -1,5 +1,5 @@ - - + +

Ich bin der Inhalt vom Verhaltenskodex.

diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html index e0df6d3..094f1e7 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -1,5 +1,5 @@ - - + +

Das hier wäre der Inhalt der Datenschutzbestimmungen.

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index e7b6ab9..7a0f5a1 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -1,5 +1,5 @@ - - + +

Hier stehen die FAQs.

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 17a15c5..8a902f6 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -1,5 +1,5 @@ - - + +

Ich bin das Impressum.

diff --git a/branding/locales/html/de/organization.html b/branding/locales/html/de/organization.html new file mode 100644 index 0000000..7ecd439 --- /dev/null +++ b/branding/locales/html/de/organization.html @@ -0,0 +1,7 @@ + + + +
+

Hier wird das Netzwerk beschrieben.

+
+

Neu gebrandet …

diff --git a/branding/locales/html/de/support.html b/branding/locales/html/de/support.html new file mode 100644 index 0000000..6dab2b2 --- /dev/null +++ b/branding/locales/html/de/support.html @@ -0,0 +1,7 @@ + + + +
+

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 49a09ca..38cc15a 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -1,5 +1,5 @@ - - + +

Ich bin der Inhalt der Seite "Nutzungsbedingungen".

diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html index 936ebde..fe10442 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -1,5 +1,5 @@ - - + +

I am the content of the code of conduct.

diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html index dec4735..981c746 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -1,5 +1,5 @@ - - + +

This would be our data privacy section.

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index b5905c6..33d6d27 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -1,5 +1,5 @@ - - + +

Here are the FAQs.

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 6c496ad..5f42e2e 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -1,5 +1,5 @@ - - + +

I am the imprint.

diff --git a/branding/locales/html/en/organization.html b/branding/locales/html/en/organization.html new file mode 100644 index 0000000..7c972d2 --- /dev/null +++ b/branding/locales/html/en/organization.html @@ -0,0 +1,7 @@ + + + +
+

Here the network is described.

+
+

Rebranded …

diff --git a/branding/locales/html/en/support.html b/branding/locales/html/en/support.html new file mode 100644 index 0000000..b54197d --- /dev/null +++ b/branding/locales/html/en/support.html @@ -0,0 +1,7 @@ + + + +
+

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 a959ee9..030a96c 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -1,5 +1,5 @@ - - + +

I am the content of the page "Terms And Conditions".

From bfecd09fcdb1ef4997f7be95d148ae6164fd1eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 11:49:59 +0200 Subject: [PATCH 05/11] Refine comments --- branding/constants/links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branding/constants/links.js b/branding/constants/links.js index 4a55fc5..55cc72d 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,7 +1,7 @@ // 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/ export default { - LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization' - SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support' + LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social' + 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! // on null or empty strings internal pages are used, see 'webapp/locales/html/' // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ From 551dd5eec72111ab1f94a90c70a49721c31eb52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 17:33:37 +0200 Subject: [PATCH 06/11] Change comments --- branding/constants/links.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/branding/constants/links.js b/branding/constants/links.js index 55cc72d..b111726 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,10 +1,12 @@ // 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/ 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/ + 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! - + // on null or empty strings internal pages are used, see 'webapp/locales/html/' - // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ 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 From 895150f997d8659c168bfb606e462280a7db056a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 27 Jul 2021 11:54:03 +0200 Subject: [PATCH 07/11] Change DockerHub build number to compatible one --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8519b2f..cb57d49 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", "version": "1.0.4", - "ocelotDockerVersionTag": "1.0.4-100", + "ocelotDockerVersionTag": "1.0.4-135", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community", From a57f6cb9c97937a1edaec6dd8cfd60fc6e209619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Aug 2021 11:53:42 +0200 Subject: [PATCH 08/11] Implement new internal pages - Add internal donation page. - Replace `links.js`. - Remove copying of `links.js` to backend. - Add copying of `emails.js` to backend and set new values. - Remove leading `
` on each internal page default. --- branding/constants/emails.js | 8 +- branding/constants/links.js | 141 ++++++++++++++++-- branding/locales/html/de/code-of-conduct.html | 1 - branding/locales/html/de/data-privacy.html | 1 - branding/locales/html/de/donate.html | 6 + branding/locales/html/de/faq.html | 1 - branding/locales/html/de/imprint.html | 1 - branding/locales/html/de/organization.html | 1 - branding/locales/html/de/support.html | 1 - .../locales/html/de/terms-and-conditions.html | 1 - branding/locales/html/en/code-of-conduct.html | 1 - branding/locales/html/en/data-privacy.html | 1 - branding/locales/html/en/donate.html | 6 + branding/locales/html/en/faq.html | 1 - branding/locales/html/en/imprint.html | 1 - branding/locales/html/en/organization.html | 1 - branding/locales/html/en/support.html | 1 - .../locales/html/en/terms-and-conditions.html | 1 - docker/backend.Dockerfile | 3 +- docker/maintenance.Dockerfile | 1 - 20 files changed, 149 insertions(+), 30 deletions(-) create mode 100644 branding/locales/html/de/donate.html create mode 100644 branding/locales/html/en/donate.html 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/ - From 59a98eccbb2f2307f63053566a583b40976f5b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Aug 2021 12:11:53 +0200 Subject: [PATCH 09/11] Set 'ocelotDockerVersionTag' to '1.0.5-153' --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cb57d49..92c12c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", - "version": "1.0.4", - "ocelotDockerVersionTag": "1.0.4-135", + "version": "1.0.5", + "ocelotDockerVersionTag": "1.0.5-153", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community", From 2ddf8173728fd31953502a8a8e6fd6cfc9a00805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Aug 2021 13:24:09 +0200 Subject: [PATCH 10/11] Fix image upload problem by adding volumes to Docker YAML files --- docker-compose.ocelotsocial-branded.yml | 11 ++++++++++- docker-compose.yml | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docker-compose.ocelotsocial-branded.yml b/docker-compose.ocelotsocial-branded.yml index 5ea530e..0b09900 100644 --- a/docker-compose.ocelotsocial-branded.yml +++ b/docker-compose.ocelotsocial-branded.yml @@ -30,6 +30,8 @@ services: - neo4j ports: - 4000:4000 + volumes: + - backend_uploads:/app/public/uploads environment: - NEO4J_URI=bolt://neo4j:7687 - GRAPHQL_URI=http://backend:4000 @@ -58,6 +60,8 @@ services: - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes ports: - 7687:7687 + volumes: + - neo4j_data:/data ######################################################## # MAINTENANCE ########################################## ######################################################## @@ -76,5 +80,10 @@ services: - 1080:80 networks: - test-network + networks: - test-network: \ No newline at end of file + test-network: + +volumes: + backend_uploads: + neo4j_data: diff --git a/docker-compose.yml b/docker-compose.yml index 4379459..17d5001 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,8 @@ services: - neo4j ports: - 4000:4000 + volumes: + - backend_uploads:/app/public/uploads environment: - NEO4J_URI=bolt://neo4j:7687 - GRAPHQL_URI=http://backend:4000 @@ -58,6 +60,8 @@ services: image: ocelotsocialnetwork/neo4j:community networks: - test-network + volumes: + - neo4j_data:/data environment: - NEO4J_AUTH=none - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.* @@ -86,5 +90,10 @@ services: - 1080:80 networks: - test-network + networks: test-network: + +volumes: + backend_uploads: + neo4j_data: From 89ef3aad2d6fba5c0136224608bfa5d18f947bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 12 Aug 2021 13:34:31 +0200 Subject: [PATCH 11/11] Fix warning in docker-compose - Fixes 'WARNING: The WEBSOCKETS_URI variable is not set. Defaulting to a blank string.' --- docker-compose.ocelotsocial-branded.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.ocelotsocial-branded.yml b/docker-compose.ocelotsocial-branded.yml index 0b09900..6d4c148 100644 --- a/docker-compose.ocelotsocial-branded.yml +++ b/docker-compose.ocelotsocial-branded.yml @@ -17,7 +17,7 @@ services: - HOST=0.0.0.0 - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" - - WEBSOCKETS_URI=${WEBSOCKETS_URI} + # - WEBSOCKETS_URI=ws://backend:4000/graphql # is not working and not given in Docker YAML in main repo - PUBLIC_REGISTRATION=true ######################################################## # BACKEND ############################################## diff --git a/docker-compose.yml b/docker-compose.yml index 17d5001..41d515d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: - HOST=0.0.0.0 - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" - - WEBSOCKETS_URI=${WEBSOCKETS_URI} + # - WEBSOCKETS_URI=ws://backend:4000/graphql # is not working and not given in Docker YAML in main repo - PUBLIC_REGISTRATION=true ######################################################## # BACKEND ##############################################