🚀Bumped version to v0.2.3

Reviewed-on: #16
Reviewed-by: Nicolai Ort <info@nicolai-ort.com>

.drone.yml

@@ -70,40 +70,6 @@ steps:
         - dev
       cache: true
       registry: registry.odit.services
-  - name: run changelog export
-    depends_on: ["clone"]
-    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
-    commands:
-      - npx auto-changelog --commit-limit false -p -u --hide-credit
-  - name: push new changelog to repo
-    depends_on: ["run changelog export"]
-    image: appleboy/drone-git-push
-    settings:
-      branch: dev
-      commit: true
-      commit_message: 🧾New changelog file version [CI SKIP] [skip ci]
-      author_email: bot@odit.services
-      remote: git@git.odit.services:lfk/mailer.git
-      ssh_key:
-        from_secret: git_ssh
-  - name: run full license export
-    depends_on: ["clone"]
-    image: registry.odit.services/hub/library/node:19.0.1-alpine3.16
-    commands:
-      - yarn
-      - yarn licenses:export
-  - name: push new licenses file to repo
-    depends_on: ["run full license export"]
-    image: appleboy/drone-git-push
-    settings:
-      branch: dev
-      commit: true
-      commit_message: 📖New license file version [CI SKIP] [skip ci]
-      author_email: bot@odit.services
-      remote: git@git.odit.services:lfk/mailer.git
-      skip_verify: true
-      ssh_key:
-        from_secret: git_ssh
 trigger:
   branch:
     - dev
@@ -142,15 +108,6 @@ steps:
         - latest
       cache: true
       registry: registry.odit.services
-  - name: push merge to repo
-    depends_on: ["clone"]
-    image: appleboy/drone-git-push
-    settings:
-      branch: dev
-      commit: false
-      remote: git@git.odit.services:lfk/mailer.git
-      ssh_key:
-        from_secret: git_ssh
 trigger:
   branch:
     - main

.gitignore

@@ -138,3 +138,4 @@ build
 lib
 /oss-attribution
 *.tmp
+pnpm-lock.yaml

CHANGELOG.md

@@ -2,12 +2,38 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2)
+#### [v0.2.3](https://git.odit.services/lfk/mailer/compare/v0.2.2...v0.2.3)
+
+- Fixed missing closing tag [`8e2bbb3`](https://git.odit.services/lfk/mailer/commit/8e2bbb324091c0ba28ccd24fc189b2e7ddab8ce3)
+
+#### [v0.2.2](https://git.odit.services/lfk/mailer/compare/v0.2.1...v0.2.2)
+
+> 3 February 2023
 
 - 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)
