Merge remote-tracking branch 'origin/development' into feature/123-an…

…hänge-für-die-tn-bei-der-anmeldung

.devcontainer/devcontainer.json

@@ -17,21 +17,6 @@
 	"remoteEnv": {
 		"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
 	},
-	"forwardPorts": [3030, 8080, 7700],
-	"portsAttributes":{
-		"3030": {
-			"label": "API",
-			"onAutoForward": "silent"
-		},
-		"8080": {
-			"label": "Frontend",
-			"onAutoForward": "silent"
-		},
-		"7700": {
-			"label": "Meilisearch",
-			"onAutoForward": "silent"
-		}
-	},
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -41,8 +26,13 @@
 				"bradlc.vscode-tailwindcss",
 				"prisma.prisma",
 				"github.copilot",
-				"actboy168.tasks"
-			]
+				"actboy168.tasks",
+				"Vue.volar"
+			],
+			"settings": {
+        "terminal.integrated.defaultProfile.linux": "zsh",
+        "terminal.integrated.profiles.linux": { "zsh": { "path": "/bin/zsh" } }
+      }
 		}
 	},
 	"onCreateCommand": {

.eslintrc.js

@@ -91,6 +91,7 @@ module.exports = {
         'vue/define-emits-declaration': 'error',
         'vue/component-api-style': ['error', ['script-setup']],
         'vue/block-lang': ['error', { script: { lang: 'ts' } }],
+        'vue/no-v-html': 'off',
         ...importSettings,
       },
     },

.vscode/settings.json

@@ -7,13 +7,87 @@
         "source.fixAll.eslint": "explicit"
     },
     "editor.tabSize": 2,
+    "files.associations": {
+        "*.mjml": "html"
+    },
     "files.trimTrailingWhitespace": true,
     "files.trimFinalNewlines": true,
     "files.insertFinalNewline": true,
