Merge branch 'dev'

close #50

.dockerignore

@@ -0,0 +1,187 @@
+# ---> Node
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+# ---> Windows
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# ---> macOS
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# ---> Vue
+# gitignore template for Vue.js projects
+#
+# Recommended template: Node.gitignore
+
+# TODO: where does this rule come from?
+docs/_book
+
+# TODO: where does this rule come from?
+test/
+
+/package-lock.json
+/yarn.lock
+/public/env.js

.drone.yml

@@ -1,117 +0,0 @@
----
-kind: secret
-name: docker_username
-get:
-  path: odit-registry-builder
-  name: username
-
----
-kind: secret
-name: docker_password
-get:
-  path: odit-registry-builder
-  name: password
-
----
-kind: secret
-name: git_ssh
-get:
-  path: odit-git-bot
-  name: sshkey
-
----
-kind: pipeline
-type: kubernetes
-name: build:dev
-
-steps:
-  - 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
-      tags:
-        - dev
-      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
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - latest
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  branch:
-    - main
-  event:
-    - push
-
----
-kind: pipeline
-type: kubernetes
-name: build:tags
-steps:
-  - name: build $DRONE_TAG
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - '${DRONE_TAG}'
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  event:
-  - tag

.vscode/settings.json

@@ -2,5 +2,9 @@
     "i18n-ally.localesPaths": [
         "src/locales"
     ],
-    "i18n-ally.keystyle": "nested"
+    "i18n-ally.keystyle": "nested",
+    "i18n-ally.extract.keygenStyle": "snake_case",
+    "i18n-ally.enabledFrameworks": [
+        "vue"
+    ]
 }

.woodpecker/build.yml

@@ -0,0 +1,33 @@
+steps:
+  - name: build latest
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - latest
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/selfservice:dev
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    when:
+      branch: main
+  - name: build dev
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - dev
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/selfservice:dev
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    when:
+      branch: dev
+when:
+  event: push

.woodpecker/release.yml

@@ -0,0 +1,17 @@
+steps:
+  - name: build tag
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - "${CI_COMMIT_TAG}"
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/selfservice:dev
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+when:
+  event:
+    - tag

CHANGELOG.md

