diff --git a/storefront/app/components/base/header/index.vue b/storefront/app/components/base/header/index.vue index d94bf31f..0563784c 100644 --- a/storefront/app/components/base/header/index.vue +++ b/storefront/app/components/base/header/index.vue @@ -18,35 +18,35 @@ {{ t('header.nav.shop') }} {{ t('header.nav.catalog') }} {{ t('header.nav.brands') }} {{ t('header.nav.blog') }} {{ t('header.nav.contact') }} diff --git a/storefront/app/components/ui/title.vue b/storefront/app/components/ui/title.vue index 8a90db41..db151184 100644 --- a/storefront/app/components/ui/title.vue +++ b/storefront/app/components/ui/title.vue @@ -40,7 +40,7 @@ font-weight: 400; letter-spacing: -0.5px; } -:deep(.title__wrapper div) { +:deep(.title__wrapper .search) { position: relative; & span { diff --git a/storefront/app/composables/brands/useBrandBySlug.ts b/storefront/app/composables/brands/useBrandBySlug.ts index cba9b4da..7dd0cc65 100644 --- a/storefront/app/composables/brands/useBrandBySlug.ts +++ b/storefront/app/composables/brands/useBrandBySlug.ts @@ -8,6 +8,14 @@ export async function useBrandBySlug(slug: string) { slug, }); + if (!data.value?.brands?.edges?.length) { + throw createError({ + status: 404, + statusText: 'Brand not found', + fatal: true + }); + } + watch(error, (err) => { if (err) { console.error('useBrandsBySlug error:', err); diff --git a/storefront/app/composables/categories/useCategoryBySlug.ts b/storefront/app/composables/categories/useCategoryBySlug.ts index 27bacfcb..0a30c961 100644 --- a/storefront/app/composables/categories/useCategoryBySlug.ts +++ b/storefront/app/composables/categories/useCategoryBySlug.ts @@ -13,6 +13,14 @@ export async function useCategoryBySlug(slug: string) { }); const minMaxPrices = computed(() => category.value?.minMaxPrices ?? { minPrice: 0, maxPrice: 50000 }); + if (!data.value?.categories?.edges?.length) { + throw createError({ + status: 404, + statusText: 'Category not found', + fatal: true + }); + } + watch(error, (err) => { if (err) { console.error('useCategoryBySlug error:', err); diff --git a/storefront/app/composables/products/useProductBySlug.ts b/storefront/app/composables/products/useProductBySlug.ts index f30a1af0..ea2f6aa9 100644 --- a/storefront/app/composables/products/useProductBySlug.ts +++ b/storefront/app/composables/products/useProductBySlug.ts @@ -13,6 +13,14 @@ export async function useProductBySlug(slug: string) { product.value = result; } + if (!data.value?.products?.edges?.length) { + throw createError({ + status: 404, + statusText: 'Product not found', + fatal: true + }); + } + watch(error, (err) => { if (err) { console.error('useProductBySlug error:', err); diff --git a/storefront/app/error.vue b/storefront/app/error.vue new file mode 100644 index 00000000..69b79a55 --- /dev/null +++ b/storefront/app/error.vue @@ -0,0 +1,82 @@ + + + + + \ No newline at end of file diff --git a/storefront/app/pages/brand/[brandSlug].vue b/storefront/app/pages/brand/[brandSlug].vue index 7e0bee76..4947516c 100644 --- a/storefront/app/pages/brand/[brandSlug].vue +++ b/storefront/app/pages/brand/[brandSlug].vue @@ -9,7 +9,7 @@ :alt="brand.name" />

{{ brand.name }}

-

{{ brand.description }}

+
diff --git a/storefront/app/pages/brands.vue b/storefront/app/pages/brands.vue index fab39de9..30c4e064 100644 --- a/storefront/app/pages/brands.vue +++ b/storefront/app/pages/brands.vue @@ -3,7 +3,7 @@

{{ t('brands.title') }}

{{ t('brands.text') }}

-
+
.<,|\\-", - "pageNotFound": "Page not found" + "pageNotFound": "Page not found", + "404": "The page you're looking for doesn't exist or has been moved.", + "brandNotFound": "Brand not found", + "productNotFound": "Product not found", + "categoryNotFound": "Category not found" }, "fields": { "search": "Search", @@ -49,7 +54,8 @@ "confirmPassword": "Confirm password", "confirmNewPassword": "Confirm new password", "brandsSearch": "Search brands by name...", - "promocode": "Enter promocode" + "promocode": "Enter promocode", + "address": "Start typing the address" }, "checkboxes": { "remember": "Remember me", @@ -72,6 +78,8 @@ "reset": "If specified email exists in our system, we will send a password recovery email!", "newPassword": "You have successfully changed your password!", "contactUs": "Your message was sent successfully!", + "createAddress": "You have successfully added a new address!", + "deleteAddress": "You have successfully deleted an address!", "addToCart": "{product} has been added to the cart!", "removeFromCart": "{product} has been removed from the cart!", "removeAllFromCart": "You have successfully emptied the cart!", @@ -196,7 +204,8 @@ "return": "Return Policy", "faq": "FAQ", "shipping": "Shipping Information", - "about": "About Us" + "about": "About Us", + "addresses": "Addresses" }, "contact": { "title": "Get in Touch", @@ -280,6 +289,14 @@ "until": "Until", "empty": "You don't have any promocodes." }, + "addresses": { + "title": "Addresses", + "title1": "Add New Address", + "title2": "Your saved addresses", + "search": { + "empty": "Nothing found" + } + }, "logout": "Logout" }, "demo": { diff --git a/storefront/i18n/locales/ru-ru.json b/storefront/i18n/locales/ru-ru.json index 75b56de5..ee0d402e 100644 --- a/storefront/i18n/locales/ru-ru.json +++ b/storefront/i18n/locales/ru-ru.json @@ -21,7 +21,8 @@ "sendMessage": "Отправить сообщение", "saveChanges": "Сохранить изменения", "clearAll": "Очистить всё", - "buyNow": "Купить Сейчас" + "buyNow": "Купить Сейчас", + "backToHome": "Обратно на Главную" }, "errors": { "required": "Это поле обязательно!", @@ -32,7 +33,11 @@ "needNumber": "Добавьте цифру.", "needMin": "Мин. 8 символов", "needSpecial": "Добавьте спецсимвол: #.?!$%^&*'()_+=:;\"'/>.<,|\\-", - "pageNotFound": "Страница не найдена" + "pageNotFound": "Страница не найдена", + "404": "Страница, которую вы ищете, не существует или была перемещена.", + "brandNotFound": "Бренд не найден", + "productNotFound": "Товар не найден", + "categoryNotFound": "Категория не найдена" }, "fields": { "search": "Поиск", @@ -49,7 +54,8 @@ "confirmPassword": "Подтвердите пароль", "confirmNewPassword": "Подтвердите новый пароль", "brandsSearch": "Поиск брендов по названию...", - "promocode": "Введите промокод" + "promocode": "Введите промокод", + "address": "Начните вводить адрес" }, "checkboxes": { "remember": "Запомнить меня", @@ -72,6 +78,8 @@ "reset": "Если указанный email существует в нашей системе, мы отправим на него письмо для восстановления пароля!", "newPassword": "Вы успешно изменили пароль!", "contactUs": "Ваше сообщение успешно отправлено!", + "createAddress": "Вы успешно добавили новый адрес!", + "deleteAddress": "Вы успешно удалили адрес!", "addToCart": "{product} добавлен в корзину!", "removeFromCart": "{product} удален из корзины!", "removeAllFromCart": "Корзина успешно очищена!", @@ -196,7 +204,8 @@ "return": "Политика возврата", "faq": "Часто задаваемые вопросы", "shipping": "Информация о доставке", - "about": "О нас" + "about": "О нас", + "addresses": "Адреса" }, "contact": { "title": "Свяжитесь с нами", @@ -280,6 +289,14 @@ "until": "До", "empty": "У вас нет промокодов." }, + "addresses": { + "title": "Адреса", + "title1": "Добавить Новый Адрес", + "title2": "Ваши сохраненные адреса", + "search": { + "empty": "Ничего не найдено" + } + }, "logout": "Выйти" }, "demo": {