-    "volar.completion.preferredTagNameCase": "pascal",
+    "vue.server.hybridMode": true,
     "workbench.colorCustomizations": {
         "titleBar.activeBackground": "#4d7c0f",
         "titleBar.inactiveBackground": "#4d7c0f"
-      },
-      "git.enableCommitSigning": false
+    },
+    "git.enableCommitSigning": false,
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.expand": false,
+    "explorer.fileNesting.patterns": {
+      "*.asax": "$(capture).*.cs, $(capture).*.vb",
+      "*.ascx": "$(capture).*.cs, $(capture).*.vb",
+      "*.ashx": "$(capture).*.cs, $(capture).*.vb",
+      "*.aspx": "$(capture).*.cs, $(capture).*.vb",
+      "*.bloc.dart": "$(capture).event.dart, $(capture).state.dart",
+      "*.c": "$(capture).h",
+      "*.cc": "$(capture).hpp, $(capture).h, $(capture).hxx",
+      "*.cjs": "$(capture).cjs.map, $(capture).*.cjs, $(capture)_*.cjs",
+      "*.component.ts": "$(capture).component.html, $(capture).component.spec.ts, $(capture).component.css, $(capture).component.scss, $(capture).component.sass, $(capture).component.less",
+      "*.cpp": "$(capture).hpp, $(capture).h, $(capture).hxx",
+      "*.cs": "$(capture).*.cs",
+      "*.cshtml": "$(capture).cshtml.cs",
+      "*.csproj": "*.config, *proj.user, appsettings.*, bundleconfig.json",
+      "*.css": "$(capture).css.map, $(capture).*.css",
+      "*.cxx": "$(capture).hpp, $(capture).h, $(capture).hxx",
+      "*.dart": "$(capture).freezed.dart, $(capture).g.dart",
+      "*.ex": "$(capture).html.eex, $(capture).html.heex, $(capture).html.leex",
+      "*.go": "$(capture)_test.go",
+      "*.java": "$(capture).class",
+      "*.js": "$(capture).js.map, $(capture).*.js, $(capture)_*.js",
+      "*.jsx": "$(capture).js, $(capture).*.jsx, $(capture)_*.js, $(capture)_*.jsx",
+      "*.master": "$(capture).*.cs, $(capture).*.vb",
+      "*.mjs": "$(capture).mjs.map, $(capture).*.mjs, $(capture)_*.mjs",
+      "*.module.ts": "$(capture).resolver.ts, $(capture).controller.ts, $(capture).service.ts",
+      "*.pubxml": "$(capture).pubxml.user",
+      "*.resx": "$(capture).*.resx, $(capture).designer.cs, $(capture).designer.vb",
+      "*.tex": "$(capture).acn, $(capture).acr, $(capture).alg, $(capture).aux, $(capture).bbl, $(capture).blg, $(capture).fdb_latexmk, $(capture).fls, $(capture).glg, $(capture).glo, $(capture).gls, $(capture).idx, $(capture).ind, $(capture).ist, $(capture).lof, $(capture).log, $(capture).lot, $(capture).out, $(capture).pdf, $(capture).synctex.gz, $(capture).toc, $(capture).xdv",
+      "*.ts": "$(capture).js, $(capture).d.ts.map, $(capture).*.ts, $(capture)_*.js, $(capture)_*.ts",
+      "*.tsx": "$(capture).ts, $(capture).*.tsx, $(capture)_*.ts, $(capture)_*.tsx",
+      "*.vbproj": "*.config, *proj.user, appsettings.*, bundleconfig.json",
+      "*.vue": "$(capture).*.ts, $(capture).*.js, $(capture).story.vue",
+      "*.xaml": "$(capture).xaml.cs",
+      "+layout.svelte": "+layout.ts,+layout.ts,+layout.js,+layout.server.ts,+layout.server.js",
+      "+page.svelte": "+page.server.ts,+page.server.js,+page.ts,+page.js ",
+      ".clang-tidy": ".clang-format, .clangd, compile_commands.json",
+      ".env": "*.env, .env.*, .envrc, env.d.ts",
+      ".project": ".classpath",
+      "BUILD.bazel": "*.bzl, *.bazel, *.bazelrc, bazel.rc, .bazelignore, .bazelproject, WORKSPACE",
+      "CMakeLists.txt": "*.cmake, *.cmake.in, .cmake-format.yaml, CMakePresets.json",
+      "I*.cs": "$(capture).cs",
+      "artisan": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, server.php, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, webpack.mix.js, windi.config.*",
+      "astro.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "cargo.toml": ".clippy.toml, .rustfmt.toml, cargo.lock, clippy.toml, cross.toml, rust-toolchain.toml, rustfmt.toml",
+      "composer.json": ".php*.cache, composer.lock, phpunit.xml*, psalm*.xml",
+      "default.nix": "shell.nix",
+      "deno.json*": "*.env, .env.*, .envrc, api-extractor.json, deno.lock, env.d.ts, import-map.json, import_map.json, jsconfig.*, tsconfig.*, tsdoc.*",
+      "dockerfile": ".dockerignore, docker-compose.*, dockerfile*",
+      "flake.nix": "flake.lock",
+      "gatsby-config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, gatsby-browser.*, gatsby-node.*, gatsby-ssr.*, gatsby-transformer.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "gemfile": ".ruby-version, gemfile.lock",
+      "go.mod": ".air*, go.sum",
+      "go.work": "go.work.sum",
+      "mix.exs": ".credo.exs, .dialyzer_ignore.exs, .formatter.exs, .iex.exs, .tool-versions, mix.lock",
+      "next.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, next-env.d.ts, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "nuxt.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "package.json": ".browserslist*, .circleci*, .commitlint*, .cz-config.js, .czrc, .dlint.json, .dprint.json, .editorconfig, .eslint*, .firebase*, .flowconfig, .github*, .gitlab*, .gitpod*, .huskyrc*, .jslint*, .lintstagedrc*, .markdownlint*, .node-version, .nodemon*, .npm*, .nvmrc, .pm2*, .pnp.*, .pnpm*, .prettier*, .releaserc*, .sentry*, .stackblitz*, .styleci*, .stylelint*, .tazerc*, .textlint*, .tool-versions, .travis*, .versionrc*, .vscode*, .watchman*, .xo-config*, .yamllint*, .yarnrc*, Procfile, apollo.config.*, appveyor*, azure-pipelines*, bower.json, build.config.*, commitlint*, crowdin*, dangerfile*, dlint.json, dprint.json, firebase.json, grunt*, gulp*, jenkins*, lerna*, lint-staged*, nest-cli.*, netlify*, nodemon*, npm-shrinkwrap.json, nx.*, package-lock.json, package.nls*.json, phpcs.xml, pm2.*, pnpm*, prettier*, pullapprove*, pyrightconfig.json, release-tasks.sh, renovate*, rollup.config.*, stylelint*, tslint*, tsup.config.*, turbo*, typedoc*, unlighthouse*, vercel*, vetur.config.*, webpack*, workspace.json, xo.config.*, yarn*, tsconfig.*, .gitignore",
+      "pubspec.yaml": ".metadata, .packages, all_lint_rules.yaml, analysis_options.yaml, build.yaml, pubspec.lock, pubspec_overrides.yaml",
+      "pyproject.toml": ".pdm.toml, pdm.lock, pyproject.toml",
+      "quasar.conf.js": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, quasar.extensions.json, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "readme*": "authors, backers*, changelog*, citation*, code_of_conduct*, codeowners, contributing*, contributors, copying, credits, governance.md, history.md, license*, maintainers, readme*, security.md, sponsors*",
+      "remix.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, remix.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "rush.json": ".browserslist*, .circleci*, .commitlint*, .cz-config.js, .czrc, .dlint.json, .dprint.json, .editorconfig, .eslint*, .firebase*, .flowconfig, .github*, .gitlab*, .gitpod*, .huskyrc*, .jslint*, .lintstagedrc*, .markdownlint*, .node-version, .nodemon*, .npm*, .nvmrc, .pm2*, .pnp.*, .pnpm*, .prettier*, .releaserc*, .sentry*, .stackblitz*, .styleci*, .stylelint*, .tazerc*, .textlint*, .tool-versions, .travis*, .versionrc*, .vscode*, .watchman*, .xo-config*, .yamllint*, .yarnrc*, Procfile, apollo.config.*, appveyor*, azure-pipelines*, bower.json, build.config.*, commitlint*, crowdin*, dangerfile*, dlint.json, dprint.json, firebase.json, grunt*, gulp*, jenkins*, lerna*, lint-staged*, nest-cli.*, netlify*, nodemon*, npm-shrinkwrap.json, nx.*, package-lock.json, package.nls*.json, phpcs.xml, pm2.*, pnpm*, prettier*, pullapprove*, pyrightconfig.json, release-tasks.sh, renovate*, rollup.config.*, stylelint*, tslint*, tsup.config.*, turbo*, typedoc*, unlighthouse*, vercel*, vetur.config.*, webpack*, workspace.json, xo.config.*, yarn*",
+      "shims.d.ts": "*.d.ts",
+      "svelte.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, mdsvex.config.js, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "vite.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "vue.config.*": "*.env, .babelrc*, .codecov, .cssnanorc*, .env.*, .envrc, .htmlnanorc*, .lighthouserc.*, .mocha*, .postcssrc*, .terserrc*, api-extractor.json, ava.config.*, babel.config.*, contentlayer.config.*, cssnano.config.*, cypress.*, env.d.ts, formkit.config.*, formulate.config.*, histoire.config.*, htmlnanorc.*, jasmine.*, jest.config.*, jsconfig.*, karma*, lighthouserc.*, playwright.config.*, postcss.config.*, puppeteer.config.*, svgo.config.*, tailwind.config.*, tsconfig.*, tsdoc.*, uno.config.*, unocss.config.*, vitest.config.*, webpack.config.*, windi.config.*",
+      "docker-compose.yml": "docker-compose-*, .dockerignore, e2e-vnc.yaml"
+    },
 }

