bfg-common 1.5.653 → 1.5.654

package/components/common/layout/theHeader/userMenu/modals/changePassword/New.vue

@@ -1,193 +1,193 @@
-<template>
-  <ui-modal
-    :title="localization.common.changePassword"
-    :texts="modalTexts"
-    :subtitle="props.subtitle"
-    width="560px"
-    test-id="change-password-modal"
-    show
-    @submit="onSubmit"
-    @hide="onHideModal"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <ui-alert
-          v-if="alertErrorText"
-          :messages="[alertErrorText]"
-          test-id="change-password-error-alert"
-          type="error"
-          class="change-password__alert"
-          hide-close-button
-        />
-
-        <p class="change-password__description">
-          {{ description }}
-        </p>
-
-        <div class="change-password__form">
-          <ui-input
-            v-model="modelLocal.current_password"
-            :label="localization.common.currentPassword"
-            :error="passwordErrorText"
-            :autocomplete="'new-password'"
-            type="password"
-            test-id="change-password-password-field"
-          />
-
-          <ui-input
-            v-model="modelLocal.new_password"
-            :label="localization.common.newPassword"
-            :error="newPasswordErrorText"
-            test-id="change-password-new-password-field"
-            type="password"
-          />
-
-          <ui-input
-            v-model="modelLocal.confirm_password"
-            :label="localization.common.confirmNewPassword"
-            :error="confirmPasswordErrorText"
-            test-id="change-password-confirm-password-field"
-            type="password"
-          />
-        </div>
-      </ui-modal-block-standard>
-    </template>
-
-    <template #footerLeftContent><span /></template>
-  </ui-modal>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ChangePasswordForm } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_InitialValidationFields } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
-import {
-  validateField,
-  getPasswordMismatchError,
-} from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils'
-
-const props = defineProps<{
-  project: UI_T_Project
-  subtitle: string
-  firstTime: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'change-password'): void
-}>()
-const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const description = ref<string>(props.firstTime
-    ? localization.value.common.firstTimeChangePasswordDesc
-    : localization.value.common.changePasswordDesc)
-
-const modalTexts = computed<UI_I_ModalTexts>(() => {
-  return {
-    button1: localization.value.common.cancel,
-    button2: localization.value.common.save,
-  }
-})
-
-const alertErrorText = ref<string>('')
-const initValidationFields = ref<UI_I_InitialValidationFields>({
-  currentPassword: false,
-  newPassword: false,
-  confirmPassword: false,
-})
-const initValidation = (types: string[]): boolean => {
-  types.forEach((type) => (initValidationFields.value[type] = true))
-
-  return (
-    !!passwordErrorText.value ||
-    !!newPasswordErrorText.value ||
-    !!confirmPasswordErrorText.value
-  )
-}
-
-const passwordErrorText = computed<string>(() => {
-  if (!initValidationFields.value.currentPassword) return ''
-
-  return !modelLocal.value.current_password
-    ? localization.value.common.fieldRequired
-    : ''
-})
-const newPasswordErrorText = computed<string>(() => {
-  if (!initValidationFields.value.newPassword) return ''
-
-  const { new_password, confirm_password } = modelLocal.value
-  return !new_password
-    ? localization.value.common.fieldRequired
-    : getPasswordMismatchError(
-        localization.value,
-        new_password,
-        confirm_password
-      )
-})
-const confirmPasswordErrorText = computed<string>(() => {
-  if (!initValidationFields.value.confirmPassword) return ''
-  const { new_password, confirm_password } = modelLocal.value
-  return !confirm_password
-    ? localization.value.common.fieldRequired
-    : getPasswordMismatchError(
-        localization.value,
-        new_password,
-        confirm_password
-      )
-})
-const onSubmit = (): void => {
-  const isFieldValid = initValidation([
-    'currentPassword',
-    'newPassword',
-    'confirmPassword',
-  ])
-
-  const { current_password, new_password } = modelLocal.value
-
-  if (!isFieldValid) {
-    alertErrorText.value = validateField(
-      localization.value,
-      current_password,
-      new_password
-    )
-  }
-
-  !isFieldValid && !alertErrorText.value && emits('change-password')
-}
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins.scss';
-.modal-container-standard {
-  padding-top: 8px;
-  padding-bottom: 8px;
-
-  .change-password {
-    &__description {
-      color: #9da6ad;
-      font-size: 12px;
-      font-weight: 400;
-      line-height: 14.52px;
-      margin-bottom: 20px;
-    }
-    &__alert {
-      padding: 10px 12px;
-      margin-bottom: 12px;
-      :deep(svg) {
-        width: 16px;
-        height: 16px;
-      }
-    }
-    &__form {
-      @include flex($dir: column);
-      row-gap: 16px;
-    }
-  }
-}
-</style>
+<template>
+  <ui-modal
+    :title="localization.common.changePassword"
+    :texts="modalTexts"
+    :subtitle="props.subtitle"
+    width="560px"
+    test-id="change-password-modal"
+    show
+    @submit="onSubmit"
+    @hide="onHideModal"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <ui-alert
+          v-if="alertErrorText"
+          :messages="[alertErrorText]"
+          test-id="change-password-error-alert"
+          type="error"
+          class="change-password__alert"
+          hide-close-button
+        />
+
+        <p class="change-password__description">
+          {{ description }}
+        </p>
+
+        <div class="change-password__form">
+          <ui-input
+            v-model="modelLocal.current_password"
+            :label="localization.common.currentPassword"
+            :error="passwordErrorText"
+            :autocomplete="'new-password'"
+            type="password"
+            test-id="change-password-password-field"
+          />
+
+          <ui-input
+            v-model="modelLocal.new_password"
+            :label="localization.common.newPassword"
+            :error="newPasswordErrorText"
+            test-id="change-password-new-password-field"
+            type="password"
+          />
+
+          <ui-input
+            v-model="modelLocal.confirm_password"
+            :label="localization.common.confirmNewPassword"
+            :error="confirmPasswordErrorText"
+            test-id="change-password-confirm-password-field"
+            type="password"
+          />
+        </div>
+      </ui-modal-block-standard>
+    </template>
+
+    <template #footerLeftContent><span /></template>
+  </ui-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ChangePasswordForm } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_InitialValidationFields } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import {
+  validateField,
+  getPasswordMismatchError,
+} from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils'
+
+const props = defineProps<{
+  project: UI_T_Project
+  subtitle: string
+  firstTime: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'change-password'): void
+}>()
+const modelLocal = defineModel<UI_I_ChangePasswordForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const description = ref<string>(props.firstTime
+    ? localization.value.common.firstTimeChangePasswordDesc
+    : localization.value.common.changePasswordDesc)
+
+const modalTexts = computed<UI_I_ModalTexts>(() => {
+  return {
+    button1: localization.value.common.cancel,
+    button2: localization.value.common.save,
+  }
+})
+
+const alertErrorText = ref<string>('')
+const initValidationFields = ref<UI_I_InitialValidationFields>({
+  currentPassword: false,
+  newPassword: false,
+  confirmPassword: false,
+})
+const initValidation = (types: string[]): boolean => {
+  types.forEach((type) => (initValidationFields.value[type] = true))
+
+  return (
+    !!passwordErrorText.value ||
+    !!newPasswordErrorText.value ||
+    !!confirmPasswordErrorText.value
+  )
+}
+
+const passwordErrorText = computed<string>(() => {
+  if (!initValidationFields.value.currentPassword) return ''
+
+  return !modelLocal.value.current_password
+    ? localization.value.common.fieldRequired
+    : ''
+})
+const newPasswordErrorText = computed<string>(() => {
+  if (!initValidationFields.value.newPassword) return ''
+
+  const { new_password, confirm_password } = modelLocal.value
+  return !new_password
+    ? localization.value.common.fieldRequired
+    : getPasswordMismatchError(
+        localization.value,
+        new_password,
+        confirm_password
+      )
+})
+const confirmPasswordErrorText = computed<string>(() => {
+  if (!initValidationFields.value.confirmPassword) return ''
+  const { new_password, confirm_password } = modelLocal.value
+  return !confirm_password
+    ? localization.value.common.fieldRequired
+    : getPasswordMismatchError(
+        localization.value,
+        new_password,
+        confirm_password
+      )
+})
+const onSubmit = (): void => {
+  const isFieldValid = initValidation([
+    'currentPassword',
+    'newPassword',
+    'confirmPassword',
+  ])
+
+  const { current_password, new_password } = modelLocal.value
+
+  if (!isFieldValid) {
+    alertErrorText.value = validateField(
+      localization.value,
+      current_password,
+      new_password
+    )
+  }
+
+  !isFieldValid && !alertErrorText.value && emits('change-password')
+}
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+.modal-container-standard {
+  padding-top: 8px;
+  padding-bottom: 8px;
+
+  .change-password {
+    &__description {
+      color: #9da6ad;
+      font-size: 12px;
+      font-weight: 400;
+      line-height: 14.52px;
+      margin-bottom: 20px;
+    }
+    &__alert {
+      padding: 10px 12px;
+      margin-bottom: 12px;
+      :deep(svg) {
+        width: 16px;
+        height: 16px;
+      }
+    }
+    &__form {
+      @include flex($dir: column);
+      row-gap: 16px;
+    }
+  }
+}
+</style>

