Merge pull request 'cleaned up mail texts for lfk 2023' (#16 ) from feature/simpler-mail-texts into main

Reviewed-on: #16 Reviewed-by: Nicolai Ort <info@nicolai-ort.com>
cleaned up mail texts for lfk 2023
2023-02-01 13:55:30 +00:00 · 2023-01-31 13:56:59 +01:00
7 changed files with 98 additions and 91 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ get:
 ---
 kind: pipeline
 type: kubernetes
-name: tests:node
+name: tests:node_latest
 clone:
  disable: true
 steps:
@@ -32,7 +32,7 @@ steps:
      - git clone $DRONE_REMOTE_URL .
      - git checkout $DRONE_SOURCE_BRANCH
  - name: run tests
-    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
+    image: node:latest
    commands:
      - yarn
      - yarn test:ci
@@ -54,25 +54,21 @@ steps:
      - git clone $DRONE_REMOTE_URL .
      - git checkout dev
  - name: build dev
-    image: registry.odit.services/library/drone-kaniko
+    image: plugins/docker
+    depends_on: [clone]
    settings:
      username:
        from_secret: docker_username
      password:
        from_secret: docker_password
-      build_args:
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
-      repo: lfk/mailer
+      repo: registry.odit.services/lfk/mailer
      tags:
        - dev
-      cache: true
      registry: registry.odit.services
+      mtu: 1000
  - name: run changelog export
    depends_on: ["clone"]
-    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
+    image: node:latest
    commands:
      - npx auto-changelog --commit-limit false -p -u --hide-credit
  - name: push new changelog to repo
@@ -88,7 +84,7 @@ steps:
        from_secret: git_ssh
  - name: run full license export
    depends_on: ["clone"]
-    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
+    image: node:14.15.1-alpine3.12
    commands:
      - yarn
      - yarn licenses:export
@@ -104,6 +100,7 @@ steps:
      skip_verify: true
      ssh_key:
        from_secret: git_ssh
+
 trigger:
  branch:
    - dev
@@ -126,22 +123,18 @@ steps:
      - git merge main
      - git checkout main
  - name: build latest
-    image: registry.odit.services/library/drone-kaniko
+    depends_on: ["clone"]
+    image: plugins/docker
    settings:
      username:
        from_secret: docker_username
      password:
        from_secret: docker_password
-      build_args:
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
-      repo: lfk/mailer
+      repo: registry.odit.services/lfk/mailer
      tags:
        - latest
-      cache: true
      registry: registry.odit.services
+      mtu: 1000
  - name: push merge to repo
    depends_on: ["clone"]
    image: appleboy/drone-git-push
@@ -151,6 +144,7 @@ steps:
      remote: git@git.odit.services:lfk/mailer.git
      ssh_key:
        from_secret: git_ssh
+
 trigger:
  branch:
    - main
@@ -164,22 +158,18 @@ name: build:tags

 steps:
  - name: build $DRONE_TAG
-    image: registry.odit.services/library/drone-kaniko
+    image: plugins/docker
+    depends_on: [clone]
    settings:
      username:
        from_secret: docker_username
      password:
        from_secret: docker_password
-      build_args:
-        - NPM_REGISTRY_DOMAIN:
-          from_secret: npmjs_domain
-        - NPM_REGISTRY_TOKEN:
-          from_secret: npmjs_token
-      repo: lfk/mailer
+      repo: registry.odit.services/lfk/mailer
      tags:
-        - "${DRONE_TAG}"
-      cache: true
+        - '${DRONE_TAG}'
      registry: registry.odit.services
+      mtu: 1000
 trigger:
  event:
-    - tag
+  - tag
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
-strict-peer-dependencies=false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,6 @@ All notable changes to this project will be documented in this file. Dates are d
 #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2)

 - update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663)
- 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39)
- 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc)

 #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2)
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
+FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
 WORKDIR /app
 COPY package.json ./
 RUN npm i -g pnpm
@@ -8,7 +8,7 @@ COPY tsconfig.json ./
 COPY src ./src
 RUN pnpm run build
 # final image
