Compare commits
	
		
			33 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9b446abc1f | |||
| 5d974e562e | |||
| a030f6b738 | |||
| 1249248a9d | |||
| 0bd6d543bf | |||
| 92d7bfd594 | |||
| 917cb6be34 | |||
| d159cb59be | |||
| 9812d79d4d | |||
| 4663214ede | |||
| 9c9ceaa666 | |||
| 602d80bd14 | |||
| 45ee4ab812 | |||
| 020c310865 | |||
| 1102d29c0e | |||
| 1a3af200dd | |||
| 71f419ffb4 | |||
| b74bea0340 | |||
| b0172c500b | |||
| 75b4dac0fe | |||
| 51d058bf96 | |||
| ad13bae068 | |||
| 152e74190d | |||
| 4c83e2e738 | |||
| cb1b9d330b | |||
| 3b4c11e4c0 | |||
| 89820d4450 | |||
| 121022c843 | |||
| d713fbef94 | |||
| 815a36f202 | |||
| baa6da3dd0 | |||
| f141130db5 | |||
| 5a123b0cf8 | 
							
								
								
									
										17
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -25,23 +25,6 @@ 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] | ||||
|   | ||||
							
								
								
									
										66
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										66
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,8 +2,74 @@ | ||||
|  | ||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||
|  | ||||
| #### [0.7.6](https://git.odit.services/lfk/selfservice/compare/0.7.5...0.7.6) | ||||
|  | ||||
| - update texts of pdf generation status toasts [`#44`](https://git.odit.services/lfk/selfservice/issues/44) | ||||
| - update release script [`5d974e5`](https://git.odit.services/lfk/selfservice/commit/5d974e562ed1ed5aeac579afe000c2dca945ff71) | ||||
|  | ||||
| #### [0.7.5](https://git.odit.services/lfk/selfservice/compare/0.7.4...0.7.5) | ||||
|  | ||||
| > 30 January 2023 | ||||
|  | ||||
| - fix: relativ links [`917cb6b`](https://git.odit.services/lfk/selfservice/commit/917cb6be340844bcc2318bf73cec37c3c831fd5d) | ||||
| - 🚀Bumped version to v0.7.5 [`1249248`](https://git.odit.services/lfk/selfservice/commit/1249248a9d3e0d72665bca6871a651f2491a4039) | ||||
| - 2023 [`9812d79`](https://git.odit.services/lfk/selfservice/commit/9812d79d4de820ce791f69634c5861f4f04ad7f1) | ||||
| - update nginx base [`0bd6d54`](https://git.odit.services/lfk/selfservice/commit/0bd6d543bf60b7a333b96d5d319269d4bf50db96) | ||||
| - updated base node image [`92d7bfd`](https://git.odit.services/lfk/selfservice/commit/92d7bfd59407273f86809b53ffc9f67fb8ba0ec7) | ||||
| - AGB link [`d159cb5`](https://git.odit.services/lfk/selfservice/commit/d159cb59be35f963abc89c42732ba6110d27830c) | ||||
|  | ||||
| #### [0.7.4](https://git.odit.services/lfk/selfservice/compare/0.7.3...0.7.4) | ||||
|  | ||||
| > 21 April 2021 | ||||
|  | ||||
| - Updated dronefile [`9c9ceaa`](https://git.odit.services/lfk/selfservice/commit/9c9ceaa6664f6ea21a536a12f04e552156e81da4) | ||||
| - 🚀Bumped version to v0.7.4 [`4663214`](https://git.odit.services/lfk/selfservice/commit/4663214ede3880386b5389885e32c953571290e6) | ||||
|  | ||||
| #### [0.7.3](https://git.odit.services/lfk/selfservice/compare/0.7.2...0.7.3) | ||||
|  | ||||
| > 21 April 2021 | ||||
|  | ||||
| - 🚀Bumped version to v0.7.3 [`602d80b`](https://git.odit.services/lfk/selfservice/commit/602d80bd14c4bd00a24b746be1e74d9e41af0445) | ||||
| - Merge pull request 'Button fixes bugfix/42-button_links' (#43) from bugfix/42-button_links into dev [`45ee4ab`](https://git.odit.services/lfk/selfservice/commit/45ee4ab81260adf5b938d9f5359d256cce879acb) | ||||
| - Removed useless register now button [`1102d29`](https://git.odit.services/lfk/selfservice/commit/1102d29c0e174b7a34fc4d3e6fe32d2dfb276765) | ||||
| - Fixed register button link [`020c310`](https://git.odit.services/lfk/selfservice/commit/020c310865912b8f0752069e1c7e2adf71ab9835) | ||||
|  | ||||
| #### [0.7.2](https://git.odit.services/lfk/selfservice/compare/0.7.1...0.7.2) | ||||
|  | ||||
| > 14 April 2021 | ||||
|  | ||||
| - 🚀Bumped version to v0.7.2 [`1a3af20`](https://git.odit.services/lfk/selfservice/commit/1a3af200dd41c8cc4271690ed72bef911901ce54) | ||||
| - Document generation hotfix 🐞 [`b74bea0`](https://git.odit.services/lfk/selfservice/commit/b74bea03401c672ae774aaddc6da5beb67e2890e) | ||||
|  | ||||
| #### [0.7.1](https://git.odit.services/lfk/selfservice/compare/0.7.0...0.7.1) | ||||
|  | ||||
| > 13 April 2021 | ||||
|  | ||||
| - Merge pull request 'bugfix/31-env-js-linking-ci' (#41) from bugfix/31-env-js-linking-ci into dev [`#31`](https://git.odit.services/lfk/selfservice/issues/31) | ||||
| - ⏫ dependency bump [`ad13bae`](https://git.odit.services/lfk/selfservice/commit/ad13bae068416bed10d00e6887a05d580a836482) | ||||
| - 🚀Bumped version to v0.7.1 [`b0172c5`](https://git.odit.services/lfk/selfservice/commit/b0172c500b0613209ac44e61023043065b3854b0) | ||||
| - added 'yarn postbuild' script for fixing env.js in dist/index.html [`51d058b`](https://git.odit.services/lfk/selfservice/commit/51d058bf966c3dcb064562e6bf696a748d0cd148) | ||||
|  | ||||
| #### [0.7.0](https://git.odit.services/lfk/selfservice/compare/0.6.1...0.7.0) | ||||
|  | ||||
| > 6 April 2021 | ||||
|  | ||||
| - 🚀Bumped version to v0.7.0 [`152e741`](https://git.odit.services/lfk/selfservice/commit/152e74190d13d30110d494a9062f868390ca19b3) | ||||
| - 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) | ||||
|   | ||||
| @@ -1,9 +1,10 @@ | ||||
| FROM node:15.9.0-alpine3.13 | ||||
| FROM registry.odit.services/hub/library/node:15.9.0-alpine3.13 | ||||
| WORKDIR /app | ||||
| COPY . . | ||||
| RUN yarn | ||||
| RUN yarn build | ||||
| RUN yarn postbuild | ||||
| # final image | ||||
| FROM fholzer/nginx-brotli:v1.19.1 | ||||
| FROM registry.odit.services/library/nginx-brotli:3.15 | ||||
| COPY --from=0 /app/dist /usr/share/nginx/html | ||||
| COPY ./nginx.conf /etc/nginx/nginx.conf | ||||
							
								
								
									
										6
									
								
								env_fix.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								env_fix.js
									
									
									
									
									
										Normal file
									
								
							| @@ -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); | ||||
| } | ||||
							
								
								
									
										17
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,17 +1,18 @@ | ||||
| { | ||||
| 	"name": "@odit/lfk-selfservice", | ||||
| 	"version": "0.6.1", | ||||
| 	"version": "0.7.6", | ||||
| 	"scripts": { | ||||
| 		"dev": "vite", | ||||
| 		"build": "vite build", | ||||
| 		"release": "release-it --only-version" | ||||
| 		"release": "release-it", | ||||
| 		"postbuild": "node env_fix.js" | ||||
| 	}, | ||||
| 	"dependencies": { | ||||
| 		"marked": "2.0.1", | ||||
| 		"marked": "2.0.3", | ||||
| 		"redaxios": "0.4.1", | ||||
| 		"toastify-js": "1.10.0", | ||||
| 		"validator": "13.5.2", | ||||
| 		"vue-i18n": "9.0.0", | ||||
| 		"vue-i18n": "9.1.4", | ||||
| 		"vue-toastification": "2.0.0-rc.1", | ||||
| 		"vue": "3.0.9", | ||||
| 		"vue-router": "4.0.5" | ||||
| @@ -23,10 +24,10 @@ | ||||
| 		"@tailwindcss/line-clamp": "0.2.0", | ||||
| 		"@tailwindcss/typography": "0.4.0", | ||||
| 		"@vitejs/plugin-vue": "1.2.1", | ||||
| 		"@vue/compiler-sfc": "3.0.10", | ||||
| 		"@vue/compiler-sfc": "3.0.11", | ||||
| 		"autoprefixer": "10.2.5", | ||||
| 		"tailwindcss": "2.0.4", | ||||
| 		"release-it": "14.5.0", | ||||
| 		"tailwindcss": "2.1.1", | ||||
| 		"release-it": "14.6.1", | ||||
| 		"vite": "2.1.5" | ||||
| 	}, | ||||
| 	"release-it": { | ||||
| @@ -35,7 +36,7 @@ | ||||
| 			"requireCleanWorkingDir": false, | ||||
| 			"commitMessage": "🚀Bumped version to v${version}", | ||||
| 			"requireBranch": "dev", | ||||
| 			"push": false, | ||||
| 			"push": true, | ||||
| 			"tag": true, | ||||
| 			"tagName": null, | ||||
| 			"tagAnnotation": "v${version}" | ||||
|   | ||||
| @@ -5,8 +5,10 @@ const config = { | ||||
| 	baseurl: '', | ||||
| 	// optional, will fallback to /selfservice/ | ||||
| 	baseurl_selfservice: '/selfservice/', | ||||
| 	// optional, will fallback to /imprint | ||||
| 	// full url (including fqdn) | ||||
| 	baseurl_documentserver: 'http://localhost:4010/documents', | ||||
| 	// optional, will fallback to baseurl_selfservice/imprint | ||||
| 	url_imprint: '', | ||||
| 	// optional, will fallback to /privacy | ||||
| 	// optional, will fallback to baseurl_selfservice/privacy | ||||
| 	url_privacy: '' | ||||
| }; | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|   <footer class="text-gray-400 bg-gray-900 body-font"> | ||||
|     <div class="container px-5 py-8 mx-auto flex items-center sm:flex-row flex-col"> | ||||
|       <p class="text-sm text-gray-400 sm:ml-4 sm:pl-4 sm:py-2 sm:mt-0 mt-4"> | ||||
|         Lauf für Kaya! Selfservice - Copyright © 2021 + proudly powered by | ||||
|         Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by | ||||
|         <a | ||||
|           class="underline" | ||||
|           target="_blank" | ||||
|   | ||||
| @@ -29,7 +29,7 @@ | ||||
|               placeholder="Passwort" | ||||
|             /> | ||||
|             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm"> | ||||
|               <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a> | ||||
|               <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a> | ||||
|             </div> | ||||
|           </div> | ||||
|         </div> | ||||
| @@ -80,7 +80,7 @@ | ||||
|         </div> | ||||
|         <div class="mt-6"> | ||||
|           <a | ||||
|             href="./register" | ||||
|             href="/selfservice/register" | ||||
|             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm" | ||||
|           >Account erstellen</a> | ||||
|         </div> | ||||
| @@ -101,7 +101,7 @@ function login() { | ||||
|   axios.get("").then((res) => { | ||||
|     loading.value = false; | ||||
|     Toastify({ | ||||
|       text: "This is a toast", | ||||
|       text: "Login läuft...", | ||||
|       duration: 3000, | ||||
|     }).showToast(); | ||||
|   }); | ||||
|   | ||||
| @@ -29,7 +29,7 @@ | ||||
|               placeholder="Passwort" | ||||
|             /> | ||||
|             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm"> | ||||
|               <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a> | ||||
|               <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a> | ||||
|             </div> | ||||
|           </div> | ||||
|         </div> | ||||
| @@ -80,7 +80,7 @@ | ||||
|         </div> | ||||
|         <div class="mt-6"> | ||||
|           <a | ||||
|             href="./register" | ||||
|             href="/selfservice/register" | ||||
|             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm" | ||||
|           >Account erstellen</a> | ||||
|         </div> | ||||
| @@ -101,7 +101,7 @@ function login() { | ||||
|   axios.get("").then((res) => { | ||||
|     loading.value = false; | ||||
|     Toastify({ | ||||
|       text: "This is a toast", | ||||
|       text: "Login läuft...", | ||||
|       duration: 3000, | ||||
|     }).showToast(); | ||||
|   }); | ||||
|   | ||||
| @@ -1,12 +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?", | ||||
|     "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", | ||||
|     "delete-all-of-my-data": "Meine gesamten Daten löschen", | ||||
|     "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", | ||||
| @@ -24,6 +26,7 @@ | ||||
|     "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", | ||||
| @@ -35,7 +38,7 @@ | ||||
|     "profile": "Profil", | ||||
|     "provide_address": "Adresse angeben?", | ||||
|     "register": { | ||||
|         "register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren." | ||||
|         "register_now": "Jetzt für den Lauf für Kaya! 2023 registrieren." | ||||
|     }, | ||||
|     "register_now": "Jetzt registrieren!", | ||||
|     "register_now_small": "Jetzt registrieren", | ||||
| @@ -47,6 +50,7 @@ | ||||
|     "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", | ||||
|     "you_have_been_registered": "Sie wurden registriert!", | ||||
|   | ||||
| @@ -2,11 +2,13 @@ | ||||
|     "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", | ||||
| @@ -24,6 +26,7 @@ | ||||
|     "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", | ||||
| @@ -35,7 +38,7 @@ | ||||
|     "profile": "Profile", | ||||
|     "provide_address": "Provide a postal address?", | ||||
|     "register": { | ||||
|         "register_now": "Register now for Lauf für Kaya! 2021." | ||||
|         "register_now": "Register now for Lauf für Kaya! 2023." | ||||
|     }, | ||||
|     "register_now": "Register now!", | ||||
|     "register_now_small": "Register now", | ||||
| @@ -47,6 +50,7 @@ | ||||
|     "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!", | ||||
|   | ||||
| @@ -11,10 +11,10 @@ | ||||
|         <div class="mt-6 sm:flex place-content-center"> | ||||
|           <a | ||||
|             class="w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 transition ease-in-out duration-150 xl:text-lg xl:py-4" | ||||
|             href="./register/" | ||||
|             href="/selfservice/register/" | ||||
|           >{{ $t('register_now') }}</a> | ||||
|           <a | ||||
|             href="./profile/" | ||||
|             href="/selfservice/profile/" | ||||
|             class="mt-4 sm:ml-4 sm:mt-0 w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-white bg-gray-800 shadow-sm hover:bg-gray-700 focus:outline-none focus:bg-gray-700 transition ease-in-out duration-150 xl:text-lg xl:py-4" | ||||
|           >{{ $t('view_my_data') }}</a> | ||||
|         </div> | ||||
|   | ||||
| @@ -216,7 +216,7 @@ | ||||
|                       <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 | ||||
|                             <span v-text="s.distance"></span> | ||||
|                           </td> | ||||
|                           <td class="px-4 py-3" v-text="s.lapTime"></td> | ||||
|                         </tr> | ||||
| @@ -236,7 +236,88 @@ | ||||
|             </div> | ||||
|           </div> | ||||
|           <div v-if="(state.activetab === 'sponsorings')" class="tab-content block"> | ||||
|             <div class="py-4 w-full">coming soon...</div> | ||||
|             <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> | ||||
| @@ -256,6 +337,7 @@ const state = reactive({ | ||||
|   middlename: "", | ||||
|   lastname: "", | ||||
|   scans: [], | ||||
|   sponsorings: [], | ||||
|   group: "", | ||||
|   activetab: "profile", | ||||
|   delete_active: false, | ||||
| @@ -274,37 +356,39 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`) | ||||
|     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"); | ||||
|     toast.error("Profil konnte nicht geladen werden..."); | ||||
|   }) | ||||
| axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`) | ||||
|   .then(({ data }) => { | ||||
|     data.map(function(s) { | ||||
|       s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s" | ||||
|       s.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"); | ||||
|     toast.error("Profil konnte nicht geladen werden..."); | ||||
|   }) | ||||
| function delete_me() { | ||||
|   toast("Deletion in progress..."); | ||||
|   toast("Profil wird gelöscht..."); | ||||
|   let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true` | ||||
|   axios.delete(url) | ||||
|     .then(() => { | ||||
|       toast("All Data deleted!"); | ||||
|       toast("Alle Daten gelöscht!"); | ||||
|       location.replace(`${config.baseurl_selfservice}`); | ||||
|     }) | ||||
|     .catch((error) => { | ||||
|       toast.error("An error occured while deleting your profile data"); | ||||
|       toast.error("Profil konnte nicht gelöscht werden..."); | ||||
|     }); | ||||
| } | ||||
| function get_certificate() { | ||||
|   toast("Generation in progress..."); | ||||
|   toast("Urkunde wird generiert..."); | ||||
|   const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2); | ||||
|   let url = `${config.baseurl}documents/certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`; | ||||
|   let url = `${config.baseurl_documentserver}certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`; | ||||
|   let postdata = Object.assign({}, state.fullobject); | ||||
|   postdata.group = { | ||||
|     name: postdata.group | ||||
| @@ -316,7 +400,7 @@ function get_certificate() { | ||||
|     .then((response) => { | ||||
|       console.log(response) | ||||
|       if (response.status != "200") { | ||||
|         toast.error("An error occured while generateing your certificate!"); | ||||
|         toast.error("Urkunde konnte nicht generiert werden..."); | ||||
|       } else { | ||||
|         var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' })); | ||||
|         var fileLink = document.createElement('a'); | ||||
| @@ -327,12 +411,12 @@ function get_certificate() { | ||||
|  | ||||
|         fileLink.click(); | ||||
|         fileLink.remove(); | ||||
|         toast("Document generated!"); | ||||
|         toast("Urkunde generiert!"); | ||||
|       } | ||||
|     }) | ||||
|     .catch((err) => { | ||||
|       console.error(err); | ||||
|       toast.error("An error occured while deleting your profile data"); | ||||
|       toast.error("An error occured while generating your certificate"); | ||||
|     }); | ||||
| } | ||||
| </script> | ||||
| @@ -61,7 +61,7 @@ | ||||
|                 </div> | ||||
|                 <div class="mt-2"> | ||||
|                     <a | ||||
|                         href="./register/" | ||||
|                         href="/selfservice/register/" | ||||
|                         class="text-white block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 bg-blue-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm" | ||||
|                     >{{ $t('register_now_small') }}</a> | ||||
|                 </div> | ||||
| @@ -88,16 +88,16 @@ const state = reactive({ | ||||
| const toast = useToast(); | ||||
| function resendMail() { | ||||
|     if (isEmail(user_email.value)) { | ||||
|         toast("sending password reset mail..."); | ||||
|         toast("Login-Link wird angefordert..."); | ||||
|         const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2); | ||||
|         axios.post(`${config.baseurl}api/runners/forgot?mail=${user_email.value}&locale=${browserlocale}`) | ||||
|             .then(({ data }) => { | ||||
|                 console.log(data); | ||||
|                 toast("sent password reset mail to " + user_email.value + "!"); | ||||
|                 toast("Login-Link gesendet an " + user_email.value + "!"); | ||||
|             }) | ||||
|             .catch((error) => { | ||||
|                 console.log(error); | ||||
|                 toast("user does not exist..."); | ||||
|                 toast("Fehler beim Anfordern des Login-Links..."); | ||||
|             }); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -200,7 +200,7 @@ | ||||
|               <a | ||||
|                 target="_blank" | ||||
|                 rel="noreferrer,noopener" | ||||
|                 href | ||||
|                 href="https://lauf-fuer-kaya.de/datenschutz/" | ||||
|                 class="underline" | ||||
|               >{{ $t('tos') }}</a> | ||||
|               {{ $t('i_accept_end') }} | ||||
| @@ -234,22 +234,6 @@ | ||||
|           >{{ $t('registrieren') }}</button> | ||||
|         </div> | ||||
|       </div> | ||||
|       <div class="mt-6"> | ||||
|         <div class="relative"> | ||||
|           <div class="absolute inset-0 flex items-center"> | ||||
|             <div class="w-full border-t border-gray-300"></div> | ||||
|           </div> | ||||
|           <div class="relative flex justify-center text-sm"> | ||||
|             <span class="px-2 bg-white dark:bg-gray-900">{{ $t('already_have_an_account') }}</span> | ||||
|           </div> | ||||
|         </div> | ||||
|         <div class="mt-6"> | ||||
|           <a | ||||
|             href="./login" | ||||
|             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('go_to_login') }}</a> | ||||
|         </div> | ||||
|       </div> | ||||
|     </div> | ||||
|   </div> | ||||
| </template> | ||||
| @@ -317,7 +301,7 @@ function login() { | ||||
|       if (state.org_name !== '' && state.org_teams.length > 0) { | ||||
|         postdata.team = org_team.value; | ||||
|       } | ||||
|       toast("registration in progress..."); | ||||
|       toast("Registrierung läuft..."); | ||||
|       const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2); | ||||
|       let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`; | ||||
|       if (props.token) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user