diff --git a/frontend/components/common/Button.vue b/frontend/components/common/Button.vue index 20cef21b..e4f348e8 100644 --- a/frontend/components/common/Button.vue +++ b/frontend/components/common/Button.vue @@ -175,6 +175,7 @@ const loaderColor = computed(() => loaderColorDict[props.buttonKind] ?? ''); &__content { font-size: var(--font-size-M); + } &__icon { diff --git a/frontend/components/detailes/Actions.vue b/frontend/components/detailes/Actions.vue index 9c355284..e009c979 100644 --- a/frontend/components/detailes/Actions.vue +++ b/frontend/components/detailes/Actions.vue @@ -75,7 +75,6 @@ patchDeleteEventModal({ @media (min-width: 1440px) { flex-direction: row; - width: 167px; } &__button-admin { diff --git a/frontend/components/detailes/Description.vue b/frontend/components/detailes/Description.vue new file mode 100644 index 00000000..d80d1405 --- /dev/null +++ b/frontend/components/detailes/Description.vue @@ -0,0 +1,148 @@ + + + diff --git a/frontend/components/detailes/EventSummary.vue b/frontend/components/detailes/EventSummary.vue new file mode 100644 index 00000000..d636a02a --- /dev/null +++ b/frontend/components/detailes/EventSummary.vue @@ -0,0 +1,108 @@ + + + diff --git a/frontend/components/detailes/Info.vue b/frontend/components/detailes/Info.vue deleted file mode 100644 index ec389e42..00000000 --- a/frontend/components/detailes/Info.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue new file mode 100644 index 00000000..c312305b --- /dev/null +++ b/frontend/components/detailes/InfoPoster.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/frontend/components/detailes/Items/Organizer.vue b/frontend/components/detailes/Items/Organizer.vue index c61b5c1c..6aa99978 100644 --- a/frontend/components/detailes/Items/Organizer.vue +++ b/frontend/components/detailes/Items/Organizer.vue @@ -26,6 +26,7 @@ defineProps({ @media (min-width: 768px) { margin-bottom: 0; + margin-top: 10px; } } diff --git a/frontend/components/detailes/Items/Title.vue b/frontend/components/detailes/Items/Title.vue index f73a0836..9246dcd3 100644 --- a/frontend/components/detailes/Items/Title.vue +++ b/frontend/components/detailes/Items/Title.vue @@ -38,16 +38,13 @@ defineProps({ .event-info-title { display: flex; width: 100%; - margin-bottom: 10px; - align-items: start; + align-items: center; + @media (min-width: 768px) { + gap: 16px; + } &__title { word-break: break-all; - - @media (min-width: 768px) { - margin-bottom: 12px; - margin-right: 16px; - } } } diff --git a/frontend/i18n/locales/en-GB/event.ts b/frontend/i18n/locales/en-GB/event.ts index 87ab6259..847390f2 100644 --- a/frontend/i18n/locales/en-GB/event.ts +++ b/frontend/i18n/locales/en-GB/event.ts @@ -4,6 +4,13 @@ export default { event: 'Event image' }, description_title: 'Event description', + poster: { + create_title: 'You can also create your own event and gather people around it.', + click_button: 'Just click on the button:', + button: 'in your personal account', + button_plus: 'on the main page' + }, + price: { free: 'Free', unknown: 'Price not specified', diff --git a/frontend/i18n/locales/en-GB/global.ts b/frontend/i18n/locales/en-GB/global.ts index 2463caa6..c6503906 100644 --- a/frontend/i18n/locales/en-GB/global.ts +++ b/frontend/i18n/locales/en-GB/global.ts @@ -28,7 +28,8 @@ export default { save: 'Save', search: 'Search', share: 'Share', - yes: 'Yes' + yes: 'Yes', + more: 'More' }, notFound: 'Nothing found' }; diff --git a/frontend/i18n/locales/ru-RU/event.ts b/frontend/i18n/locales/ru-RU/event.ts index b3be10f5..013dc57f 100644 --- a/frontend/i18n/locales/ru-RU/event.ts +++ b/frontend/i18n/locales/ru-RU/event.ts @@ -5,6 +5,13 @@ export default { event: 'Изображение мероприятия' }, description_title: 'Описание мероприятия', + poster: { + create_title: 'А еще ты можешь сам создать мероприятие и объединить людей вокруг него.', + click_button: 'Просто нажмите на кнопку:', + button: 'в личном кабинете', + button_plus: 'на главной' + }, + price: { free: 'Бесплатно', unknown: 'Цена не указана', diff --git a/frontend/i18n/locales/ru-RU/global.ts b/frontend/i18n/locales/ru-RU/global.ts index ec14852c..8d5ff675 100644 --- a/frontend/i18n/locales/ru-RU/global.ts +++ b/frontend/i18n/locales/ru-RU/global.ts @@ -28,7 +28,8 @@ export default { save: 'Сохранить', search: 'Поиск', share: 'Поделиться', - yes: 'Да' + yes: 'Да', + more: 'Подробнее' }, notFound: 'Ничего не найдено' }; diff --git a/frontend/pages/event/[id].vue b/frontend/pages/event/[id].vue index 7b192218..5c36fc5e 100644 --- a/frontend/pages/event/[id].vue +++ b/frontend/pages/event/[id].vue @@ -17,7 +17,7 @@ const route = useRoute(); const localePath = useLocalePath(); const { t } = useI18n(); const id = getFirstParam(route.params.id); - +const mobile = inject('mobile'); const posterEvent = ref(null); const toggleFavourites = async () => { @@ -89,6 +89,7 @@ const deleteCard = async () => { }; const onEditButtonClick = async () => { + console.log('EDIT', id); await navigateTo(localePath({ path: `${RoutePathEnum.EVENT_EDIT}${id}` })); }; @@ -129,23 +130,35 @@ const onEditButtonClick = async () => { :is-in-favourites="isInFavourites" @toggle-favourites="toggleFavourites" /> -
- - - -
+ + + + + + + @@ -170,31 +183,17 @@ const onEditButtonClick = async () => { min-height: unset; height: unset; } -} -.event-info { - flex: 1; - display: flex; - flex-direction: column; - width: 100%; - min-height: 250px; - padding-inline: 0; - - @media (min-width: 768px) { - flex-direction: row; - - justify-content: space-between; - } - - &__actions { - display: flex; - width: 100%; - padding-top: 15px; + &__button-contact { + margin-top: auto; @media (min-width: 768px) { - width: 34%; - justify-content: flex-end; - padding-top: 50px; + margin-top: 0; + width: 272px; + } + + @media (min-width: 1440px) { + width: 351px; } } } diff --git a/frontend/public/img/event/background.svg b/frontend/public/img/event/background.svg new file mode 100644 index 00000000..79bde743 --- /dev/null +++ b/frontend/public/img/event/background.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +