diff --git a/branding/constants/emails.js b/branding/constants/emails.js index a4af6cd..f66a396 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: 'team@wir.social', - MODERATION: 'team@wir.social', + SUPPORT_EMAIL: 'team@wir.social', + MODERATION_EMAIL: 'team@wir.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://wir.social/organization', + SUPPORT_LINK: 'https://wir.social/support', } diff --git a/branding/constants/links.js b/branding/constants/links.js index a334f73..e4290a7 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,13 +1,134 @@ -// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding -export default { - ORGANIZATION: 'https://webcraft-media.de', - SUPPORT: 'https://webcraft-media.de', +// this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ - // on null or empty string internal imprint is used, see 'webapp/locales/html/' - DONATE: 'https://webcraft-media.de/donate-for-wir-social.html', - IMPRINT: 'https://www.webcraft-media.de/#!impressum', - DATA_PRIVACY: 'https://www.webcraft-media.de/#!datenschutz', - TERMS_AND_CONDITIONS: null, - CODE_OF_CONDUCT: null, - FAQ: 'https://www.webcraft-media.de/#!contact', +import { defaultPageParamsPages } from '~/components/utils/InternalPages.js' + +const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ + externalLink: 'https://webcraft-media.de', // 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({ + externalLink: 'https://webcraft-media.de/donate-for-wir-social.html', // 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({ + externalLink: 'https://www.webcraft-media.de/#!impressum', // 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: https://www.webcraft-media.de/#!datenschutz, // 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://www.webcraft-media.de/#!contact', // 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://webcraft-media.de', // 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 for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ + + ORGANIZATION, + DONATE, + IMPRINT, + TERMS_AND_CONDITIONS, + CODE_OF_CONDUCT, + DATA_PRIVACY, + FAQ, + SUPPORT, + + 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 5e096fe..ba039b5 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -1,6 +1,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 0472a68..a00b03c 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -1,6 +1,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/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 e2f6fcb..24e0ced 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -1,6 +1,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 4c64c8c..521c527 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -1,6 +1,6 @@ - - + + -Ich bin das Impressum
+Ich bin das Impressum.
Neu gebrandet …
diff --git a/branding/locales/html/de/organization.html b/branding/locales/html/de/organization.html new file mode 100644 index 0000000..ed7c97b --- /dev/null +++ b/branding/locales/html/de/organization.html @@ -0,0 +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 new file mode 100644 index 0000000..6282306 --- /dev/null +++ b/branding/locales/html/de/support.html @@ -0,0 +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 7589244..74396a6 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -1,6 +1,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 7a93d97..75128e8 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -1,6 +1,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 ccbd2c3..31a1169 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -1,6 +1,6 @@ - - + + -This would be our data privacy section
+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 ada798d..08d3cee 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -1,6 +1,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 3e021cb..fbae0bd 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -1,6 +1,6 @@ - - + + -I am the imprint
+I am the imprint.
Rebranded …
diff --git a/branding/locales/html/en/organization.html b/branding/locales/html/en/organization.html new file mode 100644 index 0000000..99a8bbb --- /dev/null +++ b/branding/locales/html/en/organization.html @@ -0,0 +1,6 @@ + + + +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..30f8535 --- /dev/null +++ b/branding/locales/html/en/support.html @@ -0,0 +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 1da118d..50f354b 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -1,6 +1,6 @@ - - + + -I am the content of the page "terms and conditions"
+
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 @@ - + diff --git a/docker-compose.wirsocial.yml b/docker-compose.wirsocial.yml index f13ea72..f9eff7d 100644 --- a/docker-compose.wirsocial.yml +++ b/docker-compose.wirsocial.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: \ 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..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 ############################################## @@ -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: 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/ - diff --git a/package.json b/package.json index 5c4212e..126fd40 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "wir.social", - "version": "1.0.4", - "ocelotDockerVersionTag": "1.0.4-100", + "version": "1.0.5", + "ocelotDockerVersionTag": "1.0.5-153", "dockerOrganisation": "wirsocial", "description": "wir.social Network driven by ocelot.social", "author": "ocelot.social Community",