added 'yarn postbuild' script for fixing env.js in dist/index.html

ref #31

.drone.yml

@@ -1,109 +1,134 @@
----
+---
-kind: secret
+kind: secret
-name: docker_username
+name: docker_username
-get:
+get:
-  path: odit-registry-builder
+  path: odit-registry-builder
-  name: username
+  name: username
-
+
----
+---
-kind: secret
+kind: secret
-name: docker_password
+name: docker_password
-get:
+get:
-  path: odit-registry-builder
+  path: odit-registry-builder
-  name: password
+  name: password
-
+
----
+---
-kind: secret
+kind: secret
-name: git_ssh
+name: git_ssh
-get:
+get:
-  path: odit-git-bot
+  path: odit-git-bot
-  name: sshkey
+  name: sshkey
-
+
----
+---
-kind: pipeline
+kind: pipeline
-type: kubernetes
+type: kubernetes
-name: build:dev
+name: build:dev
-
+
-steps:
+steps:
-  # - name: run full license export
+  # - name: run full license export
-  #   depends_on: ["clone"]
+  #   depends_on: ["clone"]
-  #   image: node:alpine
+  #   image: node:alpine
-  #   commands:
+  #   commands:
-  #     - yarn
+  #     - yarn
-  #     - yarn licenses:export
+  #     - yarn licenses:export
-  # - name: push new licenses file to repo
+  # - name: push new licenses file to repo
-  #   depends_on: ["run full license export"]
+  #   depends_on: ["run full license export"]
-  #   image: appleboy/drone-git-push
+  #   image: appleboy/drone-git-push
-  #   settings:
+  #   settings:
-  #     branch: dev
+  #     branch: dev
-  #     commit: true
+  #     commit: true
-  #     commit_message: new license file version [CI SKIP]
+  #     commit_message: new license file version [CI SKIP]
-  #     author_email: bot@odit.services
+  #     author_email: bot@odit.services
-  #     remote: git@git.odit.services:lfk/selfservice.git
+  #     remote: git@git.odit.services:lfk/selfservice.git
-  #     ssh_key:
+  #     ssh_key:
-  #       from_secret: git_ssh
+  #       from_secret: git_ssh
-  - name: build dev
+  - name: build dev
-    image: plugins/docker
+    image: plugins/docker
-    depends_on: [clone]
+    depends_on: [clone]
-    settings:
+    settings:
-      username:
+      username:
-        from_secret: docker_username
+        from_secret: docker_username
-      password:
+      password:
-        from_secret: docker_password
+        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
+      repo: registry.odit.services/lfk/selfservice
-      tags:
+      tags:
-        - dev
+        - dev
-      registry: registry.odit.services
+      registry: registry.odit.services
-      mtu: 1000
+      mtu: 1000
-trigger:
+trigger:
-  branch:
+  branch:
-    - dev
+    - dev
-  event:
+  event:
-    - push
+    - push
-
+
----
+---
-kind: pipeline
+kind: pipeline
-type: kubernetes
+type: kubernetes
-name: build:latest
+name: build:testing
-
+
-steps:
+steps:
-  - name: build latest
+  - name: build testing
-    image: plugins/docker
+    image: plugins/docker
-    depends_on: [clone]
+    depends_on: [clone]
-    settings:
+    settings:
-      username:
+      username:
-        from_secret: docker_username
+        from_secret: docker_username
-      password:
+      password:
-        from_secret: docker_password
+        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
+      repo: registry.odit.services/lfk/selfservice
-      tags:
+      tags:
-        - latest
+        - testing
-      registry: registry.odit.services
+      registry: registry.odit.services
-      mtu: 1000
+      mtu: 1000
-trigger:
+trigger:
-  branch:
+  branch:
-    - main
+    - bugfix/31-env_linking
-  event:
+  event:
-    - push
+    - push
-
+
----
+---
-kind: pipeline
+kind: pipeline
-type: kubernetes
+type: kubernetes
-name: build:tags
+name: build:latest
-steps:
+
-  - name: build $DRONE_TAG
+steps:
-    image: plugins/docker
+  - name: build latest
-    depends_on: [clone]
+    image: plugins/docker
-    settings:
+    depends_on: [clone]
-      username:
+    settings:
-        from_secret: docker_username
+      username:
-      password:
+        from_secret: docker_username
-        from_secret: docker_password
+      password:
-      repo: registry.odit.services/lfk/selfservice
+        from_secret: docker_password
-      tags:
+      repo: registry.odit.services/lfk/selfservice
-        - '${DRONE_TAG}'
+      tags:
-      registry: registry.odit.services
+        - latest
-      mtu: 1000
+      registry: registry.odit.services
-trigger:
+      mtu: 1000
-  event:
+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

CHANGELOG.md

@@ -2,8 +2,146 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.7.0](https://git.odit.services/lfk/selfservice/compare/0.6.1...0.7.0)
+
+- Merge pull request 'Donation list feature/39-donation_list' (#40) from feature/39-donation_list into dev [`4c83e2e`](https://git.odit.services/lfk/selfservice/commit/4c83e2e738a075354383dca4d500808f761247d2)
+- Added total to bottom of page [`89820d4`](https://git.odit.services/lfk/selfservice/commit/89820d44501793365248b8e778522cdc188afa70)
+- Sorted translations 🌍 [`cb1b9d3`](https://git.odit.services/lfk/selfservice/commit/cb1b9d330b28f11cceed9691aee4ccee5246d346)
+- Added basic sponsoring table [`f141130`](https://git.odit.services/lfk/selfservice/commit/f141130db5ede60a623747f4e324f66259e5bc75)
+- Added translations 🌍 [`d713fbe`](https://git.odit.services/lfk/selfservice/commit/d713fbef94e75fbbc62254ea8f0ca50dc4e93d79)
+- Now w/ formatted currency amount [`815a36f`](https://git.odit.services/lfk/selfservice/commit/815a36f20271f47f49c3814b001c3404d43113cd)
+- Fixed spaces in name [`baa6da3`](https://git.odit.services/lfk/selfservice/commit/baa6da3dd06c493fccc61945b9bcbd9b2e79d910)
+- Updated env description [`5a123b0`](https://git.odit.services/lfk/selfservice/commit/5a123b0cf89f49d450becbbc03b28c5bb6416b7c)
+- added distance formatting [`121022c`](https://git.odit.services/lfk/selfservice/commit/121022c8434484a363a3f2ea68aba4d8ef7cad2d)
+
+#### [0.6.1](https://git.odit.services/lfk/selfservice/compare/0.6.0...0.6.1)
+
+> 6 April 2021
+
+- 🚀Bumped version to v0.6.1 [`f5ae214`](https://git.odit.services/lfk/selfservice/commit/f5ae2145df07413329f60c229d9571fd1de2ca79)
+- Fixed imprint/privacy default links [`96c0e56`](https://git.odit.services/lfk/selfservice/commit/96c0e5698697361e65c5aa80c9a0aada5c3d5f30)
+
+#### [0.6.0](https://git.odit.services/lfk/selfservice/compare/0.5.1...0.6.0)
+
+> 3 April 2021
+
+- 🚀Bumped version to v0.6.0 [`bc1de2a`](https://git.odit.services/lfk/selfservice/commit/bc1de2acdcbf8f3319026887cb6b3d594fcd63dc)
+- first part of certificate generation with manual data [`f633439`](https://git.odit.services/lfk/selfservice/commit/f6334397dc99cd38d31ef524bc26ba7d386b33dd)
+- Renoved fixed data [`f0a7f35`](https://git.odit.services/lfk/selfservice/commit/f0a7f35dec07508a07d4c11abda297ad0bf91187)
+- Revert "🚀Bumped version to v0.6.0" [`145b499`](https://git.odit.services/lfk/selfservice/commit/145b49906bdf2d75abf93e1779f188a691a3a909)
+- 🚀Bumped version to v0.6.0 [`0a62e8f`](https://git.odit.services/lfk/selfservice/commit/0a62e8f5d1929bfe9a53a9709a3031f06a2487c3)
+- Merge pull request 'Certificate download feature/19-runner_certficates' (#38) from feature/19-runner_certficates into dev [`53eeb6b`](https://git.odit.services/lfk/selfservice/commit/53eeb6be3ddf4735a11b6c4636c28b4d16aa58ee)
+- Fixed blob handling [`b938cfc`](https://git.odit.services/lfk/selfservice/commit/b938cfc49e269e76761a752f8257ebbab88f6959)
+- Reverted relative linking fix [`c3b2b93`](https://git.odit.services/lfk/selfservice/commit/c3b2b93d90102b4e31cfce15220acfc8fe48a7c5)
+
+#### [0.5.1](https://git.odit.services/lfk/selfservice/compare/0.5.0...0.5.1)
+
+> 3 April 2021
+
+- Merge pull request 'feature/30-profile-forgot-link' (#35) from feature/30-profile-forgot-link into dev [`#30`](https://git.odit.services/lfk/selfservice/issues/30)
+- 🚀Bumped version to v0.5.1 [`1a3c9ed`](https://git.odit.services/lfk/selfservice/commit/1a3c9edeb3987907ffe2223da8f3be079a1c80d2)
+- Merge pull request 'Env linking bugfix bugfix/31-env_linking' (#37) from bugfix/31-env_linking into dev [`fd6bd88`](https://git.odit.services/lfk/selfservice/commit/fd6bd88d4238cca2a2755ab1bc51ff7870bef947)
+- basic ProfileNone layout [`863568d`](https://git.odit.services/lfk/selfservice/commit/863568d7d0e132dd1b7d13a2cb1afe8db02c472c)
+- add forgot view + action [`30f3a51`](https://git.odit.services/lfk/selfservice/commit/30f3a51ef82ad966225abc6fd95508af56106924)
+- Added building pipeline for current branch [`544542a`](https://git.odit.services/lfk/selfservice/commit/544542ac1e9717506676c1495c2d530eca833d31)
+- Removed useless code [`713db5e`](https://git.odit.services/lfk/selfservice/commit/713db5e1e8fed5f38b3a5d19cfe870eff16eeda1)
+- Now manually linking env and main [`67c0dae`](https://git.odit.services/lfk/selfservice/commit/67c0dae537df5842e89c0ed040c0fef02df01b69)
+- Fixed post url and body [`0795ea3`](https://git.odit.services/lfk/selfservice/commit/0795ea318d80b764eee89462ad87da86aa7ce0ae)
+- 🐞 fix home routes [`60dea51`](https://git.odit.services/lfk/selfservice/commit/60dea511b9fbb6d206ee531618e788e686fa6b5a)
+
+#### [0.5.0](https://git.odit.services/lfk/selfservice/compare/0.4.5...0.5.0)
+
+> 1 April 2021
+
+- 🚀Bumped version to v0.5.0 [`676f0e8`](https://git.odit.services/lfk/selfservice/commit/676f0e83393be823ccb612846650a9a98bf7f0b3)
+- Revert "🚀Bumped version to v0.5.0" [`27fd8f9`](https://git.odit.services/lfk/selfservice/commit/27fd8f9a9106294ae6522f2fff42dfbf84f06f82)
+- 🚀Bumped version to v0.5.0 [`b8c1b8c`](https://git.odit.services/lfk/selfservice/commit/b8c1b8c43b6d050d239d836bbb6ace2504fdcd21)
+- Merge pull request 'Runner self deletion feature/21-user_deletion' (#36) from feature/21-user_deletion into dev [`bd512e0`](https://git.odit.services/lfk/selfservice/commit/bd512e0651363f1f2543136d354d9ada9990d83d)
+- Sorted translations [`cf0437c`](https://git.odit.services/lfk/selfservice/commit/cf0437c3a738d42154ed1336d6020b88661b462f)
+- Added translations 🌍 [`ba3dedb`](https://git.odit.services/lfk/selfservice/commit/ba3dedb1643e2d5f1c2ab92224a11c1c8a82ae71)
+- Added confirmation for profile deletion [`8773239`](https://git.odit.services/lfk/selfservice/commit/8773239244c064a888a4ad1f66298f2811fcc2ae)
+- Added confirmation for profile deletion [`85b0549`](https://git.odit.services/lfk/selfservice/commit/85b0549a11927758c579cd08bc8015ae00105a84)
+- Updated icons [`d710d4b`](https://git.odit.services/lfk/selfservice/commit/d710d4b68ff0e9515eb4a0a4ea0def7b3552e599)
+- Added data deletion button [`619078c`](https://git.odit.services/lfk/selfservice/commit/619078cce8281bef520b05bf3e735c26d0752375)
+- Content i18n run 🌍 [`175bb16`](https://git.odit.services/lfk/selfservice/commit/175bb168ae134009c26072b76cd74948aecc189f)
+- Implemented basic deletion [`fc04e71`](https://git.odit.services/lfk/selfservice/commit/fc04e713110df161c481cb9a3b64e78b30d4f79b)
+- Added translations [`8a24505`](https://git.odit.services/lfk/selfservice/commit/8a24505d64832001d6a44800f61f7e0705892046)
+- Updated toasts and removed useless code [`7440fc4`](https://git.odit.services/lfk/selfservice/commit/7440fc404ea2a8e68e7ce896e8369700069b2021)
+- Added error toast [`9751c2e`](https://git.odit.services/lfk/selfservice/commit/9751c2e9fd99650efab4d5edce3909c907ea9391)
+- Merge pull request 'RELEASE 0.3.0' (#25) from dev into main [`1c19657`](https://git.odit.services/lfk/selfservice/commit/1c196579356a70f9d761f7f69d79033157570076)
+
+#### [0.4.5](https://git.odit.services/lfk/selfservice/compare/0.4.4...0.4.5)
+
+> 1 April 2021
+
+- Merge pull request 'feature/32-registration-language' (#33) from feature/32-registration-language into dev [`#32`](https://git.odit.services/lfk/selfservice/issues/32)
+- 🚀Bumped version to v0.4.5 [`efcb7f5`](https://git.odit.services/lfk/selfservice/commit/efcb7f56745aa3f347eb98399ee1bcb68a157e9d)
+- 🐞 fix /profile/ router on register [`52a0828`](https://git.odit.services/lfk/selfservice/commit/52a082841d47d1ed9c0997776a0784285a3f6ba7)
+- pass browser locale to api/runners/register/ [`e3f7497`](https://git.odit.services/lfk/selfservice/commit/e3f7497af5860b2472b6cdfd33090b9d68b9fb49)
+
+#### [0.4.4](https://git.odit.services/lfk/selfservice/compare/0.4.3...0.4.4)
+
+> 31 March 2021
+
+- 🚀Bumped version to v0.4.4 [`9b62962`](https://git.odit.services/lfk/selfservice/commit/9b62962758f8a73d669bca69b77f2c09a13c9e7a)
+- 🚑 hotfix - baseurl_selfservice -> baseurl [`84dc33b`](https://git.odit.services/lfk/selfservice/commit/84dc33bf14ace839261aea02ffbcac5d627f8200)
+
+#### [0.4.3](https://git.odit.services/lfk/selfservice/compare/0.4.2...0.4.3)
+
+> 31 March 2021
+
+- 🚀Bumped version to v0.4.3 [`cad34d3`](https://git.odit.services/lfk/selfservice/commit/cad34d357b9bd8501eed26b35b5324d2b4f756c3)
+- 🚑 hotfix - Profile api path [`2056ce1`](https://git.odit.services/lfk/selfservice/commit/2056ce1e62a33e14bce5bdef5ea8cd38e039dc62)
+
+#### [0.4.2](https://git.odit.services/lfk/selfservice/compare/0.4.1...0.4.2)
+
+> 31 March 2021
+
+- 🚀Bumped version to v0.4.2 [`3b2c99c`](https://git.odit.services/lfk/selfservice/commit/3b2c99c7090de03aab12415342136460ddd735ee)
+- 🚑 fix organization registration token [`f150821`](https://git.odit.services/lfk/selfservice/commit/f150821f0f60e4798b02ebf50588da61ccb51279)
+
+#### [0.4.1](https://git.odit.services/lfk/selfservice/compare/0.4.0...0.4.1)
+
+> 31 March 2021
+
+- Fixed registration routing [`2141f62`](https://git.odit.services/lfk/selfservice/commit/2141f62dca7ecb2be2579a7e79ffca513563c22a)
+- 🚀Bumped version to v0.4.1 [`5191ece`](https://git.odit.services/lfk/selfservice/commit/5191ecea1eb3ac66a3f0c2743d43ff5b505061b7)
+
+#### [0.4.0](https://git.odit.services/lfk/selfservice/compare/0.3.1...0.4.0)
+
+> 31 March 2021
+
+- Merge pull request 'bugfix/27-route-matching' (#28) from bugfix/27-route-matching into dev [`#27`](https://git.odit.services/lfk/selfservice/issues/27)
+- added missing routes [`f603e53`](https://git.odit.services/lfk/selfservice/commit/f603e531512a2245ea2fe41304eb039080bcba28)
+- added env config instructions [`ba604f7`](https://git.odit.services/lfk/selfservice/commit/ba604f77e9ce770e60f032cf393a5987a0401fbe)
+- 🚀Bumped version to v0.4.0 [`149fbdf`](https://git.odit.services/lfk/selfservice/commit/149fbdf58180d1af33f9741d9076df0bb1591130)
+- Home - route fixes [`c178932`](https://git.odit.services/lfk/selfservice/commit/c178932d943e08168fa6be39eb0a1d7e4a25824a)
+- route fix for favicon + background [`106bf4c`](https://git.odit.services/lfk/selfservice/commit/106bf4c0ff07fe847f98aa250230f2a272f55a04)
+- favicon fix [`63d9ee2`](https://git.odit.services/lfk/selfservice/commit/63d9ee2f867e42ecd23ca1d48d59b6deb7458d76)
+- load main.js as deferred [`2e7a718`](https://git.odit.services/lfk/selfservice/commit/2e7a718daa7ca607622e3e339bdb85f5c64cfcf0)
+
+#### [0.3.1](https://git.odit.services/lfk/selfservice/compare/0.3.0...0.3.1)
+
+> 31 March 2021
+
+- 🐞 fixed Vite/ Tailwind build [`27b81d8`](https://git.odit.services/lfk/selfservice/commit/27b81d87aeb907f6c3d35ea6f55b4fe56c1e79b4)
+- 🚀Bumped version to v0.3.1 [`6e0bf56`](https://git.odit.services/lfk/selfservice/commit/6e0bf56289852cda0c30325f4b8ca7826386abf4)
+
+#### [0.3.0](https://git.odit.services/lfk/selfservice/compare/0.2.0...0.3.0)
+
+> 30 March 2021
+
+- Merge branch 'bugfix/23-broken-build' into dev [`#23`](https://git.odit.services/lfk/selfservice/issues/23)
+- migrate to Tailwind JIT + views + router/ build fix [`15b60f6`](https://git.odit.services/lfk/selfservice/commit/15b60f60b5d4f3c4035460f25807c5f5f2f19578)
+- 🚀Bumped version to v0.3.0 [`cb5f48d`](https://git.odit.services/lfk/selfservice/commit/cb5f48d913b8aff2b138c93c4e29a2b8a553529d)
+- 🐞 fix release config [`ae44d7e`](https://git.odit.services/lfk/selfservice/commit/ae44d7e2e86b9bee74d453301846d02b29c632f2)
+- 🚀Bumped version to v0.1.2 [`5253fb1`](https://git.odit.services/lfk/selfservice/commit/5253fb18325ce9069e84180b30110ae97752ef20)
+
 #### [0.2.0](https://git.odit.services/lfk/selfservice/compare/0.1.1...0.2.0)
 
+> 27 March 2021
+
+- 🚀Bumped version to v0.2.0 [`83924a9`](https://git.odit.services/lfk/selfservice/commit/83924a9416dc966a417b32fa19b5fb725181e5ee)
 - Added ci to build dev and tags [`a174df1`](https://git.odit.services/lfk/selfservice/commit/a174df19ddbf65b0229af38947a9416b1bcd0703)
 - Now building latest from main [ci-skip] [`323ddc1`](https://git.odit.services/lfk/selfservice/commit/323ddc1c3d91ffa74200ed9250b891d2fe4da78d)
 - Added releaseit config [`eec6a35`](https://git.odit.services/lfk/selfservice/commit/eec6a358d899a40eb6bac92bb3af37b2d37a5d91)

Dockerfile

@@ -3,6 +3,7 @@ WORKDIR /app
 COPY . .
 RUN yarn
 RUN yarn build
+RUN yarn postbuild
 # final image
 FROM fholzer/nginx-brotli:v1.19.1
 COPY --from=0 /app/dist /usr/share/nginx/html

README.md

@@ -4,7 +4,7 @@ runner selfservice portal
 
 ## ⚡ Development
 ### Requirements
-- Node.js v14.15.0 or newer
+- Node.js v14.16.0 or newer
 - yarn package manager >= v1.22.10 < 2
 
 ### Recommended Extensions
@@ -14,9 +14,17 @@ runner selfservice portal
 ### 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
 
-## 🔨 environment 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 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
+  - 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

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

index.html

@@ -1,17 +1,17 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
-<html lang="de">
+<html lang="de">
-
+
-<head>
+<head>
-  <meta charset="UTF-8">
+  <meta charset="UTF-8">
-  <link rel="icon" href="/favicon.ico" />
+  <link rel="icon" href="/favicon.ico" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Lauf für Kaya! - Selfservice</title>
+  <title>Lauf für Kaya! - Selfservice</title>
-</head>
+</head>
-
+
-<body class="dark:bg-gray-900 text-black dark:text-white p-0">
+<body class="dark:bg-gray-900 text-black dark:text-white p-0">
-  <div id="app"></div>
+  <div id="app"></div>
-  <script src="/env.js"></script>
+  <script src="/env.js"></script>
-  <script type="module" src="/src/main.js"></script>
+  <script defer type="module" src="/src/main.js"></script>
-</body>
+</body>
-
+
 </html>

nginx.conf

@@ -7,9 +7,16 @@ http {
         error_page 404 /index.html;
         root /usr/share/nginx/html;
         location / {
+            rewrite /register/(.*) /$1  break;
+            rewrite /profile/(.*) /$1  break;
+
             try_files $uri $uri/ /index.html;
         }
+
         location ~* \.(?:ico|css|gif|jpe?g|png)$ {
+            rewrite /register/(.*) /$1  break;
+            rewrite /profile/(.*) /$1  break;
+
             expires 1y;
             add_header Pragma public;
             add_header Cache-Control "public";

package.json

@@ -1,47 +1,51 @@
-{
+{
-  "name": "@odit/lfk-selfservice",
+	"name": "@odit/lfk-selfservice",
-  "version": "0.2.0",
+	"version": "0.7.0",
-  "scripts": {
+	"scripts": {
-    "dev": "vite",
+		"dev": "vite",
-    "build": "vite build",
+		"build": "vite build",
-    "release": "release-it --only-version"
+		"release": "release-it --only-version",
-  },
+		"postbuild": "node env_fix.js"
-  "dependencies": {
+	},
-    "marked": "^2.0.1",
+	"dependencies": {
-    "redaxios": "^0.4.1",
+		"marked": "2.0.3",
-    "toastify-js": "^1.10.0",
+		"redaxios": "0.4.1",
-    "validator": "^13.5.2",
+		"toastify-js": "1.10.0",
-    "vue": "^3.0.5",
+		"validator": "13.5.2",
-    "vue-i18n": "^9.0.0",
+		"vue-i18n": "9.1.4",
-    "vue-router": "4",
+		"vue-toastification": "2.0.0-rc.1",
-    "vue-toastification": "^2.0.0-rc.1"
+		"vue": "3.0.9",
-  },
+		"vue-router": "4.0.5"
-  "devDependencies": {
+	},
-    "@vitejs/plugin-vue": "^1.1.5",
+	"devDependencies": {
-    "@vue/compiler-sfc": "^3.0.7",
+		"@tailwindcss/jit": "0.1.18",
-    "autoprefixer": "^10.2.5",
+		"@tailwindcss/aspect-ratio": "0.2.0",
-    "postcss": "^8.2.8",
+		"@tailwindcss/forms": "0.3.2",
-    "release-it": "^14.5.0",
+		"@tailwindcss/line-clamp": "0.2.0",
-    "tailwindcss": "^2.0.4",
+		"@tailwindcss/typography": "0.4.0",
-    "vite": "^2.1.3",
+		"@vitejs/plugin-vue": "1.2.1",
-    "vite-plugin-windicss": "^0.10.2"
+		"@vue/compiler-sfc": "3.0.11",
-  },
+		"autoprefixer": "10.2.5",
-  "release-it": {
+		"tailwindcss": "2.1.1",
-    "git": {
+		"release-it": "14.6.1",
-      "commit": true,
+		"vite": "2.1.5"
-      "requireCleanWorkingDir": false,
+	},
-      "commitMessage": "🚀Bumped version to v${version}",
+	"release-it": {
-      "requireBranch": "dev",
+		"git": {
-      "push": false,
+			"commit": true,
-      "tag": true,
+			"requireCleanWorkingDir": false,
-      "tagName": null,
+			"commitMessage": "🚀Bumped version to v${version}",
-      "tagAnnotation": "v${version}"
+			"requireBranch": "dev",
-    },
+			"push": false,
-    "npm": {
+			"tag": true,
-      "publish": false
+			"tagName": null,
-    },
+			"tagAnnotation": "v${version}"
-    "hooks": {
+		},
-      "after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js  && git add src/locales"
+		"npm": {
-    }
+			"publish": false
-  }
+		},
-}
+		"hooks": {
+			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js  && git add src/locales"
+		}
+	}
+}

postcss.config.js

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

public/env.sample.js

@@ -1,12 +1,12 @@
 const config = {
 	// required
 	documentserver_key: '',
-	// required
+	// required, with trailing slash
 	baseurl: '',
-	// optional, will fallback to /selfservice
+	// optional, will fallback to /selfservice/
-	baseurl_selfservice: '/selfservice',
+	baseurl_selfservice: '/selfservice/',
-	// optional, will fallback to /imprint
+	// optional, will fallback to baseurl_selfservice/imprint
 	url_imprint: '',
-	// optional, will fallback to /privacy
+	// optional, will fallback to baseurl_selfservice/privacy
 	url_privacy: ''
 };

src/App.vue

@@ -1,8 +1,5 @@
 <template>
-  <router-view></router-view>
+  <main>
-</template>
+    <router-view></router-view>
-
+  </main>
-<script setup>
+</template>
-console.log(config.baseurl_selfservice);
-config.baseurl_selfservice = (config.baseurl_selfservice || "/selfservice");
-</script>

src/components/Footer.vue

@@ -31,8 +31,8 @@
 export default {
   data() {
     return {
-      imprint_url: config.url_imprint || "/imprint/"
+      imprint_url: config.url_imprint || config.baseurl_selfservice + "imprint"
-      , privacy_url: config.url_privacy || "/privacy/"
+      , privacy_url: config.url_privacy || config.baseurl_selfservice + "privacy"
     }
   },
 }

src/components/Profile.vue

@@ -1,212 +0,0 @@
-<template>
-  <div class="min-h-screen w-full p-4">
-    <section class="text-white body-font">
-      <div class="container mx-auto flex items-center md:flex-row flex-col">
-        <div
-          class="flex flex-col md:pr-10 md:mb-0 mb-6 pr-0 w-full md:w-auto md:text-left text-center text-black dark:text-gray-200"
-        >
-          <p
-            class="text-3xl font-bold whitespace-nowrap"
-            v-text="(state.firstname || '') + ' ' + (state.middlename || '') + ' ' + (state.lastname || '')"
-          ></p>
-          <p class="text-md whitespace-nowrap">{{ state.group }}</p>
-        </div>
-        <div class="inline-flex md:ml-auto md:mr-0 mx-auto items-center">
-          <button
-            type="button"
-            class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-              stroke="currentColor"
-              stroke-width="2"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              class="feather feather-download"
-              style="display: inline;height: 1rem;vertical-align: sub;"
-            >
-              <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
-              <polyline points="7 10 12 15 17 10" />
-              <line x1="12" y1="15" x2="12" y2="3" />
-            </svg>
-            {{ $t('download_certificate') }}
-          </button>
-        </div>
-      </div>
-    </section>
-    <div class="flex flex-wrap">
-      <div class="w-full p-4">
-        <div class="flex flex-wrap flex-col w-full tabs">
-          <div class="flex lg:flex-wrap flex-row lg:space-x-2">
-            <div class="flex-none">
-              <button
-                @click="() => { state.activetab = 'profile' }"
-                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'profile') }"
-                class="tab tab-underline py-4 px-6 block"
-                type="button"
-              >{{ $t('profile') }}</button>
-            </div>
-            <div class="flex-none">
-              <button
-                @click="() => { state.activetab = 'laptimes' }"
-                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'laptimes') }"
-                class="tab tab-underline py-4 px-6 block"
-                type="button"
-              >{{ $t('lap_times') }}</button>
-            </div>
-            <div class="flex-none">
-              <button
-                @click="() => { state.activetab = 'sponsorings' }"
-                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'sponsorings') }"
-                class="tab tab-underline py-4 px-6 block"
-                type="button"
-              >{{ $t('sponsoring') }}</button>
-            </div>
-          </div>
-          <div v-if="(state.activetab === 'profile')" class="tab-content block">
-            <div class="py-4 w-full">
-              <div class="flex flex-col">
-                <form class="form flex flex-wrap w-full">
-                  <div class="w-full">
-                    <div class="form-element">
-                      <div class="text-lg">{{ $t('vorname') }}</div>
-                      <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
-                        v-text="state.firstname"
-                      />
-                    </div>
-                    <div class="form-element">
-                      <div class="text-lg">{{ $t('mittelname') }}</div>
-                      <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
-                        v-text="state.middlename"
-                      />
-                    </div>
-                    <div class="form-element">
-                      <div class="text-lg">{{ $t('nachname') }}</div>
-                      <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
-                        v-text="state.lastname"
-                      />
-                    </div>
-                    <div class="form-element">
-                      <div class="text-lg">{{ $t('e_mail_adress') }}</div>
-                      <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
-                        v-text="state.email"
-                      />
-                    </div>
-                    <div class="form-element">
-                      <div class="text-lg">{{ $t('phone_number') }}</div>
-                      <p
-                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
-                        v-text="state.phone"
-                      />
-                    </div>
-                  </div>
-                </form>
-              </div>
-            </div>
-          </div>
-          <div v-if="(state.activetab === 'laptimes')" class="tab-content block">
-            <div class="py-4 w-full">
-              <section class="text-gray-400 dark:bg-gray-900 body-font">
-                <div class="container mx-auto">
-                  <div class="lg:w-2/3 w-full mx-auto overflow-auto">
-                    <table
-                      v-if="state.scans.length > 0"
-                      class="table-auto w-full text-left whitespace-no-wrap"
-                    >
-                      <thead
-                        class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
-                      >
-                        <tr>
-                          <th
-                            class="px-4 py-3 title-font tracking-wider font-medium"
-                          >{{ $t('distance') }}</th>
-                          <th
-                            class="px-4 py-3 title-font tracking-wider font-medium"
-                          >{{ $t('lap_time') }}</th>
-                        </tr>
-                      </thead>
-                      <tbody class="text-gray-900 dark:text-gray-50">
-                        <tr v-for="s in state.scans" :key="s.id">
-                          <td class="px-4 py-3">
-                            <span v-text="s.distance"></span>m
-                          </td>
-                          <td class="px-4 py-3" v-text="s.lapTime"></td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <div v-else class="text-center font-bold text-black dark:text-white text-2xl">
-                      <img
-                        src="../assets/empty_laps.svg"
-                        style="height:25rem; margin:0 auto;"
-                        :alt="[[$t('no_laps_scans_were_recorded_yet')]]"
-                      />
-                      {{ $t('no_laps_scans_were_recorded_yet') }}
-                    </div>
-                  </div>
-                </div>
-              </section>
-            </div>
-          </div>
-          <div v-if="(state.activetab === 'sponsorings')" class="tab-content block">
-            <div class="py-4 w-full">coming soon...</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive } from "vue";
-import { useToast } from "vue-toastification";
-import axios from "redaxios";
-// import isEmail from 'validator/es/lib/isEmail';
-// import isMobilePhone from 'validator/es/lib/isMobilePhone';
-// import isPostalCode from 'validator/es/lib/isPostalCode';
-// 
-const state = reactive({
-  phone: "",
-  email: "",
-  firstname: "",
-  middlename: "",
-  lastname: "",
-  scans: [],
-  group: "",
-  activetab: "profile",
-})
-const toast = useToast();
-const props = defineProps({
-  token: String
-})
-const accesstoken = atob(props.token);
-axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
-  .then(({ data }) => {
-    state.phone = data.phone;
-    state.email = data.email;
-    state.firstname = data.firstname;
-    state.middlename = data.middlename;
-    state.lastname = data.lastname;
-    state.group = data.group;
-  }).catch((error) => {
-    toast.error("An error occured while loading your profile data");
-  })
-axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
-  .then(({ data }) => {
-    data.map(function(s) {
-      s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
-      return s;
-    })
-    data.filter(s => s.valid === true);
-    state.scans = data;
-  }).catch((error) => {
-    toast.error("An error occured while loading your profile data");
-  })
-</script>

src/locales/de.json

@@ -1,8 +1,16 @@
 {
+    "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt nur über den Link, den Sie bei der Registrierung erhalten haben.",
     "already_have_an_account": "Sie haben bereits einen Account?",
+    "amount_per_kilometer_in_eur": "Betrag pro Kilometer (in €)",
     "apartment_suite_etc": "Addresszeile 2",
+    "cancel_keep_my_data": "Abbrechen, meine Daten behalten",
     "configuration_error": "Konfigurationsfehler",
+    "confirm_delete_all_of_my_data": "Bestätigung, meine gesamten Daten löschen",
     "confirm_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_certificate": "Urkunde herunterladen",
     "e_mail_adress": "E-Mail Adresse",
@@ -13,10 +21,14 @@
     "imprint": "Impressum",
     "lap_time": "Rundenzeit",
     "lap_times": "Rundenzeiten",
+    "lost_your_registration_mail": "Haben Sie Ihre Registrierungsmail verloren?",
     "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",
     "no_laps_scans_were_recorded_yet": "Es wurden noch keine Runden / Scans aufgezeichnet ...",
+    "no_sponsorings_for_you_were_recorded_yet": "Es gibt noch keine Sponsorings für dich",
+    "not_registered_yet": "Noch nicht registriert?",
+    "organization": "Organisation",
     "ort": "Ort",
     "phone_number": "Telefonnummer",
     "please_provide_a_valid_zipcode": "Bitte geben Sie eine gültige Postleitzahl an...",
@@ -29,13 +41,18 @@
         "register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
     },
     "register_now": "Jetzt registrieren!",
+    "register_now_small": "Jetzt registrieren",
     "registrieren": "Registrieren",
+    "resend_the_registration_mail": "Registrierungsmail erneut versenden",
     "save_changes": "Änderungen speichern",
     "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",
     "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,8 +1,16 @@
 {
+    "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!",
     "already_have_an_account": "Already have an account?",
+    "amount_per_kilometer_in_eur": "Amount per kilometer (in €)",
     "apartment_suite_etc": "Apartment, suite, etc.",
+    "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_certificate": "Download certificate",
     "e_mail_adress": "mail address",
@@ -13,10 +21,13 @@
     "imprint": "Imprint",
     "lap_time": "Lap time",
     "lap_times": "Lap times",
+    "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",
     "nachname": "Lastname",
     "no_laps_scans_were_recorded_yet": "No laps/ scans were recorded yet...",
+    "no_sponsorings_for_you_were_recorded_yet": "No sponsorings for you were recorded yet...",
+    "not_registered_yet": "Not registered yet?",
     "organization": "Organization",
     "ort": "City",
     "phone_number": "Phone Number",
@@ -30,14 +41,18 @@
         "register_now": "Register now for Lauf für Kaya! 2021."
     },
     "register_now": "Register now!",
+    "register_now_small": "Register now",
     "registrieren": "Register Now",
+    "resend_the_registration_mail": "Resend the registration mail",
     "save_changes": "Save changes",
     "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",
     "view_my_data": "View my data",
     "vorname": "Firstname",
-    "you_have_been_registered": "You have been registered!"
+    "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

@@ -1,10 +1,21 @@
 import { createApp } from 'vue';
-import App from './App.vue';
+import './tailwind.css';
-import Toast from 'vue-toastification';
-import 'windi.css';
 import 'toastify-js/src/toastify.css';
 import 'vue-toastification/dist/index.css';
-import { router } from './router';
+import App from './App.vue';
+import { routes } from './routes.js';
+import { createRouter, createWebHistory } from 'vue-router';
 import { i18n } from './language';
+import Toast from 'vue-toastification';
 
-createApp(App).use(Toast).use(i18n).use(router).mount('#app');
+const app = createApp(App);
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes
+});
+
+app.use(router);
+app.use(i18n);
+app.use(Toast);
+app.mount('#app');

src/router.js

@@ -1,26 +0,0 @@
-import { createWebHistory, createRouter } from 'vue-router';
-// ------------
-const EnvError = import('./components/EnvError.vue');
-const Home = import('./components/Home.vue');
-const Imprint = import('./components/Imprint.vue');
-const Privacy = import('./components/Privacy.vue');
-const Register = () => import('./components/Register.vue');
-const Profile = () => import('./components/Profile.vue');
-//
-let routes = [ { path: '/:pathMatch(.*)*', component: EnvError } ];
-if (typeof config !== 'undefined') {
-	if (config.baseurl && config.documentserver_key) {
-		routes = [
-			{ path: '/', component: Home },
-			{ path: '/imprint', component: Imprint },
-			{ path: '/privacy', component: Privacy },
-			{ path: '/register', component: Register },
-			{ path: '/register/:token', component: Register, props: true },
-			{ path: '/profile/:token', component: Profile, props: true }
-		];
-	}
-}
-export const router = createRouter({
-	history: createWebHistory(),
-	routes
-});

src/routes.js

@@ -0,0 +1,24 @@
+// import EnvError from './components/EnvError.vue';
+import Home from './views/Home.vue';
+import Imprint from './views/Imprint.vue';
+import Privacy from './views/Privacy.vue';
+import Register from './views/Register.vue';
+import Profile from './views/Profile.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: config.baseurl_selfservice + 'imprint', component: Imprint },
+	{ path: config.baseurl_selfservice + 'imprint/', component: Imprint },
+	{ path: config.baseurl_selfservice + 'privacy', component: Privacy },
+	{ path: config.baseurl_selfservice + 'privacy/', component: Privacy },
+	{ path: config.baseurl_selfservice + 'register', component: Register },
+	{ path: config.baseurl_selfservice + 'register/', component: Register },
+	{ path: config.baseurl_selfservice + 'register/:token', component: Register, props: true },
+	{ path: config.baseurl_selfservice + 'profile', component: Profile },
+	{ path: config.baseurl_selfservice + 'profile/', component: ProfileNone },
+	{ path: config.baseurl_selfservice + 'profile/:token', component: Profile, props: true }
+];

src/tailwind.css

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

src/views/Home.vue

@@ -1,5 +1,5 @@
 <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" style="background-image: url('./background.jpg');">
     <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" />
@@ -9,14 +9,14 @@
         <p class="px-0 mb-6 text-lg text-gray-100 md:text-xl lg:px-24">Selfservice Portal</p>
         <p class="px-0 mb-6 text-md text-gray-100 lg:px-24">{{ $t('main_page_text') }}</p>
         <div class="mt-6 sm:flex place-content-center">
-          <router-link
+          <a
             class="w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 transition ease-in-out duration-150 xl:text-lg xl:py-4"
-            to="/register"
+            href="./register/"
-          >{{ $t('register_now') }}</router-link>
+          >{{ $t('register_now') }}</a>
-          <router-link
+          <a
-            to="/profile"
+            href="./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') }}</router-link>
+          >{{ $t('view_my_data') }}</a>
         </div>
       </div>
     </section>
@@ -25,6 +25,6 @@
 </template>
 
 <script setup>
-import LoginForm from "./LoginForm.vue";
+import Footer from "@/components/Footer.vue";
-import Footer from "./Footer.vue";
+console.log(config);
 </script>

src/views/Imprint.vue

@@ -10,7 +10,7 @@
     </div>
   </section>
 </template>
-<style src="./simple.css">
+<style src="../simple.css">
 </style>
 <script>
 import marked from "marked";

src/views/Privacy.vue

@@ -10,7 +10,7 @@
     </div>
   </section>
 </template>
-<style src="./simple.css">
+<style src="../simple.css">
 </style>
 <script>
 import marked from "marked";

src/views/Profile.vue

@@ -0,0 +1,422 @@
+<template>
+  <div class="min-h-screen w-full p-4">
+    <section class="text-white body-font">
+      <div class="container mx-auto flex items-center md:flex-row flex-col">
+        <div
+          class="flex flex-col md:pr-10 md:mb-0 mb-6 pr-0 w-full md:w-auto md:text-left text-center text-black dark:text-gray-200"
+        >
+          <p
+            class="text-3xl font-bold whitespace-nowrap"
+            v-text="(state.firstname || '') + ' ' + (state.middlename || '') + ' ' + (state.lastname || '')"
+          ></p>
+          <p class="text-md whitespace-nowrap">{{ state.group }}</p>
+        </div>
+        <div class="inline-flex md:ml-auto md:mr-0 mx-auto items-center">
+          <div v-if="(state.delete_active === false)">
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
+              @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;"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              {{ $t('download_certificate') }}
+            </button>
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
+              @click="() => { state.delete_active = true }"
+            >
+              <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"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path d="M0 0h24v24H0z" />
+                <path
+                  fill="currentColor"
+                  d="M17 6h5v2h-2v13a1 1 0 01-1 1H5a1 1 0 01-1-1V8H2V6h5V3a1 1 0 011-1h8a1 1 0 011 1v3zm1 2H6v12h12V8zm-5 6l2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2 1 1-2 2zM9 4v2h6V4H9z"
+                />
+              </svg>
+              {{ $t('delete_my_data') }}
+            </button>
+          </div>
+          <div v-if="(state.delete_active === true)">
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
+              @click="() => { state.delete_active = false }"
+            >
+              <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"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path fill="none" d="M0 0h24v24H0z" />
+                <path fill="currentColor" d="M12 11l5-5 1 1-5 5 5 5-1 1-5-5-5 5-1-1 5-5-5-5 1-1z" />
+              </svg>
+              {{ $t('cancel_keep_my_data') }}
+            </button>
+            <button
+              type="button"
+              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
+              @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"
+                class="feather feather-download"
+                style="display: inline;height: 1rem;vertical-align: sub;"
+              >
+                <path d="M0 0h24v24H0z" />
+                <path
+                  fill="currentColor"
+                  d="M17 6h5v2h-2v13a1 1 0 01-1 1H5a1 1 0 01-1-1V8H2V6h5V3a1 1 0 011-1h8a1 1 0 011 1v3zm1 2H6v12h12V8zm-5 6l2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2 1 1-2 2zM9 4v2h6V4H9z"
+                />
+              </svg>
+              {{ $t('confirm_delete_all_of_my_data') }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </section>
+    <div class="flex flex-wrap">
+      <div class="w-full p-4">
+        <div class="flex flex-wrap flex-col w-full tabs">
+          <div class="flex lg:flex-wrap flex-row lg:space-x-2">
+            <div class="flex-none">
+              <button
+                @click="() => { state.activetab = 'profile' }"
+                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'profile') }"
+                class="tab tab-underline py-4 px-6 block"
+                type="button"
+              >{{ $t('profile') }}</button>
+            </div>
+            <div class="flex-none">
+              <button
+                @click="() => { state.activetab = 'laptimes' }"
+                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'laptimes') }"
+                class="tab tab-underline py-4 px-6 block"
+                type="button"
+              >{{ $t('lap_times') }}</button>
+            </div>
+            <div class="flex-none">
+              <button
+                @click="() => { state.activetab = 'sponsorings' }"
+                :class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'sponsorings') }"
+                class="tab tab-underline py-4 px-6 block"
+                type="button"
+              >{{ $t('sponsoring') }}</button>
+            </div>
+          </div>
+          <div v-if="(state.activetab === 'profile')" class="tab-content block">
+            <div class="py-4 w-full">
+              <div class="flex flex-col">
+                <form class="form flex flex-wrap w-full">
+                  <div class="w-full">
+                    <div class="form-element">
+                      <div class="text-lg">{{ $t('vorname') }}</div>
+                      <p
+                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        v-text="state.firstname"
+                      />
+                    </div>
+                    <div class="form-element">
+                      <div class="text-lg">{{ $t('mittelname') }}</div>
+                      <p
+                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        v-text="state.middlename"
+                      />
+                    </div>
+                    <div class="form-element">
+                      <div class="text-lg">{{ $t('nachname') }}</div>
+                      <p
+                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        v-text="state.lastname"
+                      />
+                    </div>
+                    <div class="form-element">
+                      <div class="text-lg">{{ $t('e_mail_adress') }}</div>
+                      <p
+                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        v-text="state.email"
+                      />
+                    </div>
+                    <div class="form-element">
+                      <div class="text-lg">{{ $t('phone_number') }}</div>
+                      <p
+                        class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
+                        v-text="state.phone"
+                      />
+                    </div>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+          <div v-if="(state.activetab === 'laptimes')" class="tab-content block">
+            <div class="py-4 w-full">
+              <section class="text-gray-400 dark:bg-gray-900 body-font">
+                <div class="container mx-auto">
+                  <div class="lg:w-2/3 w-full mx-auto overflow-auto">
+                    <table
+                      v-if="state.scans.length > 0"
+                      class="table-auto w-full text-left whitespace-no-wrap"
+                    >
+                      <thead
+                        class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
+                      >
+                        <tr>
+                          <th
+                            class="px-4 py-3 title-font tracking-wider font-medium"
+                          >{{ $t('distance') }}</th>
+                          <th
+                            class="px-4 py-3 title-font tracking-wider font-medium"
+                          >{{ $t('lap_time') }}</th>
+                        </tr>
+                      </thead>
+                      <tbody class="text-gray-900 dark:text-gray-50">
+                        <tr v-for="s in state.scans" :key="s.id">
+                          <td class="px-4 py-3">
+                            <span v-text="s.distance"></span>
+                          </td>
+                          <td class="px-4 py-3" v-text="s.lapTime"></td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <div v-else class="text-center font-bold text-black dark:text-white text-2xl">
+                      <img
+                        src="../assets/empty_laps.svg"
+                        style="height:25rem; margin:0 auto;"
+                        :alt="[[$t('no_laps_scans_were_recorded_yet')]]"
+                      />
+                      {{ $t('no_laps_scans_were_recorded_yet') }}
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </div>
+          </div>
+          <div v-if="(state.activetab === 'sponsorings')" class="tab-content block">
+            <div class="py-4 w-full">
+              <section class="text-gray-400 dark:bg-gray-900 body-font">
+                <div class="container mx-auto">
+                  <div class="lg:w-2/3 w-full mx-auto overflow-auto">
+                    <table
+                      v-if="state.sponsorings.length > 0"
+                      class="table-auto w-full text-left whitespace-no-wrap"
+                    >
+                      <thead
+                        class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
+                      >
+                        <tr>
+                          <th class="px-4 py-3 title-font tracking-wider font-medium">Name</th>
+                          <th
+                            class="px-4 py-3 title-font tracking-wider font-medium"
+                          >{{ $t('amount_per_kilometer_in_eur') }}</th>
+                          <th
+                            class="px-4 py-3 title-font tracking-wider font-medium"
+                          >{{ $t('current_total_amount_in_eur') }}</th>
+                        </tr>
+                      </thead>
+                      <tbody class="text-gray-900 dark:text-gray-50">
+                        <tr v-for="s in state.sponsorings" :key="s.id">
+                          <td class="px-4 py-3">
+                            <span v-text="s.donor.firstname"></span>
+                            <span v-if="s.donor.middlename">
+                              <span v-text="s.donor.middlename"></span>
+                            </span>
+                            <span v-text="s.donor.lastname"></span>
+                          </td>
+                          <td class="px-4 py-3">
+                            <span
+                              v-text="(s.amountPerDistance / 100)
+                              .toFixed(2)
+                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                            ></span>€
+                          </td>
+                          <td class="px-4 py-3">
+                            <span
+                              v-text="(s.amount / 100)
+                              .toFixed(2)
+                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                            ></span>€
+                          </td>
+                        </tr>
+                      </tbody>
+                      <tfoot class="text-gray-900 dark:text-gray-50">
+                        <tr>
+                          <td class="px-4 py-3">{{ $t('total') }}</td>
+                          <td class="px-4 py-3">
+                            <span
+                              v-text="(state.sponsorings.reduce(function(sum, current) {
+                              return sum + current.amountPerDistance;
+                            }, 0) / 100)
+                              .toFixed(2)
+                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                            ></span>€
+                          </td>
+                          <td class="px-4 py-3">
+                            <span
+                              v-text="(state.sponsorings.reduce(function(sum, current) {
+                              return sum + current.amount;
+                            }, 0) / 100)
+                              .toFixed(2)
+                              .toLocaleString('de-DE', { valute: 'EUR' })"
+                            ></span>€
+                          </td>
+                        </tr>
+                      </tfoot>
+                    </table>
+                    <div v-else class="text-center font-bold text-black dark:text-white text-2xl">
+                      <img
+                        src="../assets/empty_laps.svg"
+                        style="height:25rem; margin:0 auto;"
+                        :alt="[[$t('no_sponsorings_for_you_were_recorded_yet')]]"
+                      />
+                      {{ $t('no_sponsorings_for_you_were_recorded_yet') }}
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive } from "vue";
+import { useToast } from "vue-toastification";
+import axios from "redaxios";
+
+const state = reactive({
+  phone: "",
+  email: "",
+  firstname: "",
+  middlename: "",
+  lastname: "",
+  scans: [],
+  sponsorings: [],
+  group: "",
+  activetab: "profile",
+  delete_active: false,
+  fullobject: {}
+})
+const toast = useToast();
+const props = defineProps({
+  token: String
+})
+const accesstoken = atob(props.token);
+axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
+  .then(({ data }) => {
+    state.phone = data.phone;
+    state.email = data.email;
+    state.firstname = data.firstname;
+    state.middlename = data.middlename;
+    state.lastname = data.lastname;
+    state.group = data.group;
+    state.sponsorings = data.distanceDonations;
+    state.fullobject = data;
+  }).catch((error) => {
+    toast.error("An error occured while loading your profile data");
+  })
+axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
+  .then(({ data }) => {
+    data.map(function(s) {
+      s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
+      s.distance = Math.floor(s.distance / 1000) + 'km ' + (Math.floor(s.distance % 1000) + "").padStart(3, "0") + "m"
+      return s;
+    })
+    data.filter(s => s.valid === true);
+    state.scans = data;
+  }).catch((error) => {
+    toast.error("An error occured while loading your profile data");
+  })
+function delete_me() {
+  toast("Deletion in progress...");
+  let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`
+  axios.delete(url)
+    .then(() => {
+      toast("All Data deleted!");
+      location.replace(`${config.baseurl_selfservice}`);
+    })
+    .catch((error) => {
+      toast.error("An error occured while deleting your profile data");
+    });
+}
+function get_certificate() {
+  toast("Generation in progress...");
+  const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
+  let url = `${config.baseurl}documents/certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
+  let postdata = Object.assign({}, state.fullobject);
+  postdata.group = {
+    name: postdata.group
+  }
+  postdata = [postdata]
+  axios.post(url, postdata, {
+    responseType: "blob"
+  })
+    .then((response) => {
+      console.log(response)
+      if (response.status != "200") {
+        toast.error("An error occured while generateing your certificate!");
+      } else {
+        var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
+        var fileLink = document.createElement('a');
+
+        fileLink.href = fileURL;
+        fileLink.setAttribute('download', 'Certificate.pdf');
+        document.body.appendChild(fileLink);
+
+        fileLink.click();
+        fileLink.remove();
+        toast("Document generated!");
+      }
+    })
+    .catch((err) => {
+      console.error(err);
+      toast.error("An error occured while deleting your profile data");
+    });
+}
+</script>

src/views/ProfileNone.vue

@@ -0,0 +1,104 @@
+<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! - {{ $t('profile') }}</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">
+                <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"
+                        >{{ $t('lost_your_registration_mail') }}</span>
+                    </div>
+                </div>
+                <div class="mt-4">
+                    <label for="email_address" class="block font-medium">
+                        {{ $t('e_mail_adress') }}
+                        <span class="font-bold">*</span>
+                    </label>
+                    <input
+                        v-model="user_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"
+                    />
+                    <p
+                        v-if="!isEmail(user_email)"
+                        class="text-sm"
+                    >{{ $t('please_provide_valid_mail') }}</p>
+                </div>
+                <div class="mt-2">
+                    <a
+                        :disabled="(!state.submit_enabled)"
+                        :class="{ 'opacity-50': (!state.submit_enabled), 'cursor-not-allowed': (!state.submit_enabled) }"
+                        @click="resendMail"
+                        class="block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 dark:bg-gray-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
+                    >{{ $t('resend_the_registration_mail') }}</a>
+                </div>
+            </div>
+            <div class="mt-12">
+                <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">{{ $t('not_registered_yet') }}</span>
+                    </div>
+                </div>
+                <div class="mt-2">
+                    <a
+                        href="./register/"
+                        class="text-white block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 bg-blue-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
+                    >{{ $t('register_now_small') }}</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+  
+  <script setup>
+import { computed, ref, reactive, defineProps } from "vue";
+import axios from "redaxios";
+import isEmail from 'validator/es/lib/isEmail';
+import isMobilePhone from 'validator/es/lib/isMobilePhone';
+import isPostalCode from 'validator/es/lib/isPostalCode';
+import { useToast } from "vue-toastification";
+
+let user_email = ref("");
+// 
+const state = reactive({
+    org_name: "",
+    org_teams: [],
+    submit_enabled: computed(() => isEmail(user_email.value))
+})
+const toast = useToast();
+function resendMail() {
+    if (isEmail(user_email.value)) {
+        toast("sending password reset mail...");
+        const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
+        axios.post(`${config.baseurl}api/runners/forgot?mail=${user_email.value}&locale=${browserlocale}`)
+            .then(({ data }) => {
+                console.log(data);
+                toast("sent password reset mail to " + user_email.value + "!");
+            })
+            .catch((error) => {
+                console.log(error);
+                toast("user does not exist...");
+            });
+    }
+}
+</script>

src/views/Register.vue

@@ -261,14 +261,11 @@ import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
 import { useToast } from "vue-toastification";
-import { router } from '../router';
-import { i18n } from '../language';
 
 const props = defineProps({
   token: String
 })
 if (props.token) {
-  props.token = atob(props.token);
   axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
     .then(({ data }) => {
       state.org_name = data.name;
@@ -321,14 +318,16 @@ function login() {
         postdata.team = org_team.value;
       }
       toast("registration in progress...");
-      let url = `${config.baseurl}api/runners/register`;
+      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}`
+        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`
       }
       axios.post(url, postdata)
         .then(({ data }) => {
           const token = btoa(data.token);
-          router.push(`${config.baseurl_selfservice}/profile/${token}`);
+          // alert(token);
+          location.replace(`${config.baseurl_selfservice}profile/${token}`);
         })
         .catch((error) => {
           console.log(error);

tailwind.config.js

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

vite.config.js

@@ -1,9 +1,13 @@
+import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
-import WindiCSS from 'vite-plugin-windicss';
+import path from 'path';
 
-/**
+export default defineConfig({
- * @type {import('vite').UserConfig}
+	plugins: [ vue() ],
- */
+	base: './',
-export default {
+	resolve: {
-	plugins: [ vue(), WindiCSS() ]
+		alias: {
-};
+			'@': path.resolve(__dirname, '/src')
+		}
+	}
+});