From 4d690ebe668efe134e0e442076df3077aa77c06a Mon Sep 17 00:00:00 2001 From: Nikita S Date: Tue, 15 Oct 2024 19:05:29 +0500 Subject: [PATCH 01/23] =?UTF-8?q?=D0=9A=D0=B0=D1=80=D1=82=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/assets/less/global.less | 2 +- frontend/components/common/Button.vue | 1 + frontend/components/common/Icon.vue | 1 + frontend/components/detailes/Info.vue | 142 ++++++++++++++++++----- frontend/i18n/locales/ru-RU/event.ts | 4 + frontend/i18n/locales/ru-RU/global.ts | 3 +- frontend/pages/event/[id].vue | 2 + frontend/public/img/event/background.svg | 62 ++++++++++ 8 files changed, 187 insertions(+), 30 deletions(-) create mode 100644 frontend/public/img/event/background.svg diff --git a/frontend/assets/less/global.less b/frontend/assets/less/global.less index 3500ff0c3..438572af6 100644 --- a/frontend/assets/less/global.less +++ b/frontend/assets/less/global.less @@ -133,7 +133,7 @@ h6 { } .button { - font-size: var(--font-size-M); + font-size: var(--font-size-XS); line-height: 1.6; } .button14 { diff --git a/frontend/components/common/Button.vue b/frontend/components/common/Button.vue index 20cef21b8..e4f348e85 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/common/Icon.vue b/frontend/components/common/Icon.vue index ae602f90b..f6d61321d 100644 --- a/frontend/components/common/Icon.vue +++ b/frontend/components/common/Icon.vue @@ -4,6 +4,7 @@ export type IconName = | 'afisha-logo-dark' | 'arrow-right' | 'back' + | 'background' | 'button-plus' | 'calendar' | 'check' diff --git a/frontend/components/detailes/Info.vue b/frontend/components/detailes/Info.vue index 7a0e35dba..ec349574d 100644 --- a/frontend/components/detailes/Info.vue +++ b/frontend/components/detailes/Info.vue @@ -52,38 +52,124 @@ defineProps({ has-link-to-g-maps size="big" /> -

- {{ $t('event.description_title') }} -

-

- {{ posterEvent.description }} -

-
- +
+
+

+ {{ $t('event.description_title') }} +

+

+ {{ posterEvent.description }} +

+
+ +
+ +
+
{{ $t('event.create_title') }}
+

{{ $t('event.click_button') }}

+ +
+
{{ $t('global.button.create_event') }}
+

{{ $t('event.button') }}

+
+ +
+
+

{{ $t('event.button_circle') }}

+ + +
+
+
From 303bcd7ef276a0b94cde0b87a40b9105127886d5 Mon Sep 17 00:00:00 2001 From: Nikita S Date: Thu, 17 Oct 2024 22:16:11 +0500 Subject: [PATCH 13/23] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D1=8D=D0=BA=D0=B3=D1=80=D0=B0=D1=83=D0=BD=D0=B4?= =?UTF-8?q?,=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BD=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/detailes/InfoPoster.vue | 94 +++++++++--------- frontend/public/img/event/background.svg | 102 +++++++++++--------- 2 files changed, 106 insertions(+), 90 deletions(-) diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue index 729fb6a80..0614f4206 100644 --- a/frontend/components/detailes/InfoPoster.vue +++ b/frontend/components/detailes/InfoPoster.vue @@ -2,32 +2,18 @@ @@ -38,7 +24,7 @@ width: 350px; height: 225px; margin-top: 24px; - padding: 20px; + padding: 38px 12px 17px 12px; background-image: url(/img/event/background.svg); background-repeat: no-repeat; background-size: cover; @@ -49,44 +35,58 @@ @media (min-width: 1440px) { width: 400px; + height: 280px; } &__title { text-align: center; - margin: 18px 0; - } - &__text { - font-size: 12px; + font-size: 14px; font-weight: bold; @media (min-width: 1440px) { font-size: 16px; } } + &__text { + margin-top: 19px; + margin-bottom: 21px; + @media (min-width: 768px) { + margin-bottom: 13px; + } + @media (min-width: 1440px) { + margin-bottom: 26px; + } + } + + &__text-btn { + margin-left: 140px; + //margin-bottom: 18px; когда вставим кнопку "подробнее" + margin-bottom: 27px; + @media (min-width: 1440px) { + margin-left: 170px; + margin-bottom: 30px; + } + } - &__button-info { - margin: 10px 0; + &__plus { display: flex; align-items: center; - font-size: 12px; } - &__button { - margin-right: 14px; - border-radius: 8px; - line-height: 18px; - padding: 4px 10px; - color: var(--color-white); - background-color: var(--color-accent-green-main); - border: 1px solid var(--color-accent-green-main); - cursor: default; + + &__text-plus { + margin-left: 50px; + margin-right: 91px; + @media (min-width: 1440px) { + margin-left: 60px; + } } - &__button-plus { - width: 38px; - height: 38px; - cursor: default; - background-color: var(--color-accent-green-main); - border: 1px solid var(--color-accent-green-main); - margin-right: 13px; + .font-size { + font-size: 12px; + font-weight: bold; + + @media (min-width: 1440px) { + font-size: 16px; + } } } diff --git a/frontend/public/img/event/background.svg b/frontend/public/img/event/background.svg index 742b32655..dc447e93c 100644 --- a/frontend/public/img/event/background.svg +++ b/frontend/public/img/event/background.svg @@ -1,62 +1,78 @@ - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + - + - + - - + + From 96e51e8995f44274d9385c40127a80097abdb145 Mon Sep 17 00:00:00 2001 From: Nikita S Date: Mon, 21 Oct 2024 21:11:08 +0500 Subject: [PATCH 14/23] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/i18n/locales/en-GB/event.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/i18n/locales/en-GB/event.ts b/frontend/i18n/locales/en-GB/event.ts index cf0148bd6..e392fef21 100644 --- a/frontend/i18n/locales/en-GB/event.ts +++ b/frontend/i18n/locales/en-GB/event.ts @@ -6,8 +6,8 @@ export default { description_title: 'Event description', create_title: 'And you can also create an event yourself and rally people around it.', click_button: 'Just click on the button:', - button: 'in my personal account', - button_plus: 'on the main', + button: 'in your profile', + button_plus: 'on the main page', price: { free: 'Free', unknown: 'Price not specified', From aa0177ab27729efd5aadf1d3a45a544eba1e0f88 Mon Sep 17 00:00:00 2001 From: Nikita S Date: Mon, 21 Oct 2024 21:44:00 +0500 Subject: [PATCH 15/23] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=20font-size=20=D0=B8=20=D1=81=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20position?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/detailes/InfoPoster.vue | 46 +++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue index 0614f4206..cefb70751 100644 --- a/frontend/components/detailes/InfoPoster.vue +++ b/frontend/components/detailes/InfoPoster.vue @@ -3,11 +3,11 @@

{{ $t('event.create_title') }}

-

{{ $t('event.click_button') }}

-

{{ $t('event.button') }}

+

{{ $t('event.click_button') }}

+

{{ $t('event.button') }}

-

{{ $t('event.button_plus') }}

+

{{ $t('event.button_plus') }}

+

{{ $t('event.poster.button_plus') }}

+
diff --git a/frontend/i18n/locales/en-GB/event.ts b/frontend/i18n/locales/en-GB/event.ts index a9f838b1e..847390f27 100644 --- a/frontend/i18n/locales/en-GB/event.ts +++ b/frontend/i18n/locales/en-GB/event.ts @@ -5,9 +5,9 @@ export default { }, description_title: 'Event description', poster: { - create_title: 'And you can also create an event yourself and rally people around it.', + create_title: 'You can also create your own event and gather people around it.', click_button: 'Just click on the button:', - button: 'in your profile', + button: 'in your personal account', button_plus: 'on the main page' }, diff --git a/frontend/i18n/locales/en-GB/global.ts b/frontend/i18n/locales/en-GB/global.ts index 2463caa63..c65039060 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 9e169f453..013dc57ff 100644 --- a/frontend/i18n/locales/ru-RU/event.ts +++ b/frontend/i18n/locales/ru-RU/event.ts @@ -5,9 +5,8 @@ export default { event: 'Изображение мероприятия' }, description_title: 'Описание мероприятия', - poster: { - create_title: 'А еще ты можешь сам создать мероприятие и объеденить людей вокруг него.', + create_title: 'А еще ты можешь сам создать мероприятие и объединить людей вокруг него.', click_button: 'Просто нажмите на кнопку:', button: 'в личном кабинете', button_plus: 'на главной' From a2e35ea57f71ff47d2a4a5c214e465d760ca4e1c Mon Sep 17 00:00:00 2001 From: Nikita S Date: Tue, 22 Oct 2024 22:15:23 +0500 Subject: [PATCH 19/23] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=81=D1=82=D0=B8=D0=BB=D1=8F=D0=BC=20=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/detailes/InfoPoster.vue | 54 ++++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue index 7aa39eec8..a96f1bae5 100644 --- a/frontend/components/detailes/InfoPoster.vue +++ b/frontend/components/detailes/InfoPoster.vue @@ -2,7 +2,7 @@ @@ -39,7 +36,7 @@ width: 350px; height: 225px; margin-top: 24px; - padding: 38px 15px 17px 15px; + padding: 38px 12px 10px 12px; background-image: url(/img/event/background.svg); background-repeat: no-repeat; background-size: cover; @@ -50,10 +47,11 @@ @media (min-width: 1440px) { width: 400px; - height: 280px; + height: 250px; } &__title { text-align: center; + margin-bottom: 18px; font-size: 1.4rem; font-weight: bold; @@ -62,8 +60,6 @@ } } &__text { - margin-top: 19px; - margin-bottom: 21px; font-size: 1.2rem; font-weight: bold; @media (min-width: 768px) { @@ -83,28 +79,38 @@ font-size: 1.2rem; font-weight: bold; @media (min-width: 1440px) { - left: 174px; - font-size: 1.6rem; } } - &__plus { + &__button-info { + margin-top: 16px; display: flex; align-items: center; + font-size: 1.2rem; + } + &__button { + margin-right: 14px; + border-radius: 8px; + line-height: 18px; + padding: 4px 10px; + color: var(--color-white); + background-color: var(--color-accent-green-main); + border: 1px solid var(--color-accent-green-main); + cursor: default; } - &__text-plus { - position: absolute; - bottom: 29px; - left: 71px; - font-size: 1.2rem; - font-weight: bold; - @media (min-width: 1440px) { - left: 72px; - bottom: 55px; - font-size: 1.6rem; - } + &__button-plus { + width: 38px; + height: 38px; + cursor: default; + background-color: var(--color-accent-green-main); + border: 1px solid var(--color-accent-green-main); + margin-right: 13px; + } + + &__more { + margin-left: 91px; } } From 3dd44fe2567af6350aaf7b375dfd31ef5b0447db Mon Sep 17 00:00:00 2001 From: Nikita S Date: Tue, 22 Oct 2024 23:16:50 +0500 Subject: [PATCH 20/23] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D1=83=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/detailes/InfoPoster.vue | 28 ++---- frontend/public/img/event/background.svg | 102 +++++++++----------- 2 files changed, 49 insertions(+), 81 deletions(-) diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue index a96f1bae5..c18b420b5 100644 --- a/frontend/components/detailes/InfoPoster.vue +++ b/frontend/components/detailes/InfoPoster.vue @@ -19,11 +19,11 @@ />

{{ $t('event.poster.button_plus') }}

@@ -31,7 +31,6 @@ diff --git a/frontend/components/detailes/EventSummary.vue b/frontend/components/detailes/EventSummary.vue new file mode 100644 index 000000000..944e033cb --- /dev/null +++ b/frontend/components/detailes/EventSummary.vue @@ -0,0 +1,109 @@ + + + diff --git a/frontend/components/detailes/Info.vue b/frontend/components/detailes/Info.vue deleted file mode 100644 index 9c95d4945..000000000 --- a/frontend/components/detailes/Info.vue +++ /dev/null @@ -1,250 +0,0 @@ - - - - - diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue index c18b420b5..7c868d05f 100644 --- a/frontend/components/detailes/InfoPoster.vue +++ b/frontend/components/detailes/InfoPoster.vue @@ -5,49 +5,50 @@

{{ $t('event.poster.create_title') }}

{{ $t('event.poster.click_button') }}

-
-
{{ $t('global.button.create_event') }}
-

{{ $t('event.poster.button') }}

+
+ {{ $t('global.button.create_event') }} + {{ $t('event.poster.button') }}
-
- -

{{ $t('event.poster.button_plus') }}

+
+ + + + {{ $t('event.poster.button_plus') }} + + -->
diff --git a/frontend/components/detailes/Items/Title.vue b/frontend/components/detailes/Items/Title.vue index f73a08365..9246dcd3c 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/pages/event/[id].vue b/frontend/pages/event/[id].vue index 7e71054e5..5c36fc5e3 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,29 +130,39 @@ const onEditButtonClick = async () => { :is-in-favourites="isInFavourites" @toggle-favourites="toggleFavourites" /> -
- - - -
- + + + + + + + From a61f549190d8e5b12c46ac30d0454f32324410f5 Mon Sep 17 00:00:00 2001 From: Sinamon-maker Date: Tue, 29 Oct 2024 10:27:48 +0100 Subject: [PATCH 23/23] poster chenged --- frontend/components/detailes/InfoPoster.vue | 122 ++++++++++++++------ 1 file changed, 88 insertions(+), 34 deletions(-) diff --git a/frontend/components/detailes/InfoPoster.vue b/frontend/components/detailes/InfoPoster.vue index 707ae9e09..c312305b1 100644 --- a/frontend/components/detailes/InfoPoster.vue +++ b/frontend/components/detailes/InfoPoster.vue @@ -1,63 +1,94 @@