🚀Bumped version to v0.11.3

close #50

.drone.yml

@@ -14,10 +14,10 @@ get:
 
 ---
 kind: secret
-name: git_ssh
+name: npm_url
 get:
-  path: odit-git-bot
+  path: odit-npm-cache
-  name: sshkey
+  name: url
 
 ---
 kind: pipeline
@@ -25,86 +25,50 @@ type: kubernetes
 name: build:dev
 
 steps:
-  # - name: run full license export
+  - name: docker dev
-  #   depends_on: ["clone"]
+    image: registry.odit.services/library/drone-kaniko
-  #   image: node:alpine
-  #   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]
-  #     author_email: bot@odit.services
-  #     remote: git@git.odit.services:lfk/selfservice.git
-  #     ssh_key:
-  #       from_secret: git_ssh
-  - name: build dev
-    image: plugins/docker
     depends_on: [clone]
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
+      build_args:
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
+      repo: lfk/selfservice
       tags:
         - dev
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
 trigger:
   branch:
     - dev
   event:
     - push
 
----
-kind: pipeline
-type: kubernetes
-name: build:testing
-
-steps:
-  - name: build testing
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - testing
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  branch:
-    - bugfix/31-env_linking
-  event:
-    - push
-
 ---
 kind: pipeline
 type: kubernetes
 name: build:latest
 
 steps:
-  - name: build latest
+  - name: docker latest
-    image: plugins/docker
+    image: registry.odit.services/library/drone-kaniko
     depends_on: [clone]
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
+      build_args:
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
+      repo: lfk/selfservice
       tags:
         - latest
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
 trigger:
   branch:
     - main
@@ -116,19 +80,22 @@ kind: pipeline
 type: kubernetes
 name: build:tags
 steps:
-  - name: build $DRONE_TAG
+  - name: docker release
-    image: plugins/docker
+    image: registry.odit.services/library/drone-kaniko
     depends_on: [clone]
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
+      build_args:
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
+      repo: lfk/selfservice
       tags:
-        - '${DRONE_TAG}'
+        - "${DRONE_TAG}"
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
 trigger:
   event:
   - tag

CHANGELOG.md

