refactor: move to new lfk ts client

package.json

@@ -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",

pnpm-lock.yaml

@@ -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':

src/views/Profile.vue

@@ -490,12 +490,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 +571,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"
     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 +621,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'));

src/views/ProfileNone.vue

@@ -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 });

src/views/Register.vue

@@ -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 });
+                }
+              });
+            }
+          });
+      }
     }
   }
 }