.vscode/tasks.json

@@ -202,7 +202,7 @@
 			"options": {
         "cwd": "${workspaceFolder}/api",
 				"statusbar": {
-					"hide" : true
+					"hide" : false
 				}
 			},
 			"presentation": {

Dockerfile

@@ -1,4 +1,5 @@
 FROM node:20-alpine3.17 AS workspace-base
+
 ENV CI=true
 ENV HUSKY=0
 
@@ -14,28 +15,28 @@ COPY vendor/ ./vendor/
 
 COPY package*.json ./
 
-RUN npm ci
 COPY . ./
+RUN npm ci
 RUN npm run postinstall --workspace ./api
 
 ENV TZ=Europe/Berlin
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ARG commitHash
-ENV COMMIT_HASH $commitHash
+ENV COMMIT_HASH=$commitHash
 ARG version
-ENV VERSION $version
+ENV VERSION=$version
 
-FROM api-build-stage as api-production-stage
+FROM api-build-stage AS api-production-stage
 
 CMD [ "npm", "start", "-w", "./api"]
 
-FROM workspace-base as frontend-build-stage
-ARG tenant
-ENV VITE_APP_COMMIT_HASH $commitHash
-ENV VITE_APP_VERSION $version
+FROM workspace-base AS frontend-build-stage
+
+ENV VITE_APP_COMMIT_HASH=$commitHash
+ENV VITE_APP_VERSION=$version
 RUN npm run build --workspace ./frontend
 
-FROM workspace-base as api-build-stage
+FROM workspace-base AS api-build-stage
 
 # todo packing
 # RUN npm run build --workspace ./api

README.md

@@ -2,7 +2,6 @@
 # brahmsee.digital
 
 ![ci workflow](https://github.com/codeanker/brahmsee.digital/actions/workflows/ci.yml/badge.svg)
-![deploy workflow](https://github.com/codeanker/brahmsee.digital/actions/workflows/deploy.yml/badge.svg)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/codeanker/brahmsee.digital/development)
 

api/config/custom-environment-variables.json

@@ -34,5 +34,14 @@
       "container": "FILE_PROVIDER_AZURE_CONTAINER",
       "folder": "FILE_PROVIDER_AZURE_FOLDER"
     }
+  },
+  "tomtom": {
+    "apiKey": "TOMTOM_APIKEY"
+  },
+  "public": {
+    "legal": {
+      "imprint": "PUBLIC_LEGAL_IMPRINT",
+      "privacy": "PUBLIC_LEGAL_PRIVACY"
+    }
   }
 }