-FROM registry.odit.services/hub/library/node:19.0.1-alpine3.16
+FROM registry.odit.services/hub/library/node:14.15.1-alpine3.12
 COPY package.json ./
 RUN npm i -g pnpm
 RUN pnpm i --prod
--- a/licenses.md
+++ b/licenses.md
@@ -244,7 +244,7 @@ SOFTWARE.
 # i18next-fs-backend
 **Author**: undefined
 **Repo**: git@github.com:i18next/i18next-fs-backend.git
-**License**: undefined
+**License**: MIT
 **Description**: i18next-fs-backend is a backend layer for i18next using in Node.js and for Deno to load translations from the filesystem.
 ## License Text
 
@@ -492,27 +492,27 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **License**: MIT
 **Description**: TypeScript definitions for Nodemailer
 ## License Text
-    MIT License
-
-    Copyright (c) Microsoft Corporation. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
 

 # axios
@@ -604,7 +604,7 @@ SOFTWARE.
 **Author**: [object Object]
 **Repo**: https://github.com/remy/nodemon.git
 **License**: MIT
-**Description**: Simple monitor script for use during development of a node.js app.
+**Description**: Simple monitor script for use during development of a Node.js app.
 ## License Text
 MIT License

@@ -687,6 +687,27 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **License**: MIT
 **Description**: Starts server, waits for URL, then runs test command; when the tests end, shuts down server
 ## License Text