+- 🚀Bumped version to v0.2.2 [`a616570`](https://git.odit.services/lfk/mailer/commit/a6165708a6a529bf219f28be74e2de71e64a2be5)
+- Merge pull request 'cleaned up mail texts for lfk 2023' (#16) from feature/simpler-mail-texts into main [`e7ad878`](https://git.odit.services/lfk/mailer/commit/e7ad878fb93773d1dec35d3b8b9c4f7b4b773221)
+- cleaned up mail texts for lfk 2023 [`1eb1a0a`](https://git.odit.services/lfk/mailer/commit/1eb1a0ad7e11b8f25b2b8d0efea991cab444c6ee)
+
+#### [v0.2.1](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.2.1)
+
+> 2 February 2023
+
+- update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15)
+- Moved Release management to releaseit [`68bd293`](https://git.odit.services/lfk/mailer/commit/68bd293acb474fe8f201423ffd442d0ee186a482)
+- Fresh licenses 4 yall [`c48a2ed`](https://git.odit.services/lfk/mailer/commit/c48a2ed01e65dc20c562d80099ca7448a8725446)
+- Version pinning [`22470d6`](https://git.odit.services/lfk/mailer/commit/22470d6160b450515966e7e38c37c45085f8ceb2)
+- 🚀Bumped version to v0.2.1 [`da4f497`](https://git.odit.services/lfk/mailer/commit/da4f497e887e788adf6d39f71d61488157c8381a)
+- Now building w/ kaniko [`f422f98`](https://git.odit.services/lfk/mailer/commit/f422f989c7d5c2fead70e37fc314b734034916f7)
 - 📖New license file version [CI SKIP] [skip ci] [`247d4b6`](https://git.odit.services/lfk/mailer/commit/247d4b617678655845b5baf6ae5deba01e953a39)
+- Bumped used ci node images [`0692b72`](https://git.odit.services/lfk/mailer/commit/0692b72955974c2fdee6441d4e7838d41dde8ed6)
+- 🚀Bumped version to v0.2.0 [`84e3778`](https://git.odit.services/lfk/mailer/commit/84e3778b8962834b57ee92ba01a0b02505bbc7e7)
+- Merge pull request 'feature/kaniko' (#18) from feature/kaniko into dev [`4ca5f9d`](https://git.odit.services/lfk/mailer/commit/4ca5f9d38dc3300d0bcbf8448283b53b484a827d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`00bb40d`](https://git.odit.services/lfk/mailer/commit/00bb40ddf999245d9fa0b005f000e670f4daf60c)
+- Bumped docker node [`af173dc`](https://git.odit.services/lfk/mailer/commit/af173dcec822f12d8233b717304ad82b7fac14db)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`e155454`](https://git.odit.services/lfk/mailer/commit/e155454013aa32e31db6afe5d6cb476c21d38aba)
+- Shut up pnpm warnings [`acb013e`](https://git.odit.services/lfk/mailer/commit/acb013e8ae86f868aced40dbc2a68f8165627145)
+- Merge pull request 'update runner-welcome mail template' (#17) from dev into main [`07306be`](https://git.odit.services/lfk/mailer/commit/07306be49722877dcce04660e452acedc6f77663)
 - 🧾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)

licenses.md

@@ -515,6 +515,35 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     SOFTWARE
  
 
+# auto-changelog
+**Author**: Pete Cook <pete@cookpete.com> (https://github.com/cookpete)
+**Repo**: https://github.com/CookPete/auto-changelog.git
+**License**: MIT
+**Description**: Command line tool for generating a changelog from git tags and commit history
+## License Text
+The MIT License
+
+Copyright (c) 2017 Pete Cook https://cookpete.com
+
+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
 **Author**: Matt Zabriskie
 **Repo**: https://github.com/axios/axios.git

package.json

@@ -1,12 +1,13 @@
 {
   "name": "@odit/lfk-mailer",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "The document mailer for the LfK! runner system. This generates and sends mails (password reset, welcome, ...)",
   "main": "src/app.ts",
   "scripts": {
     "dev": "nodemon src/app.ts",
     "build": "rimraf ./dist && tsc && cp-cli ./src/templates ./dist/templates && cp-cli ./src/locales ./dist/locales",
     "licenses:export": "license-exporter --markdown",
+    "changelog:export": "auto-changelog --commit-limit false -p -u --hide-credit",
     "release": "release-it --only-version",
     "translations:sort": "node ./scripts/sort_translations.js",
     "test": "jest",
@@ -65,6 +66,7 @@
     "@types/jest": "26.0.20",
     "@types/node": "14.14.22",
     "@types/nodemailer": "6.4.0",
+    "auto-changelog": "^2.4.0",
     "axios": "0.21.1",
     "cp-cli": "2.0.0",
     "jest": "26.6.3",
@@ -82,11 +84,16 @@
       "requireCleanWorkingDir": false,
       "commitMessage": "🚀Bumped version to v${version}",
       "requireBranch": "dev",
-      "push": false,
-      "tag": false
+      "push": true,
+      "tag": true,
+      "tagName": "v${version}",
+      "tagAnnotation": "v${version}"
     },
     "npm": {
       "publish": false
+    },
+    "hooks": {
+      "after:bump": "npm run changelog:export && npm run licenses:export && git add CHANGELOG.md && git add licenses.md"
     }
   }
 }

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"

src/templates/runner_forgot.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="de" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml">
 <head>
-    <title>{{__ "your-event_name-profile"}}<title> <!-- The title tag shows in email notifications, like Android 4.4. -->
+    <title>{{__ "your-event_name-profile"}}</title> <!-- The title tag shows in email notifications, like Android 4.4. -->
     <meta charset="utf-8"> <!-- utf-8 works for most cases -->
     <meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
     <meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->