hl-core 0.0.9-beta.5 → 0.0.9-beta.51

package/components/Pages/Anketa.vue

@@ -1,6 +1,6 @@
 <template>
   <base-fade-transition>
-    <section v-if="firstQuestionList && firstQuestionList.length && !firstPanel && !secondPanel" class="flex flex-col">
+    <section v-if="firstQuestionList && firstQuestionList.length && !firstPanel && !secondPanel" class="flex flex-col shrink grow max-h-[90vh]">
       <section :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] my-[14px] p-4 flex flex-col gap-4">
         <base-form-toggle
           v-model="answerToAll"
@@ -10,7 +10,7 @@
           @clicked="handleToggler"
         />
       </section>
-      <v-form ref="vForm" class="max-h-[70vh] overflow-y-scroll" @submit="submitForm">
+      <v-form ref="vForm" class="grow shrink overflow-y-scroll" @submit="submitForm">
         <section
           v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'N').length"
           :class="[$styles.blueBgLight, $styles.rounded]"
@@ -34,19 +34,19 @@
           <base-form-text-section v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'Y')" :key="index">
             <base-fade-transition>
               <div
-                v-if="question.first.answerName === 'Да' && secondQuestionList"
+                v-if="question.first.answerName === 'Да' && question.second"
                 :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
                 class="rounded-t-lg pl-6 py-1 cursor-pointer"
                 @click="openFirstPanel(question)"
               >
-                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: secondQuestionList.length }) }}
+                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
               </div>
             </base-fade-transition>
             <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
               {{ question.first.name }}
               <base-fade-transition>
                 <i
-                  v-if="question.first.answerName === 'Да' && secondQuestionList && secondQuestionList.length"
+                  v-if="question.first.answerName === 'Да' && question.second && question.second.length"
                   class="mdi mdi-chevron-right text-2xl cursor-pointer"
                   @click="openFirstPanel(question)"
                 ></i>
@@ -68,43 +68,87 @@
             </div>
           </base-form-text-section>
         </section>
+        <section
+          v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'D').length"
+          :class="[$styles.blueBgLight, $styles.rounded]"
+          class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+        >
+          <base-form-text-section v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'D')" :key="index">
+            <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between"> {{ question.first.name }} </span>
+            <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
+              <v-radio-group
+                v-model="question.first.answerName"
+                class="anketa-radio"
+                :true-icon="`mdi-radiobox-marked ${$styles.greenText}`"
+                false-icon="mdi-radiobox-blank text-[#636363]"
+                :rules="$rules.required"
+                :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+                inline
+              >
+                <v-radio label="Да" value="Да" />
+                <v-radio label="Нет" value="Нет" />
+              </v-radio-group>
+            </div>
+            <base-fade-transition>
+              <div v-if="question.first.answerName === 'Да'" :class="[$styles.whiteText, $styles.textSimple]">
+                <base-form-input
+                  v-model="question.first.answerText"
+                  :label="$dataStore.t('labels.inDetails')"
+                  :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+                  :rules="$rules.required"
+                />
+              </div>
+            </base-fade-transition>
+          </base-form-text-section>
+        </section>
       </v-form>
-      <base-btn
-        class="my-[14px] self-center"
-        :loading="isButtonLoading"
-        :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-        @click="submitForm"
-        :text="$dataStore.t('buttons.save')"
-      />
+      <div class="px-[14px]">
+        <base-btn
+          class="my-[14px] self-center"
+          :loading="isButtonLoading"
+          :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+          @click="submitForm"
+          :text="$dataStore.t('buttons.save')"
+        />
+      </div>
     </section>
-    <v-btn
-      v-if="secondQuestionList && secondQuestionList.length && firstPanel"
-      icon="mdi mdi-close"
-      class="ml-3 !absolute z-10"
-      @click="
-        firstPanel = false;
-        secondPanel = false;
-      "
+    <base-btn
+      v-if="currentQuestion && currentQuestion.second && currentQuestion.second.length && firstPanel"
+      class="!absolute z-10 my-[14px] self-center w-[96%] bottom-[-40px]"
+      :text="$dataStore.t('buttons.save')"
+      @click="submitSecondaryForm"
     />
-    <section ref="firstPanelSection" v-if="secondQuestionList && secondQuestionList.length && firstPanel" class="flex flex-col px-[10px] pb-[14px]" :class="[$styles.scrollPage]">
-      <section v-if="currentQuestion" :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4">
+    <section ref="firstPanelSection" v-if="currentQuestion && currentQuestion.second && firstPanel" class="flex flex-col px-[10px] pb-[14px]" :class="[$styles.scrollPage]">
+      <v-form
+        v-if="currentQuestion"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+        ref="vSecondaryForm"
+        @submit="submitSecondaryForm"
+      >
         <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
           <base-form-input
             v-if="question.definedAnswers === 'N'"
             v-model="question.answerText"
             class="border-t-[1px] border-t-[#F3F6FC]"
-            placeholder="Введите текст"
+            :placeholder="$dataStore.t('labels.inputText')"
             :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="isSecondRequired ? $rules.required : []"
           />