@@ -2,10 +2,141 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [1.0.1](https://git.odit.services/lfk/selfservice/compare/1.0.0...1.0.1)
+
+- fix(container): Add dockeringore [`7fcb6a9`](https://git.odit.services/lfk/selfservice/commit/7fcb6a9fc3f98772990790f6385200732f8bce7c)
+
+### [1.0.0](https://git.odit.services/lfk/selfservice/compare/0.11.3...1.0.0)
+
+> 2 December 2024
+
+- chore(deps): update all [`4a11fef`](https://git.odit.services/lfk/selfservice/commit/4a11fef0e0ad0940535fd1d6a1a57a829dc2b50d)
+- chore: pnpm v9 [`b85c395`](https://git.odit.services/lfk/selfservice/commit/b85c3958c288293bb98df2326f73dfad1684e3cb)
+- wip: general updates [`1eab535`](https://git.odit.services/lfk/selfservice/commit/1eab5353810a0a351cfc72b493c5156f55a4c9d2)
+- refactor [`4af5c45`](https://git.odit.services/lfk/selfservice/commit/4af5c4545bfaad21d71bcbf91d2cd8ea53847b62)
+- fix: translations [`548148e`](https://git.odit.services/lfk/selfservice/commit/548148e8982d7d146182af9f2a69de87f0b3529e)
+- refactor: translations [`196b386`](https://git.odit.services/lfk/selfservice/commit/196b386d6d57e91fbb4f46091a59ba04bb6e6984)
+- feat(ci)!: Switch to woodpecker [`9a3d307`](https://git.odit.services/lfk/selfservice/commit/9a3d307dfae0851eb842ad3f1c34460bca13bff1)
+- i18n [`048edfb`](https://git.odit.services/lfk/selfservice/commit/048edfba89a69efd3362dd8df8b89f8780f5f3fe)
+- registration brand font + more translations [`afffde8`](https://git.odit.services/lfk/selfservice/commit/afffde8fa04df88d0a8bff05d0a28550414ce385)
+- feat: lfk font [`af9a168`](https://git.odit.services/lfk/selfservice/commit/af9a168f587768d8b1af8990729e743481ba687d)
+- updated profile page [`4fcc38c`](https://git.odit.services/lfk/selfservice/commit/4fcc38c374553b22f92a734903df1b7a032348fa)
+- 🚀Bumped version to v1.0.0 [`2285ea5`](https://git.odit.services/lfk/selfservice/commit/2285ea507069cf362baa950e7337aec72a37d4e3)
+- i18n [`f296cbc`](https://git.odit.services/lfk/selfservice/commit/f296cbc1a0c9035db6546c85781be71b152264d7)
+- feat(Footer): ref lfk [`6376dcb`](https://git.odit.services/lfk/selfservice/commit/6376dcb5fe7e3b1e1e639e41bc1b682036d838a0)
+- feat(Home): improve ui [`75b61d9`](https://git.odit.services/lfk/selfservice/commit/75b61d991bd483aaf00871c12c9268fc6e21435b)
+- refactor(ci): Make ready for new woodpecker [`780bc54`](https://git.odit.services/lfk/selfservice/commit/780bc54604998abd275f3b7d50a3849002eb243d)
+- refactor: code cleanup [`ec6d252`](https://git.odit.services/lfk/selfservice/commit/ec6d252928fb84248041a3675590b85293c96133)
+- chore: 2025 [`cb2f8ee`](https://git.odit.services/lfk/selfservice/commit/cb2f8eeab1a7e260df938b8aa94fa31f8e1b5efe)
+- footer update [`90c085d`](https://git.odit.services/lfk/selfservice/commit/90c085db28798bbcac24eb9700285221a9bcad92)
+- improved style in registered view [`1a3ab98`](https://git.odit.services/lfk/selfservice/commit/1a3ab98412b82eeb1f0dea8ea642f5fc6435c09d)
+- add i18n ally snake case config [`0acda07`](https://git.odit.services/lfk/selfservice/commit/0acda07eb53a85f7b2e87a3e26d90b7cdf1fe012)
+- feat(Home): improve background.jpg import [`3e289d8`](https://git.odit.services/lfk/selfservice/commit/3e289d83f9db98641f0f7f732b622dab9955f3a1)
+- chore(deps): node@23.3.0 [`f71b01c`](https://git.odit.services/lfk/selfservice/commit/f71b01c39a62ef4402004e2fbcfacb37bc92ea39)
+- Pin pnpm [`c36db2c`](https://git.odit.services/lfk/selfservice/commit/c36db2c18fc5f7cfd7bf5d295f3faf3931df736b)
+
+#### [0.11.3](https://git.odit.services/lfk/selfservice/compare/0.11.2...0.11.3)
+
+> 7 April 2023
+
+- 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)
+- 🚀Bumped version to v0.11.3 [`240f44d`](https://git.odit.services/lfk/selfservice/commit/240f44df60184c492f6cff3d864c1f9f2563ff80)
+- 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)

Dockerfile

@@ -1,10 +1,15 @@
-FROM registry.odit.services/hub/library/node:15.9.0-alpine3.13
+FROM node:23.3.0-alpine3.20 AS build
+# FROM registry.odit.services/hub/library/node:23.3.0-alpine3.20 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@9
-RUN yarn build
+RUN npm i -g pnpm@9
-RUN yarn postbuild
+RUN pnpm i --frozen-lockfile
+RUN pnpm build
+RUN pnpm postbuild
+
 # final image
-FROM registry.odit.services/library/nginx-brotli:3.15
+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

README.md

@@ -2,29 +2,8 @@
 
 runner selfservice portal
 
-## ⚡ Development
-### Requirements
-- Node.js v14.16.0 or newer
-- yarn package manager >= v1.22.10 < 2
-
-### Recommended Extensions
-- will be automatically recommended via `./vscode/extensions.json`
-- we also provide a config for i18n-ally in the `./vscode/` folder
-
-### Fastest Dev Environment
-- You can install the [Remote - Containers](https://github.com/Microsoft/vscode-remote-release) extension and use all recommended extensions and editor settings via the provided `./devcontainer/` config
-
-### Manual Dev Environment
-```
-yarn && yarn dev --open
-```
-
 ## 🔨 Environment config
 - copy the `/public/env.sample.js` file to `/public/env.js`
 - set the required environment variables
   - `documentserver_key`: url to the [document server](https://git.odit.services/lfk/document-server) instance
   - `baseurl`: url to the main lfk instance - WITH TRAILING SLASH
-  - see [@lfk/deployment](https://git.odit.services/lfk/deployment) for a complete deployment guide
-  - `baseurl_selfservice`: location of the selfservice instance - WITH TRAILING SLASH
-    - e.g. path: `/selfservice/`
-    - e.g. url: `https://example.com/selfservice/`

env_fix.js

@@ -1,6 +1,6 @@
-const fs = require('fs');
+import { existsSync, writeFileSync, readFileSync } from "node:fs";
-if (fs.existsSync('./dist/index.html')) {
+if (existsSync("./dist/index.html")) {
-	const content = fs.readFileSync('./dist/index.html', { encoding: 'utf8' });
+	const content = readFileSync("./dist/index.html", { encoding: "utf8" });
 	const newcontent = content.replace(`"/env.js"`, `"./env.js"`);
-	fs.writeFileSync('./dist/index.html', newcontent);
+	writeFileSync("./dist/index.html", newcontent);
 }

index.html

@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8">
-  <link rel="icon" href="/favicon.ico" />
+  <link rel="icon" href="/favicon-lfk.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Lauf für Kaya! - Selfservice</title>
 </head>

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)$ {

order_i18n.js

@@ -1,16 +1,18 @@
-const fs = require('fs');
+import { readdirSync, readFileSync, writeFileSync } from "node:fs";
 // get all language files
-const files = fs.readdirSync('./src/locales/');
+const files = readdirSync("./src/locales/");
 files.forEach((f) => {
 	// read file as object
-	const unordered = JSON.parse(fs.readFileSync(`src/locales/${f}`));
+	const unordered = JSON.parse(readFileSync(`src/locales/${f}`));
 	// order object by keys alpabetically A-Z
-	const ordered = Object.keys(unordered).sort().reduce((obj, key) => {
+	const ordered = Object.keys(unordered)
+		.sort()
+		.reduce((obj, key) => {
 			obj[key] = unordered[key];
 			return obj;
 		}, {});
 	// format output as json for commit diff compatibility
 	const out = JSON.stringify(ordered, 0, 4);
 	// write output file
-	fs.writeFileSync(`src/locales/${f}`, out);
+	writeFileSync(`src/locales/${f}`, out);
 });

package.json

@@ -1,6 +1,7 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.7.10",
+	"version": "1.0.1",
+	"type": "module",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
@@ -8,28 +9,25 @@
 		"postbuild": "node env_fix.js"
 	},
 	"dependencies": {
-		"bwip-js": "3.2.2",
+		"@fontsource/athiti": "^5.1.0",
-		"marked": "2.0.3",
+		"@tailwindcss/vite": "4.0.0-beta.4",
-		"redaxios": "0.4.1",
+		"bwip-js": "4.5.1",
-		"toastify-js": "1.10.0",
+		"marked": "15.0.3",
-		"validator": "13.5.2",
+		"redaxios": "0.5.1",
-		"vue-i18n": "9.1.4",
+		"tailwindcss": "4.0.0-beta.4",
-		"vue-toastification": "2.0.0-rc.1",
+		"toastify-js": "1.12.0",
-		"vue": "3.0.9",
+		"validator": "13.12.0",
-		"vue-router": "4.0.5"
+		"vue": "3.5.13",
+		"vue-i18n": "10.0.5",
+		"vue-router": "4.5.0",
+		"vue-toastification": "2.0.0-rc.1"
 	},
 	"devDependencies": {
-		"@tailwindcss/jit": "0.1.18",
+		"@vitejs/plugin-vue": "5.2.1",
-		"@tailwindcss/aspect-ratio": "0.2.0",
+		"autoprefixer": "10.4.20",
-		"@tailwindcss/forms": "0.3.2",
+		"release-it": "17.10.0",
-		"@tailwindcss/line-clamp": "0.2.0",
+		"vite": "6.0.2",
-		"@tailwindcss/typography": "0.4.0",
+		"vite-plugin-vue-devtools": "^7.6.7"
-		"@vitejs/plugin-vue": "1.2.1",
-		"@vue/compiler-sfc": "3.0.11",
-		"autoprefixer": "10.2.5",
-		"tailwindcss": "2.1.1",
-		"release-it": "14.6.1",
-		"vite": "2.1.5"
 	},
 	"release-it": {
 		"git": {

postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    '@tailwindcss/jit': {},
-    autoprefixer: {},
-  },
-}

public/env.sample.js

@@ -3,15 +3,12 @@ const config = {
 	documentserver_key: '',
 	// required, with trailing slash
 	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
+	// optional, will fallback to /imprint
 	url_imprint: '',
-	// optional, will fallback to baseurl_selfservice/privacy
+	// optional, will fallback to /privacy
 	url_privacy: '',
-	codeformat: 'code39'
 };

src/components/EnvError.vue

@@ -1,29 +0,0 @@
-<template>
-  <section class="container px-4 py-32 mx-auto">
-    <div class="w-full mx-auto lg:w-1/3">
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        stroke="currentColor"
-        stroke-width="2"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        class="h-20 feather feather-alert-triangle"
-        viewBox="0 0 24 24"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0zM12 9v4M12 17h.01"
-        />
-      </svg>
-      <p
-        class="mt-5 mb-3 text-xl font-bold text-black dark:text-gray-50 md:text-2xl"
-      >{{ $t('configuration_error') }}</p>
-      <p class="mb-3 text-base font-medium text-gray-700 dark:text-gray-400">
-        {{ $t('the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help') }}
-        <br />
-        <br />
-        {{ $t('if_you_are_the_system_administrator_please_refer_to_the_official_product_documentation_readme_for_configuration_guidance') }}
-      </p>
-    </div>
-  </section>
-</template>

src/components/Footer.vue

@@ -1,28 +1,16 @@
 <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">
+      <p class="text-sm text-gray-400 sm:ml-4 sm:pl-4 sm:py-2 sm:mt-0 mt-4 text-center md:text-left">
-        Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by
+        Lauf für Kaya! Selfservice<br>Copyright © 2024<br>proudly powered by
-        <a
+        <a class="underline" target="_blank" rel="noopener,noreferrer"
-          class="underline"
+          href="https://odit.services?ref=lfk">ODIT.Services</a>
-          target="_blank"
-          rel="noopener,noreferrer"
-          href="https://odit.services"
-        >ODIT.Services</a>
       </p>
       <span class="inline-flex sm:ml-auto sm:mt-0 mt-4 justify-center sm:justify-start">
-        <a
+        <a target="_blank" rel="noopener,noreferrer" :href="[[imprint_url]]" class="ml-3 text-gray-400 underline">{{
-          target="_blank"
+          $t('imprint') }}</a>
-          rel="noopener,noreferrer"
+        <a target="_blank" rel="noopener,noreferrer" :href="[[privacy_url]]" class="ml-3 text-gray-400 underline">{{
-          :href="[[imprint_url]]"
+          $t('privacy_policy') }}</a>
-          class="ml-3 text-gray-400 underline"
-        >Impressum</a>
-        <a
-          target="_blank"
-          rel="noopener,noreferrer"
-          :href="[[privacy_url]]"
-          class="ml-3 text-gray-400 underline"
-        >Datenschutzerklärung</a>
       </span>
     </div>
   </footer>
@@ -31,8 +19,8 @@
 export default {
   data() {
     return {
-      imprint_url: config.url_imprint || config.baseurl_selfservice + "imprint"
+      imprint_url: config.url_imprint || "/imprint"
-      , privacy_url: config.url_privacy || config.baseurl_selfservice + "privacy"
+      , privacy_url: config.url_privacy || "/privacy"
     }
   },
 }

src/components/HelloWorld.vue

@@ -1,30 +0,0 @@
-<template>
-  <h1>{{ msg }}</h1>
-
-  <p>
-    <a href="https://vitejs.dev/guide/features.html" target="_blank">Vite Documentation</a> |
-    <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Documentation</a>
-  </p>
-
-  <button @click="state.count++">count is: {{ state.count }}</button>
-  <p>
-    Edit
-    <code>components/HelloWorld.vue</code> to test hot module replacement.
-  </p>
-</template>
-
-<script setup>
-import { defineProps, reactive } from 'vue'
-
-defineProps({
-  msg: String
-})
-
-const state = reactive({ count: 0 })
-</script>
-
-<style scoped>
-a {
-  color: #42b983;
-}
-</style>

src/components/Login.vue

@@ -1,109 +0,0 @@
-<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! - Registrieren</h1>
-      <p
-        class="mx-auto leading-relaxed text-base text-center"
-      >Bitte anmelden...</p>
-      <div class="mt-5">
-        <div class="rounded-md shadow-sm">
-          <div>
-            <input
-              aria-label="E-Mail Adresse"
-              name="email"
-              type="email"
-              required
-              class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border text-gray-900 rounded-t-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
-              placeholder="E-Mail Adresse"
-              v-model="mail"
-            />
-          </div>
-          <div class="-mt-px relative">
-            <input
-              aria-label="Passwort"
-              name="password"
-              type="password"
-              required
-              class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border text-gray-900 rounded-b-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
-              placeholder="Passwort"
-            />
-            <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
-            </div>
-          </div>
-        </div>
-        <div class="mt-5">
-          <button
-            v-if="loading === false"
-            @click="login"
-            type="submit"
-            class="relative block w-full py-2 px-3 border border-transparent rounded-md font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm text-white"
-          >
-            <span class="absolute left-0 inset-y pl-3">
-              <svg class="h-5 w-5 text-gray-500" fill="currentColor" viewBox="0 0 20 20">
-                <path
-                  fill-rule="evenodd"
-                  d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                  clip-rule="evenodd"
-                />
-              </svg>
-            </span>
-            Log in
-          </button>
-          <button
-            v-if="loading === true"
-            type="submit"
-            class="relative block w-full py-2 px-3 border border-transparent rounded-md font-semibold bg-yellow-500 sm:text-sm text-black"
-          >
-            <span class="absolute left-0 inset-y pl-3">
-              <svg class="h-5 w-5 text-gray-500" fill="currentColor" viewBox="0 0 20 20">
-                <path
-                  fill-rule="evenodd"
-                  d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                  clip-rule="evenodd"
-                />
-              </svg>
-            </span>
-            Logging in...
-          </button>
-        </div>
-      </div>
-      <div class="mt-6">
-        <div class="relative">
-          <div class="absolute inset-0 flex items-center">
-            <div class="w-full border-t border-gray-300"></div>
-          </div>
-          <div class="relative flex justify-center text-sm">
-            <span class="px-2 bg-white dark:bg-gray-900">Sie haben noch keinen Account?</span>
-          </div>
-        </div>
-        <div class="mt-6">
-          <a
-            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>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref } from "vue";
-import axios from "redaxios";
-import Toastify from "toastify-js";
-
-let mail = ref("");
-let loading = ref(false);
-function login() {
-  loading.value = true;
-  axios.get("").then((res) => {
-    loading.value = false;
-    Toastify({
-      text: "Login läuft...",
-      duration: 3000,
-    }).showToast();
-  });
-}
-</script>

src/components/LoginForm.vue

@@ -1,109 +0,0 @@
-<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-8 w-auto" src="/img/tailwindui-logo.svg" alt="" /> -->
-      <h1 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center">Login</h1>
-      <p
-        class="mx-auto leading-relaxed text-base text-center"
-      >Bitte anmelden...</p>
-      <div class="mt-5">
-        <div class="rounded-md shadow-sm">
-          <div>
-            <input
-              aria-label="E-Mail Adresse"
-              name="email"
-              type="email"
-              required
-              class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border text-gray-900 rounded-t-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
-              placeholder="E-Mail Adresse"
-              v-model="mail"
-            />
-          </div>
-          <div class="-mt-px relative">
-            <input
-              aria-label="Passwort"
-              name="password"
-              type="password"
-              required
-              class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border text-gray-900 rounded-b-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
-              placeholder="Passwort"
-            />
-            <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
-            </div>
-          </div>
-        </div>
-        <div class="mt-5">
-          <button
-            v-if="loading === false"
-            @click="login"
-            type="submit"
-            class="relative block w-full py-2 px-3 border border-transparent rounded-md font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm text-white"
-          >
-            <span class="absolute left-0 inset-y pl-3">
-              <svg class="h-5 w-5 text-gray-500" fill="currentColor" viewBox="0 0 20 20">
-                <path
-                  fill-rule="evenodd"
-                  d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                  clip-rule="evenodd"
-                />
-              </svg>
-            </span>
-            Log in
-          </button>
-          <button
-            v-if="loading === true"
-            type="submit"
-            class="relative block w-full py-2 px-3 border border-transparent rounded-md font-semibold bg-yellow-500 sm:text-sm text-black"
-          >
-            <span class="absolute left-0 inset-y pl-3">
-              <svg class="h-5 w-5 text-gray-500" fill="currentColor" viewBox="0 0 20 20">
-                <path
-                  fill-rule="evenodd"
-                  d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                  clip-rule="evenodd"
-                />
-              </svg>
-            </span>
-            Logging in...
-          </button>
-        </div>
-      </div>
-      <div class="mt-6">
-        <div class="relative">
-          <div class="absolute inset-0 flex items-center">
-            <div class="w-full border-t border-gray-300"></div>
-          </div>
-          <div class="relative flex justify-center text-sm">
-            <span class="px-2 bg-white dark:bg-gray-900">Sie haben noch keinen Account?</span>
-          </div>
-        </div>
-        <div class="mt-6">
-          <a
-            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>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref } from "vue";
-import axios from "redaxios";
-import Toastify from "toastify-js";
-
-let mail = ref("");
-let loading = ref(false);
-function login() {
-  loading.value = true;
-  axios.get("").then((res) => {
-    loading.value = false;
-    Toastify({
-      text: "Login läuft...",
-      duration: 3000,
-    }).showToast();
-  });
-}
-</script>

src/locales/de.json

@@ -1,28 +1,33 @@
 {
-    "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?",
+    "alle_daten_geloescht": "Alle Daten gelöscht!",
+    "already_registered": "bereits registriert...",
     "amount_per_kilometer_in_eur": "Betrag pro Kilometer (in €)",
     "apartment_suite_etc": "Addresszeile 2",
+    "buergerlauf": "Bürgerlauf",
     "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",
     "delete_my_data": "Meine Daten löschen",
-    "deletion_in_progress": "Daten werden gelöscht...",
     "distance": "Distanz",
-    "download registrationcode": "Registrierungscode herunterladen",
     "download_certificate": "Urkunde herunterladen",
+    "download_registrationcode": "Registrierungscode herunterladen",
     "e_mail_adress": "E-Mail Adresse",
-    "go_to_login": "Zum Login",
+    "error-loading-privacy-policy": "Fehler beim Laden der Datenschutzerklärung",
+    "error_loading_imprint": "Fehler beim Laden des Impressums",
+    "error_requesting_the_login_link": "Fehler beim Anfordern des Login-Links...",
     "i_accept": "Ich habe die ",
     "i_accept_end": "gelesen und akzeptiert.",
     "if_you_are_the_system_administrator_please_refer_to_the_official_product_documentation_readme_for_configuration_guidance": "Wenn Sie der Systemadministrator sind, finden Sie Konfigurationsanweisungen in der offiziellen Produktdokumentation / README.",
     "imprint": "Impressum",
+    "invalid_input_phone_number_should_be_international_format": "ungültige Eingabe... Die Telefonnummer sollte ein internationales Format haben",
     "lap_time": "Rundenzeit",
     "lap_times": "Rundenzeiten",
-    "lost_your_registration_mail": "Haben Sie Ihre Registrierungsmail verloren?",
+    "login_link_gesendet_an_user_email_value": "Login-Link gesendet an ",
+    "login_link_is_requested": "Login-Link wird angefordert...",
+    "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",
@@ -31,30 +36,36 @@
     "not_registered_yet": "Noch nicht registriert?",
     "organization": "Organisation",
     "ort": "Ort",
-    "phone_number": "Telefonnummer",
+    "phone_number": "Telefonnummer (international formatiert)",
     "please_provide_a_valid_zipcode": "Bitte geben Sie eine gültige Postleitzahl an...",
     "please_provide_valid_mail": "Bitte geben Sie eine gültige E-Mail Adresse an",
     "plz": "PLZ",
     "privacy_policy": "Datenschutzerklärung",
+    "profil_konnte_nicht_geladen_werden": "Profil konnte nicht geladen werden...",
+    "profil_konnte_nicht_geloescht_werden": "Profil konnte nicht gelöscht werden...",
+    "profil_wird_geloescht": "Profil wird gelöscht...",
     "profile": "Profil",
     "provide_address": "Adresse angeben?",
     "register": {
-        "register_now": "Jetzt für den Lauf für Kaya! 2023 registrieren."
+        "register_now": "Jetzt für den Lauf für Kaya! 2025 registrieren."
     },
     "register_now": "Jetzt registrieren!",
     "register_now_small": "Jetzt registrieren",
+    "registration_running": "Registrierung läuft...",
+    "registrationcode": "Registrierungscode",
     "registrieren": "Registrieren",
-    "registrierungscode": "Registrierungscode",
+    "registriert": "Registriert",
-    "resend_the_registration_mail": "Registrierungsmail erneut versenden",
+    "registrierungscode_generiert": "Registrierungscode generiert!",
-    "save_changes": "Änderungen speichern",
+    "registrierungscode_wird_generiert": "Registrierungscode wird generiert...",
+    "resend_the_registration_mail": "Login-Link anfordern",
     "sponsoring": "Sponsoring",
     "strasse": "Straße",
     "the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help": "Das System ist nicht richtig konfiguriert. Bitte wenden Sie sich an den Systemadministrator, um Hilfe zu erhalten.",
     "this_is_not_a_valid_international_phone_number": "Dies ist keine gültige internationale Telefonnummer",
-    "tos": "AGBs",
     "total": "Gesamt",
+    "urkunde_generiert": "Urkunde generiert!",
+    "urkunde_konnte_nicht_generiert_werden": "Urkunde konnte nicht generiert werden...",
+    "urkunde_wird_generiert": "Urkunde wird generiert...",
     "view_my_data": "Meine Läuferdaten einsehen",
-    "vorname": "Vorname",
+    "vorname": "Vorname"
-    "you_have_been_registered": "Sie wurden registriert!",
-    "you_have_not_provided_a_valid_access_key": "Sie haben keinen gültigen Zugangsschlüssel angegeben..."
 }

src/locales/en.json

@@ -1,27 +1,32 @@
 {
     "access_is_only_provided_via_your_email_link": "Access is only provided via the link you received upon registration.",
-    "all_data_deleted": "All Data deleted!",
+    "alle_daten_geloescht": "all data deleted!",
-    "already_have_an_account": "Already have an account?",
+    "already_registered": "already registered...",
     "amount_per_kilometer_in_eur": "Amount per kilometer (in €)",
     "apartment_suite_etc": "Apartment, suite, etc.",
+    "buergerlauf": "Public Run",
     "cancel_keep_my_data": "Cancel, keep my data",
     "configuration_error": "Configuration error",
     "confirm_delete_all_of_my_data": "Confirm, delete all of my data",
     "confirm_personal_data": "I hereby confirm that the above information is complete and correct",
     "current_total_amount_in_eur": "Current total amount (in €)",
     "delete_my_data": "Delete my data",
-    "deletion_in_progress": "Deletion in progress...",
     "distance": "Distance",
-    "download registrationcode": "Download registrationcode",
     "download_certificate": "Download certificate",
+    "download_registrationcode": "Download registrationcode",
     "e_mail_adress": "mail address",
-    "go_to_login": "Go To Login",
+    "error-loading-privacy-policy": "Error loading Privacy Policy",
+    "error_loading_imprint": "Error loading Imprint",
+    "error_requesting_the_login_link": "Error requesting the login link...",
     "i_accept": "I have read and accepted the ",
     "i_accept_end": "",
     "if_you_are_the_system_administrator_please_refer_to_the_official_product_documentation_readme_for_configuration_guidance": "If you are the system administrator, please refer to the official product documentation/ README for configuration guidance.",
     "imprint": "Imprint",
+    "invalid_input_phone_number_should_be_international_format": "invalid input... phone number should be international format",
     "lap_time": "Lap time",
     "lap_times": "Lap times",
+    "login_link_gesendet_an_user_email_value": "Login-Link sent to ",
+    "login_link_is_requested": "Login link is requested...",
     "lost_your_registration_mail": "Lost your registration mail?",
     "main_page_text": "Here you can register for the Lauf Für Kaya! or manage your runner profile.",
     "mittelname": "Middlename",
@@ -31,29 +36,36 @@
     "not_registered_yet": "Not registered yet?",
     "organization": "Organization",
     "ort": "City",
-    "phone_number": "Phone Number",
+    "phone_number": "Phone Number (international format)",
     "please_provide_a_valid_zipcode": "Please provide a valid zipcode...",
     "please_provide_valid_mail": "Please provide a valid mail address.",
     "plz": "zipcode",
     "privacy_policy": "Privacy Policy",
+    "profil_konnte_nicht_geladen_werden": "could not load profile...",
+    "profil_konnte_nicht_geloescht_werden": "couold not delete profile...",
+    "profil_wird_geloescht": "deleting profile...",
     "profile": "Profile",
     "provide_address": "Provide a postal address?",
     "register": {
-        "register_now": "Register now for Lauf für Kaya! 2023."
+        "register_now": "Register now for Lauf für Kaya! 2025."
     },
     "register_now": "Register now!",
     "register_now_small": "Register now",
+    "registration_running": "registration is running...",
+    "registrationcode": "Registration Code",
     "registrieren": "Register Now",
-    "resend_the_registration_mail": "Resend the registration mail",
+    "registriert": "Registered",
-    "save_changes": "Save changes",
+    "registrierungscode_generiert": "created registration code!",
+    "registrierungscode_wird_generiert": "creating registration code...",
+    "resend_the_registration_mail": "Send me a login link",
     "sponsoring": "Sponsoring",
     "strasse": "Street/ Block",
     "the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help": "The system is not properly configured. Please contact the system administrator for help.",
     "this_is_not_a_valid_international_phone_number": "This is not a valid international phone number",
-    "tos": "Terms of Service",
     "total": "Total",
+    "urkunde_generiert": "created certificate",
+    "urkunde_konnte_nicht_generiert_werden": "could not create your certificate...",
+    "urkunde_wird_generiert": "creating certificate...",
     "view_my_data": "View my data",
-    "vorname": "Firstname",
+    "vorname": "Firstname"
-    "you_have_been_registered": "You have been registered!",
-    "you_have_not_provided_a_valid_access_key": "You have not provided a valid access key..."
 }

src/main.js

@@ -2,6 +2,14 @@ import { createApp } from 'vue';
 import './tailwind.css';
 import 'toastify-js/src/toastify.css';
 import 'vue-toastification/dist/index.css';
+// import '@fontsource/athiti';
+import '@fontsource/athiti/200.css';
+import '@fontsource/athiti/300.css';
+import '@fontsource/athiti/400.css';
+import '@fontsource/athiti/500.css';
+import '@fontsource/athiti/600.css';
+import '@fontsource/athiti/700.css';
+// 
 import App from './App.vue';
 import { routes } from './routes.js';
 import { createRouter, createWebHistory } from 'vue-router';

src/routes.js

@@ -1,24 +1,23 @@
-// import EnvError from './components/EnvError.vue';
+import Home from "./views/Home.vue";
-import Home from './views/Home.vue';
+import Imprint from "./views/Imprint.vue";
-import Imprint from './views/Imprint.vue';
+import Privacy from "./views/Privacy.vue";
-import Privacy from './views/Privacy.vue';
+import Register from "./views/Register.vue";
-import Register from './views/Register.vue';
+import Profile from "./views/Profile.vue";
-import Profile from './views/Profile.vue';
+import ProfileNone from "./views/ProfileNone.vue";
-import ProfileNone from './views/ProfileNone.vue';
 
 console.log(config);
 
 /** @type {import('vue-router').RouterOptions['routes']} */
 export const routes = [
-	{ path: config.baseurl_selfservice + '', component: Home },
+	{ path: "/", component: Home },
-	{ path: config.baseurl_selfservice + 'imprint', component: Imprint },
+	{ path: "/imprint", component: Imprint },
-	{ path: config.baseurl_selfservice + 'imprint/', component: Imprint },
+	{ path: "/imprint/", component: Imprint },
-	{ path: config.baseurl_selfservice + 'privacy', component: Privacy },
+	{ path: "/privacy", component: Privacy },
-	{ path: config.baseurl_selfservice + 'privacy/', component: Privacy },
+	{ path: "/privacy/", component: Privacy },
-	{ path: config.baseurl_selfservice + 'register', component: Register },
+	{ path: "/register", component: Register },
-	{ path: config.baseurl_selfservice + 'register/', component: Register },
+	{ path: "/register/", component: Register },
-	{ path: config.baseurl_selfservice + 'register/:token', component: Register, props: true },
+	{ path: "/register/:token", component: Register, props: true },
-	{ path: config.baseurl_selfservice + 'profile', component: Profile },
+	{ path: "/profile", component: Profile },
-	{ path: config.baseurl_selfservice + 'profile/', component: ProfileNone },
+	{ path: "/profile/", component: ProfileNone },
-	{ path: config.baseurl_selfservice + 'profile/:token', component: Profile, props: true }
+	{ path: "/profile/:token", component: Profile, props: true },
 ];

src/tailwind.css

@@ -1,3 +1 @@
-@import 'tailwindcss/base';
+@import "tailwindcss";
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';

src/views/Home.vue

@@ -1,23 +1,20 @@
 <template>
-  <div class="bg-cover bg-fixed m-0 h-screen" style="background-image: url('./background.jpg');">
+  <div class="bg-cover bg-fixed m-0 h-screen text-white"
+    v-bind:style='{ backgroundImage: "url(" + background_base64 + ")", }'>
     <section class="container px-4 py-24 mx-auto">
       <div class="w-full mx-auto text-center">
-        <img src="/favicon.png" class="h-32 mx-auto" />
+        <img src="/favicon-lfk.png" class="h-32 mx-auto" />
         <h1
-          class="mb-6 text-4xl font-extrabold leading-none tracking-normal text-white md:text-6xl md:tracking-tight"
+          class="mb-6 text-4xl font-extrabold leading-none tracking-normal md:text-6xl md:tracking-tight font-[Athiti]">
-        >Lauf Für Kaya!</h1>
+          Lauf Für Kaya!<br>2025</h1>
-        <p class="px-0 mb-6 text-lg text-gray-100 md:text-xl lg:px-24">Selfservice Portal</p>
+        <h2 class="mb-6 text-xl font-bold leading-none tracking-normal md:text-3xl md:tracking-tight font-[Athiti]">
-        <p class="px-0 mb-6 text-md text-gray-100 lg:px-24">{{ $t('main_page_text') }}</p>
+          Selfservice Portal</h2>
-        <div class="mt-6 sm:flex place-content-center">
+        <p class="px-0 mb-6 text-md lg:px-24 font-medium">{{ $t('main_page_text') }}</p>
-          <a
+        <a class="w-full block mx-auto md:w-3/4 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 xl:text-lg xl:py-4"
-            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/">{{ $t('register_now') }}</a>
-            href="/selfservice/register/"
+        <a href="/profile/"
-          >{{ $t('register_now') }}</a>
+          class="md:mt-4 mt-2 w-full block mx-auto md:w-3/4 px-6 py-3 text-base font-semibold rounded-md bg-gray-800 shadow-sm hover:bg-gray-700 focus:outline-none focus:bg-gray-700 xl:text-lg xl:py-4 border border-gray-400">{{
-          <a
+            $t('view_my_data') }}</a>
-            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>
       </div>
     </section>
   </div>
@@ -25,6 +22,6 @@
 </template>
 
 <script setup>
+import background_base64 from "../assets/background.jpg?inline";
 import Footer from "@/components/Footer.vue";
-console.log(config);
 </script>

src/views/Imprint.vue

@@ -2,22 +2,24 @@
   <section class="container px-4 py-24 mx-auto">
     <div class="simplecontent">
       <div class="mb-24 text-left md:text-center">
-        <h1
+        <h1 class="mb-4 text-4xl font-bold leading-tight text-gray-900 dark:text-gray-50 md:text-5xl">{{ $t('imprint')
-          class="mb-4 text-4xl font-bold leading-tight text-gray-900 dark:text-gray-50 md:text-5xl"
+          }}
-        >{{$t('imprint')}}</h1>
+        </h1>
       </div>
       <div class="mx-auto prose" v-html="content"></div>
     </div>
   </section>
+  <Footer></Footer>
 </template>
-<style src="../simple.css">
+<style src="../simple.css"></style>
-</style>
 <script>
-import marked from "marked";
+import { marked } from "marked";
+import Footer from "@/components/Footer.vue";
 export default {
+  components: { Footer },
   data() {
     return {
-      content: ""
+      content: "",
     }
   },
   async beforeMount() {
@@ -29,7 +31,7 @@ export default {
       try {
         md = await fetch(`/imprint_en.md`);
       } catch (error) {
-        md = "Error loading Imprint";
+        md = t('error_loading_imprint');
       }
     }
     this.content = marked(await md.text());

src/views/Privacy.vue

@@ -2,19 +2,20 @@
   <section class="container px-4 py-24 mx-auto">
     <div class="simplecontent">
       <div class="mb-24 text-left md:text-center">
-        <h1
+        <h1 class="mb-4 text-4xl font-bold leading-tight text-gray-900 dark:text-gray-50 md:text-5xl">{{
-          class="mb-4 text-4xl font-bold leading-tight text-gray-900 dark:text-gray-50 md:text-5xl"
+          $t('privacy_policy') }}</h1>
-        >{{ $t('privacy_policy') }}</h1>
       </div>
       <div class="mx-auto prose" v-html="content"></div>
     </div>
   </section>
+  <Footer></Footer>
 </template>
-<style src="../simple.css">
+<style src="../simple.css"></style>
-</style>
 <script>
-import marked from "marked";
+import { marked } from "marked";
+import Footer from "@/components/Footer.vue";
 export default {
+  components: { Footer },
   data() {
     return {
       content: ""
@@ -29,7 +30,7 @@ export default {
       try {
         md = await fetch(`/privacy_en.md`);
       } catch (error) {
-        md = "Error loading Privacy Policy";
+        md = t('error-loading-privacy-policy');
       }
     }
     this.content = marked(await md.text());

src/views/Profile.vue

@@ -12,8 +12,7 @@
             text-center text-black
             dark:text-gray-200
           ">
-          <p class="text-3xl font-bold whitespace-nowrap" v-text="
+          <p class="text-4xl md:text-3xl font-bold whitespace-nowrap font-[Athiti]" v-text="(state.firstname || '') +
-            (state.firstname || '') +
             ' ' +
             (state.middlename || '') +
             ' ' +
@@ -23,21 +22,45 @@
         </div>
         <div class="inline-flex md:ml-auto md:mr-0 mx-auto items-center">
           <div v-if="state.delete_active === false">
-            <button type="button"
+            <button type="button" class="
-              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"
+                focus:border-black focus:ring-2 focus:ring-black
-              @click="get_registration">
+                text-white text-base md:text-sm
+                py-3.5
+                px-5
+                md:py-2.5
+                md: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;">
+                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') }}
+              {{ $t("download_registrationcode") }}
             </button>
-            <button type="button"
+            <button type="button" class="
-              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"
+                focus:border-black focus:ring-2 focus:ring-black
-              @click="get_certificate">
+                text-white text-base md:text-sm
+                py-3.5
+                px-5
+                md:py-2.5
+                md: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 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">
@@ -49,15 +72,17 @@
             </button>
             <button type="button" class="
                 focus:border-black focus:ring-2 focus:ring-black
-                text-white text-sm
+                text-white text-base md:text-sm
-                py-2.5
+                py-3.5
                 px-5
+                md:py-2.5
+                md:px-5
                 rounded-md
                 bg-red-600
                 hover:bg-red-700 hover:shadow-lg
-                ml-1
+                w-full
-              " @click="
+                md:w-auto
-                () => {
+              " @click="() => {
                 state.delete_active = true;
               }
                 ">
@@ -74,14 +99,19 @@
           <div v-if="state.delete_active === true">
             <button type="button" class="
                 focus:border-black focus:ring-2 focus:ring-black
-                text-white text-sm
+                text-white text-base md:text-sm
-                py-2.5
+                py-3.5
                 px-5
+                md:py-2.5
+                md: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="
+              " @click="() => {
-                () => {
                 state.delete_active = false;
               }
                 ">
@@ -95,13 +125,17 @@
             </button>
             <button type="button" class="
                 focus:border-black focus:ring-2 focus:ring-black
-                text-white text-sm
+                text-white text-base md:text-sm
-                py-2.5
+                py-3.5
                 px-5
+                md:py-2.5
+                md:px-5
                 rounded-md
+                w-full
+                md:w-auto
                 bg-red-600
                 hover:bg-red-700 hover:shadow-lg
-                ml-1
+                md:ml-1
               " @click="delete_me">
               <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
                 stroke="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
@@ -117,12 +151,11 @@
       </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="
+              <button @click="() => {
-                () => {
                 state.activetab = 'profile';
               }
                 " :class="{
@@ -133,8 +166,7 @@
               </button>
             </div>
             <div class="flex-none">
-              <button @click="
+              <button @click="() => {
-                () => {
                 state.activetab = 'laptimes';
               }
                 " :class="{
@@ -145,8 +177,7 @@
               </button>
             </div>
             <div class="flex-none">
-              <button @click="
+              <button @click="() => {
-                () => {
                 state.activetab = 'sponsorings';
               }
                 " :class="{
@@ -163,8 +194,8 @@
                 <form class="form flex flex-wrap w-full">
                   <div class="w-full">
                     <div class="form-element">
-                      <div class="text-lg">{{ $t("registrierungscode") }}</div>
+                      <div class="text-lg">{{ $t("registrationcode") }}</div>
-                      <img alt="Registrierungscode" :src="state.barcode" />
+                      <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
@@ -181,7 +212,7 @@
                           transition-colors
                           duration-200
                           ease-in-out
-                        " v-text="state.firstname" />
+                        " v-text="state.firstname || '---'" />
                     </div>
                     <div class="form-element">
                       <div class="text-lg">{{ $t("mittelname") }}</div>
@@ -200,7 +231,7 @@
                           transition-colors
                           duration-200
                           ease-in-out
-                        " v-text="state.middlename" />
+                        " v-text="state.middlename || '---'" />
                     </div>
                     <div class="form-element">
                       <div class="text-lg">{{ $t("nachname") }}</div>
@@ -219,7 +250,7 @@
                           transition-colors
                           duration-200
                           ease-in-out
-                        " v-text="state.lastname" />
+                        " v-text="state.lastname || '---'" />
                     </div>
                     <div class="form-element">
                       <div class="text-lg">{{ $t("e_mail_adress") }}</div>
@@ -238,7 +269,7 @@
                           transition-colors
                           duration-200
                           ease-in-out
-                        " v-text="state.email" />
+                        " v-text="state.email || '---'" />
                     </div>
                     <div class="form-element">
                       <div class="text-lg">{{ $t("phone_number") }}</div>
@@ -257,7 +288,7 @@
                           transition-colors
                           duration-200
                           ease-in-out
-                        " v-text="state.phone" />
+                        " v-text="state.phone || '---'" />
                     </div>
                   </div>
                 </form>
@@ -376,15 +407,13 @@
                             <span v-text="s.donor.lastname"></span>
                           </td>
                           <td class="px-4 py-3">
-                            <span v-text="
+                            <span v-text="(s.amountPerDistance / 100)
-                              (s.amountPerDistance / 100)
                               .toFixed(2)
                               .toLocaleString('de-DE', { valute: 'EUR' })
                               "></span>€
                           </td>
                           <td class="px-4 py-3">
-                            <span v-text="
+                            <span v-text="(s.amount / 100)
-                              (s.amount / 100)
                               .toFixed(2)
                               .toLocaleString('de-DE', { valute: 'EUR' })
                               "></span>€
@@ -395,8 +424,7 @@
                         <tr>
                           <td class="px-4 py-3">{{ $t("total") }}</td>
                           <td class="px-4 py-3">
-                            <span v-text="
+                            <span v-text="(
-                              (
                               state.sponsorings.reduce(function (
                                 sum,
                                 current
@@ -410,8 +438,7 @@
                               "></span>€
                           </td>
                           <td class="px-4 py-3">
-                            <span v-text="
+                            <span v-text="(
-                              (
                               state.sponsorings.reduce(function (
                                 sum,
                                 current
@@ -447,6 +474,8 @@
         </div>
       </div>
     </div>
+    <!--  -->
+    <Footer></Footer>
   </div>
 </template>
 
@@ -454,22 +483,29 @@
 import { reactive } from "vue";
 import { TYPE, useToast } from "vue-toastification";
 import axios from "redaxios";
-import bwipjs from "bwip-js";
+import { toCanvas } from "bwip-js";
+import Footer from "@/components/Footer.vue";
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 
 function textToBase64Barcode(text) {
-  var canvas = document.createElement("canvas");
+  const canvas = document.createElement("canvas");
-  bwipjs.toCanvas(canvas,
+  let codeconfig = {
-    {
+    bcid: config.code_format || "code39",
-      bcid: config.codeformat || 'code39',
+    text: `${text}`,
-      text: text,
     scale: 3,
-      height: 10,
+    includetext: false,
-      // width: 10,
+    textxalign: "center",
-      includetext: true,
+    backgroundcolor: "ffffff",
-      textxalign: 'center',
+  };
-      backgroundcolor: 'ffffff'
+  if (
+    codeconfig.bcid === "code39" ||
+    codeconfig.bcid === "code128" ||
+    codeconfig.bcid === "ean13"
+  ) {
+    codeconfig.height = 10;
   }
-  )
+  toCanvas(canvas, codeconfig);
   return canvas.toDataURL("image/png");
 }
 
@@ -485,8 +521,8 @@ const state = reactive({
   group: "",
   activetab: "profile",
   delete_active: false,
-  fullobject: {}
+  fullobject: {},
-})
+});
 const toast = useToast();
 const props = defineProps({
   token: String,
@@ -503,10 +539,11 @@ axios
     state.group = data.group;
     state.sponsorings = data.distanceDonations;
     state.fullobject = data;
-    state.barcode = textToBase64Barcode(data.id);
+    state.barcode = textToBase64Barcode(data.id ?? "???");
   })
   .catch((error) => {
-    toast.error("Profil konnte nicht geladen werden...");
+    toast.clear();
+    toast.error(t('profil_konnte_nicht_geladen_werden'));
   });
 axios
   .get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
@@ -528,23 +565,26 @@ axios
     state.scans = data;
   })
   .catch((error) => {
-    toast.error("Profil konnte nicht geladen werden...");
+    toast.error(t('profil_konnte_nicht_geladen_werden'));
   });
 function delete_me() {
-  toast("Profil wird gelöscht...");
+  toast.clear();
+  toast(t('profil_wird_geloescht'));
   let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`;
   axios
     .delete(url)
     .then(() => {
-      toast("Alle Daten gelöscht!");
+      toast.clear();
-      location.replace(`${config.baseurl_selfservice}`);
+      toast(t('alle_daten_geloescht'));
+      location.replace(`/`);
     })
     .catch((error) => {
-      toast.error("Profil konnte nicht gelöscht werden...");
+      toast.clear();
+      toast.error(t('profil_konnte_nicht_geloescht_werden'));
     });
 }
 function get_certificate() {
-  toast("Urkunde wird generiert...");
+  toast(t('urkunde_wird_generiert'));
   const browserlocale = (
     (navigator.languages && navigator.languages[0]) ||
     ""
@@ -561,8 +601,8 @@ function get_certificate() {
     })
     .then((response) => {
       console.log(response);
-      if (response.status != "200") {
+      if (response.status !== 200) {
-        toast.error("Urkunde konnte nicht generiert werden...");
+        toast.error(t('urkunde_konnte_nicht_generiert_werden'));
       } else {
         var fileURL = window.URL.createObjectURL(
           new Blob([response.data], { type: "application/pdf" })
@@ -575,20 +615,24 @@ function get_certificate() {
 
         fileLink.click();
         fileLink.remove();
-        toast("Urkunde generiert!", { type: TYPE.SUCCESS });
+        toast.clear();
+        toast(t('urkunde_generiert'), { type: TYPE.SUCCESS });
       }
     })
     .catch((err) => {
       console.error(err);
-      toast.error("An error occured while generating your certificate");
+      toast.clear();
+      toast.error(t('urkunde_konnte_nicht_generiert_werden'));
     });
 }
 function get_registration() {
-  toast("Registrierungscode wird generiert...");
+  toast.clear();
+  toast(t('registrierungscode_wird_generiert'));
   var a = document.createElement("a");
   a.href = state.barcode;
-  a.download = "LfK23_Registrierungscode.png";
+  a.download = "LfK25_Registrierungscode.png";
   a.click();
-  toast("Registrierungscode generiert!", { type: TYPE.SUCCESS });
+  toast.clear();
+  toast(t('registrierungscode_generiert'), { type: TYPE.SUCCESS });
 }
 </script>

src/views/ProfileNone.vue

@@ -1,13 +1,11 @@
 <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 />
+            <img class="mx-auto h-24 w-auto" src="/favicon-lfk.png" alt />
-            <h1
+            <h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center font-[Athiti]">Lauf für Kaya! - {{
-                class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
+                $t('profile')
-            >Lauf für Kaya! - {{ $t('profile') }}</h1>
+                }}</h1>
             <p class="mx-auto leading-relaxed text-base text-center">
-                {{ $t('you_have_not_provided_a_valid_access_key') }}
-                <br />
                 {{ $t('access_is_only_provided_via_your_email_link') }}
             </p>
             <div class="mt-6">
@@ -16,9 +14,7 @@
                         <div class="w-full border-t border-gray-300"></div>
                     </div>
                     <div class="relative flex justify-center text-sm">
-                        <span
+                        <span class="px-2 bg-white dark:bg-gray-900">{{ $t('lost_your_registration_mail') }}</span>
-                            class="px-2 bg-white dark:bg-gray-900"
-                        >{{ $t('lost_your_registration_mail') }}</span>
                     </div>
                 </div>
                 <div class="mt-4">
@@ -26,28 +22,20 @@
                         {{ $t('e_mail_adress') }}
                         <span class="font-bold">*</span>
                     </label>
-                    <input
+                    <input v-model="user_email" name="email_address" id="email_address" autocomplete="email"
-                        v-model="user_email"
+                        :placeholder="[[$t('e_mail_adress')]]" type="email"
-                        name="email_address"
-                        id="email_address"
-                        autocomplete="off"
-                        :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"
+                        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) && user_email !== ''" class="text-sm">{{
-                    <p
+                        $t('please_provide_valid_mail')
-                        v-if="!isEmail(user_email)"
+                    }}</p>
-                        class="text-sm"
-                    >{{ $t('please_provide_valid_mail') }}</p>
                 </div>
                 <div class="mt-2">
-                    <a
+                    <button :disabled="(!state.submit_enabled)"
-                        :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"
+                        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">
@@ -60,23 +48,24 @@
                     </div>
                 </div>
                 <div class="mt-2">
-                    <a
+                    <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">{{
-                        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>
-                    >{{ $t('register_now_small') }}</a>
                 </div>
             </div>
         </div>
     </div>
+    <Footer></Footer>
 </template>
 
 <script setup>
-import { computed, ref, reactive, defineProps } from "vue";
+import { computed, ref, reactive } from "vue";
 import axios from "redaxios";
 import isEmail from 'validator/es/lib/isEmail';
-import isMobilePhone from 'validator/es/lib/isMobilePhone';
+import { TYPE, useToast } from "vue-toastification";
-import isPostalCode from 'validator/es/lib/isPostalCode';
+import Footer from "@/components/Footer.vue";
-import { useToast } from "vue-toastification";
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 
 let user_email = ref("");
 // 
@@ -88,16 +77,16 @@ const state = reactive({
 const toast = useToast();
 function resendMail() {
     if (isEmail(user_email.value)) {
-        toast("Login-Link wird angefordert...");
+        toast(t('login_link_is_requested'));
         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("Login-Link gesendet an " + user_email.value + "!");
+                toast(t('login_link_gesendet_an_user_email_value') + user_email.value);
             })
             .catch((error) => {
                 console.log(error);
-                toast("Fehler beim Anfordern des Login-Links...");
+                toast(t('error_requesting_the_login_link'), { type: TYPE.ERROR });
             });
     }
 }

src/views/Register.vue

@@ -1,256 +1,356 @@
 <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">
+    <div class="max-w-md w-full py-12 px-6 font-[Athiti]">
-      <img class="mx-auto h-24 w-auto" src="/favicon.png" alt />
+      <img class="mx-auto h-24 w-auto" src="/favicon-lfk.png" alt />
-      <h1
+      <h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center">
-        class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
+        Lauf für Kaya! - {{ $t('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">
-      <p
+        Bitte klicken Sie zum Fortfahren auf den Link, den wir an
-        v-if="state.org_name !== ''"
+        <b class="font-bold">{{ userdetails.mail }}</b> geschickt haben.
-        class="mx-auto leading-relaxed text-base text-center"
+      </p>
-      >{{ $t('organization') }}: {{ state.org_name }}</p>
+    </div>
-      <p
+  </div>
-        v-if="state.org_name !== '' && state.org_teams.length > 0"
+  <div class="min-h-screen flex items-center justify-center" v-else>
-        class="mx-auto leading-relaxed text-base text-center"
+    <div class="max-w-md w-full py-12 px-6 font-[Athiti]">
-      >Team:</p>
+      <img class="mx-auto h-24 w-auto" src="/favicon-lfk.png" alt />
-      <select
+      <h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center">
-        v-model="org_team"
+        Lauf für Kaya! - {{ $t("registrieren") }}
-        v-if="state.org_name !== '' && state.org_teams.length > 0"
+      </h1>
-        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"
+      <p class="mx-auto leading-relaxed text-base text-center font-medium">
-      >
+        {{ $t("register.register_now") }}
-        <option v-for="t in state.org_teams" :key="t.id" :value="t.id">{{ t.name }}</option>
+      </p>
+      <p v-if="state.org_name !== ''" class="mx-auto leading-relaxed text-base text-center font-medium">
+        {{ $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>
+      <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
+        ">
+        <option v-for="t in state.org_teams" :key="t.id" :value="t.id">
+          {{ t.name }}
+        </option>
       </select>
-      <p
+      <p v-if="state.org_name === ''" class="mx-auto leading-relaxed text-base text-center">
-        v-if="state.org_name === ''"
+        {{ $t('buergerlauf') }}
-        class="mx-auto leading-relaxed text-base text-center"
+      </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
+        <input v-model="userdetails.firstname" name="firstname" id="first_name" autocomplete="off"
-          v-model="userdetails.firstname"
+          :placeholder="[[$t('vorname')]]" type="text" :class="{
-          name="firstname"
+            'border-red-500': !userdetails.firstname.trim(),
-          id="first_name"
+            'border-green-300': userdetails.firstname.trim(),
-          autocomplete="off"
+          }" class="
-          :placeholder="[[$t('vorname')]]"
+            dark:bg-gray-800
-          type="text"
+            mt-1
-          :class="{ 'border-red-500': (!userdetails.firstname.trim()), 'border-green-300': (userdetails.firstname.trim()) }"
+            block
-          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"
+            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">{{
-        <input
+          $t("mittelname")
-          v-model="userdetails.middlename"
+        }}</label>
-          name="middlename"
+        <input v-model="userdetails.middlename" name="middlename" id="middle_name" autocomplete="off"
-          id="middle_name"
+          :placeholder="[[$t('mittelname')]]" type="text" class="
-          autocomplete="off"
+            dark:bg-gray-800
-          :placeholder="[[$t('mittelname')]]"
+            mt-1
-          type="text"
+            block
-          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"
+            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
+        <input v-model="userdetails.lastname" name="lastname" id="last_name" autocomplete="off"
-          v-model="userdetails.lastname"
+          :placeholder="[[$t('nachname')]]" type="text" :class="{
-          name="lastname"
+            'border-red-500': !userdetails.lastname.trim(),
-          id="last_name"
+            'border-green-300': userdetails.lastname.trim(),
-          autocomplete="off"
+          }" class="
-          :placeholder="[[$t('nachname')]]"
+            dark:bg-gray-800
-          type="text"
+            mt-1
-          :class="{ 'border-red-500': (!userdetails.lastname.trim()), 'border-green-300': (userdetails.lastname.trim()) }"
+            block
-          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"
+            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
+        <input v-model="userdetails.mail" name="email_address" id="email_address" autocomplete="off"
-          v-model="userdetails.mail"
+          :placeholder="[[$t('e_mail_adress')]]" type="email" :class="{
-          name="email_address"
+            'border-red-500': !isEmail(userdetails.mail),
-          id="email_address"
+            'border-green-300': isEmail(userdetails.mail),
-          autocomplete="off"
+          }" class="
-          :placeholder="[[$t('e_mail_adress')]]"
+            dark:bg-gray-800
-          type="email"
+            mt-1
-          :class="{ 'border-red-500': (!isEmail(userdetails.mail)), 'border-green-300': (isEmail(userdetails.mail)) }"
+            block
-          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"
+            w-full
-        />
+            shadow-sm
-        <p v-if="!isEmail(userdetails.mail)" class="text-sm">{{ $t('please_provide_valid_mail') }}</p>
+            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>
         <!--  -->
-        <label for="phone" class="select-none block font-medium">{{ $t('phone_number') }}</label>
+        <label for="phone" class="select-none block font-medium">{{
-        <input
+          $t("phone_number")
-          v-model="userdetails.phone"
+        }}</label>
-          name="phone"
+        <input v-model="userdetails.phone" name="phone" id="phone" autocomplete="off"
-          id="phone"
+          :placeholder="[[$t('phone_number')]]" type="text" :class="{
-          autocomplete="off"
+            'border-red-500':
-          :placeholder="[[$t('phone_number')]]"
+              !isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
-          type="text"
+            'border-green-300':
-          :class="{ 'border-red-500': (!isMobilePhone(userdetails.phone) && userdetails.phone.trim()), 'border-green-300': (isMobilePhone(userdetails.phone) && userdetails.phone.trim()) }"
+              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"
+          }" class="
-        />
+            dark:bg-gray-800
-        <p
+            mt-1
-          v-if="(!isMobilePhone(userdetails.phone) && userdetails.phone.trim())"
+            block
-          class="text-sm"
+            w-full
-        >{{ $t('this_is_not_a_valid_international_phone_number') }}</p>
+            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()" class="text-sm">
+          {{ $t("this_is_not_a_valid_international_phone_number") }}
+        </p>
         <!--  -->
         <div class="grid grid-cols-6 mt-6">
           <div class="col-span-6"></div>
           <div class="flex items-start col-span-6">
             <div class="flex items-center h-5">
-              <input
+              <input v-model="provide_address" id="address_activated" name="address_activated" type="checkbox"
-                v-model="provide_address"
+                class="h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-                id="address_activated"
-                name="address_activated"
-                type="checkbox"
-                class="h-4 w-4 text-indigo-600 border-gray-300 rounded"
-              />
             </div>
             <div class="ml-3 text-sm">
-              <label
+              <label for="address_activated" class="font-medium text-gray-600 select-none">{{ $t("provide_address")
-                for="address_activated"
+                }}</label>
-                class="font-medium text-gray-400 select-none"
-              >{{ $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
+              <input v-model="userdetails.address.street" type="text" name="street" :placeholder="[[$t('strasse')]]"
-                v-model="userdetails.address.street"
+                id="street" autocomplete="street-address" :class="{
-                type="text"
+                  'border-red-500': !userdetails.address.street.trim(),
-                name="street"
+                  'border-green-300': userdetails.address.street.trim(),
-                :placeholder="[[$t('strasse')]]"
+                }" class="
-                id="street"
+                  dark:bg-gray-800
-                autocomplete="street-address"
+                  mt-1
-                :class="{ 'border-red-500': (!userdetails.address.street.trim()), 'border-green-300': (userdetails.address.street.trim()) }"
+                  block
-                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"
+                  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">{{
-              <input
+                $t("apartment_suite_etc")
-                v-model="userdetails.address.address2"
+              }}</label>
-                type="text"
+              <input v-model="userdetails.address.address2" type="text" name="address2"
-                name="address2"
+                :placeholder="[[$t('apartment_suite_etc')]]" id="address2" autocomplete="street-address" class="
-                :placeholder="[[$t('apartment_suite_etc')]]"
+                  dark:bg-gray-800
-                id="address2"
+                  mt-1
-                autocomplete="street-address"
+                  block
-                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"
+                  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
+              <input v-model="userdetails.address.city" type="text" name="city" :placeholder="[[$t('ort')]]" id="city"
-                v-model="userdetails.address.city"
+                :class="{
-                type="text"
+                  'border-red-500': !userdetails.address.city.trim(),
-                name="city"
+                  'border-green-300': userdetails.address.city.trim(),
-                :placeholder="[[$t('ort')]]"
+                }" class="
-                id="city"
+                  dark:bg-gray-800
-                :class="{ 'border-red-500': (!userdetails.address.city.trim()), 'border-green-300': (userdetails.address.city.trim()) }"
+                  mt-1
-                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"
+                  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
+              <input v-model="userdetails.address.zipcode" type="text" name="postal_code" :placeholder="[[$t('plz')]]"
-                v-model="userdetails.address.zipcode"
+                id="postal_code" autocomplete="postal-code" :class="{
-                type="text"
+                  'border-red-500': !isPostalCode(
-                name="postal_code"
+                    userdetails.address.zipcode,
-                :placeholder="[[$t('plz')]]"
+                    'DE'
-                id="postal_code"
+                  ),
-                autocomplete="postal-code"
+                  'border-green-300': isPostalCode(
-                :class="{ 'border-red-500': (!isPostalCode(userdetails.address.zipcode, 'DE')), 'border-green-300': (isPostalCode(userdetails.address.zipcode, 'DE')) }"
+                    userdetails.address.zipcode,
-                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"
+                    '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
+            <p v-if="!isPostalCode(userdetails.address.zipcode, 'DE')" class="text-sm">
-              v-if="!isPostalCode(userdetails.address.zipcode, 'DE')"
+              {{ $t("please_provide_a_valid_zipcode") }}
-              class="text-sm"
+            </p>
-            >{{ $t('please_provide_a_valid_zipcode') }}</p>
           </div>
         </div>
         <div class="flex items-start mt-6">
           <div class="flex items-center h-5">
-            <input
+            <input v-model="agb_accepted" id="agb_accepted" name="agb_accepted" type="checkbox"
-              v-model="agb_accepted"
+              class="h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-              id="agb_accepted"
-              name="agb_accepted"
-              type="checkbox"
-              class="h-4 w-4 text-indigo-600 border-gray-300 rounded"
-            />
           </div>
           <div class="ml-3 text-sm">
-            <label for="agb_accepted" class="font-medium text-gray-400 select-none">
+            <label for="agb_accepted" class="font-medium text-gray-600 select-none">
-              {{ $t('i_accept', { tos: $t('tos') }) }}
+              {{ $t("i_accept", { tos: $t("privacy_policy") }) }}
-              <a
+              <a target="_blank" rel="noreferrer,noopener" href="https://lauf-fuer-kaya.de/datenschutz/"
-                target="_blank"
+                class="underline">{{ $t("privacy_policy") }}</a>
-                rel="noreferrer,noopener"
+              {{ $t("i_accept_end") }}
-                href="https://lauf-fuer-kaya.de/datenschutz/"
-                class="underline"
-              >{{ $t('tos') }}</a>
-              {{ $t('i_accept_end') }}
               <span class="font-bold">*</span>
             </label>
           </div>
         </div>
         <div class="flex items-start mt-6">
           <div class="flex items-center h-5">
-            <input
+            <input v-model="data_confirmed" id="data_confirmed" name="data_confirmed" type="checkbox"
-              v-model="data_confirmed"
+              class="h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-              id="data_confirmed"
-              name="data_confirmed"
-              type="checkbox"
-              class="h-4 w-4 text-indigo-600 border-gray-300 rounded"
-            />
           </div>
           <div class="ml-3 text-sm">
-            <label for="data_confirmed" class="font-medium text-gray-400 select-none">
+            <label for="data_confirmed" class="font-medium text-gray-600 select-none">
-              {{ $t('confirm_personal_data') }}
+              {{ $t("confirm_personal_data") }}
               <span class="font-bold">*</span>
             </label>
           </div>
         </div>
         <div class="mt-6">
-          <button
+          <button @click="login" :disabled="!state.submit_enabled" :class="{
-            @click="login"
+            'opacity-50': !state.submit_enabled,
-            :disabled="(!state.submit_enabled)"
+            'cursor-not-allowed': !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"
+              text-white
-          >{{ $t('registrieren') }}</button>
+              block
+              w-full
+              text-center
+              py-2
+              px-3
+              border-2 border-gray-300
+              rounded-md
+              p-1
+              bg-blue-800
+              font-medium
+              not-disabled:hover:border-gray-400
+              not-disabled:hover:bg-blue-600
+              not-disabled:cursor-pointer
+              not-disabled:focus:outline-none focus:border-gray-400
+              sm:text-sm
+            ">
+            {{ $t("registrieren") }}
+          </button>
         </div>
       </div>
     </div>
   </div>
+  <Footer></Footer>
 </template>
 
 <script setup>
-import { computed, ref, reactive, defineProps } from "vue";
+import { computed, ref, reactive } 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";
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 
 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;
@@ -261,31 +361,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 (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;
       }
@@ -296,25 +416,37 @@ 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("Registrierung läuft...");
+      toast(t('registration_running'));
-      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(t('already_registered'), { type: TYPE.ERROR });
+          } else if (error.data.message === "Invalid body, check 'errors' property for more info.") {
+            error.data.errors.forEach(e => {
+              if (e.property === "phone") {
+                toast(t('invalid_input_phone_number_should_be_international_format'), { type: TYPE.ERROR });
+              }
+            });
+          }
         });
     }
   }

tailwind.config.js

@@ -1,11 +0,0 @@
-module.exports = {
-	purge: [ './index.html', './src/**/*.{vue,js,ts,jsx,tsx}' ],
-	darkMode: 'media', // or 'media' or 'class'
-	theme: {
-		extend: {}
-	},
-	variants: {
-		extend: {}
-	},
-	plugins: []
-};

vite.config.js

@@ -1,13 +1,15 @@
-import { defineConfig } from 'vite';
+import { fileURLToPath, URL } from "node:url";
-import vue from '@vitejs/plugin-vue';
+
-import path from 'path';
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+import tailwindcss from "@tailwindcss/vite";
+import vueDevTools from "vite-plugin-vue-devtools";
 
 export default defineConfig({
-	plugins: [ vue() ],
+	plugins: [vue(), vueDevTools(), tailwindcss()],
-	base: './',
 	resolve: {
 		alias: {
-			'@': path.resolve(__dirname, '/src')
+			"@": fileURLToPath(new URL("./src", import.meta.url)),
-		}
+		},
-	}
+	},
 });