@@ -2,10 +2,180 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.11.3](https://git.odit.services/lfk/selfservice/compare/0.11.2...0.11.3)
+
+- fix: registration code white bg [`#50`](https://git.odit.services/lfk/selfservice/issues/50)
+- Pinned pnpm and lockfile [`6aca13f`](https://git.odit.services/lfk/selfservice/commit/6aca13f0cb1bc8fa43f0f09c554cec0758acd7a1)
+- switched drone to kaniko with cache [`cac5103`](https://git.odit.services/lfk/selfservice/commit/cac5103d52427e777e4c3624ebb253ad7bd393d6)
+- Switched dockerfile to pnpm with cache [`78fea1e`](https://git.odit.services/lfk/selfservice/commit/78fea1ea045a7281fe0a2841fc4d5f1505dcb3cf)
+- chore(deps): pnpm@8.1.1 [`677e65f`](https://git.odit.services/lfk/selfservice/commit/677e65f44ae4bcc6f9af4732d813f337da0c51d2)
+- fix(Footer): darkmode colors in lightmode [`772eca6`](https://git.odit.services/lfk/selfservice/commit/772eca64bb38ce1cf1ea1b58859dd744588a88e1)
+
+#### [0.11.2](https://git.odit.services/lfk/selfservice/compare/0.11.1...0.11.2)
+
+> 15 March 2023
+
+- Added footer to every page [`b9624aa`](https://git.odit.services/lfk/selfservice/commit/b9624aa5ad57002852c84081fc710c2e977251bd)
+- 🚀Bumped version to v0.11.2 [`fa51b31`](https://git.odit.services/lfk/selfservice/commit/fa51b31fe41d41b3ec9becad07ddab4cf73be051)
+- Accept tos to accept privacy_policy [`09e48e7`](https://git.odit.services/lfk/selfservice/commit/09e48e771f4c0db4a7dbb898b05b347f1aad2292)
+
+#### [0.11.1](https://git.odit.services/lfk/selfservice/compare/0.11.0...0.11.1)
+
+> 18 February 2023
+
+- Profile: add "---" if no data set [`659fa77`](https://git.odit.services/lfk/selfservice/commit/659fa77dca3b527d896d752386e91a167a1b8f4f)
+- 🚀Bumped version to v0.11.1 [`8364321`](https://git.odit.services/lfk/selfservice/commit/8364321a7cb6a0037ee0c5055b028c4cf883fb10)
+
+#### [0.11.0](https://git.odit.services/lfk/selfservice/compare/0.10.0...0.11.0)
+
+> 3 February 2023
+
+- pnpm migration [`a3a1e89`](https://git.odit.services/lfk/selfservice/commit/a3a1e89aa14798e1d180697f91809e282a229f23)
+- 🚀Bumped version to v0.11.0 [`10c9127`](https://git.odit.services/lfk/selfservice/commit/10c9127256edf2cbad1dc6690d5f4e87c32f6396)
+
+#### [0.10.0](https://git.odit.services/lfk/selfservice/compare/0.9.0...0.10.0)
+
+> 3 February 2023
+
+- text cleanups + footer [`eccce07`](https://git.odit.services/lfk/selfservice/commit/eccce0795b6960aa3a2e9368de5ae4bdf80997d7)
+- updated nginx config for cache busting [`8e2b355`](https://git.odit.services/lfk/selfservice/commit/8e2b355466e9a37510be8bf03311d6b28e1a0d9f)
+- improved profile page padding + full width registration code for easier scanning [`54540be`](https://git.odit.services/lfk/selfservice/commit/54540be6e12ed85afc96061b8548cd4ec6700eec)
+- 🚀Bumped version to v0.10.0 [`5587175`](https://git.odit.services/lfk/selfservice/commit/5587175534188e05ab43d0eed9745484e01edb63)
+
+#### [0.9.0](https://git.odit.services/lfk/selfservice/compare/0.8.3...0.9.0)
+
+> 3 February 2023
+
+- wip: error registration ui feedback [`9ac14e8`](https://git.odit.services/lfk/selfservice/commit/9ac14e8a5d740fb4cd87645e69b2cfde73e4acc7)
+- wip: registration confirmation ui [`8928f84`](https://git.odit.services/lfk/selfservice/commit/8928f841dcd370daf28416adbf1adbe16fa4d76f)
+- 🚀Bumped version to v0.9.0 [`3392a2e`](https://git.odit.services/lfk/selfservice/commit/3392a2e68edb8fcf2aa6dd4b962abbf6ac27a414)
+
+#### [0.8.3](https://git.odit.services/lfk/selfservice/compare/0.8.2...0.8.3)
+
+> 3 February 2023
+
+- fix: registration code (broke in merge) [`123509d`](https://git.odit.services/lfk/selfservice/commit/123509d0a6d15fe254e28f7a316bd6c260fe7bd2)
+- 🚀Bumped version to v0.8.3 [`4a5b9d2`](https://git.odit.services/lfk/selfservice/commit/4a5b9d25698931158a602b2159b4e6c4fa129e8e)
+- wip: fix registration code [`51f8d0f`](https://git.odit.services/lfk/selfservice/commit/51f8d0fb42d0dbba268799eb9385686d22fd2284)
+
+#### [0.8.2](https://git.odit.services/lfk/selfservice/compare/0.8.1...0.8.2)
+
+> 3 February 2023
+
+- move /registered/ to props [`c35f943`](https://git.odit.services/lfk/selfservice/commit/c35f943957e5ba84361a437c1d945331248746d1)
+- 🚀Bumped version to v0.8.2 [`f4d1c7b`](https://git.odit.services/lfk/selfservice/commit/f4d1c7b053d1e7210911772bde1b2d80a30ab225)
+- /profile/ text cleanups [`64e6ef8`](https://git.odit.services/lfk/selfservice/commit/64e6ef8cec38a8193c4fb28c5f1b26ee0e4d5063)
+- /profile/ move from anchor tag to button [`ac75828`](https://git.odit.services/lfk/selfservice/commit/ac75828309043532c6ab8aad63e0c40edf450459)
+- /profile/ toast styles [`c7f3a89`](https://git.odit.services/lfk/selfservice/commit/c7f3a893af8705af12f2e7ae7e40197ca4c28666)
+- /profile/ dont instantly show mail format error [`ab9b400`](https://git.odit.services/lfk/selfservice/commit/ab9b400fff1b421a41dd27479a81fb5e3740b9ef)
+- /profile/ autocomplete mail [`30fd7ea`](https://git.odit.services/lfk/selfservice/commit/30fd7ead0833b0b3ab4e5509608aa92112151380)
+
+#### [0.8.1](https://git.odit.services/lfk/selfservice/compare/0.8.0...0.8.1)
+
+> 2 February 2023
+
+- 🚀Bumped version to v0.8.1 [`292e440`](https://git.odit.services/lfk/selfservice/commit/292e44057aee9ef57a51aa9fa0372c3678b81de0)
+- Adjusted button text [`20fca67`](https://git.odit.services/lfk/selfservice/commit/20fca6794dd7e0c714cd09c80a68b1d3592ab09c)
+- Switched request login link api path to login (backend v13.0.0) [`8139d63`](https://git.odit.services/lfk/selfservice/commit/8139d637151c8c0184e4a98f151991b429d0a70c)
+
+#### [0.8.0](https://git.odit.services/lfk/selfservice/compare/0.7.11...0.8.0)
+
+> 2 February 2023
+
+- 🚀Bumped version to v0.8.0 [`7051909`](https://git.odit.services/lfk/selfservice/commit/7051909bf960fb44b43e979ac4d304dff9ef2ec4)
+- Merge pull request 'dont autologin on register -> require mail link' (#47) from feature/46-dont-autologin-on-register-require-mail-link into dev [`f7a0682`](https://git.odit.services/lfk/selfservice/commit/f7a0682c3392b8882be4a676882c8a49d55bd5fe)
+- add /registered/?mail route [`eb20b54`](https://git.odit.services/lfk/selfservice/commit/eb20b547e79d352f3b7cd1b5ce7b7dbfcf8c19f7)
+
+#### [0.7.11](https://git.odit.services/lfk/selfservice/compare/0.7.10...0.7.11)
+
+> 2 February 2023
+
+- Profile: improved mobile responsiveness/ design + toast clear [`077b33f`](https://git.odit.services/lfk/selfservice/commit/077b33f03180d0bd6c45becaaa63d3408c645deb)
+- 🚀Bumped version to v0.7.11 [`c63adf5`](https://git.odit.services/lfk/selfservice/commit/c63adf557bcb29c8eccc05d5a83d476c75380d95)
+- fix: registration code download button style [`52a6b3d`](https://git.odit.services/lfk/selfservice/commit/52a6b3dc776b806eaa8fee058a1c381ab63a8ea5)
+
+#### [0.7.10](https://git.odit.services/lfk/selfservice/compare/0.7.9...0.7.10)
+
+> 1 February 2023
+
+- Configureable barcode format via bwp-js [`9e06c46`](https://git.odit.services/lfk/selfservice/commit/9e06c464118c5b5d0cd78c8b8379523bf3bfdbd4)
+- Added download for registration code [`53800b4`](https://git.odit.services/lfk/selfservice/commit/53800b4fa355bb972e51e71b5b1f98772deed114)
+- 🚀Bumped version to v0.7.10 [`8b5e1ca`](https://git.odit.services/lfk/selfservice/commit/8b5e1cac1353373b13cf9d570deb7cadcd437247)
+- Pinned version [`6438288`](https://git.odit.services/lfk/selfservice/commit/64382880c40ba5c1e3c9004ce7fc65099849cd44)
+
+#### [0.7.9](https://git.odit.services/lfk/selfservice/compare/0.7.8...0.7.9)
+
+> 1 February 2023
+
+- migrate to bwip-js [`8cfddb5`](https://git.odit.services/lfk/selfservice/commit/8cfddb502964be7edf45cdc524344ea2f7f20142)
+- fix codeconfig.height [`9b261bf`](https://git.odit.services/lfk/selfservice/commit/9b261bf20023561a7c9691dff33c9a6d2b5c0cac)
+- 🚀Bumped version to v0.7.9 [`debbd92`](https://git.odit.services/lfk/selfservice/commit/debbd9219cb53dbd48cf0cb7bee329b765ce4647)
+- drop jsbarcode [`713dd15`](https://git.odit.services/lfk/selfservice/commit/713dd153126851e8cf1045bf5ba3ca702a39c738)
+
+#### [0.7.8](https://git.odit.services/lfk/selfservice/compare/0.7.7...0.7.8)
+
+> 1 February 2023
+
+- add barcode to profile [`851190e`](https://git.odit.services/lfk/selfservice/commit/851190e6a7f8b9cccbf05e60f9b50b96c196959c)
+- 🚀Bumped version to v0.7.8 [`e5a01bc`](https://git.odit.services/lfk/selfservice/commit/e5a01bcd7629164655cacd10dd1f014260c67c4b)
+- certificate generation: success toast styling [`1603a09`](https://git.odit.services/lfk/selfservice/commit/1603a097f71ed85c901baf8da04cb06b86474649)
+
+#### [0.7.7](https://git.odit.services/lfk/selfservice/compare/0.7.6...0.7.7)
+
+> 31 January 2023
+
+- 🚀Bumped version to v0.7.7 [`c2b6152`](https://git.odit.services/lfk/selfservice/commit/c2b615294e605db37695b13cec1158f535986911)
+- fix: registration w/o phone [`c647628`](https://git.odit.services/lfk/selfservice/commit/c64762831f1e6dffc9cbc3f531e23435b455a5a9)
+
+#### [0.7.6](https://git.odit.services/lfk/selfservice/compare/0.7.5...0.7.6)
+
+> 31 January 2023
+
+- update texts of pdf generation status toasts [`#44`](https://git.odit.services/lfk/selfservice/issues/44)
+- 🚀Bumped version to v0.7.6 [`9b446ab`](https://git.odit.services/lfk/selfservice/commit/9b446abc1fa231bb1f5a78c545400c617eaa4af5)
+- update release script [`5d974e5`](https://git.odit.services/lfk/selfservice/commit/5d974e562ed1ed5aeac579afe000c2dca945ff71)
+
+#### [0.7.5](https://git.odit.services/lfk/selfservice/compare/0.7.4...0.7.5)
+
+> 30 January 2023
+
+- fix: relativ links [`917cb6b`](https://git.odit.services/lfk/selfservice/commit/917cb6be340844bcc2318bf73cec37c3c831fd5d)
+- 🚀Bumped version to v0.7.5 [`1249248`](https://git.odit.services/lfk/selfservice/commit/1249248a9d3e0d72665bca6871a651f2491a4039)
+- 2023 [`9812d79`](https://git.odit.services/lfk/selfservice/commit/9812d79d4de820ce791f69634c5861f4f04ad7f1)
+- update nginx base [`0bd6d54`](https://git.odit.services/lfk/selfservice/commit/0bd6d543bf60b7a333b96d5d319269d4bf50db96)
+- updated base node image [`92d7bfd`](https://git.odit.services/lfk/selfservice/commit/92d7bfd59407273f86809b53ffc9f67fb8ba0ec7)
+- AGB link [`d159cb5`](https://git.odit.services/lfk/selfservice/commit/d159cb59be35f963abc89c42732ba6110d27830c)
+
+#### [0.7.4](https://git.odit.services/lfk/selfservice/compare/0.7.3...0.7.4)
+
+> 21 April 2021
+
+- Updated dronefile [`9c9ceaa`](https://git.odit.services/lfk/selfservice/commit/9c9ceaa6664f6ea21a536a12f04e552156e81da4)
+- 🚀Bumped version to v0.7.4 [`4663214`](https://git.odit.services/lfk/selfservice/commit/4663214ede3880386b5389885e32c953571290e6)
+
+#### [0.7.3](https://git.odit.services/lfk/selfservice/compare/0.7.2...0.7.3)
+
+> 21 April 2021
+
+- 🚀Bumped version to v0.7.3 [`602d80b`](https://git.odit.services/lfk/selfservice/commit/602d80bd14c4bd00a24b746be1e74d9e41af0445)
+- Merge pull request 'Button fixes bugfix/42-button_links' (#43) from bugfix/42-button_links into dev [`45ee4ab`](https://git.odit.services/lfk/selfservice/commit/45ee4ab81260adf5b938d9f5359d256cce879acb)
+- Removed useless register now button [`1102d29`](https://git.odit.services/lfk/selfservice/commit/1102d29c0e174b7a34fc4d3e6fe32d2dfb276765)
+- Fixed register button link [`020c310`](https://git.odit.services/lfk/selfservice/commit/020c310865912b8f0752069e1c7e2adf71ab9835)
+
+#### [0.7.2](https://git.odit.services/lfk/selfservice/compare/0.7.1...0.7.2)
+
+> 14 April 2021
+
+- 🚀Bumped version to v0.7.2 [`1a3af20`](https://git.odit.services/lfk/selfservice/commit/1a3af200dd41c8cc4271690ed72bef911901ce54)
+- Document generation hotfix 🐞 [`b74bea0`](https://git.odit.services/lfk/selfservice/commit/b74bea03401c672ae774aaddc6da5beb67e2890e)
+
 #### [0.7.1](https://git.odit.services/lfk/selfservice/compare/0.7.0...0.7.1)
 
+> 13 April 2021
+
 - Merge pull request 'bugfix/31-env-js-linking-ci' (#41) from bugfix/31-env-js-linking-ci into dev [`#31`](https://git.odit.services/lfk/selfservice/issues/31)
 - ⏫ dependency bump [`ad13bae`](https://git.odit.services/lfk/selfservice/commit/ad13bae068416bed10d00e6887a05d580a836482)
+- 🚀Bumped version to v0.7.1 [`b0172c5`](https://git.odit.services/lfk/selfservice/commit/b0172c500b0613209ac44e61023043065b3854b0)
 - added 'yarn postbuild' script for fixing env.js in dist/index.html [`51d058b`](https://git.odit.services/lfk/selfservice/commit/51d058bf966c3dcb064562e6bf696a748d0cd148)
 
 #### [0.7.0](https://git.odit.services/lfk/selfservice/compare/0.6.1...0.7.0)

Dockerfile

@@ -1,10 +1,12 @@
-FROM node:15.9.0-alpine3.13
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17 as build
+ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
+
 COPY . .
-RUN yarn
+RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
-RUN yarn build
+RUN pnpm i && pnpm build && pnpm postbuild
-RUN yarn postbuild
+
 # final image
-FROM fholzer/nginx-brotli:v1.19.1
+FROM registry.odit.services/library/nginx-brotli:3.15 as final
-COPY --from=0 /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

nginx.conf

@@ -11,6 +11,12 @@ http {
             rewrite /profile/(.*) /$1 break;
 
             try_files $uri $uri/ /index.html;
+
+            add_header Last-Modified $date_gmt;
+            add_header Cache-Control 'private no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+            if_modified_since off;
+            expires off;
+            etag off;
         }
 
         location ~* \.(?:ico|css|gif|jpe?g|png)$ {

package.json

@@ -1,13 +1,17 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.7.1",
+	"version": "0.11.3",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
-		"release": "release-it --only-version",
+		"release": "release-it",
 		"postbuild": "node env_fix.js"
 	},
+	"engines": {
+		"pnpm": "8.1.1"
+	},
 	"dependencies": {
+		"bwip-js": "3.2.2",
 		"marked": "2.0.3",
 		"redaxios": "0.4.1",
 		"toastify-js": "1.10.0",
@@ -36,7 +40,7 @@
 			"requireCleanWorkingDir": false,
 			"commitMessage": "🚀Bumped version to v${version}",
 			"requireBranch": "dev",
-			"push": false,
+			"push": true,
 			"tag": true,
 			"tagName": null,
 			"tagAnnotation": "v${version}"

public/env.sample.js

@@ -5,8 +5,12 @@ const config = {
 	baseurl: '',
 	// optional, will fallback to /selfservice/
 	baseurl_selfservice: '/selfservice/',
+	// full url (including fqdn)
+	baseurl_documentserver: 'http://localhost:4010/documents',
+	// optional, will fallback to code128
+	code_format: 'ean13',
 	// optional, will fallback to baseurl_selfservice/imprint
 	url_imprint: '',
 	// optional, will fallback to baseurl_selfservice/privacy
-	url_privacy: ''
+	url_privacy: '',
 };

src/components/Footer.vue

@@ -1,8 +1,8 @@
 <template>
-  <footer class="text-gray-400 bg-gray-900 body-font">
+  <footer>
     <div class="container px-5 py-8 mx-auto flex items-center sm:flex-row flex-col">
       <p class="text-sm text-gray-400 sm:ml-4 sm:pl-4 sm:py-2 sm:mt-0 mt-4">
-        Lauf für Kaya! Selfservice - Copyright © 2021 + proudly powered by
+        Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by
         <a
           class="underline"
           target="_blank"

src/components/Login.vue

@@ -29,7 +29,7 @@
               placeholder="Passwort"
             />
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a>
+              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
             </div>
           </div>
         </div>
@@ -80,7 +80,7 @@
         </div>
         <div class="mt-6">
           <a
-            href="./register"
+            href="/selfservice/register"
             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
           >Account erstellen</a>
         </div>
@@ -101,7 +101,7 @@ function login() {
   axios.get("").then((res) => {
     loading.value = false;
     Toastify({
-      text: "This is a toast",
+      text: "Login läuft...",
       duration: 3000,
     }).showToast();
   });

src/components/LoginForm.vue

@@ -29,7 +29,7 @@
               placeholder="Passwort"
             />
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a>
+              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
             </div>
           </div>
         </div>
@@ -80,7 +80,7 @@
         </div>
         <div class="mt-6">
           <a
-            href="./register"
+            href="/selfservice/register"
             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
           >Account erstellen</a>
         </div>
@@ -101,7 +101,7 @@ function login() {
   axios.get("").then((res) => {
     loading.value = false;
     Toastify({
-      text: "This is a toast",
+      text: "Login läuft...",
       duration: 3000,
     }).showToast();
   });

src/locales/de.json

@@ -1,11 +1,11 @@
 {
-    "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt nur über den Link, den Sie bei der Registrierung erhalten haben.",
+    "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt über den Link, den Sie bei der Registrierung erhalten haben.",
     "already_have_an_account": "Sie haben bereits einen Account?",
     "amount_per_kilometer_in_eur": "Betrag pro Kilometer (in €)",
     "apartment_suite_etc": "Addresszeile 2",
     "cancel_keep_my_data": "Abbrechen, meine Daten behalten",
     "configuration_error": "Konfigurationsfehler",
-    "confirm_delete_all_of_my_data": "Bestätigung, meine gesamten Daten löschen",
+    "confirm_delete_all_of_my_data": "Bestätigen, meine Daten löschen",
     "confirm_personal_data": "Hiermit bestätige ich die Vollständigkeit und Richtigkeit der oben genannten Angaben",
     "current_total_amount_in_eur": "Aktueller Gesamtbetrag (in €)",
     "delete_all_of_my_data": "Meine gesamten Daten löschen",
@@ -13,6 +13,7 @@
     "deletion_in_progress": "Daten werden gelöscht...",
     "distance": "Distanz",
     "download_certificate": "Urkunde herunterladen",
+    "download_registrationcode": "Registrierungscode herunterladen",
     "e_mail_adress": "E-Mail Adresse",
     "go_to_login": "Zum Login",
     "i_accept": "Ich habe die ",
@@ -21,7 +22,7 @@
     "imprint": "Impressum",
     "lap_time": "Rundenzeit",
     "lap_times": "Rundenzeiten",
-    "lost_your_registration_mail": "Haben Sie Ihre Registrierungsmail verloren?",
+    "lost_your_registration_mail": "Brauchen Sie einen neuen Login-Link?",
     "main_page_text": "Hier können Sie sich für den Lauf Für Kaya! registrieren oder ihr Läuferprofil verwalten.",
     "mittelname": "Mittelname",
     "nachname": "Nachname",
@@ -38,12 +39,13 @@
     "profile": "Profil",
     "provide_address": "Adresse angeben?",
     "register": {
-        "register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
+        "register_now": "Jetzt für den Lauf für Kaya! 2023 registrieren."
     },
     "register_now": "Jetzt registrieren!",
     "register_now_small": "Jetzt registrieren",
     "registrieren": "Registrieren",
-    "resend_the_registration_mail": "Registrierungsmail erneut versenden",
+    "registrierungscode": "Registrierungscode",
+    "resend_the_registration_mail": "Login-Link anfordern",
     "save_changes": "Änderungen speichern",
     "sponsoring": "Sponsoring",
     "strasse": "Straße",

src/locales/en.json

@@ -13,6 +13,7 @@
     "deletion_in_progress": "Deletion in progress...",
     "distance": "Distance",
     "download_certificate": "Download certificate",
+    "download_registrationcode": "Download registrationcode",
     "e_mail_adress": "mail address",
     "go_to_login": "Go To Login",
     "i_accept": "I have read and accepted the ",
@@ -38,12 +39,12 @@
     "profile": "Profile",
     "provide_address": "Provide a postal address?",
     "register": {
-        "register_now": "Register now for Lauf für Kaya! 2021."
+        "register_now": "Register now for Lauf für Kaya! 2023."
     },
     "register_now": "Register now!",
     "register_now_small": "Register now",
     "registrieren": "Register Now",
-    "resend_the_registration_mail": "Resend the registration mail",
+    "resend_the_registration_mail": "Send me a login link",
     "save_changes": "Save changes",
     "sponsoring": "Sponsoring",
     "strasse": "Street/ Block",

src/views/Home.vue

@@ -11,10 +11,10 @@
         <div class="mt-6 sm:flex place-content-center">
           <a
             class="w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 transition ease-in-out duration-150 xl:text-lg xl:py-4"
-            href="./register/"
+            href="/selfservice/register/"
           >{{ $t('register_now') }}</a>
           <a
-            href="./profile/"
+            href="/selfservice/profile/"
             class="mt-4 sm:ml-4 sm:mt-0 w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-white bg-gray-800 shadow-sm hover:bg-gray-700 focus:outline-none focus:bg-gray-700 transition ease-in-out duration-150 xl:text-lg xl:py-4"
           >{{ $t('view_my_data') }}</a>
         </div>

src/views/Imprint.vue

@@ -9,15 +9,18 @@
       <div class="mx-auto prose" v-html="content"></div>
     </div>
   </section>
+  <Footer></Footer>
 </template>
 <style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
+import Footer from "@/components/Footer.vue";
 export default {
+  components: {Footer},
   data() {
     return {
-      content: ""
+      content: "",
     }
   },
   async beforeMount() {

src/views/Privacy.vue

@@ -9,12 +9,15 @@
       <div class="mx-auto prose" v-html="content"></div>
     </div>
   </section>
+  <Footer></Footer>
 </template>
 <style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
+import Footer from "@/components/Footer.vue";
 export default {
+  components: {Footer},
   data() {
     return {
       content: ""

src/views/Profile.vue

@@ -3,19 +3,82 @@
     <section class="text-white body-font">
       <div class="container mx-auto flex items-center md:flex-row flex-col">
         <div
-          class="flex flex-col md:pr-10 md:mb-0 mb-6 pr-0 w-full md:w-auto md:text-left text-center text-black dark:text-gray-200"
+          class="
+            flex flex-col
+            md:pr-10 md:mb-0
+            mb-6
+            pr-0
+            w-full
+            md:w-auto md:text-left
+            text-center text-black
+            dark:text-gray-200
+          "
         >
           <p
             class="text-3xl font-bold whitespace-nowrap"
-            v-text="(state.firstname || '') + ' ' + (state.middlename || '') + ' ' + (state.lastname || '')"
+            v-text="
+              (state.firstname || '') +
+              ' ' +
+              (state.middlename || '') +
+              ' ' +
+              (state.lastname || '')
+            "
           ></p>
           <p class="text-md whitespace-nowrap">{{ state.group }}</p>
         </div>
         <div class="inline-flex md:ml-auto md:mr-0 mx-auto items-center">
-          <div v-if="(state.delete_active === false)">
+          <div v-if="state.delete_active === false">
             <button
               type="button"
-              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
+              class="
+                focus:border-black focus:ring-2 focus:ring-black
+                text-white text-sm
+                py-2.5
+                px-5
+                rounded-md
+                bg-blue-500
+                hover:bg-blue-600 hover:shadow-lg
+                w-full
+                md:w-auto
+                mb-1
+                md:mr-1
+              "
+              @click="get_registration"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="feather feather-download"
+                style="display: inline; height: 1rem; vertical-align: sub"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              {{ $t("download_registrationcode") }}
+            </button>
+            <button
+              type="button"
+              class="
+                focus:border-black focus:ring-2 focus:ring-black
+                text-white text-sm
+                py-2.5
+                px-5
+                rounded-md
+                bg-blue-500
+                hover:bg-blue-600 hover:shadow-lg
+                w-full
+                md:w-auto
+                mb-1
+                md:mr-1
+              "
               @click="get_certificate"
             >
               <svg
@@ -29,18 +92,32 @@
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 class="feather feather-download"
-                style="display: inline;height: 1rem;vertical-align: sub;"
+                style="display: inline; height: 1rem; vertical-align: sub"
               >
                 <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
                 <polyline points="7 10 12 15 17 10" />
                 <line x1="12" y1="15" x2="12" y2="3" />
               </svg>
-              {{ $t('download_certificate') }}
+              {{ $t("download_certificate") }}
             </button>
             <button
               type="button"
-              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
+              class="
-              @click="() => { state.delete_active = true }"
+                focus:border-black focus:ring-2 focus:ring-black
+                text-white text-sm
+                py-2.5
+                px-5
+                rounded-md
+                bg-red-600
+                hover:bg-red-700 hover:shadow-lg
+                w-full
+                md:w-auto
+              "
+              @click="
+                () => {
+                  state.delete_active = true;
+                }
+              "
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -53,7 +130,7 @@
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 class="feather feather-download"
-                style="display: inline;height: 1rem;vertical-align: sub;"
+                style="display: inline; height: 1rem; vertical-align: sub"
               >
                 <path d="M0 0h24v24H0z" />
                 <path
@@ -61,14 +138,30 @@
                   d="M17 6h5v2h-2v13a1 1 0 01-1 1H5a1 1 0 01-1-1V8H2V6h5V3a1 1 0 011-1h8a1 1 0 011 1v3zm1 2H6v12h12V8zm-5 6l2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2 1 1-2 2zM9 4v2h6V4H9z"
                 />
               </svg>
-              {{ $t('delete_my_data') }}
+              {{ $t("delete_my_data") }}
             </button>
           </div>
-          <div v-if="(state.delete_active === true)">
+          <div v-if="state.delete_active === true">
             <button
               type="button"
-              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
+              class="
-              @click="() => { state.delete_active = false }"
+                focus:border-black focus:ring-2 focus:ring-black
+                text-white text-sm
+                py-2.5
+                px-5
+                rounded-md
+                mb-1
+                md:mb-auto
+                w-full
+                md:w-auto
+                bg-blue-500
+                hover:bg-blue-600 hover:shadow-lg
+              "
+              @click="
+                () => {
+                  state.delete_active = false;
+                }
+              "
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -81,16 +174,30 @@
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 class="feather feather-download"
-                style="display: inline;height: 1rem;vertical-align: sub;"
+                style="display: inline; height: 1rem; vertical-align: sub"
               >
                 <path fill="none" d="M0 0h24v24H0z" />
-                <path fill="currentColor" d="M12 11l5-5 1 1-5 5 5 5-1 1-5-5-5 5-1-1 5-5-5-5 1-1z" />
+                <path
+                  fill="currentColor"
+                  d="M12 11l5-5 1 1-5 5 5 5-1 1-5-5-5 5-1-1 5-5-5-5 1-1z"
+                />
               </svg>
-              {{ $t('cancel_keep_my_data') }}
+              {{ $t("cancel_keep_my_data") }}
             </button>
             <button
               type="button"
-              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
+              class="
+                focus:border-black focus:ring-2 focus:ring-black
+                text-white text-sm
+                py-2.5
+                px-5
+                rounded-md
+                w-full
+                md:w-auto
+                bg-red-600
+                hover:bg-red-700 hover:shadow-lg
+                md:ml-1
+              "
               @click="delete_me"
             >
               <svg
@@ -104,7 +211,7 @@
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 class="feather feather-download"
-                style="display: inline;height: 1rem;vertical-align: sub;"
+                style="display: inline; height: 1rem; vertical-align: sub"
               >
                 <path d="M0 0h24v24H0z" />
                 <path
@@ -112,79 +219,187 @@
                   d="M17 6h5v2h-2v13a1 1 0 01-1 1H5a1 1 0 01-1-1V8H2V6h5V3a1 1 0 011-1h8a1 1 0 011 1v3zm1 2H6v12h12V8zm-5 6l2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2 1 1-2 2zM9 4v2h6V4H9z"
                 />
               </svg>
-              {{ $t('confirm_delete_all_of_my_data') }}
+              {{ $t("confirm_delete_all_of_my_data") }}
             </button>
           </div>
         </div>
       </div>
     </section>
     <div class="flex flex-wrap">
-      <div class="w-full p-4">
+      <div class="w-full">
         <div class="flex flex-wrap flex-col w-full tabs">
           <div class="flex lg:flex-wrap flex-row lg:space-x-2">
             <div class="flex-none">
               <button
-                @click="() => { state.activetab = 'profile' }"
+                @click="
-                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'profile') }"
+                  () => {
+                    state.activetab = 'profile';
+                  }
+                "
+                :class="{
+                  'tab-active border-b-2 font-medium border-blue-500':
+                    state.activetab === 'profile',
+                }"
                 class="tab tab-underline py-4 px-6 block"
                 type="button"
-              >{{ $t('profile') }}</button>
+              >
+                {{ $t("profile") }}
+              </button>
             </div>
             <div class="flex-none">
               <button
-                @click="() => { state.activetab = 'laptimes' }"
+                @click="
-                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'laptimes') }"
+                  () => {
+                    state.activetab = 'laptimes';
+                  }
+                "
+                :class="{
+                  'tab-active border-b-2 font-medium border-blue-500':
+                    state.activetab === 'laptimes',
+                }"
                 class="tab tab-underline py-4 px-6 block"
                 type="button"
-              >{{ $t('lap_times') }}</button>
+              >
+                {{ $t("lap_times") }}
+              </button>
             </div>
             <div class="flex-none">
               <button
-                @click="() => { state.activetab = 'sponsorings' }"
+                @click="
-                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'sponsorings') }"
+                  () => {
+                    state.activetab = 'sponsorings';
+                  }
+                "
+                :class="{
+                  'tab-active border-b-2 font-medium border-blue-500':
+                    state.activetab === 'sponsorings',
+                }"
                 class="tab tab-underline py-4 px-6 block"
                 type="button"
-              >{{ $t('sponsoring') }}</button>
+              >
+                {{ $t("sponsoring") }}
+              </button>
             </div>
           </div>
-          <div v-if="(state.activetab === 'profile')" class="tab-content block">
+          <div v-if="state.activetab === 'profile'" class="tab-content block">
             <div class="py-4 w-full">
               <div class="flex flex-col">
                 <form class="form flex flex-wrap w-full">
                   <div class="w-full">
                     <div class="form-element">
-                      <div class="text-lg">{{ $t('vorname') }}</div>
+                      <div class="text-lg">{{ $t("registrierungscode") }}</div>
+                      <img
+                        class="w-full md:w-auto mb-2 bg-white p-2"
+                        alt="Registrierungscode"
+                        :src="state.barcode"
+                      />
+                      <div class="text-lg">{{ $t("vorname") }}</div>
                       <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        class="
-                        v-text="state.firstname"
+                          h-10
+                          w-full
+                          dark:bg-gray-800
+                          rounded
+                          text-base
+                          outline-none
+                          dark:text-gray-100
+                          text-gray-600
+                          py-1
+                          px-3
+                          leading-8
+                          transition-colors
+                          duration-200
+                          ease-in-out
+                        "
+                        v-text="state.firstname || '---'"
                       />
                     </div>
                     <div class="form-element">
-                      <div class="text-lg">{{ $t('mittelname') }}</div>
+                      <div class="text-lg">{{ $t("mittelname") }}</div>
                       <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        class="
-                        v-text="state.middlename"
+                          h-10
+                          w-full
+                          dark:bg-gray-800
+                          rounded
+                          text-base
+                          outline-none
+                          dark:text-gray-100
+                          text-gray-600
+                          py-1
+                          px-3
+                          leading-8
+                          transition-colors
+                          duration-200
+                          ease-in-out
+                        "
+                        v-text="state.middlename || '---'"
                       />
                     </div>
                     <div class="form-element">
-                      <div class="text-lg">{{ $t('nachname') }}</div>
+                      <div class="text-lg">{{ $t("nachname") }}</div>
                       <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        class="
-                        v-text="state.lastname"
+                          h-10
+                          w-full
+                          dark:bg-gray-800
+                          rounded
+                          text-base
+                          outline-none
+                          dark:text-gray-100
+                          text-gray-600
+                          py-1
+                          px-3
+                          leading-8
+                          transition-colors
+                          duration-200
+                          ease-in-out
+                        "
+                        v-text="state.lastname || '---'"
                       />
                     </div>
                     <div class="form-element">
-                      <div class="text-lg">{{ $t('e_mail_adress') }}</div>
+                      <div class="text-lg">{{ $t("e_mail_adress") }}</div>
                       <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        class="
-                        v-text="state.email"
+                          h-10
+                          w-full
+                          dark:bg-gray-800
+                          rounded
+                          text-base
+                          outline-none
+                          dark:text-gray-100
+                          text-gray-600
+                          py-1
+                          px-3
+                          leading-8
+                          transition-colors
+                          duration-200
+                          ease-in-out
+                        "
+                        v-text="state.email || '---'"
                       />
                     </div>
                     <div class="form-element">
-                      <div class="text-lg">{{ $t('phone_number') }}</div>
+                      <div class="text-lg">{{ $t("phone_number") }}</div>
                       <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        class="
-                        v-text="state.phone"
+                          h-10
+                          w-full
+                          dark:bg-gray-800
+                          rounded
+                          text-base
+                          outline-none
+                          dark:text-gray-100
+                          text-gray-600
+                          py-1
+                          px-3
+                          leading-8
+                          transition-colors
+                          duration-200
+                          ease-in-out
+                        "
+                        v-text="state.phone || '---'"
                       />
                     </div>
                   </div>
@@ -192,7 +407,7 @@
               </div>
             </div>
           </div>
-          <div v-if="(state.activetab === 'laptimes')" class="tab-content block">
+          <div v-if="state.activetab === 'laptimes'" class="tab-content block">
             <div class="py-4 w-full">
               <section class="text-gray-400 dark:bg-gray-900 body-font">
                 <div class="container mx-auto">
@@ -202,15 +417,37 @@
                       class="table-auto w-full text-left whitespace-no-wrap"
                     >
                       <thead
-                        class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
+                        class="
+                          text-black
+                          bg-gray-300
+                          dark:text-white
+                          text-sm
+                          dark:bg-gray-800
+                        "
                       >
                         <tr>
                           <th
-                            class="px-4 py-3 title-font tracking-wider font-medium"
+                            class="
-                          >{{ $t('distance') }}</th>
+                              px-4
+                              py-3
+                              title-font
+                              tracking-wider
+                              font-medium
+                            "
+                          >
+                            {{ $t("distance") }}
+                          </th>
                           <th
-                            class="px-4 py-3 title-font tracking-wider font-medium"
+                            class="
-                          >{{ $t('lap_time') }}</th>
+                              px-4
+                              py-3
+                              title-font
+                              tracking-wider
+                              font-medium
+                            "
+                          >
+                            {{ $t("lap_time") }}
+                          </th>
                         </tr>
                       </thead>
                       <tbody class="text-gray-900 dark:text-gray-50">
@@ -222,20 +459,32 @@
                         </tr>
                       </tbody>
                     </table>
-                    <div v-else class="text-center font-bold text-black dark:text-white text-2xl">
+                    <div
+                      v-else
+                      class="
+                        text-center
+                        font-bold
+                        text-black
+                        dark:text-white
+                        text-2xl
+                      "
+                    >
                       <img
                         src="../assets/empty_laps.svg"
-                        style="height:25rem; margin:0 auto;"
+                        style="height: 25rem; margin: 0 auto"
                         :alt="[[$t('no_laps_scans_were_recorded_yet')]]"
                       />
-                      {{ $t('no_laps_scans_were_recorded_yet') }}
+                      {{ $t("no_laps_scans_were_recorded_yet") }}
                     </div>
                   </div>
                 </div>
               </section>
             </div>
           </div>
-          <div v-if="(state.activetab === 'sponsorings')" class="tab-content block">
+          <div
+            v-if="state.activetab === 'sponsorings'"
+            class="tab-content block"
+          >
             <div class="py-4 w-full">
               <section class="text-gray-400 dark:bg-gray-900 body-font">
                 <div class="container mx-auto">
@@ -245,16 +494,48 @@
                       class="table-auto w-full text-left whitespace-no-wrap"
                     >
                       <thead
-                        class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
+                        class="
+                          text-black
+                          bg-gray-300
+                          dark:text-white
+                          text-sm
+                          dark:bg-gray-800
+                        "
                       >
                         <tr>
-                          <th class="px-4 py-3 title-font tracking-wider font-medium">Name</th>
                           <th
-                            class="px-4 py-3 title-font tracking-wider font-medium"
+                            class="
-                          >{{ $t('amount_per_kilometer_in_eur') }}</th>
+                              px-4
+                              py-3
+                              title-font
+                              tracking-wider
+                              font-medium
+                            "
+                          >
+                            Name
+                          </th>
                           <th
-                            class="px-4 py-3 title-font tracking-wider font-medium"
+                            class="
-                          >{{ $t('current_total_amount_in_eur') }}</th>
+                              px-4
+                              py-3
+                              title-font
+                              tracking-wider
+                              font-medium
+                            "
+                          >
+                            {{ $t("amount_per_kilometer_in_eur") }}
+                          </th>
+                          <th
+                            class="
+                              px-4
+                              py-3
+                              title-font
+                              tracking-wider
+                              font-medium
+                            "
+                          >
+                            {{ $t("current_total_amount_in_eur") }}
+                          </th>
                         </tr>
                       </thead>
                       <tbody class="text-gray-900 dark:text-gray-50">
@@ -268,51 +549,86 @@
                           </td>
                           <td class="px-4 py-3">
                             <span
-                              v-text="(s.amountPerDistance / 100)
+                              v-text="
+                                (s.amountPerDistance / 100)
                                   .toFixed(2)
-                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                                  .toLocaleString('de-DE', { valute: 'EUR' })
-                            ></span>€
+                              "
+                            ></span
+                            >€
                           </td>
                           <td class="px-4 py-3">
                             <span
-                              v-text="(s.amount / 100)
+                              v-text="
+                                (s.amount / 100)
                                   .toFixed(2)
-                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                                  .toLocaleString('de-DE', { valute: 'EUR' })
-                            ></span>€
+                              "
+                            ></span
+                            >€
                           </td>
                         </tr>
                       </tbody>
                       <tfoot class="text-gray-900 dark:text-gray-50">
                         <tr>
-                          <td class="px-4 py-3">{{ $t('total') }}</td>
+                          <td class="px-4 py-3">{{ $t("total") }}</td>
                           <td class="px-4 py-3">
                             <span
-                              v-text="(state.sponsorings.reduce(function(sum, current) {
+                              v-text="
+                                (
+                                  state.sponsorings.reduce(function (
+                                    sum,
+                                    current
+                                  ) {
                                     return sum + current.amountPerDistance;
-                            }, 0) / 100)
+                                  },
+                                  0) / 100
+                                )
                                   .toFixed(2)
-                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                                  .toLocaleString('de-DE', { valute: 'EUR' })
-                            ></span>€
+                              "
+                            ></span
+                            >€
                           </td>
                           <td class="px-4 py-3">
                             <span
-                              v-text="(state.sponsorings.reduce(function(sum, current) {
+                              v-text="
+                                (
+                                  state.sponsorings.reduce(function (
+                                    sum,
+                                    current
+                                  ) {
                                     return sum + current.amount;
-                            }, 0) / 100)
+                                  },
+                                  0) / 100
+                                )
                                   .toFixed(2)
-                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                                  .toLocaleString('de-DE', { valute: 'EUR' })
-                            ></span>€
+                              "
+                            ></span
+                            >€
                           </td>
                         </tr>
                       </tfoot>
                     </table>
-                    <div v-else class="text-center font-bold text-black dark:text-white text-2xl">
+                    <div
+                      v-else
+                      class="
+                        text-center
+                        font-bold
+                        text-black
+                        dark:text-white
+                        text-2xl
+                      "
+                    >
                       <img
                         src="../assets/empty_laps.svg"
-                        style="height:25rem; margin:0 auto;"
+                        style="height: 25rem; margin: 0 auto"
-                        :alt="[[$t('no_sponsorings_for_you_were_recorded_yet')]]"
+                        :alt="[
+                          [$t('no_sponsorings_for_you_were_recorded_yet')],
+                        ]"
                       />
-                      {{ $t('no_sponsorings_for_you_were_recorded_yet') }}
+                      {{ $t("no_sponsorings_for_you_were_recorded_yet") }}
                     </div>
                   </div>
                 </div>
@@ -322,15 +638,41 @@
         </div>
       </div>
     </div>
+    <!--  -->
+    <Footer></Footer>
   </div>
 </template>
 
 <script setup>
 import { reactive } from "vue";
-import { useToast } from "vue-toastification";
+import { TYPE, useToast } from "vue-toastification";
 import axios from "redaxios";
+import bwipjs from "bwip-js";
+import Footer from "@/components/Footer.vue";
+
+function textToBase64Barcode(text) {
+  const canvas = document.createElement("canvas");
+  let codeconfig = {
+    bcid: config.code_format || "code39",
+    text: `${text}`,
+    scale: 3,
+    includetext: false,
+    textxalign: "center",
+    backgroundcolor: "ffffff",
+  };
+  if (
+    codeconfig.bcid === "code39" ||
+    codeconfig.bcid === "code128" ||
+    codeconfig.bcid === "ean13"
+  ) {
+    codeconfig.height = 10;
+  }
+  bwipjs.toCanvas(canvas, codeconfig);
+  return canvas.toDataURL("image/png");
+}
 
 const state = reactive({
+  barcode: "",
   phone: "",
   email: "",
   firstname: "",
@@ -341,14 +683,15 @@ const state = reactive({
   group: "",
   activetab: "profile",
   delete_active: false,
-  fullobject: {}
+  fullobject: {},
-})
+});
 const toast = useToast();
 const props = defineProps({
-  token: String
+  token: String,
-})
+});
 const accesstoken = atob(props.token);
-axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
+axios
+  .get(`${config.baseurl}api/runners/me/${accesstoken}`)
   .then(({ data }) => {
     state.phone = data.phone;
     state.email = data.email;
@@ -358,65 +701,100 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
     state.group = data.group;
     state.sponsorings = data.distanceDonations;
     state.fullobject = data;
-  }).catch((error) => {
+    state.barcode = textToBase64Barcode(data.id ?? "???");
-    toast.error("An error occured while loading your profile data");
   })
-axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
+  .catch((error) => {
+    toast.clear();
+    toast.error("Profil konnte nicht geladen werden...");
+  });
+axios
+  .get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
   .then(({ data }) => {
     data.map(function (s) {
-      s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
+      s.lapTime =
-      s.distance = Math.floor(s.distance / 1000) + 'km ' + (Math.floor(s.distance % 1000) + "").padStart(3, "0") + "m"
+        Math.floor(s.lapTime / 60) +
+        "min " +
+        (Math.floor(s.lapTime % 60) + "").padStart(2, "0") +
+        "s";
+      s.distance =
+        Math.floor(s.distance / 1000) +
+        "km " +
+        (Math.floor(s.distance % 1000) + "").padStart(3, "0") +
+        "m";
       return s;
-    })
+    });
-    data.filter(s => s.valid === true);
+    data.filter((s) => s.valid === true);
     state.scans = data;
-  }).catch((error) => {
-    toast.error("An error occured while loading your profile data");
   })
+  .catch((error) => {
+    toast.error("Profil konnte nicht geladen werden...");
+  });
 function delete_me() {
-  toast("Deletion in progress...");
+  toast.clear();
-  let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`
+  toast("Profil wird gelöscht...");
-  axios.delete(url)
+  let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`;
+  axios
+    .delete(url)
     .then(() => {
-      toast("All Data deleted!");
+      toast.clear();
+      toast("Alle Daten gelöscht!");
       location.replace(`${config.baseurl_selfservice}`);
     })
     .catch((error) => {
-      toast.error("An error occured while deleting your profile data");
+      toast.clear();
+      toast.error("Profil konnte nicht gelöscht werden...");
     });
 }
 function get_certificate() {
-  toast("Generation in progress...");
+  toast("Urkunde wird generiert...");
-  const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
+  const browserlocale = (
-  let url = `${config.baseurl}documents/certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
+    (navigator.languages && navigator.languages[0]) ||
+    ""
+  ).substr(0, 2);
+  let url = `${config.baseurl_documentserver}certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
   let postdata = Object.assign({}, state.fullobject);
   postdata.group = {
-    name: postdata.group
+    name: postdata.group,
-  }
+  };
-  postdata = [postdata]
+  postdata = [postdata];
-  axios.post(url, postdata, {
+  axios
-    responseType: "blob"
+    .post(url, postdata, {
+      responseType: "blob",
     })
     .then((response) => {
-      console.log(response)
+      console.log(response);
       if (response.status != "200") {
-        toast.error("An error occured while generateing your certificate!");
+        toast.error("Urkunde konnte nicht generiert werden...");
       } else {
-        var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
+        var fileURL = window.URL.createObjectURL(
-        var fileLink = document.createElement('a');
+          new Blob([response.data], { type: "application/pdf" })
+        );
+        var fileLink = document.createElement("a");
 
         fileLink.href = fileURL;
-        fileLink.setAttribute('download', 'Certificate.pdf');
+        fileLink.setAttribute("download", "Certificate.pdf");
         document.body.appendChild(fileLink);
 
         fileLink.click();
         fileLink.remove();
-        toast("Document generated!");
+        toast.clear();
+        toast("Urkunde generiert!", { type: TYPE.SUCCESS });
       }
     })
     .catch((err) => {
       console.error(err);
-      toast.error("An error occured while deleting your profile data");
+      toast.clear();
+      toast.error("Urkunde konnte nicht generiert werden...");
     });
 }
+function get_registration() {
+  toast.clear();
+  toast("Registrierungscode wird generiert...");
+  var a = document.createElement("a");
+  a.href = state.barcode;
+  a.download = "LfK23_Registrierungscode.png";
+  a.click();
+  toast.clear();
+  toast("Registrierungscode generiert!", { type: TYPE.SUCCESS });
+}
 </script>

src/views/ProfileNone.vue

@@ -6,8 +6,8 @@
                 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
             >Lauf für Kaya! - {{ $t('profile') }}</h1>
             <p class="mx-auto leading-relaxed text-base text-center">
-                {{ $t('you_have_not_provided_a_valid_access_key') }}
+                <!-- {{ $t('you_have_not_provided_a_valid_access_key') }}
-                <br />
+                <br /> -->
                 {{ $t('access_is_only_provided_via_your_email_link') }}
             </p>
             <div class="mt-6">
@@ -30,24 +30,24 @@
                         v-model="user_email"
                         name="email_address"
                         id="email_address"
-                        autocomplete="off"
+                        autocomplete="email"
                         :placeholder="[[$t('e_mail_adress')]]"
                         type="email"
                         :class="{ 'border-red-500': (!isEmail(user_email)), 'border-green-300': (isEmail(user_email)) }"
                         class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-2 bg-gray-50 text-gray-500 rounded-md p-2"
                     />
                     <p
-                        v-if="!isEmail(user_email)"
+                        v-if="!isEmail(user_email)&&user_email!==''"
                         class="text-sm"
                     >{{ $t('please_provide_valid_mail') }}</p>
                 </div>
                 <div class="mt-2">
-                    <a
+                    <button
                         :disabled="(!state.submit_enabled)"
                         :class="{ 'opacity-50': (!state.submit_enabled), 'cursor-not-allowed': (!state.submit_enabled) }"
                         @click="resendMail"
                         class="block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 dark:bg-gray-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
-                    >{{ $t('resend_the_registration_mail') }}</a>
+                    >{{ $t('resend_the_registration_mail') }}</button>
                 </div>
             </div>
             <div class="mt-12">
@@ -61,13 +61,14 @@
                 </div>
                 <div class="mt-2">
                     <a
-                        href="./register/"
+                        href="/selfservice/register/"
                         class="text-white block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 bg-blue-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
                     >{{ $t('register_now_small') }}</a>
                 </div>
             </div>
         </div>
     </div>
+    <Footer></Footer>
 </template>
   
   <script setup>
@@ -76,7 +77,8 @@ import axios from "redaxios";
 import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
-import { useToast } from "vue-toastification";
+import { TYPE, useToast } from "vue-toastification";
+import Footer from "@/components/Footer.vue";
 
 let user_email = ref("");
 // 
@@ -88,16 +90,16 @@ const state = reactive({
 const toast = useToast();
 function resendMail() {
     if (isEmail(user_email.value)) {
-        toast("sending password reset mail...");
+        toast("Login-Link wird angefordert...");
         const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
-        axios.post(`${config.baseurl}api/runners/forgot?mail=${user_email.value}&locale=${browserlocale}`)
+        axios.post(`${config.baseurl}api/runners/login?mail=${user_email.value}&locale=${browserlocale}`)
             .then(({ data }) => {
                 console.log(data);
-                toast("sent password reset mail to " + user_email.value + "!");
+                toast("Login-Link gesendet an " + user_email.value + "!");
             })
             .catch((error) => {
                 console.log(error);
-                toast("user does not exist...");
+                toast("Fehler beim Anfordern des Login-Links...", { type: TYPE.ERROR });
             });
     }
 }

src/views/Register.vue

@@ -1,33 +1,73 @@
 <template>
-  <div class="min-h-screen flex items-center justify-center">
+  <div
+    class="min-h-screen flex items-center justify-center"
+    v-if="registrationState === 'registered'"
+  >
     <div class="max-w-md w-full py-12 px-6">
       <img class="mx-auto h-24 w-auto" src="/favicon.png" alt />
-      <h1
+      <h1 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center">
-        class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
+        Lauf für Kaya! - Registriert
-      >Lauf für Kaya! - {{ $t('registrieren') }}</h1>
+      </h1>
-      <p class="mx-auto leading-relaxed text-base text-center">{{ $t('register.register_now') }}</p>
+      <p class="mx-auto leading-relaxed text-base text-center">
+        Bitte klicken Sie zum Fortfahren auf den Link, den wir an
+        <b class="font-bold">{{ userdetails.mail }}</b> geschickt haben.
+      </p>
+    </div>
+  </div>
+  <div class="min-h-screen flex items-center justify-center" v-else>
+    <div class="max-w-md w-full py-12 px-6">
+      <img class="mx-auto h-24 w-auto" src="/favicon.png" alt />
+      <h1 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center">
+        Lauf für Kaya! - {{ $t("registrieren") }}
+      </h1>
+      <p class="mx-auto leading-relaxed text-base text-center">
+        {{ $t("register.register_now") }}
+      </p>
       <p
         v-if="state.org_name !== ''"
         class="mx-auto leading-relaxed text-base text-center"
-      >{{ $t('organization') }}: {{ state.org_name }}</p>
+      >
+        {{ $t("organization") }}: {{ state.org_name }}
+      </p>
       <p
         v-if="state.org_name !== '' && state.org_teams.length > 0"
         class="mx-auto leading-relaxed text-base text-center"
-      >Team:</p>
+      >
+        Team:
+      </p>
       <select
         v-model="org_team"
         v-if="state.org_name !== '' && state.org_teams.length > 0"
-        class="w-full border bg-white rounded px-3 py-2 outline-none block mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
+        class="
+          w-full
+          border
+          bg-white
+          rounded
+          px-3
+          py-2
+          outline-none
+          block
+          mt-1
+          text-sm
+          dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700
+          form-select
+          focus:border-purple-400 focus:outline-none focus:shadow-outline-purple
+          dark:focus:shadow-outline-gray
+        "
       >
-        <option v-for="t in state.org_teams" :key="t.id" :value="t.id">{{ t.name }}</option>
+        <option v-for="t in state.org_teams" :key="t.id" :value="t.id">
+          {{ t.name }}
+        </option>
       </select>
       <p
         v-if="state.org_name === ''"
         class="mx-auto leading-relaxed text-base text-center"
-      >Bürgerlauf</p>
+      >
+        Bürgerlauf
+      </p>
       <div class="mt-4">
         <label for="first_name" class="block font-medium">
-          {{ $t('vorname') }}
+          {{ $t("vorname") }}
           <span class="font-bold">*</span>
         </label>
         <input
@@ -37,11 +77,28 @@
           autocomplete="off"
           :placeholder="[[$t('vorname')]]"
           type="text"
-          :class="{ 'border-red-500': (!userdetails.firstname.trim()), 'border-green-300': (userdetails.firstname.trim()) }"
+          :class="{
-          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+            'border-red-500': !userdetails.firstname.trim(),
+            'border-green-300': userdetails.firstname.trim(),
+          }"
+          class="
+            dark:bg-gray-800
+            mt-1
+            block
+            w-full
+            shadow-sm
+            sm:text-sm
+            border-gray-300 border-2
+            bg-gray-50
+            text-gray-500
+            rounded-md
+            p-2
+          "
         />
         <!--  -->
-        <label for="middle_name" class="block font-medium">{{ $t('mittelname') }}</label>
+        <label for="middle_name" class="block font-medium">{{
+          $t("mittelname")
+        }}</label>
         <input
           v-model="userdetails.middlename"
           name="middlename"
@@ -49,11 +106,23 @@
           autocomplete="off"
           :placeholder="[[$t('mittelname')]]"
           type="text"
-          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+          class="
+            dark:bg-gray-800
+            mt-1
+            block
+            w-full
+            shadow-sm
+            sm:text-sm
+            border-gray-300 border-2
+            bg-gray-50
+            text-gray-500
+            rounded-md
+            p-2
+          "
         />
         <!--  -->
         <label for="last_name" class="block font-medium">
-          {{ $t('nachname') }}
+          {{ $t("nachname") }}
           <span class="font-bold">*</span>
         </label>
         <input
@@ -63,12 +132,27 @@
           autocomplete="off"
           :placeholder="[[$t('nachname')]]"
           type="text"
-          :class="{ 'border-red-500': (!userdetails.lastname.trim()), 'border-green-300': (userdetails.lastname.trim()) }"
+          :class="{
-          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+            'border-red-500': !userdetails.lastname.trim(),
+            'border-green-300': userdetails.lastname.trim(),
+          }"
+          class="
+            dark:bg-gray-800
+            mt-1
+            block
+            w-full
+            shadow-sm
+            sm:text-sm
+            border-gray-300 border-2
+            bg-gray-50
+            text-gray-500
+            rounded-md
+            p-2
+          "
         />
         <!--  -->
         <label for="email_address" class="block font-medium">
-          {{ $t('e_mail_adress') }}
+          {{ $t("e_mail_adress") }}
           <span class="font-bold">*</span>
         </label>
         <input
@@ -78,12 +162,31 @@
           autocomplete="off"
           :placeholder="[[$t('e_mail_adress')]]"
           type="email"
-          :class="{ 'border-red-500': (!isEmail(userdetails.mail)), 'border-green-300': (isEmail(userdetails.mail)) }"
+          :class="{
-          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+            'border-red-500': !isEmail(userdetails.mail),
+            'border-green-300': isEmail(userdetails.mail),
+          }"
+          class="
+            dark:bg-gray-800
+            mt-1
+            block
+            w-full
+            shadow-sm
+            sm:text-sm
+            border-2
+            bg-gray-50
+            text-gray-500
+            rounded-md
+            p-2
+          "
         />
-        <p v-if="!isEmail(userdetails.mail)" class="text-sm">{{ $t('please_provide_valid_mail') }}</p>
+        <p v-if="!isEmail(userdetails.mail)" class="text-sm">
+          {{ $t("please_provide_valid_mail") }}
+        </p>
         <!--  -->
-        <label for="phone" class="select-none block font-medium">{{ $t('phone_number') }}</label>
+        <label for="phone" class="select-none block font-medium">{{
+          $t("phone_number")
+        }}</label>
         <input
           v-model="userdetails.phone"
           name="phone"
@@ -91,13 +194,32 @@
           autocomplete="off"
           :placeholder="[[$t('phone_number')]]"
           type="text"
-          :class="{ 'border-red-500': (!isMobilePhone(userdetails.phone) && userdetails.phone.trim()), 'border-green-300': (isMobilePhone(userdetails.phone) && userdetails.phone.trim()) }"
+          :class="{
-          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+            'border-red-500':
+              !isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
+            'border-green-300':
+              isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
+          }"
+          class="
+            dark:bg-gray-800
+            mt-1
+            block
+            w-full
+            shadow-sm
+            sm:text-sm
+            border-2
+            bg-gray-50
+            text-gray-500
+            rounded-md
+            p-2
+          "
         />
         <p
-          v-if="(!isMobilePhone(userdetails.phone) && userdetails.phone.trim())"
+          v-if="!isMobilePhone(userdetails.phone) && userdetails.phone.trim()"
           class="text-sm"
-        >{{ $t('this_is_not_a_valid_international_phone_number') }}</p>
+        >
+          {{ $t("this_is_not_a_valid_international_phone_number") }}
+        </p>
         <!--  -->
         <div class="grid grid-cols-6 mt-6">
           <div class="col-span-6"></div>
@@ -115,13 +237,14 @@
               <label
                 for="address_activated"
                 class="font-medium text-gray-400 select-none"
-              >{{ $t('provide_address') }}</label>
+                >{{ $t("provide_address") }}</label
+              >
             </div>
           </div>
           <div v-if="provide_address === true" class="col-span-6">
             <div class="col-span-6">
               <label for="street" class="block font-medium">
-                {{ $t('strasse') }}
+                {{ $t("strasse") }}
                 <span class="font-bold">*</span>
               </label>
               <input
@@ -131,12 +254,29 @@
                 :placeholder="[[$t('strasse')]]"
                 id="street"
                 autocomplete="street-address"
-                :class="{ 'border-red-500': (!userdetails.address.street.trim()), 'border-green-300': (userdetails.address.street.trim()) }"
+                :class="{
-                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+                  'border-red-500': !userdetails.address.street.trim(),
+                  'border-green-300': userdetails.address.street.trim(),
+                }"
+                class="
+                  dark:bg-gray-800
+                  mt-1
+                  block
+                  w-full
+                  shadow-sm
+                  sm:text-sm
+                  border-gray-300 border-2
+                  bg-gray-50
+                  text-gray-500
+                  rounded-md
+                  p-2
+                "
               />
             </div>
             <div class="col-span-6">
-              <label for="address2" class="block font-medium">{{ $t('apartment_suite_etc') }}</label>
+              <label for="address2" class="block font-medium">{{
+                $t("apartment_suite_etc")
+              }}</label>
               <input
                 v-model="userdetails.address.address2"
                 type="text"
@@ -144,12 +284,24 @@
                 :placeholder="[[$t('apartment_suite_etc')]]"
                 id="address2"
                 autocomplete="street-address"
-                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+                class="
+                  dark:bg-gray-800
+                  mt-1
+                  block
+                  w-full
+                  shadow-sm
+                  sm:text-sm
+                  border-gray-300 border-2
+                  bg-gray-50
+                  text-gray-500
+                  rounded-md
+                  p-2
+                "
               />
             </div>
             <div class="col-span-6 sm:col-span-6 lg:col-span-2">
               <label for="city" class="block font-medium">
-                {{ $t('ort') }}
+                {{ $t("ort") }}
                 <span class="font-bold">*</span>
               </label>
               <input
@@ -158,13 +310,28 @@
                 name="city"
                 :placeholder="[[$t('ort')]]"
                 id="city"
-                :class="{ 'border-red-500': (!userdetails.address.city.trim()), 'border-green-300': (userdetails.address.city.trim()) }"
+                :class="{
-                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+                  'border-red-500': !userdetails.address.city.trim(),
+                  'border-green-300': userdetails.address.city.trim(),
+                }"
+                class="
+                  dark:bg-gray-800
+                  mt-1
+                  block
+                  w-full
+                  shadow-sm
+                  sm:text-sm
+                  border-gray-300 border-2
+                  bg-gray-50
+                  text-gray-500
+                  rounded-md
+                  p-2
+                "
               />
             </div>
             <div class="col-span-6 sm:col-span-3 lg:col-span-2">
               <label for="postal_code" class="block font-medium">
-                {{ $t('plz') }}
+                {{ $t("plz") }}
                 <span class="font-bold">*</span>
               </label>
               <input
@@ -174,14 +341,37 @@
                 :placeholder="[[$t('plz')]]"
                 id="postal_code"
                 autocomplete="postal-code"
-                :class="{ 'border-red-500': (!isPostalCode(userdetails.address.zipcode, 'DE')), 'border-green-300': (isPostalCode(userdetails.address.zipcode, 'DE')) }"
+                :class="{
-                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
+                  'border-red-500': !isPostalCode(
+                    userdetails.address.zipcode,
+                    'DE'
+                  ),
+                  'border-green-300': isPostalCode(
+                    userdetails.address.zipcode,
+                    'DE'
+                  ),
+                }"
+                class="
+                  dark:bg-gray-800
+                  mt-1
+                  block
+                  w-full
+                  shadow-sm
+                  sm:text-sm
+                  border-gray-300 border-2
+                  bg-gray-50
+                  text-gray-500
+                  rounded-md
+                  p-2
+                "
               />
             </div>
             <p
               v-if="!isPostalCode(userdetails.address.zipcode, 'DE')"
               class="text-sm"
-            >{{ $t('please_provide_a_valid_zipcode') }}</p>
+            >
+              {{ $t("please_provide_a_valid_zipcode") }}
+            </p>
           </div>
         </div>
         <div class="flex items-start mt-6">
@@ -195,15 +385,19 @@
             />
           </div>
           <div class="ml-3 text-sm">
-            <label for="agb_accepted" class="font-medium text-gray-400 select-none">
+            <label
-              {{ $t('i_accept', { tos: $t('tos') }) }}
+              for="agb_accepted"
+              class="font-medium text-gray-400 select-none"
+            >
+              {{ $t("i_accept", { tos: $t("privacy_policy") }) }}
               <a
                 target="_blank"
                 rel="noreferrer,noopener"
-                href
+                href="https://lauf-fuer-kaya.de/datenschutz/"
                 class="underline"
-              >{{ $t('tos') }}</a>
+                >{{ $t("privacy_policy") }}</a
-              {{ $t('i_accept_end') }}
+              >
+              {{ $t("i_accept_end") }}
               <span class="font-bold">*</span>
             </label>
           </div>
@@ -219,8 +413,11 @@
             />
           </div>
           <div class="ml-3 text-sm">
-            <label for="data_confirmed" class="font-medium text-gray-400 select-none">
+            <label
-              {{ $t('confirm_personal_data') }}
+              for="data_confirmed"
+              class="font-medium text-gray-400 select-none"
+            >
+              {{ $t("confirm_personal_data") }}
               <span class="font-bold">*</span>
             </label>
           </div>
@@ -228,45 +425,52 @@
         <div class="mt-6">
           <button
             @click="login"
-            :disabled="(!state.submit_enabled)"
+            :disabled="!state.submit_enabled"
-            :class="{ 'opacity-50': (!state.submit_enabled), 'cursor-not-allowed': (!state.submit_enabled) }"
+            :class="{
-            class="text-white block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 bg-blue-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
+              'opacity-50': !state.submit_enabled,
-          >{{ $t('registrieren') }}</button>
+              'cursor-not-allowed': !state.submit_enabled,
-        </div>
+            }"
-      </div>
+            class="
-      <div class="mt-6">
+              text-white
-        <div class="relative">
+              block
-          <div class="absolute inset-0 flex items-center">
+              w-full
-            <div class="w-full border-t border-gray-300"></div>
+              text-center
-          </div>
+              py-2
-          <div class="relative flex justify-center text-sm">
+              px-3
-            <span class="px-2 bg-white dark:bg-gray-900">{{ $t('already_have_an_account') }}</span>
+              border-2 border-gray-300
-          </div>
+              rounded-md
-        </div>
+              p-1
-        <div class="mt-6">
+              bg-blue-800
-          <a
+              font-medium
-            href="./login"
+              hover:border-gray-400
-            class="block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 dark:bg-gray-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
+              focus:outline-none focus:border-gray-400
-          >{{ $t('go_to_login') }}</a>
+              sm:text-sm
+            "
+          >
+            {{ $t("registrieren") }}
+          </button>
         </div>
       </div>
     </div>
   </div>
+  <Footer></Footer>
 </template>
 
 <script setup>
 import { computed, ref, reactive, defineProps } from "vue";
 import axios from "redaxios";
-import isEmail from 'validator/es/lib/isEmail';
+import isEmail from "validator/es/lib/isEmail";
-import isMobilePhone from 'validator/es/lib/isMobilePhone';
+import isMobilePhone from "validator/es/lib/isMobilePhone";
-import isPostalCode from 'validator/es/lib/isPostalCode';
+import isPostalCode from "validator/es/lib/isPostalCode";
-import { useToast } from "vue-toastification";
+import { TYPE, useToast } from "vue-toastification";
+import Footer from "@/components/Footer.vue";
 
 const props = defineProps({
-  token: String
+  token: String,
-})
+});
 if (props.token) {
-  axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
+  axios
+    .get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
     .then(({ data }) => {
       state.org_name = data.name;
       state.org_teams = data.teams;
@@ -277,31 +481,51 @@ if (props.token) {
     });
 }
 
-let userdetails = ref({ firstname: "", lastname: "", middlename: "", mail: "", phone: "", address: { street: "", address2: "", city: "", zipcode: "" } });
+let userdetails = ref({
+  firstname: "",
+  lastname: "",
+  middlename: "",
+  mail: "",
+  phone: "",
+  address: { street: "", address2: "", city: "", zipcode: "" },
+});
 let provide_address = ref(false);
 let agb_accepted = ref(false);
 let data_confirmed = ref(false);
 let org_team = ref("");
+let registrationState = ref("pending");
 //
 const state = reactive({
   org_name: "",
   org_teams: [],
-  submit_enabled: computed(() => agb_accepted.value === true && data_confirmed.value === true && (isMobilePhone(userdetails.value.phone) || !userdetails.value.phone.trim()) && isEmail(userdetails.value.mail)
+  submit_enabled: computed(
-    && userdetails.value.firstname
+    () =>
-    && userdetails.value.lastname && (provide_address.value === false || provide_address.value === true && (userdetails.value.address.street.trim() && userdetails.value.address.city.trim() && isPostalCode(userdetails.value.address.zipcode, "DE"))))
+      agb_accepted.value === true &&
-})
+      data_confirmed.value === true &&
+      (isMobilePhone(userdetails.value.phone) ||
+        !userdetails.value.phone.trim()) &&
+      isEmail(userdetails.value.mail) &&
+      userdetails.value.firstname &&
+      userdetails.value.lastname &&
+      (provide_address.value === false ||
+        (provide_address.value === true &&
+          userdetails.value.address.street.trim() &&
+          userdetails.value.address.city.trim() &&
+          isPostalCode(userdetails.value.address.zipcode, "DE")))
+  ),
+});
 const toast = useToast();
 function login() {
   userdetails = userdetails.value;
-  if (userdetails.phone === "" || isMobilePhone(userdetails.phone)) {
+  if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
     if (isEmail(userdetails.mail)) {
       let postdata = {
-        "email": userdetails.mail,
+        email: userdetails.mail,
-        "firstname": userdetails.firstname,
+        firstname: userdetails.firstname,
-        "middlename": userdetails.middlename,
+        middlename: userdetails.middlename,
-        "lastname": userdetails.lastname,
+        lastname: userdetails.lastname,
-        "address": {}
+        address: {},
-      }
+      };
       if (isMobilePhone(userdetails.phone)) {
         postdata.phone = userdetails.phone;
       }
@@ -312,25 +536,31 @@ function login() {
           city: userdetails.address.city,
           postalcode: userdetails.address.zipcode,
           country: "DE",
+        };
       }
-      }
+      if (state.org_name !== "" && state.org_teams.length > 0) {
-      if (state.org_name !== '' && state.org_teams.length > 0) {
         postdata.team = org_team.value;
       }
-      toast("registration in progress...");
+      toast("Registrierung läuft...");
-      const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
+      const browserlocale = (
+        (navigator.languages && navigator.languages[0]) ||
+        ""
+      ).substr(0, 2);
       let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
       if (props.token) {
-        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`
+        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`;
       }
-      axios.post(url, postdata)
+      registrationState.value = "loading";
-        .then(({ data }) => {
+      axios
-          const token = btoa(data.token);
+        .post(url, postdata)
-          // alert(token);
+        .then(() => {
-          location.replace(`${config.baseurl_selfservice}profile/${token}`);
+          registrationState.value = "registered";
         })
         .catch((error) => {
           console.log(error);
+          if (error.data.message === "E-Mail already registered") {
+            toast("bereits registriert...", { type: TYPE.ERROR });
+          }
         });
     }
   }

src/views/Registered.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="min-h-screen flex items-center justify-center">
+    <div class="max-w-md w-full py-12 px-6">
+      <img class="mx-auto h-24 w-auto" src="/favicon.png" alt />
+      <h1 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center">
+        Lauf für Kaya! - Registriert
+      </h1>
+      <p class="mx-auto leading-relaxed text-base text-center">
+        Bitte klicken Sie zum Fortfahren auf den Link, den wir an
+        <b class="font-bold">{{ $props.mail }}</b> geschickt haben.
+      </p>
+    </div>
+  </div>
+  <Footer></Footer>
+</template>
+
+<script setup>
+import Footer from "@/components/Footer.vue";
+const props = defineProps({
+  mail: String,
+});
+</script>