🚀Bumped version to v1.3.1

.dockerignore

@@ -85,8 +85,6 @@ out
 .nuxt
 dist
 
-# Gatsby files
-.cache/
 # Comment in the public line in if your project uses Gatsby and not Next.js
 # https://nextjs.org/blog/next-9-1#public-directory-support
 # public

.gitea/workflows/dev.yaml

@@ -0,0 +1,27 @@
+name: Build Latest image
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.odit.services
+          username: ${{ vars.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ${{ vars.REGISTRY }}/lfk/selfservice:dev
+          platforms: linux/amd64,linux/arm64

.gitea/workflows/main.yaml

@@ -0,0 +1,27 @@
+name: Build Latest image
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.odit.services
+          username: ${{ vars.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ${{ vars.REGISTRY }}/lfk/selfservice:latest
+          platforms: linux/amd64,linux/arm64

.gitea/workflows/release.yaml

@@ -0,0 +1,27 @@
+name: Build release images
+on:
+  push:
+    tags:
+      - "*.*.*"
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.odit.services
+          username: ${{ vars.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ${{ vars.REGISTRY }}/lfk/selfservice:${{ github.ref_name }}
+          platforms: linux/amd64,linux/arm64

.woodpecker/build.yml

@@ -1,33 +0,0 @@
-steps:
-  - name: build latest
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - latest
-      registry: registry.odit.services
-      platforms: linux/amd64,linux/arm64
-      cache_from: registry.odit.services/lfk/selfservice:dev
-      username:
-        from_secret: odit-registry-builder-username
-      password:
-        from_secret: odit-registry-builder-password
-    when:
-      branch: main
-  - name: build dev
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - dev
-      registry: registry.odit.services
-      platforms: linux/amd64,linux/arm64
-      cache_from: registry.odit.services/lfk/selfservice:dev
-      username:
-        from_secret: odit-registry-builder-username
-      password:
-        from_secret: odit-registry-builder-password
-    when:
-      branch: dev
-when:
-  event: push

.woodpecker/release.yml

@@ -1,17 +0,0 @@
-steps:
-  - name: build tag
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - "${CI_COMMIT_TAG}"
-      registry: registry.odit.services
-      platforms: linux/amd64,linux/arm64
-      cache_from: registry.odit.services/lfk/selfservice:dev
-      username:
-        from_secret: odit-registry-builder-username
-      password:
-        from_secret: odit-registry-builder-password
-when:
-  event:
-    - tag

CHANGELOG.md

@@ -2,8 +2,41 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [1.3.1](https://git.odit.services/lfk/selfservice/compare/1.3.0...1.3.1)
+
+- feat: footer cleanup [`65dc27a`](https://git.odit.services/lfk/selfservice/commit/65dc27add1760c6ebe11f415c49238f82cdb5b48)
+
+#### [1.3.0](https://git.odit.services/lfk/selfservice/compare/1.2.7...1.3.0)
+
+> 28 March 2025
+
+- feat: improve phone number registration [`e14a6d6`](https://git.odit.services/lfk/selfservice/commit/e14a6d6329d547d3086abe59d00f0d054688b6f4)
+- feat: improved Register UI [`e418d2a`](https://git.odit.services/lfk/selfservice/commit/e418d2a2b74553f614520ac8c0f0377d141daa8d)
+- 🚀Bumped version to v1.3.0 [`c9e3b61`](https://git.odit.services/lfk/selfservice/commit/c9e3b613e1d08f6217ae58b8aa42a47749f0ac94)
+- feat: only show international phone number thing if + is missing [`f0c668c`](https://git.odit.services/lfk/selfservice/commit/f0c668c1c3d1a5c27d78617e5ca34ca68603ce14)
+
+#### [1.2.7](https://git.odit.services/lfk/selfservice/compare/1.2.6...1.2.7)
+
+> 23 March 2025
+
+- refactor(ci): Switch to actions [`a862593`](https://git.odit.services/lfk/selfservice/commit/a862593c5315043577699d1a6fd50854dd1bca00)
+- 🚀Bumped version to v1.2.7 [`e1a87ed`](https://git.odit.services/lfk/selfservice/commit/e1a87eda4a0c9b9be47bcfe4ddb0e93696d037f4)
+- footer: cleanup imprint & privacy url [`0e557ef`](https://git.odit.services/lfk/selfservice/commit/0e557ef4080e997b06adcbbadf3e82f12152281b)
+- fix: footer [`422df7c`](https://git.odit.services/lfk/selfservice/commit/422df7c3f832dc29721e783dc4a86ee55e9d8ccc)
+- footer padding [`0af7352`](https://git.odit.services/lfk/selfservice/commit/0af73525bc154ba730351d7a4970e9737edaa4db)
+- chore: clean up .dockerignore by removing Gatsby references [`bab145d`](https://git.odit.services/lfk/selfservice/commit/bab145d78c16dd7c56136a274d051cf408935e3e)
+
+#### [1.2.6](https://git.odit.services/lfk/selfservice/compare/1.2.5...1.2.6)
+
+> 18 March 2025
+
+- 🚀Bumped version to v1.2.6 [`63fc5ec`](https://git.odit.services/lfk/selfservice/commit/63fc5ec7474f65c743db9c281829fef31b623af6)
+- fix(profile): font sizes [`c98a65d`](https://git.odit.services/lfk/selfservice/commit/c98a65d918e5d652ee98044b4d5333c7000e1c87)
+
 #### [1.2.5](https://git.odit.services/lfk/selfservice/compare/1.2.4...1.2.5)
 
+> 18 March 2025
+
 - 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)
@@ -11,6 +44,7 @@ All notable changes to this project will be documented in this file. Dates are d
 - 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)
+- 🚀Bumped version to v1.2.5 [`b1ab04f`](https://git.odit.services/lfk/selfservice/commit/b1ab04fa53817178e016d7c2c387db12c0f6a987)
 - 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)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "1.2.5",
+	"version": "1.3.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

src/components/Footer.vue

@@ -1,18 +1,13 @@
 <template>
   <footer>
-    <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">
-      <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
-        Lauf für Kaya! Selfservice<br>Copyright © 2025<br>proudly powered by
+      <a class="underline" target="_blank" rel="noopener,noreferrer"
-        <a class="underline" target="_blank" rel="noopener,noreferrer"
+        href="https://odit.services?ref=lfk">ODIT.Services</a><br>
-          href="https://odit.services?ref=lfk">ODIT.Services</a>
+      <a target="_blank" rel="noopener,noreferrer" :href="[[imprint_url]]" class="underline">{{
-      </p>
+        $t('imprint') }}</a> <a target="_blank" rel="noopener,noreferrer" :href="[[privacy_url]]" class="underline">{{
-      <span class="inline-flex sm:ml-auto sm:mt-0 mt-4 justify-center sm:justify-start">
-        <a target="_blank" rel="noopener,noreferrer" :href="[[imprint_url]]" class="ml-3 underline">{{
-          $t('imprint') }}</a>
-        <a target="_blank" rel="noopener,noreferrer" :href="[[privacy_url]]" class="ml-3 underline">{{
           $t('privacy_policy') }}</a>
-      </span>
+    </p>
-    </div>
   </footer>
 </template>
 <script>

src/locales/de.json

@@ -19,6 +19,7 @@
     "e_mail_des_sponsors": "E-Mail des Sponsors",
     "error_requesting_the_login_link": "Fehler beim Anfordern des Login-Links...",
     "first_lap": "👏 erste Runde",
+    "hinweis": "Hinweis:",
     "i_accept": "Ich habe die ",
     "i_accept_end": "gelesen und akzeptiert.",
     "if_you_are_the_system_administrator_please_refer_to_the_official_product_documentation_readme_for_configuration_guidance": "Wenn Sie der Systemadministrator sind, finden Sie Konfigurationsanweisungen in der offiziellen Produktdokumentation / README.",
@@ -38,7 +39,7 @@
     "not_registered_yet": "Noch nicht registriert?",
     "organization": "Organisation",
     "ort": "Ort",
-    "phone_number": "Telefonnummer (international formatiert)",
+    "phone_number": "Telefonnummer",
     "please_provide_a_valid_zipcode": "Bitte geben Sie eine gültige Postleitzahl an...",
     "please_provide_valid_mail": "Bitte geben Sie eine gültige E-Mail Adresse an",
     "plz": "PLZ",
@@ -53,6 +54,7 @@
     },
     "register_now": "Jetzt registrieren!",
     "register_now_small": "Jetzt registrieren",
+    "registration_local_phone_nr": "Wenn Sie eine Telefonnummer ohne Vorwahl angeben, wird Sie als deutsche Telefonnummer gewertet",
     "registration_running": "Registrierung läuft...",
     "registrationcode": "Registrierungscode",
     "registrieren": "Registrieren",

src/locales/en.json

@@ -19,6 +19,7 @@
     "e_mail_des_sponsors": "E-Mail of the Sponsor",
     "error_requesting_the_login_link": "Error requesting the login link...",
     "first_lap": "👏 first lap",
+    "hinweis": "Note:",
     "i_accept": "I have read and accepted the ",
     "i_accept_end": "",
     "if_you_are_the_system_administrator_please_refer_to_the_official_product_documentation_readme_for_configuration_guidance": "If you are the system administrator, please refer to the official product documentation/ README for configuration guidance.",
@@ -38,7 +39,7 @@
     "not_registered_yet": "Not registered yet?",
     "organization": "Organization",
     "ort": "City",
-    "phone_number": "Phone Number (international format)",
+    "phone_number": "Phone Number",
     "please_provide_a_valid_zipcode": "Please provide a valid zipcode...",
     "please_provide_valid_mail": "Please provide a valid mail address.",
     "plz": "zipcode",
@@ -53,6 +54,7 @@
     },
     "register_now": "Register now!",
     "register_now_small": "Register now",
+    "registration_local_phone_nr": "If you enter a phone number without an country code, it will be treated as a German phone number",
     "registration_running": "registration is running...",
     "registrationcode": "Registration Code",
     "registrieren": "Register Now",

src/views/Home.vue

@@ -4,8 +4,7 @@
     <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
+        <h1 class="mb-6 text-4xl font-extrabold leading-none tracking-normal md:text-6xl md:tracking-tight">
-          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">
           Selfservice Portal</h2>
@@ -18,7 +17,9 @@
       </div>
     </section>
   </div>
-  <Footer />
+  <div class="p-8">
+    <Footer />
+  </div>
 </template>
 
 <script setup>

src/views/Profile.vue

@@ -1,6 +1,5 @@
 <template>
-  <div class="min-h-screen w-full p-4 lg:px-48 xl:w-2/3 xl:mx-auto">
+  <div class="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">
         <img src="/favicon-lfk.png" class="h-20 mx-auto" />
         <div v-if="loadstate === 'loaded'">
@@ -10,13 +9,14 @@
             ' ' +
             (state.lastname || '')
             "></h1>
-          <p class="text-md whitespace-nowrap">Team: {{ state.group }}</p>
+          <p v-if="state.group==='Citizen'" class="text-md whitespace-nowrap">Bürgerlauf<br>Start: 14:00 Uhr</p>
+          <p v-else class="text-md whitespace-nowrap">Team: {{ state.group }}</p>
         </div>
         <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="">
             <div class="grid grid-cols-3 text-center gap-1">
               <button @click="() => {
                 state.activetab = 'profile';
@@ -200,12 +200,12 @@
                     </div>
                     <div v-else class="
                         text-center
-                        font-bold
+                        font-medium
                         text-black
                         dark:text-white
-                        text-2xl
+                        text-xl
                       ">
-                      <img src="../assets/empty_laps.svg" class="mx-auto h-64"
+                      <img src="../assets/empty_laps.svg" class="mx-auto h-56"
                         :alt="[[$t('no_laps_scans_were_recorded_yet')]]" />
                       {{ $t("no_laps_scans_were_recorded_yet") }}
                     </div>
@@ -290,7 +290,7 @@
               <div class="py-4 w-full">
                 <section class="dark:bg-gray-900 body-font">
                   <div class="mx-auto">
-                    <div class="w-full mx-auto overflow-auto">
+                    <div class="w-full mx-auto">
                       <table v-if="state.sponsorings.length > 0" class="table-auto w-full text-left whitespace-no-wrap">
                         <thead class="
                       text-black
@@ -416,9 +416,8 @@
           </div>
         </div>
       </div>
-    </div>
     <!--  -->
-    <Footer></Footer>
+    <Footer />
   </div>
 </template>
 

src/views/ProfileNone.vue

@@ -4,7 +4,7 @@
             <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('profile')
-                }}</h1>
+            }}</h1>
             <p class="mx-auto leading-relaxed text-base text-center">
                 {{ $t('access_is_only_provided_via_your_email_link') }}
             </p>
@@ -28,7 +28,7 @@
                         class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-2 bg-gray-50 text-gray-500 rounded-md p-2" />
                     <p v-if="!isEmail(user_email) && user_email !== ''" class="text-sm">{{
                         $t('please_provide_valid_mail')
-                    }}</p>
+                        }}</p>
                 </div>
                 <div class="mt-2">
                     <button :disabled="(!state.submit_enabled)"
@@ -55,7 +55,7 @@
             </div>
         </div>
     </div>
-    <Footer></Footer>
+    <Footer />
 </template>
 
 <script setup>

src/views/Register.vue

@@ -51,7 +51,7 @@
         {{ $t('buergerlauf') }}
       </p>
       <div class="mt-4">
-        <label for="first_name" class="block font-medium">
+        <label for="first_name" class="block font-semibold mt-2">
           {{ $t("vorname") }}
           <span class="font-bold">*</span>
         </label>
@@ -61,7 +61,6 @@
             'border-green-300': userdetails.firstname.trim(),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
@@ -73,7 +72,7 @@
             p-2
           " />
         <!--  -->
-        <label for="last_name" class="block font-medium">
+        <label for="last_name" class="block font-semibold mt-2">
           {{ $t("nachname") }}
           <span class="font-bold">*</span>
         </label>
@@ -83,7 +82,6 @@
             'border-green-300': userdetails.lastname.trim(),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
@@ -95,7 +93,7 @@
             p-2
           " />
         <!--  -->
-        <label for="email_address" class="block font-medium">
+        <label for="email_address" class="block font-semibold mt-2">
           {{ $t("e_mail_adress") }}
           <span class="font-bold">*</span>
         </label>
@@ -105,7 +103,6 @@
             'border-green-300': isEmail(userdetails.mail),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
@@ -120,9 +117,32 @@
           {{ $t("please_provide_valid_mail") }}
         </p>
         <!--  -->
-        <label for="phone" class="select-none block font-medium">{{
+        <label for="phone" class="block font-semibold mt-2">{{
           $t("phone_number")
         }}</label>
+        <div v-if="userdetails.phone !== '' && !userdetails.phone.includes('+')"
+          class="bg-blue-100 border border-blue-200 text-black rounded-lg p-4 mb-1" role="alert" tabindex="-1"
+          aria-labelledby="hs-actions-label">
+          <div class="flex">
+            <div class="shrink-0">
+              <svg class="shrink-0 size-4 mt-1" 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">
+                <circle cx="12" cy="12" r="10"></circle>
+                <path d="M12 16v-4"></path>
+                <path d="M12 8h.01"></path>
+              </svg>
+            </div>
+            <div class="ms-3">
+              <h3 id="hs-actions-label" class="font-semibold">
+                {{ $t('hinweis') }}
+              </h3>
+              <div class="mt-2 text-sm text-gray-800 font-medium">
+                {{ $t('registration_local_phone_nr') }}
+              </div>
+            </div>
+          </div>
+        </div>
         <input v-model="userdetails.phone" name="phone" id="phone" autocomplete="off"
           :placeholder="[[$t('phone_number')]]" type="text" :class="{
             'border-red-500':
@@ -131,7 +151,6 @@
               isPhoneOkay(userdetails.phone),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
@@ -160,7 +179,7 @@
           </div>
           <div v-if="provide_address === true" class="col-span-6">
             <div class="col-span-6">
-              <label for="street" class="block font-medium">
+              <label for="street" class="block font-semibold mt-2">
                 {{ $t("strasse") }}
                 <span class="font-bold">*</span>
               </label>
@@ -170,7 +189,6 @@
                   'border-green-300': userdetails.address.street.trim(),
                 }" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
@@ -183,13 +201,12 @@
                 " />
             </div>
             <div class="col-span-6">
-              <label for="address2" class="block font-medium">{{
+              <label for="address2" class="block font-semibold mt-2">{{
                 $t("apartment_suite_etc")
               }}</label>
               <input v-model="userdetails.address.address2" type="text" name="address2"
                 :placeholder="[[$t('apartment_suite_etc')]]" id="address2" autocomplete="street-address" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
@@ -202,7 +219,7 @@
                 " />
             </div>
             <div class="col-span-6 sm:col-span-6 lg:col-span-2">
-              <label for="city" class="block font-medium">
+              <label for="city" class="block font-semibold mt-2">
                 {{ $t("ort") }}
                 <span class="font-bold">*</span>
               </label>
@@ -212,7 +229,6 @@
                   'border-green-300': userdetails.address.city.trim(),
                 }" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
@@ -225,7 +241,7 @@
                 " />
             </div>
             <div class="col-span-6 sm:col-span-3 lg:col-span-2">
-              <label for="postal_code" class="block font-medium">
+              <label for="postal_code" class="block font-semibold mt-2">
                 {{ $t("plz") }}
                 <span class="font-bold">*</span>
               </label>
@@ -241,7 +257,6 @@
                   ),
                 }" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
@@ -313,7 +328,9 @@
       </div>
     </div>
   </div>
-  <Footer></Footer>
+  <div class="p-8">
+    <Footer />
+  </div>
 </template>
 
 <script setup>
@@ -348,17 +365,30 @@ let userdetails = ref({
   phone: "",
   address: { street: "", address2: "", city: "", zipcode: "" },
 });
+function formatPhoneNumber(phoneNumber, countryCode = "+49") {
+  // Remove all non-digit characters
+  const cleanedNumber = phoneNumber.replace(/\D/g, "");
+
+  // Check if the number starts with the country code
+  if (cleanedNumber.startsWith(countryCode.replace("+", ""))) {
+    return "+" + cleanedNumber; // already international
+  }
+
+  // Check if the number starts with 0
+  if (cleanedNumber.startsWith("0")) {
+    return countryCode + cleanedNumber.slice(1);
+  }
+
+  // If it doesn't start with 0 or the country code, assume it's a local number.
+  // In this case, prepend the country code.
+  return countryCode + cleanedNumber;
+}
 function isPhoneOkay() {
   if (userdetails.value.phone === "") {
     return true
   }
-  if (userdetails.value.phone.includes(" ")) {
+  const formattedNumber = formatPhoneNumber(userdetails.value.phone)
-    return false
+  if (isMobilePhone(formattedNumber)) {
-  }
-  if (!userdetails.value.phone.includes("+")) {
-    return false
-  }
-  if (isMobilePhone(userdetails.value.phone)) {
     return true
   }
   return false
@@ -400,7 +430,7 @@ function login() {
         address: {},
       };
       if (userdetails.value.phone !== "") {
-        postdata.phone = userdetails.value.phone
+        postdata.phone = formatPhoneNumber(userdetails.value.phone)
       }
       if (provide_address.value === true) {
         postdata.address = {