diff --git a/main_dc/yalarba/easySite/easySite/app/layouts/auth.vue b/main_dc/yalarba/easySite/easySite/app/layouts/auth.vue
index d4e48e1..2cfe496 100644
--- a/main_dc/yalarba/easySite/easySite/app/layouts/auth.vue
+++ b/main_dc/yalarba/easySite/easySite/app/layouts/auth.vue
@@ -4,14 +4,10 @@
-
+
TravelEasy
-
-
+
diff --git a/main_dc/yalarba/easySite/easySite/app/pages/auth/login.vue b/main_dc/yalarba/easySite/easySite/app/pages/auth/login.vue
index 0848e2f..d88d459 100644
--- a/main_dc/yalarba/easySite/easySite/app/pages/auth/login.vue
+++ b/main_dc/yalarba/easySite/easySite/app/pages/auth/login.vue
@@ -69,7 +69,8 @@ import { loginSchema } from '~/schemas/auth'
import type { LoginForm } from '~/types/auth'
definePageMeta({
- middleware: 'auth'
+ middleware: 'auth',
+ layout: 'auth'
})
const auth = useAuth()
diff --git a/main_dc/yalarba/easySite/easySite/app/pages/profile/edit.vue b/main_dc/yalarba/easySite/easySite/app/pages/profile/edit.vue
index ae24ee5..67201b3 100644
--- a/main_dc/yalarba/easySite/easySite/app/pages/profile/edit.vue
+++ b/main_dc/yalarba/easySite/easySite/app/pages/profile/edit.vue
@@ -15,7 +15,7 @@
Личная информация
@@ -184,7 +223,17 @@ onMounted(async () => {
// Заполняем форму данными пользователя
if (auth.user.value) {
- formData.value = { ...auth.user.value }
+ formData.value = {
+ full_name: auth.user.value.full_name || '',
+ inn: auth.user.value.inn || '',
+ phone: auth.user.value.phone || '',
+ city: auth.user.value.city || '',
+ email: auth.user.value.email || '',
+ org_type: auth.user.value.org_type || '',
+ org_full_name: auth.user.value.org_full_name || '',
+ org_short_name: auth.user.value.org_short_name || '',
+ org_inn: auth.user.value.org_inn || ''
+ }
}
})
@@ -216,7 +265,7 @@ const userInitials = computed(() => {
if (!formData.value.full_name) return '??'
const names = formData.value.full_name.split(' ')
- if (names.length >= 2) {
+ if (names.length >= 2 && names[0] && names[1]) {
return `${names[0][0]}${names[1][0]}`.toUpperCase()
}
return formData.value.full_name.substring(0, 2).toUpperCase()
@@ -245,6 +294,7 @@ const validateEmail = () => {
}
// Отправка кода верификации
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const sendVerificationCode = async () => {
isSendingCode.value = true
verificationError.value = ''
@@ -255,6 +305,7 @@ const sendVerificationCode = async () => {
showVerificationModal.value = true
console.log(`Код верификации отправлен на ${formData.value.email}`)
} catch (error) {
+ console.log(error)
verificationError.value = 'Ошибка при отправке кода. Попробуйте позже.'
} finally {
isSendingCode.value = false
@@ -262,6 +313,7 @@ const sendVerificationCode = async () => {
}
// Верификация кода
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const verifyEmailCode = async () => {
isVerifyingCode.value = true
verificationError.value = ''
@@ -287,6 +339,7 @@ const verifyEmailCode = async () => {
}
// Закрытие модального окна верификации
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const closeVerificationModal = () => {
showVerificationModal.value = false
verificationCode.value = ''