adata-ui 2.1.41-beta.0 → 2.1.41

package/components/modals/Resend.vue

@@ -1,81 +1,81 @@
-<script setup lang="ts">
-import { useUrls } from '#adata-ui/composables/useUrls'
-
-const emit = defineEmits<{
-  (e: 'resend'): void
-  (e: 'close'): void
-}>()
-
-const timer = ref(120)
-const isResend = ref(false)
-const route = useRoute()
-const { landing } = useUrls()
-
-function runTimer() {
-  timer.value = 120
-  const intervalId = setInterval(() => {
-    if (timer.value <= 0) {
-      isResend.value = true
-      clearInterval(intervalId)
-      return
-    }
-    timer.value--
-  }, 1000)
-}
-
-onMounted(() => resend())
-
-function resend() {
-  isResend.value = false
-  runTimer()
-  emit('resend')
-}
-function goToMain() {
-  if (route.query.url) {
-    document.location.replace(route.query.url)
-  }
-  else {
-    document.location.replace(landing)
-  }
-  emit('close')
-}
-</script>
-
-<template>
-  <div class="flex flex-col items-center justify-center gap-5">
-    <p class="text-h2">
-      {{ $t('login.modal.title') }}
-    </p>
-    <a-ill-mail />
-    <p class="text-body-md text-center">
-      {{ $t('login.modal.subtitle1') }}
-    </p>
-    <p class="text-body-md text-center">
-      {{ $t('login.modal.subtitle2') }}
-    </p>
-    <p
-      v-if="!isResend"
-      class="text-h2"
-    >
-      {{ timer }} {{ $t('login.modal.seconds') }}
-    </p>
-    <a-button
-      v-else
-      class="w-full"
-      view="outline"
-      @click="resend"
-    >
-      {{ $t('login.modal.resend') }}
-    </a-button>
-    <a-button
-      class="w-full"
-      @click="goToMain"
-    >
-      {{ $t('login.modal.back') }}
-    </a-button>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { useUrls } from '#adata-ui/composables/useUrls'
+
+const emit = defineEmits<{
+  (e: 'resend'): void
+  (e: 'close'): void
+}>()
+
+const timer = ref(120)
+const isResend = ref(false)
+const route = useRoute()
+const { landing } = useUrls()
+
+function runTimer() {
+  timer.value = 120
+  const intervalId = setInterval(() => {
+    if (timer.value <= 0) {
+      isResend.value = true
+      clearInterval(intervalId)
+      return
+    }
+    timer.value--
+  }, 1000)
+}
+
+onMounted(() => resend())
+
+function resend() {
+  isResend.value = false
+  runTimer()
+  emit('resend')
+}
+function goToMain() {
+  if (route.query.url) {
+    document.location.replace(route.query.url)
+  }
+  else {
+    document.location.replace(landing)
+  }
+  emit('close')
+}
+</script>
+
+<template>
+  <div class="flex flex-col items-center justify-center gap-5">
+    <p class="heading-02">
+      {{ $t('login.modal.title') }}
+    </p>
+    <a-ill-mail />
+    <p class="body-400 text-center">
+      {{ $t('login.modal.subtitle1') }}
+    </p>
+    <p class="body-400 text-center">
+      {{ $t('login.modal.subtitle2') }}
+    </p>
+    <p
+      v-if="!isResend"
+      class="heading-02"
+    >
+      {{ timer }} {{ $t('login.modal.seconds') }}
+    </p>
+    <a-button
+      v-else
+      class="w-full"
+      view="outline"
+      @click="resend"
+    >
+      {{ $t('login.modal.resend') }}
+    </a-button>
+    <a-button
+      class="w-full"
+      @click="goToMain"
+    >
+      {{ $t('login.modal.back') }}
+    </a-button>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/components/modals/SubmitApplicationModal.vue

