Merge pull request #25 from Ocelot-Social-Community/23-add-new-internal-pages-v1.0.5

chore: 🍰 Implement New Internal Pages – Main Release v1.0.5
2021-08-12 13:36:34 +02:00 · 2021-08-12 13:36:34 +02:00 · ef650d1fb6
commit ef650d1fb6
parent 19838a0d80 89ef3aad2d
23 changed files with 172 additions and 35 deletions
--- 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',
 }
--- 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,
+  ],
 }
--- a/branding/locales/html/de/code-of-conduct.html
+++ b/branding/locales/html/de/code-of-conduct.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Ich bin der Inhalt vom Verhaltenskodex.</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/de/data-privacy.html
+++ b/branding/locales/html/de/data-privacy.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Das hier wäre der Inhalt der Datenschutzbestimmungen.</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/de/donate.html
+++ b/branding/locales/html/de/donate.html
@ -0,0 +1,6 @@
+<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
+<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
+
+<p>Hier steht was zu den Spenden.</p>
+<br>
+<p>Neu gebrandet …</p>
--- a/branding/locales/html/de/faq.html
+++ b/branding/locales/html/de/faq.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Hier stehen die FAQs.</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/de/imprint.html
+++ b/branding/locales/html/de/imprint.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Ich bin das Impressum.</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/de/organization.html
+++ b/branding/locales/html/de/organization.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Hier wird das Netzwerk beschrieben.</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/de/support.html
+++ b/branding/locales/html/de/support.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Ich bin der Inhalt vom Support.</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/de/terms-and-conditions.html
+++ b/branding/locales/html/de/terms-and-conditions.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Ich bin der Inhalt der Seite "Nutzungsbedingungen".</p>
 <br>
 <p>Neu gebrandet …</p>
--- a/branding/locales/html/en/code-of-conduct.html
+++ b/branding/locales/html/en/code-of-conduct.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>I am the content of the code of conduct.</p>
 <br>
 <p>Rebranded …</p>
--- a/branding/locales/html/en/data-privacy.html
+++ b/branding/locales/html/en/data-privacy.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>This would be our data privacy section.</p>
 <br>
 <p>Rebranded …</p>
--- a/branding/locales/html/en/donate.html
+++ b/branding/locales/html/en/donate.html
@ -0,0 +1,6 @@
+<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
+<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
+
+<p>Here's what it says about donations.</p>
+<br>
+<p>Rebranded …</p>
--- a/branding/locales/html/en/faq.html
+++ b/branding/locales/html/en/faq.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Here are the FAQs.</p>
 <br>
 <p>Rebranded …</p>
--- a/branding/locales/html/en/imprint.html
+++ b/branding/locales/html/en/imprint.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>I am the imprint.</p>
 <br>
 <p>Rebranded …</p>
--- a/branding/locales/html/en/organization.html
+++ b/branding/locales/html/en/organization.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>Here the network is described.</p>
 <br>
 <p>Rebranded …</p>
--- a/branding/locales/html/en/support.html
+++ b/branding/locales/html/en/support.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>I am the content of the support.</p>
 <br>
 <p>Rebranded …</p>
--- a/branding/locales/html/en/terms-and-conditions.html
+++ b/branding/locales/html/en/terms-and-conditions.html
@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

-<br>
 <p>I am the content of the page "Terms And Conditions".<p>
 <br>
 <p>Rebranded …</p>
--- 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 ##############################################
@ -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:
+  test-network:
+
+volumes:
+  backend_uploads:
+  neo4j_data:
--- 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 ##############################################
@ -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:
--- 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
--- 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/
-
--- 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",