Skip to content

Commit

Permalink
Merge branch 'development' into feature/gh-125
Browse files Browse the repository at this point in the history
  • Loading branch information
axelrindle authored Nov 24, 2024
2 parents 436b139 + 8ccd5c6 commit c9ad9bf
Show file tree
Hide file tree
Showing 133 changed files with 6,971 additions and 1,227 deletions.
24 changes: 7 additions & 17 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,4 @@ typings/
reports
**/tsconfig.tsbuildinfo
tsconfig.tsbuildinfo
uploads/
78 changes: 76 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,87 @@
"source.fixAll.eslint": "explicit"
},
"editor.tabSize": 2,
"files.associations": {
"*.mjml": "html"
},
"files.trimTrailingWhitespace": true,
"files.trimFinalNewlines": true,
"files.insertFinalNewline": true,
"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"
},
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
"options": {
"cwd": "${workspaceFolder}/api",
"statusbar": {
"hide" : true
"hide" : false
}
},
"presentation": {
Expand Down
19 changes: 10 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM node:20-alpine3.17 AS workspace-base

ENV CI=true
ENV HUSKY=0

Expand All @@ -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
Expand Down
21 changes: 21 additions & 0 deletions api/config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,26 @@
"meilisearch": {
"host": "MEILISEARCH_HOST",
"apiKey": "MEILISEARCH_KEY"
},
"fileDefaultProvider": "FILE_DEFAULT_PROVIDER",
"fileProviders": {
"LOCAL": {
"path":"FILE_PROVIDER_LOCAL_PATH"
},
"AZURE": {
"account": "FILE_PROVIDER_AZURE_ACCOUNT",
"accountKey": "FILE_PROVIDER_AZURE_ACCOUNT_KEY",
"container": "FILE_PROVIDER_AZURE_CONTAINER",
"folder": "FILE_PROVIDER_AZURE_FOLDER"
}
},
"tomtom": {
"apiKey": "TOMTOM_APIKEY"
},
"public": {
"legal": {
"imprint": "PUBLIC_LEGAL_IMPRINT",
"privacy": "PUBLIC_LEGAL_PRIVACY"
}
}
}
21 changes: 21 additions & 0 deletions api/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,26 @@
"meilisearch": {
"host": "meilisearch:7700",
"apiKey": "xbAPupQKhkKvF176vE2JxAdPGpmWVu251Hldn6K4Z6Y"
},
"fileDefaultProvider": "LOCAL",
"fileProviders": {
"LOCAL": {
"path":"../uploads"
},
"AZURE": {
"account": "",
"accountKey": "",
"container": "",
"folder": ""
}
},
"tomtom": {
"apiKey": ""
},
"public": {
"legal": {
"imprint": "",
"privacy": ""
}
}
}
73 changes: 73 additions & 0 deletions api/email/_layout.mjml
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 9 additions & 0 deletions api/email/account-activated.mjml
Original file line number Diff line number Diff line change
@@ -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}}
18 changes: 18 additions & 0 deletions api/email/account-email-confirm.mjml
Original file line number Diff line number Diff line change
@@ -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}}
18 changes: 18 additions & 0 deletions api/email/account-password-reset.mjml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{{#> layout }}

<mj-text font-size="16px" line-height="1.5">
Wir haben eine Anfrage erhalten, das Passwort für deinen Account bei <b>{{ hostname }}</b> zurückzusetzen.
Nutze den nachfolgenden Link, um das zu tun.
</mj-text>

<mj-button
align="left"
background-color="#16a34a"
border-radius="8px"
font-size="16px"
href="{{ resetUrl }}"
>
Passwort zurücksetzen
</mj-button>

{{/layout}}
19 changes: 19 additions & 0 deletions api/email/account-status-changed.mjml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{#> layout }}

<mj-text font-size="16px" line-height="1.5">
Der Status deines <b>{{ hostname }}</b> Account wurde auf <b>{{ status }}</b> geändert.
</mj-text>

{{#if isActive }}
<mj-button
align="left"
background-color="#16a34a"
border-radius="8px"
font-size="16px"
href="{{ config 'clientUrl' }}/login"
>
Zur Anmeldung
</mj-button>
{{/if}}

{{/layout}}
11 changes: 11 additions & 0 deletions api/email/registration-canceled.mjml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{{#> layout }}

<mj-text font-size="16px" line-height="1.5">
Deine Anmeldung zur Veranstaltung {{ veranstaltung }} <b>wurde storniert</b>.
</mj-text>

<mj-text font-size="16px" line-height="1.5">
Für Fragen wende dich bitte an deine Gliederung.
</mj-text>

{{/layout}}
Loading

0 comments on commit c9ad9bf

Please sign in to comment.