Compare commits

...

11 Commits
1.2.4 ... 1.2.5

16 changed files with 279 additions and 408 deletions

View File

@ -2,9 +2,25 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [1.2.5](https://git.odit.services/lfk/selfservice/compare/1.2.4...1.2.5)
- refactor: move to new lfk ts client [`865058c`](https://git.odit.services/lfk/selfservice/commit/865058c8bb7eec03278bf1f4a7b708429d0b5b20)
- feat: cleanup [`b3197dd`](https://git.odit.services/lfk/selfservice/commit/b3197dd3f95cd7d222f1ea168e9826f7ad7ef903)
- refactor: simplify imprint + privacy [`50fbfe0`](https://git.odit.services/lfk/selfservice/commit/50fbfe05f1ba830ea19f9e86b7a2fdce588f1a31)
- feat: improved tabs [`51b66eb`](https://git.odit.services/lfk/selfservice/commit/51b66eb85b3003996ac2414757ae62ee7ba80ce5)
- fix(register): phone number verification [`d5eefbb`](https://git.odit.services/lfk/selfservice/commit/d5eefbb5e22f4cc7b50e1f0c469779d3b7e310f5)
- feat: improved icons [`9af9c89`](https://git.odit.services/lfk/selfservice/commit/9af9c897f17b8a1be12f47dc271382629fc298ff)
- feat: profile cleanup [`d50719c`](https://git.odit.services/lfk/selfservice/commit/d50719c0dad4e3fbf008fb240edff80c4ea6ab4c)
- register: drop middlename [`d503061`](https://git.odit.services/lfk/selfservice/commit/d5030616043fb9fa4eccc7894ee3ada92928d102)
- feat: profile cleanup [`03532cc`](https://git.odit.services/lfk/selfservice/commit/03532cc365e38d7313ff2e8571ae15975d8a53e5)
- feat: cleanup [`0ff6df6`](https://git.odit.services/lfk/selfservice/commit/0ff6df68d61404c7be7a1e9b88a354fb12ce0907)
#### [1.2.4](https://git.odit.services/lfk/selfservice/compare/1.2.3...1.2.4)
> 17 March 2025
- feat: loading screen [`2939911`](https://git.odit.services/lfk/selfservice/commit/2939911c993c3817d841d4cb4660aa940e478cc0)
- 🚀Bumped version to v1.2.4 [`f1d552c`](https://git.odit.services/lfk/selfservice/commit/f1d552ce64557b5da0dea91e114d3ebf2f8f0199)
#### [1.2.3](https://git.odit.services/lfk/selfservice/compare/1.2.2...1.2.3)

View File

@ -1,6 +1,6 @@
{
"name": "@odit/lfk-selfservice",
"version": "1.2.4",
"version": "1.2.5",
"type": "module",
"scripts": {
"dev": "vite",
@ -9,6 +9,7 @@
},
"dependencies": {
"@fontsource/athiti": "5.2.5",
"@odit/lfk-client": "^0.0.1",
"@tailwindcss/vite": "4.0.14",
"bwip-js": "4.5.2",
"marked": "15.0.7",

15
pnpm-lock.yaml generated
View File

@ -11,6 +11,9 @@ importers:
'@fontsource/athiti':
specifier: 5.2.5
version: 5.2.5
'@odit/lfk-client':
specifier: ^0.0.1
version: 0.0.1
'@tailwindcss/vite':
specifier: 4.0.14
version: 4.0.14(vite@6.2.2(@types/node@18.11.18)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.6.1))
@ -368,6 +371,9 @@ packages:
'@fontsource/athiti@5.2.5':
resolution: {integrity: sha512-vHoAKBBw+wI4y3bGOkiogOkgcoLH7+SWtNNo/nBQ1XfhvfRPX/91xGtclEdwqUlbOJTCkNzEecdKChJQ5MsDFg==}
'@hey-api/client-fetch@0.8.3':
resolution: {integrity: sha512-EBVa8wwUMyBSeQ32PtCz6u5bFQZIMAufvwCT1ZtpjqT3caJQEza4NokbGU50q1ZVrMsM5Ot6GuDNJOF3TMo26Q==}
'@iarna/toml@2.2.5':
resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
@ -586,6 +592,9 @@ packages:
'@octokit/types@13.8.0':
resolution: {integrity: sha512-x7DjTIbEpEWXK99DMd01QfWy0hd5h4EN+Q7shkdKds3otGQP+oWE/y0A76i1OvH9fygo4ddvNf7ZvF0t78P98A==}
'@odit/lfk-client@0.0.1':
resolution: {integrity: sha512-DD3ofUIl/Jv6pznJWYevKAbMWMY9GSecyJeNT06izKfko6jsMyOlZBwGnXrydeh8+Dh274/j/GoFA9rWqPxpbQ==}
'@pnpm/config.env-replace@1.1.0':
resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==}
engines: {node: '>=12.22.0'}
@ -2433,6 +2442,8 @@ snapshots:
'@fontsource/athiti@5.2.5': {}
'@hey-api/client-fetch@0.8.3': {}
'@iarna/toml@2.2.5': {}
'@inquirer/checkbox@4.1.4(@types/node@18.11.18)':
@ -2654,6 +2665,10 @@ snapshots:
dependencies:
'@octokit/openapi-types': 23.0.1
'@odit/lfk-client@0.0.1':
dependencies:
'@hey-api/client-fetch': 0.8.3
'@pnpm/config.env-replace@1.1.0': {}
'@pnpm/network.ca-file@1.0.2':

View File

@ -1,14 +1,14 @@
const config = {
// required
documentserver_key: '',
documentserver_key: "",
// required, with trailing slash
baseurl: '',
baseurl: "",
// optional, full url, will fallback to https://lauf-fuer-kaya.de/impressum
url_imprint: "",
// optional, full url, will fallback to https://lauf-fuer-kaya.de/datenschutz
url_privacy: "",
// full url (including fqdn)
baseurl_documentserver: 'http://localhost:3000',
baseurl_documentserver: "http://localhost:3000",
// optional, will fallback to code128
code_format: 'ean13',
// optional, will fallback to /imprint
url_imprint: '',
// optional, will fallback to /privacy
url_privacy: '',
code_format: "ean13",
};

View File

@ -1 +0,0 @@
TODO:

View File

@ -1 +0,0 @@
TODO:

View File

@ -1,7 +1,7 @@
<template>
<footer>
<div class="container px-5 py-8 mx-auto flex items-center sm:flex-row flex-col">
<p class="text-sm sm:ml-4 sm:pl-4 sm:py-2 sm:mt-0 mt-4 text-center md:text-left">
<div class="py-8 mx-auto flex items-center sm:flex-row flex-col">
<p class="text-sm sm:py-2 sm:mt-0 mt-4 text-center md:text-left">
Lauf für Kaya! Selfservice<br>Copyright © 2025<br>proudly powered by
<a class="underline" target="_blank" rel="noopener,noreferrer"
href="https://odit.services?ref=lfk">ODIT.Services</a>
@ -19,8 +19,8 @@
export default {
data() {
return {
imprint_url: config.url_imprint || "/imprint"
, privacy_url: config.url_privacy || "/privacy"
imprint_url: config.url_imprint || "https://lauf-fuer-kaya.de/impressum"
, privacy_url: config.url_privacy || "https://lauf-fuer-kaya.de/datenschutz"
}
},
}

View File

@ -17,8 +17,6 @@
"download_registrationcode": "Registrierungscode herunterladen",
"e_mail_adress": "E-Mail Adresse",
"e_mail_des_sponsors": "E-Mail des Sponsors",
"error-loading-privacy-policy": "Fehler beim Laden der Datenschutzerklärung",
"error_loading_imprint": "Fehler beim Laden des Impressums",
"error_requesting_the_login_link": "Fehler beim Anfordern des Login-Links...",
"first_lap": "👏 erste Runde",
"i_accept": "Ich habe die ",

View File

@ -17,8 +17,6 @@
"download_registrationcode": "Download registrationcode",
"e_mail_adress": "mail address",
"e_mail_des_sponsors": "E-Mail of the Sponsor",
"error-loading-privacy-policy": "Error loading Privacy Policy",
"error_loading_imprint": "Error loading Imprint",
"error_requesting_the_login_link": "Error requesting the login link...",
"first_lap": "👏 first lap",
"i_accept": "I have read and accepted the ",

View File

@ -1,19 +1,13 @@
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);
// console.log(config);
/** @type {import('vue-router').RouterOptions['routes']} */
export const routes = [
{ path: "/", component: Home },
{ path: "/imprint", component: Imprint },
{ path: "/imprint/", component: Imprint },
{ path: "/privacy", component: Privacy },
{ path: "/privacy/", component: Privacy },
{ path: "/register", component: Register },
{ path: "/register/", component: Register },
{ path: "/register/:token", component: Register, props: true },

View File

@ -1,13 +1,13 @@
<template>
<div class="bg-cover bg-fixed m-0 h-screen text-white"
v-bind:style='{ backgroundImage: "url(" + background_base64 + ")", }'>
<section class="container px-4 py-24 mx-auto">
<section class="px-4 py-24 mx-auto">
<div class="w-full mx-auto text-center">
<img src="/favicon-lfk.png" class="h-32 mx-auto" />
<h1
class="mb-6 text-4xl font-extrabold leading-none tracking-normal md:text-6xl md:tracking-tight font-[Athiti]">
class="mb-6 text-4xl font-extrabold leading-none tracking-normal md:text-6xl md:tracking-tight">
Lauf Für Kaya!<br>2025</h1>
<h2 class="mb-6 text-xl font-bold leading-none tracking-normal md:text-3xl md:tracking-tight font-[Athiti]">
<h2 class="mb-6 text-xl font-bold leading-none tracking-normal md:text-3xl md:tracking-tight">
Selfservice Portal</h2>
<p class="px-0 mb-6 text-md lg:px-24 font-medium">{{ $t('main_page_text') }}</p>
<a class="w-full block mx-auto md:w-3/4 px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 xl:text-lg xl:py-4"

View File

@ -1,40 +0,0 @@
<template>
<section class="container px-4 py-24 mx-auto">
<div class="simplecontent">
<div class="mb-24 text-left md:text-center">
<h1 class="mb-4 text-4xl font-bold leading-tight text-gray-900 dark:text-gray-50 md:text-5xl">{{ $t('imprint')
}}
</h1>
</div>
<div class="mx-auto prose" v-html="content"></div>
</div>
</section>
<Footer></Footer>
</template>
<style src="../simple.css"></style>
<script>
import { marked } from "marked";
import Footer from "@/components/Footer.vue";
export default {
components: { Footer },
data() {
return {
content: "",
}
},
async beforeMount() {
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
let md = "";
try {
md = await fetch(`/imprint_${browserlocale}.md`);
} catch (error) {
try {
md = await fetch(`/imprint_en.md`);
} catch (error) {
md = t('error_loading_imprint');
}
}
this.content = marked(await md.text());
},
}
</script>

View File

@ -1,39 +0,0 @@
<template>
<section class="container px-4 py-24 mx-auto">
<div class="simplecontent">
<div class="mb-24 text-left md:text-center">
<h1 class="mb-4 text-4xl font-bold leading-tight text-gray-900 dark:text-gray-50 md:text-5xl">{{
$t('privacy_policy') }}</h1>
</div>
<div class="mx-auto prose" v-html="content"></div>
</div>
</section>
<Footer></Footer>
</template>
<style src="../simple.css"></style>
<script>
import { marked } from "marked";
import Footer from "@/components/Footer.vue";
export default {
components: { Footer },
data() {
return {
content: ""
}
},
async beforeMount() {
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
let md = "";
try {
md = await fetch(`/privacy_${browserlocale}.md`);
} catch (error) {
try {
md = await fetch(`/privacy_en.md`);
} catch (error) {
md = t('error-loading-privacy-policy');
}
}
this.content = marked(await md.text());
},
}
</script>

View File

@ -1,18 +1,10 @@
<template>
<div class="min-h-screen w-full p-4">
<div class="min-h-screen w-full p-4 lg:px-48 xl:w-2/3 xl:mx-auto">
<div class="">
<div class="
md:pr-10 md:mb-0
mb-6
pr-0
w-full
text-center
text-black
dark:text-gray-200
">
<div class="md:pr-10 md:mb-0 mb-6 pr-0 w-full text-center text-black dark:text-gray-200">
<img src="/favicon-lfk.png" class="h-20 mx-auto" />
<div v-if="loadstate === 'loaded'">
<h1 class="text-3xl font-bold whitespace-nowrap font-[Athiti]" v-text="(state.firstname || '') +
<h1 class="text-3xl font-bold whitespace-nowrap" v-text="(state.firstname || '') +
' ' +
(state.middlename || '') +
' ' +
@ -20,75 +12,61 @@
"></h1>
<p class="text-md whitespace-nowrap">Team: {{ state.group }}</p>
</div>
<h1 v-else class="text-3xl font-bold whitespace-nowrap font-[Athiti]">Daten werden geladen...</h1>
<h1 v-else class="text-3xl font-bold whitespace-nowrap">Daten werden geladen...</h1>
</div>
<div v-if="loadstate === 'loaded'" class="flex flex-wrap">
<div class="w-full">
<div class="flex flex-wrap flex-col w-full tabs">
<div class="flex lg:flex-wrap flex-row lg:space-x-2 justify-center">
<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 cursor-pointer 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 cursor-pointer 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 cursor-pointer py-4 px-6 block" type="button">
{{ $t("sponsoring") }}
</button>
</div>
<div class="grid grid-cols-3 text-center gap-1">
<button @click="() => {
state.activetab = 'profile';
}
" :class="{
'tab-active font-medium bg-blue-600 hover:bg-blue-700 text-white':
state.activetab === 'profile',
'bg-neutral-200':
state.activetab !== 'profile',
}" class="cursor-pointer rounded-md p-2 py-3 md:py-4 md:px-6 block" type="button">
{{ $t("profile") }}
</button>
<button @click="() => {
state.activetab = 'laptimes';
}
" :class="{
'tab-active font-medium bg-blue-600 hover:bg-blue-700 text-white':
state.activetab === 'laptimes',
'bg-neutral-200':
state.activetab !== 'laptimes',
}" class="cursor-pointer rounded-md p-2 py-3 md:py-4 md:px-6 block" type="button">
{{ $t("lap_times") }}
</button>
<button @click="() => {
state.activetab = 'sponsorings';
}
" :class="{
'tab-active font-medium bg-blue-600 hover:bg-blue-700 text-white':
state.activetab === 'sponsorings',
'bg-neutral-200':
state.activetab !== 'sponsorings',
}" class="cursor-pointer rounded-md p-2 py-3 md:py-4 md:px-6 block" type="button">
{{ $t("sponsoring") }}
</button>
</div>
<div v-if="state.activetab === 'profile'" class="tab-content block container">
<div class="lg:w-2/3 w-full mx-auto">
<div class="flex flex-col container">
<div v-if="state.activetab === 'profile'" class="tab-content block">
<div class="w-full mx-auto">
<div class="flex flex-col">
<div class="flex flex-wrap w-full">
<div class="w-full">
<div v-if="state.delete_active === false">
<button type="button" class="
mt-2
focus:border-black focus:ring-2 focus:ring-black
text-white text-base md:text-sm
py-3.5
px-5
md:py-2.5
md:px-5
rounded-md
bg-blue-500
hover:bg-blue-600 hover:shadow-lg
w-full
md:w-auto
cursor-pointer
mb-1
md:mr-1
" @click="get_certificate">
<button type="button"
class="mt-2 focus:border-black focus:ring-2 focus:ring-black text-white text-base font-medium md:text-sm py-3.5 px-5 md:py-2.5 md:px-5 rounded-md bg-blue-600 hover:bg-blue-700 hover:shadow-lg w-full md:w-auto cursor-pointer mb-1 md:mr-1"
@click="get_certificate">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
class="inline h-4 align-sub">
class="inline-block">
<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" />
<line x1="12" x2="12" y1="15" y2="3" />
</svg>
{{ $t("download_certificate") }}
</button>
@ -97,28 +75,15 @@
<div>
<div class="text-lg">{{ $t("registrationcode") }}</div>
<img class="w-full md:w-auto mb-2 bg-white p-2" alt="Registrierungscode" :src="state.barcode" />
<button type="button" class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-base md:text-sm
py-3.5
px-5
md:py-2.5
md:px-5
rounded-md
bg-blue-500
hover:bg-blue-600 hover:shadow-lg
w-full
md:w-auto
cursor-pointer
mb-1
md:mr-1
" @click="get_registration">
<button type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-base font-medium md:text-sm py-3.5 px-5 md:py-2.5 md:px-5 rounded-md bg-blue-600 hover:bg-blue-700 hover:shadow-lg w-full md:w-auto cursor-pointer mb-1 md:mr-1"
@click="get_registration">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
class="inline h-4 align-sub">
class="inline-block">
<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" />
<line x1="12" x2="12" y1="15" y2="3" />
</svg>
{{ $t("download_registrationcode") }}
</button>
@ -135,81 +100,49 @@
</div>
</div>
<div v-if="state.delete_active === true">
<button type="button" class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-base md:text-sm
py-3.5
px-5
md:py-2.5
md:px-5
rounded-md
mb-1
md:mb-auto
w-full
md:w-auto
cursor-pointer
bg-blue-500
hover:bg-blue-600 hover:shadow-lg
" @click="() => {
state.delete_active = false;
}
">
<button type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-base font-medium md:text-sm py-3.5 px-5 md:py-2.5 md:px-5 rounded-md mb-1 md:mb-auto w-full md:w-auto cursor-pointer bg-blue-600 hover:bg-blue-700 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="inline h-4 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" />
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
class="inline-block">
<circle cx="12" cy="12" r="10" />
<path d="m4.9 4.9 14.2 14.2" />
</svg>
{{ $t("cancel_keep_my_data") }}
</button>
<button type="button" class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-base md:text-sm
py-3.5
px-5
md:py-2.5
md:px-5
rounded-md
w-full
md:w-auto
cursor-pointer
bg-red-600
hover:bg-red-700 hover:shadow-lg
md:ml-1
" @click="delete_me">
<button type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-base font-medium md:text-sm py-3.5 px-5 md:py-2.5 md:px-5 rounded-md w-full md:w-auto cursor-pointer bg-red-600 hover:bg-red-700 hover:shadow-lg md:ml-1"
@click="delete_me">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
stroke="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
class="inline h-4 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" />
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
class="inline-block">
<path d="M3 6h18" />
<path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6" />
<path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2" />
<line x1="10" x2="10" y1="11" y2="17" />
<line x1="14" x2="14" y1="11" y2="17" />
</svg>
{{ $t("confirm_delete_all_of_my_data") }}
</button>
</div>
<button v-else type="button" class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-base md:text-sm
py-3.5
px-5
md:py-2.5
md:px-5
rounded-md
bg-red-600
hover:bg-red-700 hover:shadow-lg
w-full
md:w-auto
cursor-pointer
" @click="() => {
state.delete_active = true;
}
">
<button v-else type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-base font-medium md:text-sm py-3.5 px-5 md:py-2.5 md:px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg w-full md:w-auto cursor-pointer"
@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="inline h-4 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" />
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
class="inline-block">
<path d="M3 6h18" />
<path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6" />
<path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2" />
<line x1="10" x2="10" y1="11" y2="17" />
<line x1="14" x2="14" y1="11" y2="17" />
</svg>
{{ $t("delete_my_data") }}
</button>
@ -219,8 +152,8 @@
<div v-if="state.activetab === 'laptimes'" class="tab-content block">
<div class="py-4 w-full">
<section class="dark:bg-gray-900 body-font">
<div class="container mx-auto">
<div class="lg:w-2/3 w-full mx-auto">
<div class="mx-auto">
<div class="w-full mx-auto">
<div v-if="state.scans.length > 0">
<p class="mb-2">
{{ $t('total_distance') }}: {{ getReadableDistanceForUI() }}
@ -356,8 +289,8 @@
<div v-else>
<div class="py-4 w-full">
<section class="dark:bg-gray-900 body-font">
<div class="container mx-auto">
<div class="lg:w-2/3 w-full mx-auto overflow-auto">
<div class="mx-auto">
<div class="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
@ -490,12 +423,13 @@
</template>
<script setup>
import { reactive, ref } from "vue";
import { TYPE, useToast } from "vue-toastification";
import axios from "redaxios";
import { toCanvas } from "bwip-js";
import Footer from "@/components/Footer.vue";
import { useI18n } from 'vue-i18n'
import { runnerSelfServiceControllerGet, runnerSelfServiceControllerGetScans, runnerSelfServiceControllerRemove } from "@odit/lfk-client";
import { toCanvas } from "bwip-js";
import axios from "redaxios";
import { reactive, ref } from "vue";
import { useI18n } from 'vue-i18n';
import { TYPE, useToast } from "vue-toastification";
const { t } = useI18n()
const loadstate = ref("loading")
const mode = ref("")
@ -570,46 +504,42 @@ function getReadableDistance(distance) {
return `${m} m`
}
axios
.get(`${config.baseurl}api/runners/me/${accesstoken}`)
.then(({ data }) => {
loadstate.value = "loaded"
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;
state.barcode = textToBase64Barcode(data.id ?? "???");
})
runnerSelfServiceControllerGet({ path: { jwt: accesstoken } }).then(({ data }) => {
loadstate.value = "loaded"
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;
state.barcode = textToBase64Barcode(data.id ?? "???");
})
.catch((error) => {
loadstate = "error"
loadstate.value = "error"
toast.clear();
toast.error(t('profil_konnte_nicht_geladen_werden'));
});
axios
.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
.then(({ data }) => {
let counter = 0
data.map(function (s) {
if (counter === 0) {
s.lapTime_readable = t('first_lap')
} else {
s.lapTime_readable =
Math.floor(s.lapTime / 60) +
"min " +
(Math.floor(s.lapTime % 60) + "").padStart(2, "0") +
"s";
}
s.distance_readable = getReadableDistance(s.distance);
counter++;
return s;
});
data.filter((s) => s.valid === true);
state.scans = data;
})
runnerSelfServiceControllerGetScans({ path: { jwt: accesstoken } }).then(({ data }) => {
let counter = 0
data.map(function (s) {
if (counter === 0) {
s.lapTime_readable = t('first_lap')
} else {
s.lapTime_readable =
Math.floor(s.lapTime / 60) +
"min " +
(Math.floor(s.lapTime % 60) + "").padStart(2, "0") +
"s";
}
s.distance_readable = getReadableDistance(s.distance);
counter++;
return s;
});
data.filter((s) => s.valid === true);
state.scans = data;
})
.catch((error) => {
toast.error(t('profil_konnte_nicht_geladen_werden'));
});
@ -624,26 +554,20 @@ function addSponsoring() {
"address": {}
}
console.log(postdata);
axios
.post(`${config.baseurl}api/donors`, postdata)
.then(({ data }) => {
console.log(data);
})
.catch((error) => {
//
});
// TODO: implement: donationControllerPostDistance({body:{}})
}
function delete_me() {
toast.clear();
toast(t('profil_wird_geloescht'));
let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`;
axios
.delete(url)
.then(() => {
toast.clear();
toast(t('alle_daten_geloescht'));
location.replace(`/`);
})
runnerSelfServiceControllerRemove({
path: {
jwt: accesstoken
}, query: { force: true }
}).then(() => {
toast.clear();
toast(t('alle_daten_geloescht'));
location.replace(`/`);
})
.catch((error) => {
toast.clear();
toast.error(t('profil_konnte_nicht_geloescht_werden'));
@ -716,13 +640,13 @@ function get_certificate() {
});
}
function get_registration() {
toast.clear();
toast(t('registrierungscode_wird_generiert'));
// toast.clear();
// toast(t('registrierungscode_wird_generiert'));
var a = document.createElement("a");
a.href = state.barcode;
a.download = "LfK25_Registrierungscode.png";
a.download = `LfK25_Registrierungscode_${state.firstname}_${state.lastname}.png`;
a.click();
toast.clear();
toast(t('registrierungscode_generiert'), { type: TYPE.SUCCESS });
// toast.clear();
// toast(t('registrierungscode_generiert'), { type: TYPE.SUCCESS });
}
</script>

View File

@ -2,7 +2,7 @@
<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-lfk.png" alt />
<h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center font-[Athiti]">Lauf für Kaya! - {{
<h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center">Lauf für Kaya! - {{
$t('profile')
}}</h1>
<p class="mx-auto leading-relaxed text-base text-center">
@ -59,12 +59,12 @@
</template>
<script setup>
import { computed, ref, reactive } from "vue";
import axios from "redaxios";
import isEmail from 'validator/es/lib/isEmail';
import { TYPE, useToast } from "vue-toastification";
import Footer from "@/components/Footer.vue";
import { useI18n } from 'vue-i18n'
import { runnerSelfServiceControllerRequestNewToken } from "@odit/lfk-client";
import isEmail from 'validator/es/lib/isEmail';
import { computed, reactive, ref } from "vue";
import { useI18n } from 'vue-i18n';
import { TYPE, useToast } from "vue-toastification";
const { t } = useI18n()
let user_email = ref("");
@ -79,11 +79,10 @@ function resendMail() {
if (isEmail(user_email.value)) {
toast(t('login_link_is_requested'));
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
axios.post(`${config.baseurl}api/runners/login?mail=${user_email.value}&locale=${browserlocale}`)
.then(({ data }) => {
console.log(data);
toast(t('login_link_gesendet_an_user_email_value') + user_email.value);
})
runnerSelfServiceControllerRequestNewToken({ query: { locale: browserlocale, mail: user_email.value } }).then(({ data }) => {
console.log(data);
toast(t('login_link_gesendet_an_user_email_value') + user_email.value);
})
.catch((error) => {
console.log(error);
toast(t('error_requesting_the_login_link'), { type: TYPE.ERROR });

View File

@ -1,6 +1,6 @@
<template>
<div class="min-h-screen flex items-center justify-center" v-if="registrationState === 'registered'">
<div class="max-w-md w-full py-12 px-6 font-[Athiti]">
<div class="max-w-md w-full py-12 px-6">
<img class="mx-auto h-24 w-auto" src="/favicon-lfk.png" alt />
<h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center">
Lauf für Kaya! - {{ $t('registriert') }}
@ -12,7 +12,7 @@
</div>
</div>
<div class="min-h-screen flex items-center justify-center" v-else>
<div class="max-w-md w-full py-12 px-6 font-[Athiti]">
<div class="max-w-md w-full py-12 px-6">
<img class="mx-auto h-24 w-auto" src="/favicon-lfk.png" alt />
<h1 class="sm:text-3xl text-2xl font-semibold title-font mb-4 text-center">
Lauf für Kaya! - {{ $t("registrieren") }}
@ -73,24 +73,6 @@
p-2
" />
<!-- -->
<label for="middle_name" class="block font-medium">{{
$t("mittelname")
}}</label>
<input v-model="userdetails.middlename" name="middlename" id="middle_name" autocomplete="off"
:placeholder="[[$t('mittelname')]]" type="text" class="
dark:bg-gray-800
mt-1
block
w-full
shadow-sm
sm:text-sm
border-gray-300 border-2
bg-gray-50
text-gray-500
rounded-md
p-2
" />
<!-- -->
<label for="last_name" class="block font-medium">
{{ $t("nachname") }}
<span class="font-bold">*</span>
@ -144,9 +126,9 @@
<input v-model="userdetails.phone" name="phone" id="phone" autocomplete="off"
:placeholder="[[$t('phone_number')]]" type="text" :class="{
'border-red-500':
!isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
!isPhoneOkay(userdetails.phone),
'border-green-300':
isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
isPhoneOkay(userdetails.phone),
}" class="
dark:bg-gray-800
mt-1
@ -160,7 +142,7 @@
rounded-md
p-2
" />
<p v-if="!isMobilePhone(userdetails.phone) && userdetails.phone.trim()" class="text-sm">
<p v-if="!isPhoneOkay(userdetails.phone)" class="text-sm">
{{ $t("this_is_not_a_valid_international_phone_number") }}
</p>
<!-- -->
@ -173,7 +155,7 @@
</div>
<div class="ml-3 text-sm">
<label for="address_activated" class="font-medium text-gray-600 select-none">{{ $t("provide_address")
}}</label>
}}</label>
</div>
</div>
<div v-if="provide_address === true" class="col-span-6">
@ -335,27 +317,24 @@
</template>
<script setup>
import { computed, ref, reactive } from "vue";
import axios from "redaxios";
import Footer from "@/components/Footer.vue";
import { runnerSelfServiceControllerGetSelfserviceOrg, runnerSelfServiceControllerRegisterOrganizationRunner, runnerSelfServiceControllerRegisterRunner } from "@odit/lfk-client";
import isEmail from "validator/es/lib/isEmail";
import isMobilePhone from "validator/es/lib/isMobilePhone";
import isPostalCode from "validator/es/lib/isPostalCode";
import { computed, reactive, ref } from "vue";
import { useI18n } from 'vue-i18n';
import { TYPE, useToast } from "vue-toastification";
import Footer from "@/components/Footer.vue";
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const props = defineProps({
token: String,
});
if (props.token) {
axios
.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
.then(({ data }) => {
state.org_name = data.name;
state.org_teams = data.teams;
org_team.value = data.teams[0]?.id;
})
runnerSelfServiceControllerGetSelfserviceOrg({ path: { token: props.token } }).then(({ data }) => {
state.org_name = data.name;
state.org_teams = data.teams;
org_team.value = data.teams[0]?.id;
})
.catch((error) => {
console.log(error);
});
@ -369,6 +348,21 @@ let userdetails = ref({
phone: "",
address: { street: "", address2: "", city: "", zipcode: "" },
});
function isPhoneOkay() {
if (userdetails.value.phone === "") {
return true
}
if (userdetails.value.phone.includes(" ")) {
return false
}
if (!userdetails.value.phone.includes("+")) {
return false
}
if (isMobilePhone(userdetails.value.phone)) {
return true
}
return false
}
let provide_address = ref(false);
let agb_accepted = ref(false);
let data_confirmed = ref(false);
@ -382,8 +376,7 @@ const state = reactive({
() =>
agb_accepted.value === true &&
data_confirmed.value === true &&
(isMobilePhone(userdetails.value.phone) ||
!userdetails.value.phone.trim()) &&
isPhoneOkay() &&
isEmail(userdetails.value.mail) &&
userdetails.value.firstname &&
userdetails.value.lastname &&
@ -396,25 +389,25 @@ const state = reactive({
});
const toast = useToast();
function login() {
userdetails = userdetails.value;
if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
if (isEmail(userdetails.mail)) {
// userdetails = userdetails.value;
if (isPhoneOkay()) {
if (isEmail(userdetails.value.mail)) {
let postdata = {
email: userdetails.mail,
firstname: userdetails.firstname,
middlename: userdetails.middlename,
lastname: userdetails.lastname,
email: userdetails.value.mail,
firstname: userdetails.value.firstname,
middlename: userdetails.value.middlename,
lastname: userdetails.value.lastname,
address: {},
};
if (isMobilePhone(userdetails.phone)) {
postdata.phone = userdetails.phone;
if (userdetails.value.phone !== "") {
postdata.phone = userdetails.value.phone
}
if (provide_address.value === true) {
postdata.address = {
address1: userdetails.address.street,
address2: userdetails.address.address2 || "",
city: userdetails.address.city,
postalcode: userdetails.address.zipcode,
address1: userdetails.value.address.street,
address2: userdetails.value.address.address2 || "",
city: userdetails.value.address.city,
postalcode: userdetails.value.address.zipcode,
country: "DE",
};
}
@ -426,28 +419,42 @@ function login() {
(navigator.languages && navigator.languages[0]) ||
""
).substr(0, 2);
let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
if (props.token) {
url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`;
}
registrationState.value = "loading";
axios
.post(url, postdata)
.then(() => {
registrationState.value = "registered";
})
.catch((error) => {
console.log(error);
if (error.data.message === "E-Mail already registered") {
toast(t('already_registered'), { type: TYPE.ERROR });
} else if (error.data.message === "Invalid body, check 'errors' property for more info.") {
error.data.errors.forEach(e => {
if (e.property === "phone") {
toast(t('invalid_input_phone_number_should_be_international_format'), { type: TYPE.ERROR });
}
});
}
});
if (props.token) {
runnerSelfServiceControllerRegisterOrganizationRunner({ path: { token: props.token }, body: postdata, query: { locale: browserlocale } })
.then(() => {
registrationState.value = "registered";
})
.catch((error) => {
console.log(error);
if (error.data.message === "E-Mail already registered") {
toast(t('already_registered'), { type: TYPE.ERROR });
} else if (error.data.message === "Invalid body, check 'errors' property for more info.") {
error.data.errors.forEach(e => {
if (e.property === "phone") {
toast(t('invalid_input_phone_number_should_be_international_format'), { type: TYPE.ERROR });
}
});
}
});
} else {
runnerSelfServiceControllerRegisterRunner({ body: postdata, query: { locale: browserlocale } })
.then(() => {
registrationState.value = "registered";
})
.catch((error) => {
console.log(error);
if (error.data.message === "E-Mail already registered") {
toast(t('already_registered'), { type: TYPE.ERROR });
} else if (error.data.message === "Invalid body, check 'errors' property for more info.") {
error.data.errors.forEach(e => {
if (e.property === "phone") {
toast(t('invalid_input_phone_number_should_be_international_format'), { type: TYPE.ERROR });
}
});
}
});
}
}
}
}