feat(register): org/team as badge ui

CHANGELOG.md

@@ -2,9 +2,25 @@
 
 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)

package.json

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

src/components/Footer.vue

@@ -1,13 +1,13 @@
 <template>
-  <footer class="p-8">
-      <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><br>
-        <a target="_blank" rel="noopener,noreferrer" :href="[[imprint_url]]" class="underline">{{
-          $t('imprint') }}</a> <a target="_blank" rel="noopener,noreferrer" :href="[[privacy_url]]" class="underline">{{
+  <footer>
+    <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><br>
+      <a target="_blank" rel="noopener,noreferrer" :href="[[imprint_url]]" class="underline">{{
+        $t('imprint') }}</a> <a target="_blank" rel="noopener,noreferrer" :href="[[privacy_url]]" class="underline">{{
           $t('privacy_policy') }}</a>
-      </p>
+    </p>
   </footer>
 </template>
 <script>

src/locales/de.json

@@ -19,9 +19,14 @@
     "e_mail_des_sponsors": "E-Mail des Sponsors",
     "error_requesting_the_login_link": "Fehler beim Anfordern des Login-Links...",
     "first_lap": "👏 erste Runde",
+    "geben_sie_ihre_handynummer_an": "Ihre Handynummer",
+    "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.",
+    "ihr_nachname": "Ihr Nachname",
+    "ihr_vorname": "Ihr Vorname",
+    "ihre_e_mail_adresse": "Ihre E-Mail Adresse",
     "imprint": "Impressum",
     "invalid_input_phone_number_should_be_international_format": "ungültige Eingabe... Die Telefonnummer sollte ein internationales Format haben",
     "lap_time": "Rundenzeit",
@@ -38,7 +43,7 @@
     "not_registered_yet": "Noch nicht registriert?",
     "organization": "Organisation",
     "ort": "Ort",
-    "phone_number": "Telefonnummer (international formatiert)",
+    "phone_number": "Handynummer (optional)",
     "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",
@@ -49,10 +54,11 @@
     "profile": "Profil",
     "provide_address": "Adresse angeben?",
     "register": {
-        "register_now": "Jetzt für den Lauf für Kaya! 2025 registrieren."
+        "register_now": "Jetzt für den LfK! 2025 registrieren."
     },
     "register_now": "Jetzt registrieren!",
     "register_now_small": "Jetzt registrieren",
+    "registration_local_phone_nr": "Handynummern ohne Vorwahl werden als deutsche Telefonnummer gewertet",
     "registration_running": "Registrierung läuft...",
     "registrationcode": "Registrierungscode",
     "registrieren": "Registrieren",

src/locales/en.json

@@ -19,9 +19,14 @@
     "e_mail_des_sponsors": "E-Mail of the Sponsor",
     "error_requesting_the_login_link": "Error requesting the login link...",
     "first_lap": "👏 first lap",
+    "geben_sie_ihre_handynummer_an": "Your mobile number",
+    "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.",
+    "ihr_nachname": "Your last name",
+    "ihr_vorname": "Your first name",
+    "ihre_e_mail_adresse": "Your email address",
     "imprint": "Imprint",
     "invalid_input_phone_number_should_be_international_format": "invalid input... phone number should be international format",
     "lap_time": "Lap time",
@@ -38,7 +43,7 @@
     "not_registered_yet": "Not registered yet?",
     "organization": "Organization",
     "ort": "City",
-    "phone_number": "Phone Number (international format)",
+    "phone_number": "mobile number (optional)",
     "please_provide_a_valid_zipcode": "Please provide a valid zipcode...",
     "please_provide_valid_mail": "Please provide a valid mail address.",
     "plz": "zipcode",
@@ -49,10 +54,11 @@
     "profile": "Profile",
     "provide_address": "Provide a postal address?",
     "register": {
-        "register_now": "Register now for Lauf für Kaya! 2025."
+        "register_now": "Register now for LfK! 2025."
     },
     "register_now": "Register now!",
     "register_now_small": "Register now",
+    "registration_local_phone_nr": "Mobile numbers without an area code are considered German phone numbers",
     "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
-          class="mb-6 text-4xl font-extrabold leading-none tracking-normal md:text-6xl md:tracking-tight">
+        <h1 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

@@ -9,7 +9,8 @@
             ' ' +
             (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>
@@ -416,7 +417,7 @@
         </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

@@ -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">
+    <div class="max-w-md w-full py-6 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,26 +12,26 @@
     </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">
+    <div class="max-w-md w-full py-6 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") }}
+      <h1 class="sm:text-3xl text-2xl font-semibold title-font text-center">
+        Lauf für Kaya!
       </h1>
-      <p class="mx-auto leading-relaxed text-base text-center font-medium">
+      <p class="mx-auto leading-relaxed text-lg text-center font-medium mb-4">
         {{ $t("register.register_now") }}
       </p>
-      <p v-if="state.org_name !== ''" class="mx-auto leading-relaxed text-base text-center font-medium">
-        {{ $t("organization") }}: {{ state.org_name }}
-      </p>
-      <p v-if="state.org_name !== '' && state.org_teams.length > 0"
-        class="mx-auto leading-relaxed text-base text-center">
+      <div v-if="state.org_name !== ''" class="w-full text-center">
+        <span
+          class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-lg mx-auto font-medium bg-blue-100 text-blue-800 dark:bg-blue-800/30 dark:text-blue-500">{{ state.org_name }}</span>
+      </div>
+      <label v-if="state.org_name !== '' && state.org_teams.length > 0" for="select_team" class="block font-semibold mt-2">
         Team:
-      </p>
-      <select v-model="org_team" v-if="state.org_name !== '' && state.org_teams.length > 0" class="
+      </label>
+      <select id="select_team" v-model="org_team" v-if="state.org_name !== '' && state.org_teams.length > 0" class="
           w-full
-          border
+          border-2
           bg-white
-          rounded
+          rounded-md
           px-3
           py-2
           outline-none
@@ -47,102 +47,123 @@
           {{ t.name }}
         </option>
       </select>
-      <p v-if="state.org_name === ''" class="mx-auto leading-relaxed text-base text-center">
-        {{ $t('buergerlauf') }}
-      </p>
+      <div v-if="state.org_name === ''" class="w-full text-center">
+        <span
+          class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-lg mx-auto font-medium bg-blue-100 text-blue-800 dark:bg-blue-800/30 dark:text-blue-500">{{
+            $t('buergerlauf') }}</span>
+      </div>
       <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>
         <input v-model="userdetails.firstname" name="firstname" id="first_name" autocomplete="off"
-          :placeholder="[[$t('vorname')]]" type="text" :class="{
-            'border-red-500': !userdetails.firstname.trim(),
+          :placeholder="[[$t('ihr_vorname')]]" type="text" :class="{
+            '': !userdetails.firstname.trim(),
             'border-green-300': userdetails.firstname.trim(),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
             sm:text-sm
-            border-gray-300 border-2
+            border-2 placeholder:text-gray-800
             bg-gray-50
             text-gray-500
             rounded-md
             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>
         <input v-model="userdetails.lastname" name="lastname" id="last_name" autocomplete="off"
-          :placeholder="[[$t('nachname')]]" type="text" :class="{
-            'border-red-500': !userdetails.lastname.trim(),
+          :placeholder="[[$t('ihr_nachname')]]" type="text" :class="{
+            '': !userdetails.lastname.trim(),
             'border-green-300': userdetails.lastname.trim(),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
             sm:text-sm
-            border-gray-300 border-2
+            border-2 placeholder:text-gray-800
             bg-gray-50
             text-gray-500
             rounded-md
             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>
         <input v-model="userdetails.mail" name="email_address" id="email_address" autocomplete="off"
-          :placeholder="[[$t('e_mail_adress')]]" type="email" :class="{
-            'border-red-500': !isEmail(userdetails.mail),
+          :placeholder="[[$t('ihre_e_mail_adresse')]]" type="email" :class="{
+            '': !isEmail(userdetails.mail),
             'border-green-300': isEmail(userdetails.mail),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
             sm:text-sm
-            border-2
+            border-2 placeholder:text-gray-800
             bg-gray-50
             text-gray-500
             rounded-md
             p-2
           " />
-        <p v-if="!isEmail(userdetails.mail)" class="text-sm">
+        <p v-if="userdetails.mail !== '' && !isEmail(userdetails.mail)" class="text-sm">
           {{ $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':
-              !isPhoneOkay(userdetails.phone),
-            'border-green-300':
-              isPhoneOkay(userdetails.phone),
+          :placeholder="[[$t('geben_sie_ihre_handynummer_an')]]" type="text" :class="{
+            '':
+              userdetails.phone === '',
+            'border-red-300':
+              !isPhoneOkay(),
           }" class="
             dark:bg-gray-800
-            mt-1
             block
             w-full
             shadow-sm
             sm:text-sm
-            border-2
+            border-2 placeholder:text-gray-800
             bg-gray-50
             text-gray-500
             rounded-md
             p-2
           " />
-        <p v-if="!isPhoneOkay(userdetails.phone)" class="text-sm">
+        <p v-if="!isPhoneOkay()" class="text-sm">
           {{ $t("this_is_not_a_valid_international_phone_number") }}
         </p>
         <!--  -->
@@ -160,7 +181,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,12 +191,11 @@
                   'border-green-300': userdetails.address.street.trim(),
                 }" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
                   sm:text-sm
-                  border-gray-300 border-2
+                  border-2 placeholder:text-gray-800
                   bg-gray-50
                   text-gray-500
                   rounded-md
@@ -183,18 +203,17 @@
                 " />
             </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
                   sm:text-sm
-                  border-gray-300 border-2
+                  border-2 placeholder:text-gray-800
                   bg-gray-50
                   text-gray-500
                   rounded-md
@@ -202,7 +221,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,12 +231,11 @@
                   'border-green-300': userdetails.address.city.trim(),
                 }" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
                   sm:text-sm
-                  border-gray-300 border-2
+                  border-2 placeholder:text-gray-800
                   bg-gray-50
                   text-gray-500
                   rounded-md
@@ -225,7 +243,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,12 +259,11 @@
                   ),
                 }" class="
                   dark:bg-gray-800
-                  mt-1
                   block
                   w-full
                   shadow-sm
                   sm:text-sm
-                  border-gray-300 border-2
+                  border-2 placeholder:text-gray-800
                   bg-gray-50
                   text-gray-500
                   rounded-md
@@ -296,7 +313,7 @@
               text-center
               py-2
               px-3
-              border-2 border-gray-300
+              border-2 placeholder:text-gray-800 border-gray-300
               rounded-md
               p-1
               bg-blue-800
@@ -313,7 +330,9 @@
       </div>
     </div>
   </div>
-  <Footer></Footer>
+  <div class="p-8">
+    <Footer />
+  </div>
 </template>
 
 <script setup>
@@ -348,17 +367,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(" ")) {
-    return false
-  }
-  if (!userdetails.value.phone.includes("+")) {
-    return false
-  }
-  if (isMobilePhone(userdetails.value.phone)) {
+  const formattedNumber = formatPhoneNumber(userdetails.value.phone)
+  if (isMobilePhone(formattedNumber)) {
     return true
   }
   return false
@@ -400,7 +432,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 = {