Merge branch 'dev' into feature/30-profile-forgot-link

# Conflicts:
#	src/locales/en.json
#	src/views/Home.vue

.drone.yml

@@ -0,0 +1,109 @@
+---
+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: run full license export
+  #   depends_on: ["clone"]
+  #   image: node:alpine
+  #   commands:
+  #     - yarn
+  #     - yarn licenses:export
+  # - name: push new licenses file to repo
+  #   depends_on: ["run full license export"]
+  #   image: appleboy/drone-git-push
+  #   settings:
+  #     branch: dev
+  #     commit: true
+  #     commit_message: new license file version [CI SKIP]
+  #     author_email: bot@odit.services
+  #     remote: git@git.odit.services:lfk/selfservice.git
+  #     ssh_key:
+  #       from_secret: git_ssh
+  - name: build dev
+    image: plugins/docker
+    depends_on: [clone]
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - dev
+      registry: registry.odit.services
+      mtu: 1000
+trigger:
+  branch:
+    - dev
+  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

CHANGELOG.md

@@ -2,11 +2,110 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.5.0](https://git.odit.services/lfk/selfservice/compare/0.4.5...0.5.0)
+
+- 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)
+- package dependency cleanup [`00f8d80`](https://git.odit.services/lfk/selfservice/commit/00f8d8023e3ca47eb650c8b1c5c550112ed0d503)
+- Added image to docker-compose [`bd29d99`](https://git.odit.services/lfk/selfservice/commit/bd29d9912023539b26cdac36997d7cb29ec0d538)
+
 #### [0.1.1](https://git.odit.services/lfk/selfservice/compare/0.1.0...0.1.1)
 
+> 26 March 2021
+
 - org registration - add team select [`#18`](https://git.odit.services/lfk/selfservice/issues/18)
 - added baseurl_selfservice config [`#22`](https://git.odit.services/lfk/selfservice/issues/22)
 - [tmp] vue i18n error [`7b0bc22`](https://git.odit.services/lfk/selfservice/commit/7b0bc22a7157ee4551ab69dd5be856abed90b60c)
+- ⏫ v0.1.1 changelog [`e2be86c`](https://git.odit.services/lfk/selfservice/commit/e2be86c5589f9ca9053d5bcdc61be3a642b94791)
 - ⏫ version bump to 0.1.1 [`4d57812`](https://git.odit.services/lfk/selfservice/commit/4d57812c043e9078656818a33d241df220127a92)
 - Merge tag '0.1.0' into dev [`88996f8`](https://git.odit.services/lfk/selfservice/commit/88996f81d8990969048f00a7c175d2a30da2588b)
 

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
+  - `baseurl_selfservice`: location of the selfservice instance - WITH TRAILING SLASH
+    - e.g. path: `/selfservice/`
+    - e.g. url: `https://example.com/selfservice/`

docker-compose.yml

@@ -2,5 +2,8 @@ version: "3"
 services:
     httpd:
         build: .
+        #image: registry.odit.services/lfk/selfservice:dev
+        volumes:
+            - ./public/env.sample.js:/usr/share/nginx/html/env.js
         ports:
             - 4050:80

index.html

@@ -11,7 +11,7 @@
 <body class="dark:bg-gray-900 text-black dark:text-white p-0">
   <div id="app"></div>
   <script src="/env.js"></script>
-  <script type="module" src="/src/main.js"></script>
+  <script defer type="module" src="/src/main.js"></script>
 </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,32 +1,33 @@
 {
 	"name": "@odit/lfk-selfservice",
-  "version": "0.1.1",
+	"version": "0.5.0",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
 		"release": "release-it --only-version"
 	},
 	"dependencies": {
-    "got": "^11.8.2",
+		"marked": "2.0.1",
-    "marked": "^2.0.1",
+		"redaxios": "0.4.1",
-    "redaxios": "^0.4.1",
+		"toastify-js": "1.10.0",
-    "toastify-js": "^1.9.3",
+		"validator": "13.5.2",
-    "validator": "^13.5.2",
+		"vue-i18n": "9.0.0",
-    "vue": "^3.0.5",
+		"vue-toastification": "2.0.0-rc.1",
-    "vue-i18n": "^9.0.0",
+		"vue": "3.0.9",
-    "vue-phone-number-input": "^1.1.10",
+		"vue-router": "4.0.5"
-    "vue-router": "4",
-    "vue-toastification": "^2.0.0-rc.1"
 	},
 	"devDependencies": {
-    "@vitejs/plugin-vue": "^1.1.5",
+		"@tailwindcss/jit": "0.1.18",
-    "@vue/compiler-sfc": "^3.0.7",
+		"@tailwindcss/aspect-ratio": "0.2.0",
-    "autoprefixer": "^10.2.5",
+		"@tailwindcss/forms": "0.3.2",
-    "postcss": "^8.2.8",
+		"@tailwindcss/line-clamp": "0.2.0",
-    "release-it": "^14.5.0",
+		"@tailwindcss/typography": "0.4.0",
-    "tailwindcss": "^2.0.4",
+		"@vitejs/plugin-vue": "1.2.1",
-    "vite": "^2.1.2",
+		"@vue/compiler-sfc": "3.0.10",
-    "vite-plugin-windicss": "^0.9.11"
+		"autoprefixer": "10.2.5",
+		"tailwindcss": "2.0.4",
+		"release-it": "14.5.0",
+		"vite": "2.1.5"
 	},
 	"release-it": {
 		"git": {
@@ -35,10 +36,15 @@
 			"commitMessage": "🚀Bumped version to v${version}",
 			"requireBranch": "dev",
 			"push": false,
-      "tag": false
+			"tag": true,
+			"tagName": null,
+			"tagAnnotation": "v${version}"
 		},
 		"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,10 +1,10 @@
 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
 	url_imprint: '',
 	// optional, will fallback to /privacy

src/App.vue

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

src/locales/de.json

@@ -1,8 +1,14 @@
 {
+    "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?",
     "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",
+    "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 +19,13 @@
     "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 ...",
+    "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,7 +38,9 @@
         "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",
@@ -37,5 +48,7 @@
     "this_is_not_a_valid_international_phone_number": "Dies ist keine gültige internationale Telefonnummer",
     "tos": "AGBs",
     "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,14 @@
 {
+    "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?",
     "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",
+    "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 +19,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...",
+    "not_registered_yet": "Not registered yet?",
+    "organization": "Organization",
     "ort": "City",
     "phone_number": "Phone Number",
     "please_provide_a_valid_zipcode": "Please provide a valid zipcode...",
@@ -29,7 +38,9 @@
         "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",
@@ -38,6 +49,6 @@
     "tos": "Terms of Service",
     "view_my_data": "View my data",
     "vorname": "Firstname",
-  "organization": "Organization",
+    "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

@@ -12,6 +12,7 @@
           <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"
@@ -35,6 +36,84 @@
               </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>
@@ -165,13 +244,10 @@
 </template>
 
 <script setup>
-import { ref, reactive } from "vue";
+import { 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: "",
@@ -181,6 +257,7 @@ const state = reactive({
   scans: [],
   group: "",
   activetab: "profile",
+  delete_active: false,
 })
 const toast = useToast();
 const props = defineProps({
@@ -209,4 +286,16 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
   }).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");
+    });
+}
 </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: {
-    extend: {},
+		extend: {}
 	},
 	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')
+		}
+	}
+});