From c8a6f05eda01d2b909451f5484c83c7b16d3048a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Sep 2021 11:15:22 +0200 Subject: [PATCH 1/2] Set version 1.0.6 and new image tag 1.0.6-160 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 92c12c5..c60dc31 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", - "version": "1.0.5", - "ocelotDockerVersionTag": "1.0.5-153", + "version": "1.0.6", + "ocelotDockerVersionTag": "1.0.6-160", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community", From 07d1bb65b8ceda859d7b1de767a7424adc5b58fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Sep 2021 11:32:08 +0200 Subject: [PATCH 2/2] Implement backend email templates --- branding/email/.gitkeep | 1 + branding/email/templates/de/.gitkeep | 1 + branding/email/templates/en/.gitkeep | 1 + docker/backend.Dockerfile | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 branding/email/.gitkeep create mode 100644 branding/email/templates/de/.gitkeep create mode 100644 branding/email/templates/en/.gitkeep diff --git a/branding/email/.gitkeep b/branding/email/.gitkeep new file mode 100644 index 0000000..afe8c26 --- /dev/null +++ b/branding/email/.gitkeep @@ -0,0 +1 @@ +we can put multilanguage e-mails and a layout.html in here \ No newline at end of file diff --git a/branding/email/templates/de/.gitkeep b/branding/email/templates/de/.gitkeep new file mode 100644 index 0000000..5b414a0 --- /dev/null +++ b/branding/email/templates/de/.gitkeep @@ -0,0 +1 @@ +we can put translated e-mails in here \ No newline at end of file diff --git a/branding/email/templates/en/.gitkeep b/branding/email/templates/en/.gitkeep new file mode 100644 index 0000000..5b414a0 --- /dev/null +++ b/branding/email/templates/en/.gitkeep @@ -0,0 +1 @@ +we can put translated e-mails in here \ No newline at end of file diff --git a/docker/backend.Dockerfile b/docker/backend.Dockerfile index 319c7d0..542632c 100644 --- a/docker/backend.Dockerfile +++ b/docker/backend.Dockerfile @@ -9,10 +9,11 @@ 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 public constants and email templates into the Docker image to brand it COPY branding/constants/emails.js src/config/ COPY branding/constants/logos.js src/config/ COPY branding/constants/metadata.js src/config/ +COPY branding/email/ src/middleware/helpers/email/ ################################################################################## # BUILD ##########################################################################