-          <span v-else class="flex items-center justify-between p-4 cursor-pointer" :class="[$styles.textTitle, $styles.greenText]" @click="openSecondPanel(question)">
-            {{ question.answerName ? question.answerName : 'Выбрать вариант ответа' }}
-            <i class="mdi mdi-chevron-right text-[28px]"></i>
-          </span>
+          <base-panel-input
+            v-else
+            :class="[$styles.textTitle, $styles.greenText]"
+            :value="question.answerName ? question.answerName : 'Выбрать вариант ответа'"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :clearable="false"
+            :error-messages="isSecondRequired ? (question.answerName ? [] : ['Выбрать вариант ответа']) : []"
+            @click="openSecondPanel(question)"
+          ></base-panel-input>
         </base-form-text-section>
-      </section>
+      </v-form>
     </section>
   </base-fade-transition>
-  <Teleport v-if="secondPanel" to="#panel-actions">
+  <Teleport v-if="secondPanel" to="#right-panel-actions">
     <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
       <base-rounded-input v-model="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
       <div v-if="$dataStore.questionRefs && $dataStore.questionRefs.length && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
@@ -119,7 +163,7 @@
       <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
     </div>
   </Teleport>
-  <base-scroll-buttons @up="scrollForm('up')" @down="scrollForm('down')" />
+  <base-scroll-buttons v-if="firstQuestionList && firstQuestionList.length" @up="scrollForm('up')" @down="scrollForm('down')" />
 </template>
 
 <script lang="ts">
@@ -132,6 +176,7 @@ export default defineComponent({
     const formStore = useFormStore();
     const dataStore = useDataStore();
     const vForm = ref<any>();
+    const vSecondaryForm = ref<any>();
     const firstPanelSection = ref<any>();
     const isButtonLoading = ref<boolean>(false);
     const answerToAll = ref<boolean>(false);
@@ -148,13 +193,13 @@ export default defineComponent({
         : 'surveyByCriticalBasePolicyholder',
     );
     const firstQuestionList = ref<AnketaBody[]>([]);
-    const secondQuestionList = ref<AnketaSecond[]>([]);
     const currentQuestion = ref<AnketaBody>();
     const currentSecond = ref<AnketaSecond>();
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
 
     const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as 'insured' | 'policyholder') : 'insured'));
