From ecb0bb3766791f901407221064917591501fbff5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 10 Nov 2020 12:08:44 +0100 Subject: [PATCH] Starting rebranding to ocelot.social --- backend/Dockerfile | 4 +-- backend/src/config/links.js | 8 +++--- backend/src/config/metadata.js | 10 +++---- .../src/middleware/email/templateBuilder.js | 4 +-- .../.helmignore | 0 .../Chart.yaml | 0 .../README.md | 0 .../cluster-issuers/letsencrypt-prod.yaml | 0 .../cluster-issuers/letsencrypt-staging.yaml | 0 .../deployments/deployment-backend.yaml | 2 +- .../deployments/deployment-mailserver.yaml | 0 .../deployments/deployment-maintenance.yaml | 0 .../deployments/deployment-neo4j.yaml | 0 .../templates/deployments/deployment-web.yaml | 0 .../templates/ingress/ingress.template.yaml | 0 .../templates/jobs/job-db-migration.yaml | 0 .../templates/services/service-backend.yaml | 0 .../services/service-mailserver.yaml | 0 .../services/service-maintenance.yaml | 0 .../templates/services/service-neo4j.yaml | 0 .../templates/services/service-webapp.yaml | 0 .../templates/volumes/pvc-neo4j-data.yaml | 0 .../templates/volumes/pvc-uploads.yaml | 0 .../values.yaml | 0 docker-compose.yml | 2 +- .../ContributionForm/ContributionForm.vue | 8 ++++++ webapp/components/Logo/Logo.vue | 26 ++++++------------- webapp/components/Registration/Signup.vue | 6 ++++- webapp/constants/emails.js | 4 +-- webapp/constants/links.js | 8 +++--- webapp/constants/metadata.js | 10 +++---- webapp/layouts/basic.vue | 2 +- webapp/layouts/default.vue | 2 +- webapp/locales/html/de/code-of-conduct.html | 2 +- webapp/locales/html/de/imprint.html | 2 +- webapp/locales/html/en/code-of-conduct.html | 2 +- .../source/nuxt.config.maintenance.js | 4 +-- 37 files changed, 54 insertions(+), 52 deletions(-) rename deployment/helm/{human-connection => ocelot.social}/.helmignore (100%) rename deployment/helm/{human-connection => ocelot.social}/Chart.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/README.md (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/cluster-issuers/letsencrypt-prod.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/cluster-issuers/letsencrypt-staging.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/deployments/deployment-backend.yaml (96%) rename deployment/helm/{human-connection => ocelot.social}/templates/deployments/deployment-mailserver.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/deployments/deployment-maintenance.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/deployments/deployment-neo4j.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/deployments/deployment-web.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/ingress/ingress.template.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/jobs/job-db-migration.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/services/service-backend.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/services/service-mailserver.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/services/service-maintenance.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/services/service-neo4j.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/services/service-webapp.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/volumes/pvc-neo4j-data.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/templates/volumes/pvc-uploads.yaml (100%) rename deployment/helm/{human-connection => ocelot.social}/values.yaml (100%) diff --git a/backend/Dockerfile b/backend/Dockerfile index 6bef3579c..554c59de8 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -4,7 +4,7 @@ EXPOSE 4000 CMD ["yarn", "run", "start"] ARG BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT -ARG WORKDIR=/backend +ARG WORKDIR=/develop-backend RUN mkdir -p $WORKDIR WORKDIR $WORKDIR @@ -21,7 +21,7 @@ RUN NODE_ENV=production yarn run build # reduce image size with a multistage build FROM base as production ENV NODE_ENV=production -COPY --from=build-and-test /backend/dist ./dist +COPY --from=build-and-test /develop-backend/dist ./dist COPY ./public/img/ ./public/img/ COPY ./public/providers.json ./public/providers.json RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache diff --git a/backend/src/config/links.js b/backend/src/config/links.js index 6068498c2..ac80238aa 100644 --- a/backend/src/config/links.js +++ b/backend/src/config/links.js @@ -1,6 +1,6 @@ export default { - ORGANIZATION: 'https://human-connection.org/', - DONATE: 'https://human-connection.org/spenden/', - FAQ: 'https://faq.human-connection.org/', - SUPPORT: 'https://human-connection.org/support' + ORGANIZATION: 'https://ocelot-social.herokuapp.com/', + DONATE: 'https://www.busfaktor.org/donations', + FAQ: 'https://ocelot-social.herokuapp.com/', + SUPPORT: 'https://ocelot-social.herokuapp.com/', } diff --git a/backend/src/config/metadata.js b/backend/src/config/metadata.js index 6017cd1af..8e67e7ee7 100644 --- a/backend/src/config/metadata.js +++ b/backend/src/config/metadata.js @@ -1,7 +1,7 @@ export default { - APPLICATION_NAME: 'fyphe_O', - APPLICATION_SHORT_NAME: 'fyphe', - APPLICATION_DESCRIPTION: 'The Schools in Motion Network', - ORGANIZATION_NAME: 'Ensible e.V.', - ORGANIZATION_JURISDICTION: 'Köln', + APPLICATION_NAME: 'ocelot.social', + APPLICATION_SHORT_NAME: 'ocelot', + APPLICATION_DESCRIPTION: 'Ocelot Social Network', + ORGANIZATION_NAME: 'busFaktor() e.V.', + ORGANIZATION_JURISDICTION: 'Augsburg', } diff --git a/backend/src/middleware/email/templateBuilder.js b/backend/src/middleware/email/templateBuilder.js index 28acb633e..8d1635c03 100644 --- a/backend/src/middleware/email/templateBuilder.js +++ b/backend/src/middleware/email/templateBuilder.js @@ -9,7 +9,7 @@ const welcomeImageUrl = new URL(`/img/custom/welcome.svg`, CONFIG.CLIENT_URI) const defaultParams = { supportUrl: CONFIG.SUPPORT_URL, APPLICATION_NAME: CONFIG.APPLICATION_NAME, - welcomeImageUrl + welcomeImageUrl, } export const signupTemplate = ({ email, nonce }) => { @@ -76,7 +76,7 @@ export const wrongAccountTemplate = ({ email }) => { subject, html: mustache.render( templates.layout, - { actionUrl, supportUrl, welcomeImageUrl }, + { actionUrl, supportUrl: CONFIG.SUPPORT_URL, welcomeImageUrl }, { content: templates.wrongAccount }, ), } diff --git a/deployment/helm/human-connection/.helmignore b/deployment/helm/ocelot.social/.helmignore similarity index 100% rename from deployment/helm/human-connection/.helmignore rename to deployment/helm/ocelot.social/.helmignore diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/ocelot.social/Chart.yaml similarity index 100% rename from deployment/helm/human-connection/Chart.yaml rename to deployment/helm/ocelot.social/Chart.yaml diff --git a/deployment/helm/human-connection/README.md b/deployment/helm/ocelot.social/README.md similarity index 100% rename from deployment/helm/human-connection/README.md rename to deployment/helm/ocelot.social/README.md diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml similarity index 100% rename from deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml similarity index 100% rename from deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml similarity index 96% rename from deployment/helm/human-connection/templates/deployments/deployment-backend.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml index 4d5c34a21..e3f75a44c 100644 --- a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml +++ b/deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml @@ -44,7 +44,7 @@ spec: terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - - mountPath: /backend/public/uploads + - mountPath: /develop-backend/public/uploads name: uploads dnsPolicy: ClusterFirst restartPolicy: Always diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-mailserver.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-mailserver.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-maintenance.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-maintenance.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-neo4j.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-neo4j.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-web.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-web.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-web.yaml diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/ocelot.social/templates/ingress/ingress.template.yaml similarity index 100% rename from deployment/helm/human-connection/templates/ingress/ingress.template.yaml rename to deployment/helm/ocelot.social/templates/ingress/ingress.template.yaml diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/ocelot.social/templates/jobs/job-db-migration.yaml similarity index 100% rename from deployment/helm/human-connection/templates/jobs/job-db-migration.yaml rename to deployment/helm/ocelot.social/templates/jobs/job-db-migration.yaml diff --git a/deployment/helm/human-connection/templates/services/service-backend.yaml b/deployment/helm/ocelot.social/templates/services/service-backend.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-backend.yaml rename to deployment/helm/ocelot.social/templates/services/service-backend.yaml diff --git a/deployment/helm/human-connection/templates/services/service-mailserver.yaml b/deployment/helm/ocelot.social/templates/services/service-mailserver.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-mailserver.yaml rename to deployment/helm/ocelot.social/templates/services/service-mailserver.yaml diff --git a/deployment/helm/human-connection/templates/services/service-maintenance.yaml b/deployment/helm/ocelot.social/templates/services/service-maintenance.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-maintenance.yaml rename to deployment/helm/ocelot.social/templates/services/service-maintenance.yaml diff --git a/deployment/helm/human-connection/templates/services/service-neo4j.yaml b/deployment/helm/ocelot.social/templates/services/service-neo4j.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-neo4j.yaml rename to deployment/helm/ocelot.social/templates/services/service-neo4j.yaml diff --git a/deployment/helm/human-connection/templates/services/service-webapp.yaml b/deployment/helm/ocelot.social/templates/services/service-webapp.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-webapp.yaml rename to deployment/helm/ocelot.social/templates/services/service-webapp.yaml diff --git a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml b/deployment/helm/ocelot.social/templates/volumes/pvc-neo4j-data.yaml similarity index 100% rename from deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml rename to deployment/helm/ocelot.social/templates/volumes/pvc-neo4j-data.yaml diff --git a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml b/deployment/helm/ocelot.social/templates/volumes/pvc-uploads.yaml similarity index 100% rename from deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml rename to deployment/helm/ocelot.social/templates/volumes/pvc-uploads.yaml diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/ocelot.social/values.yaml similarity index 100% rename from deployment/helm/human-connection/values.yaml rename to deployment/helm/ocelot.social/values.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 1b9ec4e94..3038ab6b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ services: - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78 - "DEBUG=${DEBUG}" - - EMAIL_DEFAULT_SENDER=info@human-connection.org + - EMAIL_DEFAULT_SENDER=devops@ocelot.social neo4j: image: ocelotsocialnetwork/develop-neo4j:latest build: diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 8492eda69..20c9c2388 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -24,6 +24,14 @@
+ + {{ $t('contribution.inappropriatePictureText') }} + +
-