package.json

@@ -9,7 +9,6 @@
 	},
 	"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",

pnpm-lock.yaml

@@ -11,9 +11,6 @@ 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))
@@ -371,9 +368,6 @@ 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==}
 
@@ -592,9 +586,6 @@ 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'}
@@ -2442,8 +2433,6 @@ 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)':
@@ -2665,10 +2654,6 @@ 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':

src/views/Profile.vue

@@ -490,13 +490,12 @@
 </template>
 
 <script setup>
-import Footer from "@/components/Footer.vue";
-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";
+import axios from "redaxios";
+import { toCanvas } from "bwip-js";
+import Footer from "@/components/Footer.vue";
+import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 const loadstate = ref("loading")
 const mode = ref("")
@@ -571,7 +570,9 @@ function getReadableDistance(distance) {
   return `${m} m`
 }
 
-runnerSelfServiceControllerGet({ path: { jwt: accesstoken } }).then(({ data }) => {
+axios
+  .get(`${config.baseurl}api/runners/me/${accesstoken}`)
+  .then(({ data }) => {
     loadstate.value = "loaded"
     state.phone = data.phone;
     state.email = data.email;
@@ -588,7 +589,9 @@ runnerSelfServiceControllerGet({ path: { jwt: accesstoken } }).then(({ data }) =
     toast.clear();
     toast.error(t('profil_konnte_nicht_geladen_werden'));
   });
-runnerSelfServiceControllerGetScans({ path: { jwt: accesstoken } }).then(({ data }) => {
+axios
+  .get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
+  .then(({ data }) => {
     let counter = 0
     data.map(function (s) {
       if (counter === 0) {
@@ -621,16 +624,22 @@ function addSponsoring() {
     "address": {}
   }
   console.log(postdata);
-  // TODO: implement: donationControllerPostDistance({body:{}})
+  axios
+    .post(`${config.baseurl}api/donors`, postdata)
+    .then(({ data }) => {
+      console.log(data);
+    })
+    .catch((error) => {
+      // 
+    });
 }
 function delete_me() {
   toast.clear();
   toast(t('profil_wird_geloescht'));
-  runnerSelfServiceControllerRemove({
+  let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`;
-    path: {
+  axios
-      jwt: accesstoken
+    .delete(url)
-    }, query: { force: true }
+    .then(() => {
-  }).then(() => {
       toast.clear();
       toast(t('alle_daten_geloescht'));
       location.replace(`/`);

src/views/ProfileNone.vue

@@ -59,12 +59,12 @@
 </template>
 
 <script setup>
-import Footer from "@/components/Footer.vue";
+import { computed, ref, reactive } from "vue";
-import { runnerSelfServiceControllerRequestNewToken } from "@odit/lfk-client";
+import axios from "redaxios";
 import isEmail from 'validator/es/lib/isEmail';
-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()
 
 let user_email = ref("");
@@ -79,7 +79,8 @@ function resendMail() {
     if (isEmail(user_email.value)) {
         toast(t('login_link_is_requested'));
         const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
-        runnerSelfServiceControllerRequestNewToken({ query: { locale: browserlocale, mail: user_email.value } }).then(({ data }) => {
+        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);
             })

src/views/Register.vue

@@ -73,6 +73,24 @@
             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>
@@ -126,9 +144,9 @@
         <input v-model="userdetails.phone" name="phone" id="phone" autocomplete="off"
           :placeholder="[[$t('phone_number')]]" type="text" :class="{
             'border-red-500':
-              !isPhoneOkay(userdetails.phone),
+              !isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
             'border-green-300':
-              isPhoneOkay(userdetails.phone),
+              isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
           }" class="
             dark:bg-gray-800
             mt-1
@@ -142,7 +160,7 @@
             rounded-md
             p-2
           " />
-        <p v-if="!isPhoneOkay(userdetails.phone)" class="text-sm">
+        <p v-if="!isMobilePhone(userdetails.phone) && userdetails.phone.trim()" class="text-sm">
           {{ $t("this_is_not_a_valid_international_phone_number") }}
         </p>
         <!--  -->
@@ -317,20 +335,23 @@
 </template>
 
 <script setup>
-import Footer from "@/components/Footer.vue";
+import { computed, ref, reactive } from "vue";
-import { runnerSelfServiceControllerGetSelfserviceOrg, runnerSelfServiceControllerRegisterOrganizationRunner, runnerSelfServiceControllerRegisterRunner } from "@odit/lfk-client";
+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 { 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) {
-  runnerSelfServiceControllerGetSelfserviceOrg({ path: { token: props.token } }).then(({ data }) => {
+  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;
@@ -348,21 +369,6 @@ 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);
@@ -376,7 +382,8 @@ const state = reactive({
     () =>
       agb_accepted.value === true &&
       data_confirmed.value === true &&
-      isPhoneOkay() &&
+      (isMobilePhone(userdetails.value.phone) ||
+        !userdetails.value.phone.trim()) &&
       isEmail(userdetails.value.mail) &&
       userdetails.value.firstname &&
       userdetails.value.lastname &&
@@ -389,25 +396,25 @@ const state = reactive({
 });
 const toast = useToast();
 function login() {
-  // userdetails = userdetails.value;
+  userdetails = userdetails.value;
-  if (isPhoneOkay()) {
+  if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
-    if (isEmail(userdetails.value.mail)) {
+    if (isEmail(userdetails.mail)) {
       let postdata = {
-        email: userdetails.value.mail,
+        email: userdetails.mail,
-        firstname: userdetails.value.firstname,
+        firstname: userdetails.firstname,
-        middlename: userdetails.value.middlename,
+        middlename: userdetails.middlename,
-        lastname: userdetails.value.lastname,
+        lastname: userdetails.lastname,
         address: {},
       };
-      if (userdetails.value.phone !== "") {
+      if (isMobilePhone(userdetails.phone)) {
-        postdata.phone = userdetails.value.phone
+        postdata.phone = userdetails.phone;
       }
       if (provide_address.value === true) {
         postdata.address = {
-          address1: userdetails.value.address.street,
+          address1: userdetails.address.street,
-          address2: userdetails.value.address.address2 || "",
+          address2: userdetails.address.address2 || "",
-          city: userdetails.value.address.city,
+          city: userdetails.address.city,
-          postalcode: userdetails.value.address.zipcode,
+          postalcode: userdetails.address.zipcode,
           country: "DE",
         };
       }
@@ -419,9 +426,13 @@ function login() {
         (navigator.languages && navigator.languages[0]) ||
         ""
       ).substr(0, 2);
-      registrationState.value = "loading";
+      let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
       if (props.token) {
-        runnerSelfServiceControllerRegisterOrganizationRunner({ path: { token: props.token }, body: postdata, query: { locale: browserlocale } })
+        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`;
+      }
+      registrationState.value = "loading";
+      axios
+        .post(url, postdata)
         .then(() => {
           registrationState.value = "registered";
         })
@@ -437,24 +448,6 @@ function login() {
             });
           }
         });
-      } 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 });
-                }
-              });
-            }
-          });
-      }
     }
   }
 }