+    const isSecondRequired = computed(() => dataStore.controls.isSecondAnketaRequired);
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -168,11 +213,28 @@ export default defineComponent({
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
           isButtonLoading.value = true;
-          formStore[whichSurvey.value]!.body.forEach((survey: AnketaBody) => {
-            if (survey.first.answerText === 'Нет') {
-              survey.second = [];
-            }
-          });
+          const isValid = dataStore.validateAnketa(whichSurvey.value);
+          if (!isValid) {
+            isButtonLoading.value = false;
+            return false;
+          }
+          if (formStore[whichSurvey.value] && formStore[whichSurvey.value]?.body) {
+            formStore[whichSurvey.value]?.body.forEach(question => {
+              if (question.first.definedAnswers === 'Y' && question.first.answerName?.match(new RegExp('Нет', 'i')) && question.second && question.second.length) {
+                question.second.forEach(second => {
+                  if (second.definedAnswers === 'N') {
+                    second.answerText = null;
+                  } else {
+                    second.answerId = null;
+                    second.answerName = null;
+                  }
+                });
+              }
+              if (question.first.definedAnswers === 'D' && question.first.answerName?.match(new RegExp('Нет', 'i')) && question.first.answerText) {
+                question.first.answerText = null;
+              }
+            });
+          }
           formStore[whichSurvey.value]!.type = surveyType.value;
           const anketaToken = await dataStore.setSurvey(formStore[whichSurvey.value]!);
           if (typeof anketaToken === 'string') {
@@ -201,13 +263,36 @@ export default defineComponent({
       });
     };
 
-    const openFirstPanel = async (question: AnketaBody) => {
-      currentQuestion.value = question;
-      formStore[whichSurvey.value]!.body.forEach((question_object: AnketaBody) => {
-        if ((question_object.first.id === question.first.id && question_object.second && !question_object.second.length) || question_object.second == null) {
-          question_object.second = JSON.parse(JSON.stringify(formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']));
+    const submitSecondaryForm = async () => {
+      await vSecondaryForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
+        if (v.valid) {
+          if (isSecondRequired.value && currentQuestion.value && currentQuestion.value.second) {
+            const hasError = currentQuestion.value.second.find(second => (second.definedAnswers === 'N' ? !second.answerText : !second.answerName));
+            if (hasError) {
+              dataStore.showToaster('error', dataStore.t('toaster.emptySecondAnketa', { text: hasError.name }), 5000);
+              return false;
+            }
+          }
+          firstPanel.value = false;
+          secondPanel.value = false;
+        } else {
+          const errors = document.querySelector('.v-input--error');
+          if (errors) {
+            const errorText = errors.parentElement?.children[0].innerHTML;
+            if (errorText) {
+              dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: errorText?.replace(/[-<>!//.]/g, '') }));
+            }
+            errors.scrollIntoView({
+              behavior: 'smooth',
+              block: 'center',
+              inline: 'nearest',
+            });
+          }
         }
       });
+    };
+    const openFirstPanel = async (question: AnketaBody) => {
+      currentQuestion.value = question;
       firstPanel.value = true;
       secondPanel.value = false;
     };
@@ -219,8 +304,8 @@ export default defineComponent({
       await dataStore.getQuestionRefs(question.id);
       secondPanel.value = true;
       dataStore.panelAction = null;
-      dataStore.panel.open = true;
-      dataStore.panel.title = question.name;
+      dataStore.rightPanel.open = true;
+      dataStore.rightPanel.title = question.name;
       isPanelLoading.value = false;
     };
 
@@ -231,12 +316,11 @@ export default defineComponent({
       }
       secondPanel.value = false;
       dataStore.panelAction = null;
-      dataStore.panel.open = false;
+      dataStore.rightPanel.open = false;
       dataStore.questionRefs = [];
     };
 
     const getDefinedAnswerId = async (id: string, value: any, index: number) => {
-      // @ts-ignore
       await dataStore.definedAnswers(id, whichSurvey.value, value, index);
     };
 
@@ -272,18 +356,16 @@ export default defineComponent({
         formStore.applicationData.processInstanceId,
         whichMember.value === 'insured' ? formStore.applicationData.insuredApp[0].id : formStore.applicationData.clientApp.id,
         whichSurvey.value,
-        surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond',
         whichMember.value,
       );
       firstQuestionList.value = formStore[whichSurvey.value]!.body;
-      secondQuestionList.value = formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']!;
       formStore[whichSurvey.value]!.type = surveyType.value;
       const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName === 'Нет');
       if (negativeAnswer) {
         answerToAll.value = true;
       }
       await Promise.allSettled(
-        firstQuestionList.value.map(async (question: any) => {
+        firstQuestionList.value.map(async question => {
           await dataStore.definedAnswers(question.first.id, whichSurvey.value);
         }),
       );
@@ -293,10 +375,14 @@ export default defineComponent({
       await onInit();
     });
 
+    onUnmounted(() => {
+      dataStore.abortRequests();
+    });
+
     watch(
-      () => dataStore.panel.open,
+      () => dataStore.rightPanel.open,
       () => {
-        if (dataStore.panel.open === false) {
+        if (dataStore.rightPanel.open === false) {
           secondPanel.value = false;
           dataStore.panelAction = null;
         }
@@ -308,7 +394,7 @@ export default defineComponent({
       () => firstQuestionList.value,
       value => {
         if (value) {
-          const hasPositiveAnswer = value.some(i => i.first.definedAnswers === 'Y' && i.first.answerName !== 'Нет');
+          const hasPositiveAnswer = value.some(i => (i.first.definedAnswers === 'Y' || i.first.definedAnswers === 'D') && i.first.answerName !== 'Нет');
           answerToAll.value = !hasPositiveAnswer;
         }
       },
@@ -320,10 +406,10 @@ export default defineComponent({
     return {
       // State
       vForm,
+      vSecondaryForm,
       formStore,
       answerToAll,
       firstQuestionList,
-      secondQuestionList,
       whichSurvey,
       isButtonLoading,
       firstPanel,
@@ -333,9 +419,11 @@ export default defineComponent({
       isPanelLoading,
       searchQuery,
       firstPanelSection,
+      isSecondRequired,
 
       // Functions
       submitForm,
+      submitSecondaryForm,
       getDefinedAnswerId,
       scrollForm,
       handleToggler,

package/components/Pages/Auth.vue

@@ -1,7 +1,25 @@
 <template>
   <section class="flex h-full" :class="$styles.blueBgLight">
+    <svg v-if="$dataStore.isAULETTI" class="absolute ml-8 mt-8" xmlns="http://www.w3.org/2000/svg" width="256" height="73" viewBox="0 0 256 73" fill="none">
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M104.544 45.6918H107.417C108.675 45.6918 109.461 45.1378 109.461 44.2252C109.461 43.456 108.989 43.056 108.318 42.8715C108.79 42.6662 109.21 42.3177 109.21 41.6306C109.21 40.8 108.486 40.2769 107.385 40.2769H104.544V45.6918ZM105.792 44.7073V43.3536H107.165C107.847 43.3536 108.172 43.6202 108.172 44.01C108.172 44.4303 107.847 44.7073 107.228 44.7073H105.792ZM105.792 42.5125V41.2306H107.113C107.679 41.2306 107.92 41.4972 107.92 41.8459C107.92 42.2356 107.626 42.5125 107.092 42.5125H105.792ZM113.267 45.8149C114.284 45.8149 115.007 45.4148 115.531 44.7995L114.787 44.1533C114.346 44.574 113.906 44.7995 113.287 44.7995C112.47 44.7995 111.83 44.3072 111.694 43.4252H115.762C115.772 43.3637 115.783 43.1587 115.783 43.0766C115.783 41.5178 114.892 40.1641 113.13 40.1641C111.547 40.1641 110.426 41.4356 110.426 42.9843C110.426 44.6764 111.663 45.8149 113.267 45.8149ZM111.684 42.6048C111.799 41.7639 112.344 41.1794 113.12 41.1794C113.959 41.1794 114.441 41.8048 114.525 42.6048H111.684ZM117.062 47.3327H118.33V44.8508C118.718 45.3534 119.295 45.8046 120.207 45.8046C121.528 45.8046 122.786 44.7892 122.786 42.9946C122.786 41.1794 121.517 40.1641 120.207 40.1641C119.316 40.1641 118.739 40.6152 118.33 41.1794V40.2769H117.062V47.3327ZM119.913 44.7277C119.054 44.7277 118.299 44.0406 118.299 42.9946C118.299 41.9381 119.054 41.2408 119.913 41.2408C120.773 41.2408 121.496 41.9279 121.496 42.9741C121.496 44.0611 120.783 44.7277 119.913 44.7277ZM124.086 45.6918H125.354V43.5075H127.797V45.6918H129.065V40.2769H127.797V42.4715H125.354V40.2769H124.086V45.6918ZM133.29 45.8149C134.999 45.8149 136.257 44.5329 136.257 42.9946C136.257 41.4256 135.009 40.1641 133.311 40.1641C131.613 40.1641 130.355 41.4459 130.355 42.9946C130.355 44.5534 131.602 45.8149 133.29 45.8149ZM133.311 44.7381C132.325 44.7381 131.623 43.938 131.623 42.9946C131.623 42.0306 132.273 41.2511 133.29 41.2511C134.286 41.2511 134.988 42.0409 134.988 42.9946C134.988 43.9483 134.338 44.7381 133.311 44.7381ZM140.104 45.8149C141.184 45.8149 141.824 45.3943 142.369 44.7995L141.603 44.061C141.205 44.4611 140.765 44.7381 140.167 44.7381C139.192 44.7381 138.511 43.9586 138.511 42.9946V42.9741C138.511 42.0306 139.182 41.2511 140.104 41.2511C140.744 41.2511 141.152 41.5281 141.54 41.9279L142.327 41.0972C141.813 40.5435 141.163 40.1641 140.115 40.1641C138.458 40.1641 137.242 41.4562 137.242 42.9946V43.015C137.242 44.5532 138.458 45.8149 140.104 45.8149ZM144.664 45.6918H145.943V41.3433H147.726V40.2769H142.882V41.3433H144.664V45.6918ZM148.732 45.6918H151.363C152.663 45.6918 153.471 45.0047 153.471 43.8869C153.471 42.7073 152.517 42.174 151.269 42.174H150.001V40.2769H148.732V45.6918ZM150.001 44.6867V43.1382H151.175C151.825 43.1382 152.202 43.4049 152.202 43.8869C152.202 44.4098 151.835 44.6867 151.196 44.6867H150.001ZM157.087 46.9941H158.146L158.272 45.6918H162.151V46.9941H163.21L163.378 44.6252H162.591V40.2769H158.303V40.9433C158.303 42.4612 158.146 43.7227 157.685 44.6252H157.087V46.9941ZM158.985 44.6252C159.31 43.9586 159.499 43.0457 159.499 42.0612V41.3433H161.323V44.6252H158.985ZM169.08 45.6918V42.4818C169.08 41.0358 168.284 40.1947 166.648 40.1947C165.747 40.1947 165.149 40.3793 164.541 40.646L164.887 41.6409C165.39 41.4356 165.852 41.3025 166.47 41.3025C167.351 41.3025 167.833 41.7126 167.833 42.4612V42.5638C167.403 42.4304 166.973 42.3382 166.302 42.3382C165.013 42.3382 164.059 42.9124 164.059 44.1125C164.059 45.2201 164.981 45.8046 166.03 45.8046C166.868 45.8046 167.445 45.4661 167.822 45.0251V45.6918H169.08ZM167.854 43.733C167.854 44.4098 167.225 44.8714 166.386 44.8714C165.789 44.8714 165.317 44.5842 165.317 44.0713C165.317 43.5279 165.789 43.2098 166.586 43.2098C167.078 43.2098 167.529 43.3022 167.854 43.4252V43.733ZM170.59 45.6918H171.859V43.5075H174.301V45.6918H175.57V40.2769H174.301V42.4715H171.859V40.2769H170.59V45.6918ZM177.163 45.6918H178.432V43.5075H180.874V45.6918H182.143V40.2769H180.874V42.4715H178.432V40.2769H177.163V45.6918ZM183.736 45.6918H186.263C187.563 45.6918 188.37 45.0047 188.37 43.8869C188.37 42.7073 187.416 42.174 186.168 42.174H185.005V40.2769H183.736V45.6918ZM185.005 44.6867V43.1382H186.074C186.724 43.1382 187.102 43.4049 187.102 43.8869C187.102 44.4098 186.735 44.6867 186.095 44.6867H185.005ZM189.209 45.6918H190.477V40.2769H189.209V45.6918ZM192.071 45.6918H193.308V42.1022L195.038 44.5125L196.778 42.0818V45.6918H198.057V40.2769H196.799L195.059 42.7893L193.329 40.2769H192.071V45.6918ZM107.176 57.3214C108.884 57.3214 110.142 56.0394 110.142 54.5012C110.142 52.9321 108.895 51.6706 107.197 51.6706C105.498 51.6706 104.24 52.9525 104.24 54.5012C104.24 56.0599 105.488 57.3214 107.176 57.3214ZM107.197 56.2446C106.211 56.2446 105.509 55.4446 105.509 54.5012C105.509 53.5372 106.159 52.7577 107.176 52.7577C108.171 52.7577 108.874 53.5474 108.874 54.5012C108.874 55.4549 108.224 56.2446 107.197 56.2446ZM114.137 56.2446C113.224 56.2446 112.533 55.5062 112.533 54.5831C112.533 53.65 113.183 52.9116 114.116 52.9116C115.038 52.9116 115.73 53.6602 115.73 54.5831C115.73 55.5062 115.091 56.2446 114.137 56.2446ZM114.116 57.3214C115.782 57.3214 116.999 56.06 116.999 54.5626C116.999 53.0756 115.782 51.927 114.357 51.927C113.204 51.927 112.512 52.4705 112.229 52.9422C112.291 52.2243 112.616 51.6296 113.686 51.404L116.705 50.7578L116.495 49.763L113.476 50.3784C111.463 50.7886 111.264 52.4807 111.264 54.1627C111.264 56.1624 112.323 57.3214 114.116 57.3214ZM120.825 57.3214C121.842 57.3214 122.565 56.9214 123.09 56.3061L122.345 55.6599C121.905 56.0805 121.465 56.3061 120.846 56.3061C120.028 56.3061 119.389 55.8139 119.253 54.9318H123.32C123.331 54.8703 123.341 54.6653 123.341 54.5831C123.341 53.0244 122.45 51.6706 120.689 51.6706C119.106 51.6706 117.984 52.9423 117.984 54.4909C117.984 56.1831 119.221 57.3214 120.825 57.3214ZM119.242 54.1114C119.357 53.2705 119.903 52.6859 120.678 52.6859C121.517 52.6859 121.999 53.3114 122.083 54.1114H119.242ZM132.074 58.5007H133.133L133.29 56.1318H132.504V51.7834H131.235V56.1318H129.191V51.7834H127.933V56.1318H125.889V51.7834H124.62V57.1983H132.074V58.5007ZM138.993 57.1983V53.9883C138.993 52.5424 138.196 51.7013 136.561 51.7013C135.659 51.7013 135.062 51.886 134.454 52.1526L134.8 53.1475C135.303 52.9422 135.764 52.809 136.383 52.809C137.263 52.809 137.746 53.2191 137.746 53.9679V54.0704C137.316 53.937 136.886 53.8448 136.215 53.8448C134.925 53.8448 133.972 54.419 133.972 55.619C133.972 56.7266 134.894 57.3112 135.942 57.3112C136.781 57.3112 137.358 56.9728 137.735 56.5317V57.1983H138.993ZM137.767 55.2396C137.767 55.9164 137.138 56.3779 136.299 56.3779C135.701 56.3779 135.229 56.0907 135.229 55.578C135.229 55.0346 135.701 54.7165 136.498 54.7165C136.991 54.7165 137.441 54.8088 137.767 54.9318V55.2396ZM140.503 57.1983H141.771V55.014H144.214V57.1983H145.482V51.7834H144.214V53.9781H141.771V51.7834H140.503V57.1983ZM147.076 57.1983H148.271L150.902 53.5883V57.1983H152.129V51.7834H150.934C150.053 52.9935 149.183 54.2037 148.313 55.4138V51.7834H147.076V57.1983ZM153.219 57.1983H154.708L156.018 55.3729H157.15V57.1983H158.419V51.7834H155.641C154.246 51.7834 153.46 52.5013 153.46 53.5474C153.46 54.3986 153.995 54.9421 154.75 55.1677L153.219 57.1983ZM155.819 54.4395C155.169 54.4395 154.729 54.132 154.729 53.6089C154.729 53.0961 155.137 52.7885 155.808 52.7885H157.15V54.4395H155.819ZM160.012 57.1983H161.249V53.6089L162.979 56.0191L164.719 53.5883V57.1983H165.998V51.7834H164.74L163 54.2959L161.27 51.7834H160.012V57.1983Z"
+        fill="#9B9D9F"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M47.2838 0.000584217C50.7026 0.000584217 53.7982 1.35642 56.0389 3.54837C58.2795 5.74052 59.6656 8.76909 59.6656 12.1134V14.536H57.1891C55.1375 14.536 53.2798 15.3495 51.9358 16.6643C50.5916 17.9793 49.7601 19.7966 49.7601 21.8037V24.2262V27.4784C50.2542 26.8811 50.7798 26.31 51.3345 25.7673C55.3678 21.8217 60.94 19.3811 67.0944 19.3811H69.5708C72.0479 19.3811 74.5233 19.3811 76.9999 19.3811C78.3814 19.3811 79.4763 18.3095 79.4763 16.9583C79.4763 15.6129 78.3745 14.5356 76.9999 14.5356C74.1935 14.5356 71.387 14.5354 68.5808 14.5354C66.3984 14.5354 64.6186 12.7942 64.6186 10.6593V9.69025H67.0949C69.1466 9.69025 71.0042 8.87669 72.3483 7.56186C73.6924 6.2469 74.5239 4.42966 74.5239 2.42258V0H77.0005C81.7868 0 86.1206 1.89829 89.2577 4.96702C92.3946 8.03595 94.3351 12.2757 94.3351 16.958C94.3351 21.6405 92.3946 25.8802 89.2577 28.9489C86.1208 32.0176 81.787 33.9159 77.0005 33.9159H74.5239C72.0473 33.9159 69.5713 33.9161 67.0949 33.9161C65.0433 33.9161 63.1856 34.7295 61.8415 36.0445C60.4975 37.3592 59.6658 39.1766 59.6658 41.1836C59.6658 43.1909 60.4975 45.0082 61.8415 46.3229C63.1854 47.6378 65.0431 48.4513 67.0949 48.4513C69.1466 48.4513 71.004 47.6377 72.3483 46.3228C73.1235 45.5644 73.7286 44.6388 74.1016 43.6062H68.5804C66.3981 43.6062 64.6181 41.865 64.6181 39.73V38.761H67.0946H74.5241H77.0005H79.4768L79.477 41.1836C79.477 44.5283 78.0907 47.5567 75.8501 49.7485C73.6094 51.9405 70.514 53.2964 67.0949 53.2964C63.676 53.2964 60.5803 51.9405 58.3396 49.7486C56.099 47.5567 54.7129 44.5283 54.7129 41.1836C54.7129 37.8391 56.099 34.8107 58.3396 32.6188C60.5805 30.4268 63.6762 29.071 67.0949 29.071C69.5713 29.071 72.0473 29.0708 74.5239 29.0708H77.0005C80.4199 29.0708 83.5155 27.715 85.7559 25.5232C87.9964 23.3315 89.3823 20.3031 89.3823 16.958C89.3823 13.6131 87.9964 10.5844 85.7559 8.3927C84.0046 6.67948 81.7307 5.47691 79.1881 5.03353C78.8024 6.75058 78.0442 8.33129 77.0008 9.69042C81.0974 9.69083 84.4291 12.953 84.4291 16.9583C84.4291 20.9585 81.0892 24.2262 76.9999 24.2262C74.5233 24.2262 72.0479 24.2262 69.5708 24.2262H67.0944C62.3072 24.2262 57.9732 26.1244 54.8363 29.193C48.066 35.8161 48.066 46.7255 54.8363 53.3486C57.9732 56.4173 62.3072 58.3153 67.0944 58.3153H69.5708V59.2265C69.5708 60.3482 69.1387 61.3137 68.2962 62.0746C67.4536 62.8355 66.4355 63.1797 65.2924 63.0901C63.3075 62.9347 61.3956 62.5248 59.5914 61.8938C59.2774 64.7074 57.9786 67.232 56.0389 69.1297C53.7982 71.3217 50.7026 72.6775 47.2838 72.6775C43.8647 72.6775 40.769 71.3217 38.5283 69.1297C36.5886 67.2322 35.2898 64.7076 34.9758 61.894C33.1715 62.525 31.2595 62.9352 29.2744 63.0906C28.1315 63.1801 27.1133 62.8358 26.2707 62.0749C25.4282 61.3141 24.9959 60.3486 24.9959 59.2268V58.3158H27.4724C32.2596 58.3158 36.5935 56.4176 39.7304 53.349C46.502 46.7245 46.502 35.8171 39.7304 29.1927C36.5935 26.124 32.2596 24.2258 27.4724 24.2258H24.9959C22.5195 24.2258 20.0431 24.2258 17.5668 24.2258C13.4777 24.2258 10.1376 20.958 10.1376 16.9579C10.1376 12.9527 13.4695 9.69049 17.5661 9.69008C16.5228 8.33116 15.7648 6.75103 15.3793 5.03412C12.8367 5.4775 10.563 6.6799 8.81163 8.39312C6.57118 10.5849 5.18509 13.6133 5.18509 16.9583C5.18509 20.3034 6.57118 23.3318 8.81163 25.5235C11.0521 27.7153 14.1479 29.0712 17.5673 29.0712H20.0436C22.5205 29.0712 24.9962 29.0717 27.4728 29.0717C30.8914 29.0717 33.9873 30.4276 36.2281 32.6195C38.4687 34.8115 39.8548 37.8399 39.8548 41.1843C39.8548 44.5291 38.4687 47.5574 36.2281 49.7494C33.9873 51.9413 30.8914 53.2972 27.4728 53.2972C24.0538 53.2972 20.9581 51.9412 18.7176 49.7492C16.4771 47.5575 15.0908 44.5291 15.0908 41.1843V38.7617H20.0436H27.4728H29.9491V39.7308C29.9491 41.8658 28.1694 43.6069 25.9869 43.6069H20.4661C20.8391 44.6395 21.4442 45.5652 22.2195 46.3235C23.5636 47.6385 25.4211 48.4521 27.4728 48.4521C29.5244 48.4521 31.3821 47.6387 32.7262 46.3237C34.0702 45.0089 34.9019 43.1916 34.9019 41.1843C34.9019 39.1773 34.0702 37.36 32.7262 36.0452C31.3821 34.7303 29.5244 33.9168 27.4728 33.9168C24.9962 33.9168 22.5205 33.9162 20.0436 33.9162H17.5673C12.7807 33.9162 8.44674 32.0182 5.30982 28.9492C2.17276 25.8806 0.232422 21.6409 0.232422 16.9583C0.232422 12.2758 2.17297 8.03609 5.30982 4.96743C8.44674 1.89871 12.7807 0.000333839 17.5673 0.000333839H20.0436V2.42308C20.0436 4.43016 20.8751 6.24748 22.2193 7.56245C23.5633 8.87727 25.421 9.69083 27.4726 9.69083H29.9489V10.6596C29.9489 12.7946 28.1688 14.536 25.9864 14.5357C23.1801 14.5355 20.3734 14.5352 17.5668 14.5352C16.1922 14.5352 15.0904 15.6125 15.0904 16.9579C15.0904 18.3091 16.1853 19.3807 17.5668 19.3807C20.0431 19.3807 22.5195 19.3807 24.9959 19.3807H27.4724C33.6268 19.3807 39.1989 21.8213 43.2322 25.7669C43.7873 26.31 44.3131 26.8815 44.8074 27.4791V24.2262V21.8037C44.8074 19.7966 43.9759 17.9793 42.6318 16.6643C41.2877 15.3495 39.4299 14.536 37.3783 14.536H34.9019C34.9019 11.3059 34.9019 8.07581 34.9019 4.84567H33.9113C31.7289 4.84567 29.9489 3.10456 29.9489 0.969634V0.000584217H34.9019H39.8548C42.3312 0.000584217 44.8074 0.000584217 47.2838 0.000584217ZM115.912 18.6546H116.716L119.651 25.9359H112.837L115.912 18.6546ZM112.627 14.1763L104.241 33.0806H109.762L110.95 30.3115H121.643L122.866 33.0806H128.318L120.105 14.1763H112.627ZM131.588 14.1763V23.8165C131.588 30.0723 135.467 33.5591 141.548 33.5591C147.628 33.5591 151.507 30.0723 151.507 23.8165V14.1763H146.335V23.8506C146.335 27.2007 144.832 29.1493 141.548 29.1493C138.228 29.1493 136.725 27.2007 136.725 23.8506V14.1763H131.588ZM156.49 14.1763V33.0806H174.382V28.5339H161.627V14.1763H156.49ZM178.841 14.1763V33.0806H197.082V28.4314H183.978V25.765H195.335V21.2184H183.978V18.7229H196.628V14.1763H178.841ZM201.471 14.1763V18.6886H208.984V33.0806H214.156V18.6886H221.669V14.1763H201.471ZM225.674 14.1763V18.6886H233.187V33.0806H238.359V18.6886H245.872V14.1763H225.674ZM250.471 14.1763V33.0806H255.607V14.1763H250.471ZM39.8548 4.84567V9.93328C42.2805 10.4149 44.4488 11.5905 46.1336 13.2386C46.5472 13.6432 46.9315 14.0767 47.2838 14.5352C47.636 14.0767 48.0203 13.6432 48.434 13.2386C50.0446 11.663 52.0973 10.5195 54.394 10.0009C54.0351 8.84331 53.3892 7.80764 52.5371 6.97414C51.7619 6.21578 50.8159 5.62388 49.7601 5.25913V7.26825H44.8074V4.84567H39.8548ZM39.8546 59.4887V60.5647C39.8546 62.5719 40.6862 64.3893 42.0303 65.704C43.3743 67.0188 45.2319 67.8323 47.2838 67.8323C49.3354 67.8323 51.1931 67.0188 52.5371 65.704C53.8813 64.3891 54.7128 62.5717 54.7128 60.5647V59.4887C53.497 58.6925 52.3652 57.7826 51.3345 56.7743C49.7155 55.1905 48.3449 53.3641 47.2836 51.3556C46.2223 53.3641 44.8512 55.1909 43.2322 56.7747C42.2017 57.7829 41.0703 58.6927 39.8546 59.4887Z"
+        fill="#C19B5F"
+      />
+    </svg>
     <!-- @vue-ignore -->
-    <aside :class="{ '!hidden': !$display().lgAndUp.value }" class="w-full lg:w-1/4 bg-white flex flex-col justify-between border-r-2 relative px-8">
+    <aside
+      v-if="$dataStore.isAULETTI === false"
+      :class="{ '!hidden': !$display().lgAndUp.value }"
+      class="w-full lg:w-1/4 bg-white flex flex-col justify-between border-r-2 relative px-8"
+    >
       <img draggable="false" class="w-[50%] mt-8" src="~/assets/auth-logo.svg" />
       <div class="self-center flex flex-col items-center justify-center base-auth">
         <v-carousel :show-arrows="false" color="#009C73">
@@ -16,15 +34,29 @@
       </div>
       <base-btn :text="$dataStore.t('buttons.more')" :disabled="true" class="mb-28" />
     </aside>
-    <section v-if="isLogin" class="w-full lg:w-3/4 flex flex-col justify-center">
+    <section v-if="isLogin" class="flex flex-col justify-center" :class="[$dataStore.isAULETTI === false ? 'w-full lg:w-3/4' : 'w-full']">
       <!-- @vue-ignore -->
-      <img :class="{ '!block': !$display().lgAndUp.value }" draggable="false" class="hidden w-2/4 sm:w-1/3 mb-10 self-center" src="~/assets/auth-logo.svg" />
+      <img
+        v-if="$dataStore.isAULETTI === false"
+        :class="{ '!block': !$display().lgAndUp.value }"
+        draggable="false"
+        class="hidden w-2/4 sm:w-1/3 mb-10 self-center"
+        src="~/assets/auth-logo.svg"
+      />
       <div class="flex flex-col items-center mb-8 text-center">
-        <h1 class="text-[28px] font-medium mb-1">{{ $dataStore.t('labels.welcomeHL') }}</h1>
+        <h1 class="text-[28px] font-medium mb-1">{{ $dataStore.isAULETTI === false ? $dataStore.t('labels.welcomeHL') : $dataStore.t('labels.welcomeAuletti') }}</h1>
         <span :class="[$styles.greyTextDark]" class="text-[16px]">{{ $dataStore.t('labels.needAuth') }}</span>
       </div>
       <v-form ref="vForm" class="w-2/3 lg:w-[25vw] self-center">
-        <base-rounded-input class="mb-1" v-model.trim="login" :rules="$rules.required" :loading="authLoading" :placeholder="$dataStore.t('buttons.userLogin')" type="text" />
+        <base-rounded-input
+          class="mb-1"
+          v-model.trim="login"
+          :rules="$rules.required"
+          :loading="authLoading"
+          :placeholder="$dataStore.t('buttons.userLogin')"
+          type="text"
+          @keyup.enter="submitAuthForm"
+        />
         <base-rounded-input
           class="mb-1"
           v-model.trim="password"
@@ -34,6 +66,7 @@
           :append-inner-icon="showPassword ? 'mdi-eye-outline' : 'mdi-eye-off-outline'"
           @append="showPassword = !showPassword"
           :type="showPassword ? ('' as InputTypes) : 'password'"
+          @keyup.enter="submitAuthForm"
         />
         <span v-if="$dataStore.isLKA" class="inline-block w-full text-end mb-4" :class="[$styles.textSimple, $styles.greyTextDark]" @click="isLogin = false">{{
           $dataStore.t('labels.resetPassword')
@@ -41,13 +74,19 @@
         <base-btn :text="$dataStore.t('buttons.login')" :disabled="authLoading" :btn="$styles.greenBtn" @click="submitAuthForm" />
       </v-form>
     </section>
-    <section v-if="isLogin === false" class="w-full lg:w-3/4 flex flex-col justify-center items-center">
+    <section v-if="isLogin === false" class="flex flex-col justify-center items-center" :class="[$dataStore.isAULETTI === false ? 'w-full lg:w-3/4' : 'w-full']">
       <div class="flex flex-col items-center mb-4">
         <h1 class="text-[28px] font-medium mb-1">{{ $dataStore.t('labels.resetPassword') }}</h1>
         <span :class="[$styles.greyTextDark]" class="text-[16px]">{{ $dataStore.t('labels.resetType') }}</span>
       </div>
       <div class="p-[2px] mb-8 rounded-[12px] border-[1px] w-2/3 lg:w-[25vw]" :class="[$styles.whiteBg]">
-        <v-tabs v-model="resetPasswordType" density="compact" slider-color="#009c73" class="w-full base-reset-password rounded-[12px]" :class="[$styles.whiteBg]">
+        <v-tabs
+          v-model="resetPasswordType"
+          density="compact"
+          :slider-color="$dataStore.isAULETTI || $dataStore.isAulettiParent ? '#DEBE8C' : '#009c73'"
+          class="w-full base-reset-password rounded-[12px]"
+          :class="[$styles.whiteBg]"
+        >
           <v-tab :ripple="false" value="phone"> {{ $dataStore.t('form.phoneNumber') }} </v-tab>
           <v-tab :ripple="false" value="email"> {{ $dataStore.t('form.email') }} </v-tab>
         </v-tabs>
@@ -61,6 +100,7 @@
           :loading="authLoading"
           :placeholder="$dataStore.t('form.phoneNumber')"
           type="text"
+          @keyup.enter="submitAuthForm"
         />
         <base-rounded-input
           v-if="resetPasswordType === 'email'"
@@ -69,6 +109,7 @@
           :loading="authLoading"
           :placeholder="$dataStore.t('form.email')"
           type="text"
+          @keyup.enter="submitAuthForm"
         />
         <span class="inline-block w-full text-end mb-4" :class="[$styles.textSimple, $styles.greyTextDark]" @click="isLogin = true">{{ $dataStore.t('buttons.login') }}</span>
         <base-btn :text="$dataStore.t('buttons.reset')" :disabled="authLoading" :btn="$styles.greenBtn" @click="submitAuthForm" />
@@ -109,8 +150,8 @@ export default defineComponent({
       },
     ];
 
-    const login = ref<string>(getBaseCredentials()[useEnv().envMode].login);
-    const password = ref<string>(getBaseCredentials()[useEnv().envMode].password);
+    const login = ref<string>('');
+    const password = ref<string>('');
 
     const numAttempts = ref(0);