@@ -1,126 +1,129 @@
-<script setup lang="ts">
-import * as z from 'zod'
-import { useUIValidation } from '#adata-ui/composables/useUIValidation'
-
-const props = defineProps<{
-  userInfo: any
-}>()
-
-const emit = defineEmits<{
-  (e: 'send', num: number): void
-}>()
-const { t } = useI18n()
-const isOpen = defineModel<boolean>({default: false})
-const form: any = reactive({
-  name: '',
-  email: '',
-  phone: '',
-  comment: '',
-})
-
-const scheme = z.object({
-  name: z.string().nonempty(t('modals.submit_application_modal.rules.required')),
-  email: z.string().nonempty(t('modals.submit_application_modal.rules.required')).email(t('modals.submit_application_modal.rules.email')),
-  phone: z.string().nonempty(t('modals.submit_application_modal.rules.required')).min(17, t('forms.feedback.phoneMinLength', { count: 10 })),
-  comment: z.string().nonempty(t('modals.submit_application_modal.rules.required')),
-})
-
-const submitted = ref(false)
-
-const { validation, getError } = useUIValidation(
-  scheme,
-  () => form,
-  submitted,
-)
-
-const send = () => {
-  submitted.value = true
-  if (validation.value) return
-  emit('send', form)
-  form.name = ''
-  form.email = props.userInfo?.email || ''
-  form.phone = ''
-  form.comment = ''
-
-}
-const cancel = () => {
-  isOpen.value = false
-}
-
-defineExpose({
-  reset: () => (submitted.value = false),
-})
-
-onMounted(() => {
-  form.email = props.userInfo?.email || ''
-})
-</script>
-
-<template>
-  <a-modal-v2
-    v-model="isOpen"
-    width="424px"
-    persistent
-  >
-    <div class="flex flex-col gap-5 px-6 py-4">
-      <p class="text-h2 text-center">
-        {{ t('modals.submit_application_modal.title') }}
-      </p>
-      <a-ill-mail class="w-full" />
-      <div class="flex flex-col gap-3">
-        <a-input-v2
-          v-model="form.name"
-          required
-          :label="t('modals.submit_application_modal.labels.name')"
-          :error="getError('name')"
-        />
-        <a-input-v2
-          v-model="form.email"
-          required
-          type="email"
-          :label="t('modals.submit_application_modal.labels.email')"
-          :error="getError('email')"
-        />
-        <a-input-v2
-          v-model="form.phone"
-          required
-          type="tel"
-          clearable
-          mask="8 (###) ###-##-##"
-          :label="t('modals.submit_application_modal.labels.phone')"
-          :error="getError('phone')"
-        />
-        <a-textarea-v2
-          v-model="form.comment"
-          required
-          :rows="4"
-          resize="none"
-          :label="t('modals.submit_application_modal.labels.comment')"
-          :error="getError('comment')"
-        />
-      </div>
-    </div>
-    <template #footer>
-      <div class="flex gap-2">
-        <a-button-v2
-          view="outline"
-          color="blue"
-          block
-          @click="cancel"
-        >
-          {{ t('reuse.close') }}
-        </a-button-v2>
-        <a-button-v2
-          block
-          @click="send"
-        >
-          {{ t('reuse.send') }}
-        </a-button-v2>
-      </div>
-    </template>
-  </a-modal-v2>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import * as z from 'zod'
+import { useUIValidation } from '#adata-ui/composables/useUIValidation'
+
+const props = defineProps<{
+  userInfo: any
+}>()
+
+const emit = defineEmits<{
+  (e: 'send', num: number): void
+}>()
+const { t } = useI18n()
+const isOpen = defineModel<boolean>({default: false})
+const form: any = reactive({
+  name: '',
+  email: '',
+  phone: '',
+  comment: '',
+})
+
+const scheme = z.object({
+  name: z.string().nonempty(t('modals.submit_application_modal.rules.required')),
+  email: z.string().nonempty(t('modals.submit_application_modal.rules.required')).email(t('modals.submit_application_modal.rules.email')),
+  phone: z.string().nonempty(t('modals.submit_application_modal.rules.required')).min(17, t('forms.feedback.phoneMinLength', { count: 10 })),
+  comment: z.string().nonempty(t('modals.submit_application_modal.rules.required')),
+})
+
+const submitted = ref(false)
+
+const { validation, getError } = useUIValidation(
+  scheme,
+  () => form,
+  submitted,
+)
+
+const send = () => {
+  submitted.value = true
+  if (validation.value) return
+  emit('send', form)
+  form.name = ''
+  form.email = props.userInfo?.email || ''
+  form.phone = ''
+  form.comment = ''
+
+}
+const cancel = () => {
+  isOpen.value = false
+}
+
+defineExpose({
+  reset: () => (submitted.value = false),
+})
+
+watch(isOpen, (value) => {
+  if (!value) submitted.value = false
+})
+
+onMounted(() => {
+  form.email = props.userInfo?.email || ''
+})
+</script>
+
+<template>
+  <a-modal-v2
+    v-model="isOpen"
+    width="424px"
+  >
+    <div class="flex flex-col gap-5 px-6 py-4">
+      <p class="heading-02 text-center">
+        {{ t('modals.submit_application_modal.title') }}
+      </p>
+      <a-ill-mail class="w-full" />
+      <div class="flex flex-col gap-3">
+        <a-input-v2
+          v-model="form.name"
+          required
+          :label="t('modals.submit_application_modal.labels.name')"
+          :error="getError('name')"
+        />
+        <a-input-v2
+          v-model="form.email"
+          required
+          type="email"
+          :label="t('modals.submit_application_modal.labels.email')"
+          :error="getError('email')"
+        />
+        <a-input-v2
+          v-model="form.phone"
+          required
+          type="tel"
+          clearable
+          mask="8 (###) ###-##-##"
+          :label="t('modals.submit_application_modal.labels.phone')"
+          :error="getError('phone')"
+        />
+        <a-textarea-v2
+          v-model="form.comment"
+          required
+          :rows="4"
+          resize="none"
+          :label="t('modals.submit_application_modal.labels.comment')"
+          :error="getError('comment')"
+        />
+      </div>
+    </div>
+    <template #footer>
+      <div class="flex gap-2">
+        <a-button-v2
+          view="outline"
+          color="blue"
+          block
+          @click="cancel"
+        >
+          {{ t('reuse.close') }}
+        </a-button-v2>
+        <a-button-v2
+          block
+          @click="send"
+        >
+          {{ t('reuse.send') }}
+        </a-button-v2>
+      </div>
+    </template>
+  </a-modal-v2>
+</template>
+
+<style scoped>
+
+</style>