api/config/default.json

@@ -1,6 +1,6 @@
 {
   "server": {
-    "host": "localhost",
+    "host": "0.0.0.0",
     "port": 3030
   },
 
@@ -42,5 +42,14 @@
       "container": "",
       "folder": ""
     }
+  },
+  "tomtom": {
+    "apiKey": ""
+  },
+  "public": {
+    "legal": {
+      "imprint": "",
+      "privacy": ""
+    }
   }
 }

api/email/_layout.mjml

@@ -0,0 +1,73 @@
+<mjml>
+  <mj-head>
+    <mj-attributes>
+      <mj-all font-family="sans-serif" />
+    </mj-attributes>
+
+    <mj-style>
+      .footer {
+        padding: 10px 0;
+      }
+
+    	.footer a,
+      .footer p {
+      	color: #696969;
+      }
+    </mj-style>
+  </mj-head>
+
+  <mj-body background-color="#f1f5f9">
+    <mj-wrapper background-color="#fff" border-radius="32px">
+      <mj-section>
+        <mj-column vertical-align="middle">
+          <mj-text align="left" font-size="24px">{{ veranstaltung }}</mj-text>
+        </mj-column>
+        <mj-column vertical-align="middle">
+          <mj-text align="right" font-size="18px">DLRG {{ gliederung }}</mj-text>
+        </mj-column>
+      </mj-section>
+
+      <mj-section>
+        <mj-column>
+          <mj-text font-size="30px" font-weight="500">
+            {{ subject }}
+          </mj-text>
+
+          <mj-text font-size="16px">
+            Moin {{ name }},
+          </mj-text>
+
+          {{> @partial-block }}
+        </mj-column>
+      </mj-section>
+
+      <mj-section>
+        <mj-column>
+          <mj-text>
+            Viele Grüße
+          </mj-text>
+          <mj-text>
+            Dein Orga-Team
+          </mj-text>
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+
+    <mj-section css-class="footer" padding="10px 0 0 0">
+      <mj-column>
+        <!-- Logo von LV -->
+        <mj-image width="192px" src="{{ url 'img/gliederung_sh.png' }}"></mj-image>
+      </mj-column>
+    </mj-section>
+
+    <mj-section css-class="footer" padding="0">
+      <mj-column>
+        <mj-text align="center" font-size="12px">
+          <a href="{{ config 'public.legal.imprint' }}">Impressum</a>
+          <span> - </span>
+          <a href="{{ config 'public.legal.privacy' }}">Datenschutz</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+  </mj-body>
+</mjml>

api/email/account-activated.mjml

@@ -0,0 +1,9 @@
+{{#> layout }}
+
+<mj-text font-size="16px" line-height="1.5">
+  Dein <b>{{ hostname }}</b> Account wurde bestätigt.
+  Bevor du dich anmelden kannst, muss dein Account noch durch einen Administrator
+  aktiviert werden.
+</mj-text>
+
+{{/layout}}

api/email/account-email-confirm.mjml

@@ -0,0 +1,18 @@
+{{#> layout }}
+
+<mj-text font-size="16px" line-height="1.5">
+  Dein <b>{{ hostname }}</b> Account wurde erstellt. Um den Registrierungsprozess
+  abzuschließen, bestätige deine E-Mail Adresse bitte mit dem nachfolgenden Link.
+</mj-text>
+
+<mj-button
+  align="left"
+  background-color="#16a34a"
+  border-radius="8px"
+  font-size="16px"
+  href="{{ activationUrl }}"
+>
+  Account bestätigen
+</mj-button>
+
+{{/layout}}