@everymatrix/general-player-register-form-step2 0.0.246 → 0.0.250

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/general-player-register-form-step2",
-  "version": "0.0.246",
+  "version": "0.0.250",
   "main": "dist/general-player-register-form-step2.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a366db972245075088a5539434d1ea34d55c1b91"
+  "gitHead": "a6d1510ec4bbfb0c340f1528b6c6636b9552705c"
 }

package/src/GeneralPlayerRegisterFormStep2.svelte

@@ -70,12 +70,8 @@
     }
   }
 
-  const regexValidators = {
-    user: /^(?!(?:.*\d){9})(?=(?:.*[a-zA-Z]){2})^[a-zA-Z\d]*$/,
-  }
-
-  const checkUserIdentifier = (user:string) => {
-    if(regexValidators.user.test(user) && user.length <= 50) {
+  const checkName = (name) => {
+    if (name && name.length >=2 && name.length <= 50) {
       return true;
     }
 
@@ -83,12 +79,12 @@
   }
 
   const validateUserFirstName = () => {
-    invalidFirstName = !checkUserIdentifier(userFirstName);
+    invalidFirstName = !checkName(userFirstName);
     checkIsValid();
   }
 
   const validateUserLastName = () => {
-    invalidLastName = !checkUserIdentifier(userLastName);
+    invalidLastName = !checkName(userLastName);
     checkIsValid();
   }
 
@@ -174,15 +170,15 @@
   $: licenseyears && createYearsArray();
 </script>
 
-<div class="RegisterFormHeader">
-  <button class="BackButton" on:click={goBack}>
+<div class="RegisterFormHeader" part="RegisterFormHeader">
+  <button class="BackButton" part="BackButton" on:click={goBack}>
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.a{fill:var(--emfe-w-color-primary, #D0046C);}</style></defs><path class="a" d="M12,0,9.818,2.182l8.26,8.26H0v3.117H18.078l-8.26,8.26L12,24,24,12Z" transform="translate(24 24) rotate(180)"/></svg>
     {$_('registerFormStep2.registerBackButton')}
   </button>
 </div>
-<div class="RegisterFormContent">
-  <div class="UserTitleContainer">
-    <label for="Title">{$_('registerFormStep2.registerUserTitle')}:<span class="FormRequired">*</span></label>
+<div class="RegisterFormContent" part="RegisterFormContent">
+  <div class="UserTitleContainer" part="UserTitleContainer">
+    <label for="Title">{$_('registerFormStep2.registerUserTitle')}:<span class="FormRequired" part="FormRequired">*</span></label>
     <select bind:value={userTitleSelected} on:blur={checkIsValid} id="Title">
       <option value="" disabled selected>{$_('registerFormStep2.registerUserTitleSelect')}</option>
       <option value="Mr.">{$_('registerFormStep2.registerUserTitleSelectMr')}</option>
@@ -190,36 +186,36 @@
       <option value="Ms.">{$_('registerFormStep2.registerUserTitleSelectMs')}</option>
     </select>
   </div>
-  <div class="FirstNameContainer {invalidFirstName ? 'InvalidField' : ''}">
-    <label for="FirstName">{$_('registerFormStep2.registerFirstName')}:<span class="FormRequired">*</span></label>
+  <div class="FirstNameContainer {invalidFirstName ? 'InvalidField' : ''}" part="FirstNameContainer {invalidFirstName ? 'InvalidField' : ''}">
+    <label for="FirstName">{$_('registerFormStep2.registerFirstName')}:<span class="FormRequired" part="FormRequired">*</span></label>
     <input bind:value={userFirstName} on:blur={validateUserFirstName} type="text" id="FirstName" />
     {#if invalidFirstName}
-      <p class="InvalidInput">{$_('registerFormStep2.registerFirstNameError')}</p>
+      <p class="InvalidInput" part="InvalidInput">{$_('registerFormStep2.registerFirstNameError')}</p>
     {/if}
   </div>
-  <div class="LastNameContainer {invalidLastName ? 'InvalidField' : ''}">
-    <label for="LastName">{$_('registerFormStep2.registerLastName')}:<span class="FormRequired">*</span></label>
+  <div class="LastNameContainer {invalidLastName ? 'InvalidField' : ''}" part="LastNameContainer {invalidLastName ? 'InvalidField' : ''}">
+    <label for="LastName">{$_('registerFormStep2.registerLastName')}:<span class="FormRequired" part="FormRequired">*</span></label>
     <input bind:value={userLastName} on:blur={validateUserLastName} type="text" id="LastName" />
     {#if invalidLastName}
-      <p class="InvalidInput">{$_('registerFormStep2.registerLastNameError')}</p>
+      <p class="InvalidInput" part="InvalidInput">{$_('registerFormStep2.registerLastNameError')}</p>
     {/if}
   </div>
-  <div class="BirthDateContainer">
-    <label for="BirthDate">{$_('registerFormStep2.registerDateOfBirth')}:<span class="FormRequired">*</span></label>
-    <div class="BirthDateOptions">
-      <select bind:value={birthDaySelected} on:blur={checkIsValid} class="BirthDaySelected">
+  <div class="BirthDateContainer" part="BirthDateContainer">
+    <label for="BirthDate">{$_('registerFormStep2.registerDateOfBirth')}:<span class="FormRequired" part="FormRequired">*</span></label>
+    <div class="BirthDateOptions" part="BirthDateOptions">
+      <select bind:value={birthDaySelected} on:blur={checkIsValid} class="BirthDaySelected" part="BirthDaySelected">
         <option value="" disabled selected>{$_('registerFormStep2.registerBirthDay')}</option>
         {#each birthDays as birthDay}
           <option value={birthDay}>{birthDay}</option>
         {/each}
       </select>
-      <select bind:value={birthMonthSelected} on:blur={checkIsValid} class="BirthMonthSelected">
+      <select bind:value={birthMonthSelected} on:blur={checkIsValid} class="BirthMonthSelected" part="BirthMonthSelected">
         <option value="" disabled selected>{$_('registerFormStep2.registerBirthMonth')}</option>
         {#each birthMonths as birthMonth}
           <option value={birthMonth}>{birthMonth}</option>
         {/each}
       </select>
-      <select bind:value={birthYearSelected} on:blur={checkIsValid} class="BirthYearSelected">
+      <select bind:value={birthYearSelected} on:blur={checkIsValid} class="BirthYearSelected" part="BirthYearSelected">
         <option value="" disabled selected>{$_('registerFormStep2.registerBirthYear')}</option>
         {#if !isLoading}
           {#each birthYears as birthYear}
@@ -229,15 +225,15 @@
       </select>
     </div>
   </div>
-  <div class="BirthPlaceContainer {invalidBirthPlace ? 'InvalidField' : ''}">
-    <label for="BirthPlace">{$_('registerFormStep2.registerBirthPlace')}:<span class="FormRequired">*</span></label>
+  <div class="BirthPlaceContainer {invalidBirthPlace ? 'InvalidField' : ''}" part="BirthPlaceContainer {invalidBirthPlace ? 'InvalidField' : ''}">
+    <label for="BirthPlace">{$_('registerFormStep2.registerBirthPlace')}:<span class="FormRequired" part="FormRequired">*</span></label>
     <input bind:value={birthPlace} on:keyup={validateBirthPlace} type="text" id="BirthPlace" />
     {#if invalidBirthPlace}
-      <p class="InvalidInput">{$_('registerFormStep2.registerBirthPlaceError')}</p>
+      <p class="InvalidInput" part="InvalidInput">{$_('registerFormStep2.registerBirthPlaceError')}</p>
     {/if}
   </div>
-  <div class="CurrencyContainer">
-    <label for="Currency">{$_('registerFormStep2.registerCurrency')}:<span class="FormRequired">*</span></label>
+  <div class="CurrencyContainer" part="CurrencyContainer">
+    <label for="Currency">{$_('registerFormStep2.registerCurrency')}:<span class="FormRequired" part="FormRequired">*</span></label>
     <select bind:value={currencySelected} id="Currency">
       {#each currencies as currency}
         <option value={currency}>{currency}</option>
@@ -245,7 +241,7 @@
     </select>
   </div>
 </div>
-<button class="RegisterStepNext" disabled={!isValid} on:click={goNext}>{$_('registerFormStep2.registerNext')}</button>
+<button class="RegisterStepNext" part="RegisterStepNext" disabled={!isValid} on:click={goNext}>{$_('registerFormStep2.registerNext')}</button>
 
 <style lang="scss">
   //This function does a multiplication

package/src/translations.js

@@ -8,9 +8,9 @@ export const RegisterFormStep2Translations = {
       registerUserTitleSelectMrs: 'Mrs.',
       registerUserTitleSelectMs: 'Ms.',
       registerFirstName: 'First Name',
-      registerFirstNameError: 'First name must be 2-50 characters long and contain no special characters.',
+      registerFirstNameError: 'First name must be 2-50 characters long.',
       registerLastName: 'Last Name',
-      registerLastNameError: 'Last name must be 2-50 characters long and contain no special characters.',
+      registerLastNameError: 'Last name must be 2-50 characters.',
       registerDateOfBirth: 'Date of Birth',
       registerBirthDay: 'Day',
       registerBirthMonth: 'Month',
@@ -30,9 +30,9 @@ export const RegisterFormStep2Translations = {
       registerUserTitleSelectMrs: 'Bayan.',
       registerUserTitleSelectMs: 'Hanım.',
       registerFirstName: 'İlk adı',
-      registerFirstNameError: 'Ad 2-50 karakter uzunluğunda olmalı ve özel karakter içermemelidir.',
+      registerFirstNameError: 'Ad 2-50 karakter uzunluğunda olmalıdır.',
       registerLastName: 'Soyadı',
-      registerLastNameError: 'Soyadı 2-50 karakter uzunluğunda olmalı ve özel karakter içermemelidir.',
+      registerLastNameError: 'Soyadı 2-50 karakter uzunluğunda olmalıdır.',
       registerDateOfBirth: 'Doğum tarihi',
       registerBirthDay: 'Gün',
       registerBirthMonth: 'Ay',
@@ -52,9 +52,9 @@ export const RegisterFormStep2Translations = {
       registerUserTitleSelectMrs: 'Dna.',
       registerUserTitleSelectMs: 'Dra.',
       registerFirstName: 'Prenume',
-      registerFirstNameError: 'Prenumele trebuie sa fie de 2-50 litere lungime si sa nu contina caractere speciale.',
+      registerFirstNameError: 'Prenumele trebuie sa fie de 2-50 litere lungime.',
       registerLastName: 'Nume',
-      registerLastNameError: 'Numele trebuie sa fie de 2-50 litere lungime si sa nu contina caractere speciale',
+      registerLastNameError: 'Numele trebuie sa fie de 2-50 litere lungime.',
       registerDateOfBirth: 'Data Nasterii',
       registerBirthDay: 'Zi',
       registerBirthMonth: 'Luna',