package/components/modals/id/AuthModal.vue

@@ -1,72 +1,92 @@
-<script setup lang="ts">
-import { useUrls } from '#adata-ui/composables/useUrls'
-
-const { t } = useI18n()
-const isOpen = useAuthModal()
-const { myLayer } = useAppConfig()
-const { login } = useUrls()
-
-const { loginModal } = useIdModals()
-
-function close(){
-  isOpen.value = false
-}
-
-function goAuth() {
-  if (myLayer.authMode !== 'local') {
-    if (window) {
-      let fullPath = encodeURIComponent(window.location.toString())
-      if (fullPath.includes('basic-info')) {
-        fullPath = fullPath.replace('%2Fcounterparty%2Fmain', '').replace('%2Fbasic-info', '')
-      }
-      window.location.href = `${login}?url=${fullPath}`
-    }
-  }
-  else {
-    isOpen.value = false
-    loginModal.value = true
-  }
-}
-</script>
-
-<template>
-  <a-modal-v2
-    v-model="isOpen"
-    width="424px"
-    data-test-id="no-access-popup"
-    hide-header-border
-  >
-    <div class="flex flex-col items-center justify-center gap-4 px-6 pb-4">
-      <a-ill-shield-user />
-      <p class="text-h4 whitespace-pre-wrap text-center">
-        {{ t('modals.auth.title') }}
-      </p>
-      <p class="text-body-md whitespace-pre-wrap text-center text-quaternary">
-        {{ t('modals.auth.content') }}
-      </p>
-    </div>
-    <template #footer>
-      <div class="grid grid-cols-1 md:grid-cols-2 gap-3">
-        <a-button-v2
-          view="outline"
-          color="white"
-          block
-          data-test-id="no-access-popup-close-button"
-          @click="close"
-        >
-          {{ t('modals.buttons.close') }}
-        </a-button-v2>
-        <a-button-v2
-          color="blue"
-          block
-          data-test-id="no-access-popup-authorize-button"
-          @click="goAuth"
-        >
-          {{ t('modals.buttons.logIn') }}
-        </a-button-v2>
-      </div>
-    </template>
-  </a-modal-v2>
-</template>
-
-<style scoped></style>
+<script setup lang="ts">
+import { useUrls } from '#adata-ui/composables/useUrls'
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+const { t } = useI18n()
+const isOpen = useAuthModal()
+const { myLayer } = useAppConfig()
+const { login } = useUrls()
+
+const { loginModal, registrationModal } = useIdModals()
+
+function goAuth() {
+  if (myLayer.authMode !== 'local') {
+    if (window) {
+      let fullPath = encodeURIComponent(window.location.toString())
+      if (fullPath.includes('basic-info')) {
+        fullPath = fullPath.replace('%2Fcounterparty%2Fmain', '').replace('%2Fbasic-info', '')
+      }
+      window.location.href = `${login}?url=${fullPath}`
+    }
+  }
+  else {
+    isOpen.value = false
+    loginModal.value = true
+  }
+}
+
+function goRegister() {
+  if (myLayer.authMode !== 'local') {
+    if (window) {
+      let fullPath = encodeURIComponent(window.location.toString())
+      if (fullPath.includes('basic-info')) {
+        fullPath = fullPath.replace('%2Fcounterparty%2Fmain', '').replace('%2Fbasic-info', '')
+      }
+      window.location.href = `${login}register?url=${fullPath}`
+    }
+  }
+  else {
+    isOpen.value = false
+    registrationModal.value = true
+  }
+}
+const close = () => {
+  isOpen.value = false
+  emit('close')
+}
+</script>
+
+<template>
+  <a-modal
+    v-model="isOpen"
+    :title="t('modals.auth.title')"
+    data-test-id="no-access-popup"
+  >
+    <div class="flex flex-col items-center gap-5 text-center text-sm">
+      <a-ill-door />
+      <div>{{ t('modals.auth.content') }}</div>
+      <a-button
+        block
+        variant="success"
+        data-test-id="no-access-popup-authorize-button"
+        @click="goAuth"
+      >
+        {{ t('modals.buttons.logIn') }}
+      </a-button>
+      <div>{{ t('modals.auth.firstTime') }}</div>
+    </div>
+    <template #footer>
+      <div class="flex gap-2">
+        <a-button
+          view="outline"
+          block
+          data-test-id="no-access-popup-close-button"
+          @click="close"
+        >
+          {{ t('modals.buttons.close') }}
+        </a-button>
+        <a-button
+          block
+          data-test-id="no-access-popup-register-button"
+          @click="goRegister"
+        >
+          {{ t('modals.buttons.register') }}
+        </a-button>
+      </div>
+    </template>
+  </a-modal>
+</template>
+
+<style scoped></style>