package/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types.ts

@@ -1,7 +1,7 @@
-export type UI_T_UserPreferenceTab =
-  | 'time-tab'
-  | 'language-tab'
-  | 'console-tab'
-  | 'inventory-tab'
-  | 'security-tab'
-  | 'view-tab'
+export type UI_T_UserPreferenceTab =
+  | 'time-tab'
+  | 'language-tab'
+  | 'console-tab'
+  | 'inventory-tab'
+  | 'security-tab'
+  | 'view-tab'

package/components/common/layout/theHeader/userMenu/modals/preferences/security/Old.vue

@@ -1,118 +1,120 @@
-<template>
-  <form id="security-form" class="compact">
-    <div class="description">Two-Factor Authentication</div>
-
-    <div class="flex-align-center">
-      <label for="security"
-        >Add an extra layer of security to your account</label
-      >
-      <input id="security" v-model="security" type="checkbox" class="switch" />
-    </div>
-
-    <div v-if="props.recoveryCodes.length" class="recovery-codes">
-      <label>Recovery codes:</label>
-      <ul class="recovery-codes-list">
-        <li
-          v-for="item in props.recoveryCodes"
-          :key="item"
-          class="recovery-codes-list-item"
-        >
-          {{ item }}
-        </li>
-      </ul>
-    </div>
-  </form>
-</template>
-
-<script setup lang="ts">
-// import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  recoveryCodes: string[]
-}>()
-
-// const localization = computed<UI_I_Localization>(() => useLocal())
-
-const security = defineModel<boolean>('security')
-
-// const isDisabled = ref<boolean>(true)
-</script>
-
-<style lang="scss" scoped>
-.description {
-  margin-bottom: 10px;
-}
-
-.recovery-codes {
-  display: flex;
-  margin-top: 10px;
-
-  .recovery-codes-list-item {
-    font-size: 12px;
-  }
-}
-
-label {
-  margin-right: 6px;
-}
-
-input[type='checkbox'] {
-  --active: var(--checkbox-value-active-color);
-  --active-inner: var(--checkbox-mark-color);
-  --border: var(--checkbox-mark-color);
-  --background: var(--checkbox-mark-background-color);
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  height: 20px;
-  outline: none;
-  display: inline-block;
-  vertical-align: top;
-  position: relative;
-  margin: 0;
-  cursor: pointer;
-  border: 1px solid var(--bc, var(--border));
-  background: var(--b, var(--background));
-  transition: background 0.3s, border-color 0.3s, box-shadow 0.2s;
-  &:after {
-    content: '';
-    display: block;
-    left: 0;
-    top: 0;
-    position: absolute;
-    transition: transform var(--d-t, 0.3s) var(--d-t-e, ease),
-      opacity var(--d-o, 0.2s);
-  }
-  &:checked {
-    --b: var(--active);
-    --bc: var(--active);
-    --d-o: 0.3s;
-    --d-t: 0.6s;
-    --d-t-e: cubic-bezier(0.2, 0.85, 0.32, 1.2);
-  }
-}
-input[type='checkbox'] {
-  &.switch {
-    width: 35px;
-    border-radius: 11px;
-    &:after {
-      left: 2px;
-      top: 2px;
-      bottom: 2px;
-      border-radius: 50%;
-      width: 14px;
-      height: 14px;
-      border: 1px solid var(--bc, var(--border));
-      background: var(--ab, var(--border));
-      transform: translateX(var(--x, 0));
-    }
-    &:checked {
-      --ab: var(--active-inner);
-      --x: 14px;
-    }
-    &:disabled {
-      cursor: not-allowed;
-      opacity: 0.5;
-    }
-  }
-}
-</style>
+<template>
+  <form id="security-form" class="compact">
+    <div class="description">
+      {{ localization.myPreferences.twoFactorAuthentication }}
+    </div>
+
+    <div class="flex-align-center">
+      <label for="security">{{
+        localization.myPreferences.securityLabel
+      }}</label>
+      <input id="security" v-model="security" type="checkbox" class="switch" />
+    </div>
+
+    <div v-if="props.recoveryCodes.length" class="recovery-codes">
+<!--      TODO-->
+      <label>Recovery codes:</label>
+      <ul class="recovery-codes-list">
+        <li
+          v-for="item in props.recoveryCodes"
+          :key="item"
+          class="recovery-codes-list-item"
+        >
+          {{ item }}
+        </li>
+      </ul>
+    </div>
+  </form>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  recoveryCodes: string[]
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const security = defineModel<boolean>('security')
+</script>
+
+<style lang="scss" scoped>
+.description {
+  margin-bottom: 10px;
+}
+
+.recovery-codes {
+  display: flex;
+  margin-top: 10px;
+
+  .recovery-codes-list-item {
+    font-size: 12px;
+  }
+}
+
+label {
+  margin-right: 6px;
+}
+
+// TODO повторяется в ../view, необходимо вынести глобально
+input[type='checkbox'] {
+  --active: var(--checkbox-value-active-color);
+  --active-inner: var(--checkbox-mark-color);
+  --border: var(--checkbox-mark-color);
+  --background: var(--checkbox-mark-background-color);
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  height: 20px;
+  outline: none;
+  display: inline-block;
+  vertical-align: top;
+  position: relative;
+  margin: 0;
+  cursor: pointer;
+  border: 1px solid var(--bc, var(--border));
+  background: var(--b, var(--background));
+  transition: background 0.3s, border-color 0.3s, box-shadow 0.2s;
+  &:after {
+    content: '';
+    display: block;
+    left: 0;
+    top: 0;
+    position: absolute;
+    transition: transform var(--d-t, 0.3s) var(--d-t-e, ease),
+      opacity var(--d-o, 0.2s);
+  }
+  &:checked {
+    --b: var(--active);
+    --bc: var(--active);
+    --d-o: 0.3s;
+    --d-t: 0.6s;
+    --d-t-e: cubic-bezier(0.2, 0.85, 0.32, 1.2);
+  }
+}
+input[type='checkbox'] {
+  &.switch {
+    width: 35px;
+    border-radius: 11px;
+    &:after {
+      left: 2px;
+      top: 2px;
+      bottom: 2px;
+      border-radius: 50%;
+      width: 14px;
+      height: 14px;
+      border: 1px solid var(--bc, var(--border));
+      background: var(--ab, var(--border));
+      transform: translateX(var(--x, 0));
+    }
+    &:checked {
+      --ab: var(--active-inner);
+      --x: 14px;
+    }
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.5;
+    }
+  }
+}
+</style>