+MIT License
+
+Copyright (c) 2022 bahmutov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 

 # ts-jest
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-mailer",
-  "version": "0.2.0",
+  "version": "0.1.2",
  "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)",
  "main": "src/app.ts",
  "scripts": {
@@ -44,37 +44,37 @@
  ],
  "license": "CC-BY-NC-SA-4.0",
  "dependencies": {
-    "@odit/class-validator-jsonschema": "2.1.1",
+    "@odit/class-validator-jsonschema": "^2.1.1",
    "class-transformer": "0.3.1",
-    "class-validator": "0.13.1",
-    "consola": "2.15.3",
-    "cors": "2.8.5",
-    "dotenv": "8.2.0",
-    "express": "4.17.1",
-    "handlebars": "4.7.6",
-    "i18next": "19.8.7",
-    "i18next-fs-backend": "1.0.8",
-    "nodemailer": "6.5.0",
-    "reflect-metadata": "0.1.13",
+    "class-validator": "^0.13.1",
+    "consola": "^2.15.3",
+    "cors": "^2.8.5",
+    "dotenv": "^8.2.0",
+    "express": "^4.17.1",
+    "handlebars": "^4.7.6",
+    "i18next": "^19.8.7",
+    "i18next-fs-backend": "^1.0.8",
+    "nodemailer": "^6.5.0",
+    "reflect-metadata": "^0.1.13",
    "routing-controllers": "0.9.0-alpha.6",
    "routing-controllers-openapi": "2.2.0"
  },
  "devDependencies": {
-    "@odit/license-exporter": "0.0.10",
-    "@types/express": "4.17.11",
-    "@types/jest": "26.0.20",
-    "@types/node": "14.14.22",
-    "@types/nodemailer": "6.4.0",
-    "axios": "0.21.1",
-    "cp-cli": "2.0.0",
-    "jest": "26.6.3",
-    "nodemon": "2.0.7",
-    "release-it": "14.2.2",
-    "rimraf": "3.0.2",
-    "start-server-and-test": "1.12.0",
-    "ts-jest": "26.5.2",
-    "ts-node": "9.1.1",
-    "typescript": "4.1.3"
+    "@odit/license-exporter": "^0.0.10",
+    "@types/express": "^4.17.11",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^14.14.22",
+    "@types/nodemailer": "^6.4.0",
+    "axios": "^0.21.1",
+    "cp-cli": "^2.0.0",
+    "jest": "^26.6.3",
+    "nodemon": "^2.0.7",
+    "release-it": "^14.2.2",
+    "rimraf": "^3.0.2",
+    "start-server-and-test": "^1.12.0",
+    "ts-jest": "^26.5.2",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.1.3"
  },
  "release-it": {
    "git": {
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -2,9 +2,9 @@
    "a-password-reset-for-your-account-got-requested": "Ein Passwort Reset wurde für dein Konto beantragt.",
    "all-rights-reserved": "Alle Rechte vorbehalten",
    "event_name-registration": "{{event_name}} Registrierung",
-    "if-you-didnt-register-yourself-you-should-contact-us-to-get-your-data-removed-from-our-systems": "Solltest du dich nicht selbst registriert haben schick uns bitte eine Mail und wir entfernen deine Daten aus unserem System: ",
+    "if-you-didnt-register-yourself-you-should-contact-us-to-get-your-data-removed-from-our-systems": "Solltest du dich nicht selbst registriert haben, sende uns bitte eine Mail und wir entfernen deine Daten aus unserem System: ",
    "if-you-didnt-request-the-reset-please-ignore-this-mail": "Solltest du den Reset nicht beantragt haben kannst du diese Mail einfach ignorieren.",
-    "if-you-ever-loose-the-link-you-can-request-a-new-one-by-visiting-our-website": "Solltest du den Link verlieren kannst du auf unserer Website einen neuen beantragen:",
+    "if-you-ever-loose-the-link-you-can-request-a-new-one-by-visiting-our-website": "Auf unserer Website kannst du jederzeit einen neuen Login-Link beantragen:",
    "imprint": "Impressum",
    "lfk-mail-test": "{{copyright_owner}} - Mail test",
    "lfk-password-reset": "{{copyright_owner}} - Passwort zurücksetzen",
@@ -13,8 +13,8 @@
    "reset-password": "Passwort zurücksetzen",
    "test-mail": "Test mail",
    "thank-you-for-requesting-a-new-link-to-your-event_name-runner-profile": "Danke, dass du einen neuen Profillink für das {{event_name}} Läuferstem beantragt hast.",
-    "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung und willkommen beim {{event_name}}!",
-    "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Du must nichts weiter machen, außer deinen Registrierungscode zum Lauf mitzubringen.",
+    "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung beim {{event_name}}",
+    "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Bitte bringe deinen Registrierungscode zum Lauf am 21.04.2023 mit.",
    "this-is-a-test-mail-triggered-by-an-admin-in-the-lfk-backend": "Das ist eine Testmail, die von einem Admin im LfK! Backend erzeugt wurde.",
    "this-mail-was-sent-to-recipient_mail-because-someone-request-a-mail-test-for-this-mail-address": "Du bekommst diese Mail, weil jemand eine Testmail für deine Mail-Adresse angefragt hat.",
    "this-mail-was-sent-to-you-because-someone-request-a-password-reset-for-a-account-linked-to-the-mail-address": "Du bekommst diese E-Mail, weil jemand einen Passwort-Reset für deinen Account beantragt hat.",
@@ -24,7 +24,7 @@
    "view-my-data": "Meine Daten",
    "we-successfully-processed-your-registration": "Wir haben deine Registrierung erfolgreich verarbeitet.",
    "welcome": "Willkommen",
-    "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Du kannst deinen Registrierungscode, deine Rundenzeiten und vieles mehr im Selfservice einsehen:",
+    "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Deinen Registrierungscode, Rundenzeiten und vieles mehr kannst du im Selfservice einsehen:",
    "your-event_name-profile": "Dein {{event_name}} Profil",
    "your-password-wont-be-changed-until-you-click-the-reset-link-below-and-set-a-new-one": "Dein Passwort wird erst zurückgesetzt, wenn du den Reset-Link öffnest und ein neues Passwort setzt.",
    "your-profile": "Dein Profil"
Author	SHA1	Message	Date
Philipp Dormann	e7ad878fb9	Merge pull request 'cleaned up mail texts for lfk 2023' (#16 ) from feature/simpler-mail-texts into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #16 Reviewed-by: Nicolai Ort <info@nicolai-ort.com>	2023-02-01 13:55:30 +00:00
Philipp Dormann	1eb1a0ad7e	cleaned up mail texts for lfk 2023 Some checks failed continuous-integration/drone/pr Build is failing Details	2023-01-31 13:56:59 +01:00