From a96c0290f9156f939b0938bd4185c3cf709cc506 Mon Sep 17 00:00:00 2001 From: Sinamon-maker Date: Fri, 26 Jul 2024 07:37:43 -0700 Subject: [PATCH 01/66] domain variable changed - added https --- docker-compose.demo.yml | 2 +- docker-compose.prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml index 72c060a6..f3d1b12c 100644 --- a/docker-compose.demo.yml +++ b/docker-compose.demo.yml @@ -24,7 +24,7 @@ services: - VITE_IPREGISTRY_API_KEY=ryy5dlbl3v8y55x4 - VITE_TELEGRAM_AUTH_BOT_NAME - VITE_MODE=production - - VITE_DOMAIN=demo.afisha.peredelano.com + - VITE_DOMAIN=https://demo.afisha.peredelano.com - VITE_GOOGLE_OAUTH_KEY logging: *default-logging restart: always diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 3fa8d466..4c895cae 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -24,7 +24,7 @@ services: - VITE_IPREGISTRY_API_KEY=ryy5dlbl3v8y55x4 - VITE_TELEGRAM_AUTH_BOT_NAME - VITE_MODE=production - - VITE_DOMAIN=afisha.peredelano.com + - VITE_DOMAIN=https://afisha.peredelano.com - VITE_GTAG_ID - VITE_GOOGLE_OAUTH_KEY logging: *default-logging From 1fc26bdc86ac8d9d100ca668a05a34fd326bd556 Mon Sep 17 00:00:00 2001 From: Nikita S Date: Fri, 12 Jul 2024 22:04:39 +0500 Subject: [PATCH 02/66] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=80=D0=B0=D1=81=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B5=D0=BF=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/about/Values.vue | 2 +- frontend/i18n/locales/en-GB/about.ts | 10 +++++----- frontend/i18n/locales/ru-RU/about.ts | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/components/about/Values.vue b/frontend/components/about/Values.vue index 6c951ea4..8fc94742 100644 --- a/frontend/components/about/Values.vue +++ b/frontend/components/about/Values.vue @@ -30,7 +30,7 @@ import { values } from './AboutData'; @media (min-width: 1440px) { width: 1260px; - gap: 170px; + } } diff --git a/frontend/i18n/locales/en-GB/about.ts b/frontend/i18n/locales/en-GB/about.ts index afe3f084..f56c68cd 100644 --- a/frontend/i18n/locales/en-GB/about.ts +++ b/frontend/i18n/locales/en-GB/about.ts @@ -4,11 +4,11 @@ export default { values: { title: 'Values that we are committed to in our work:', - openness: 'Openness: we believe in the power of communication and openness;', - innovation: 'Innovation: constantly looking for ways to make our app better;', - community:'Community: strive to create a space where everyone feels accepted;', - accessibility: 'Accessibility: we make cultural events accessible to everyone;', - quality: 'Quality: equal quality to both large platforms and small initiatives.' + openness: 'Openness: we believe in the power of communication and openness', + innovation: 'Innovation: constantly looking for ways to make our app better', + community:'Community: strive to create a space where everyone feels accepted', + accessibility: 'Accessibility: we make cultural events accessible to everyone', + quality: 'Quality: equal quality to both large platforms and small initiatives' }, github: "Link to the project's GitHub:", diff --git a/frontend/i18n/locales/ru-RU/about.ts b/frontend/i18n/locales/ru-RU/about.ts index 6d75c74c..d5e94341 100644 --- a/frontend/i18n/locales/ru-RU/about.ts +++ b/frontend/i18n/locales/ru-RU/about.ts @@ -4,11 +4,11 @@ export default { values: { title: 'Наши ценности, которых мы придерживаемся в своей работе:', - openness: 'Открытость: мы верим в силу общения и открытости;', - innovation: 'Инновации: постоянно ищем способы сделать наше приложение лучше;', - community:'Сообщество: стремимся создать пространство, где каждый чувствует себя принятым;', - accessibility: 'Доступность: мы делаем культурные события доступными для всех;', - quality: 'Качество: не уступаем в качестве как крупным платформам, так и маленьким инициативам.' + openness: 'Открытость: мы верим в силу общения и открытости', + innovation: 'Инновации: постоянно ищем способы сделать наше приложение лучше', + community:'Сообщество: стремимся создать пространство, где каждый чувствует себя принятым', + accessibility: 'Доступность: мы делаем культурные события доступными для всех', + quality: 'Качество: не уступаем в качестве как крупным платформам, так и маленьким инициативам' }, github: ' Ссылка на GitHub проекта: ', From 37b89fc6afc137bb7dd590b9e2f0da2bafbbb999 Mon Sep 17 00:00:00 2001 From: Nikita S Date: Fri, 12 Jul 2024 22:21:58 +0500 Subject: [PATCH 03/66] =?UTF-8?q?=D0=B2=D1=8B=D1=80=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D1=8F=D0=BB=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pages/about.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pages/about.vue b/frontend/pages/about.vue index 0b4e973b..af28c54d 100644 --- a/frontend/pages/about.vue +++ b/frontend/pages/about.vue @@ -122,7 +122,7 @@ const urlAfisha = 'https://afisha.peredelano.com/'; @media (min-width: 1440px) { font-size: var(--font-size-L); line-height: 30px; - align-self: flex-start; + } } From 3c9b3d2e3381bbf0ac19a1b5a31ce3a41221e9d9 Mon Sep 17 00:00:00 2001 From: toprogramm Date: Thu, 18 Jul 2024 01:18:15 +0600 Subject: [PATCH 04/66] added prototypes of buttons edit and delete --- frontend/pages/user/my-events.vue | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/frontend/pages/user/my-events.vue b/frontend/pages/user/my-events.vue index ef90deda..311e85c6 100644 --- a/frontend/pages/user/my-events.vue +++ b/frontend/pages/user/my-events.vue @@ -11,8 +11,21 @@ const mobile = inject('mobile'); const myEvents = ref([]); +const localePath = useLocalePath(); const { data } = await apiRouter.events.createdEvents.get.useQuery({}); if (data.value) myEvents.value = data.value; + +const deleteCard = async (id) => { + // если запрос проходит, то ничего не приходит, т.е. может придти только error + const { error } = await apiRouter.events.delete.useMutation({ data: { id } }); + if (error.value) return; + + navigateTo(localePath({ path: RoutePathEnum.USER_PAGE })); +}; + +const onEditButtonClick = async (id) => { + await navigateTo(localePath({ path: `${RoutePathEnum.EVENT_EDIT}${id}` })); +}; From 36e7a5c94cb4712a1af5ffd42fbe5b404f11c658 Mon Sep 17 00:00:00 2001 From: toprogramm Date: Mon, 29 Jul 2024 04:46:42 +0600 Subject: [PATCH 10/66] added component for test --- frontend/components/user/EventCard.vue | 3 + frontend/components/user/userButtons.vue | 116 +++++++++++++++++++++++ frontend/pages/user/my-events.vue | 104 +++++--------------- 3 files changed, 141 insertions(+), 82 deletions(-) create mode 100644 frontend/components/user/userButtons.vue diff --git a/frontend/components/user/EventCard.vue b/frontend/components/user/EventCard.vue index cce6ee09..62d10fe5 100644 --- a/frontend/components/user/EventCard.vue +++ b/frontend/components/user/EventCard.vue @@ -98,11 +98,14 @@ const tagArray = computed(() => { class="description__tags" /> + + diff --git a/frontend/pages/user/my-events.vue b/frontend/pages/user/my-events.vue index ad3a2b3a..407277b6 100644 --- a/frontend/pages/user/my-events.vue +++ b/frontend/pages/user/my-events.vue @@ -2,8 +2,8 @@ import { SeoItemTypeEnum } from '~/constants/enums/seo'; import type { EventOnPoster } from '../../../common/types'; import { RoutePathEnum } from '../../constants/enums/route'; - import { ref } from 'vue'; +import UserButtons from '~/components/user/userButtons.vue'; definePageMeta({ layout: 'profile' @@ -25,9 +25,13 @@ const deleteCard = async (id: string) => { myEvents.value = myEvents.value.filter((event: EventOnPoster) => event.id !== id); }; -const onEditButtonClick = async (id) => { +const onEditButtonClick = async (id: string) => { await navigateTo(localePath({ path: `${RoutePathEnum.EVENT_EDIT}${id}` })); }; + +// const addToFavorites = async (id: string) => { +// // Задел для избранного добавьте в UserButtons @favorite="addToFavorites" и перепишите визуал в компоненте UserButtons +// };