diff --git a/src/api/routes/services/controller.ts b/src/api/routes/services/controller.ts index bf6b93d..d4b4548 100644 --- a/src/api/routes/services/controller.ts +++ b/src/api/routes/services/controller.ts @@ -309,13 +309,13 @@ const showProgramsItems: ServiceItemType[] = [ image: { alt: 'Бумажная дискотека', height: 241, - mobileHeight: 160, + mobileHeight: 205, mobilePosition: { left: -10, top: -24, }, mobileSrc: diskoMobileImage, - mobileWidth: 330, + mobileWidth: 350, position: { left: -20, top: -24, diff --git a/src/api/routes/statistic/controller.ts b/src/api/routes/statistic/controller.ts index 2653833..09be2e8 100644 --- a/src/api/routes/statistic/controller.ts +++ b/src/api/routes/statistic/controller.ts @@ -204,12 +204,13 @@ const birthdayItems: StatisticsItem[] = [ const homeItems: StatisticsItem[] = [ { + mobileText: 'Ежегодно нас выбирают и к нам\\n возвращаются тысячи клиентов,\\n потому что:', size: { sm: 'auto', width: 'auto', xs: 12, }, - text: 'Ежегодно нас выбирают и к нам возвращаются тысячи клиентов, потому что:', + text: 'Ежегодно нас выбирают\\n и к нам возвращаются\\n тысячи клиентов, потому что:', title: 'Доверьтесь лидеру\\n в сфере развлечений', }, { @@ -224,8 +225,8 @@ const homeItems: StatisticsItem[] = [ mobileSrc: PinataMobileImg, mobileWidth: 128, position: { - right: 0, - top: -14, + right: 1, + top: -12, }, src: PinataDesktopImg, width: 123, @@ -251,7 +252,7 @@ const homeItems: StatisticsItem[] = [ mobileWidth: 112, position: { right: 28, - top: 11, + top: 14, }, src: StarDesktopImg, width: 66, @@ -301,7 +302,7 @@ const homeItems: StatisticsItem[] = [ }, mobileWidth: 131, position: { - right: 20, + right: 16, top: -5, }, src: CupMobileImg, diff --git a/src/api/routes/text/controller.ts b/src/api/routes/text/controller.ts index c7a800c..9c2fd37 100644 --- a/src/api/routes/text/controller.ts +++ b/src/api/routes/text/controller.ts @@ -3,67 +3,100 @@ import { v4 as uuid } from 'uuid'; import { PAGE_LINK, TextSection } from '../../../constants'; -const birthdayTitleText = { +type TitleText = { + age?: { + styles?: object; + text: string; + }; + description?: string; + id?: string; + labels?: { + items: { + mark?: true; + markMobile?: true; + text: string; + }[]; + styles?: object; + }; + mobileDescription?: string; + mobileTitle?: string; + partySize?: { + max: number; + min: number; + styles?: object; + }; + subtitle?: string; + time?: { + styles?: object; + text: string; + }; + title: string; +}; + +const birthdayTitleText: TitleText = { description: 'Организуем незабываемый праздник в новом формате: выгодные комбо, тематические программы, ' + 'творческие мастер-классы и многое другое ждёт Вас \\n в нашем мире развлечений', title: 'День Рождения', }; -const graduationTitleText = { +const graduationTitleText: TitleText = { description: 'Организуем незабываемый праздник в новом формате: выгодные комбо, индивидуальные дипломы, ' + 'творческие мастер-классы и многое другое ждёт вас в нашем мире развлечений', title: 'Выпускной', }; -const outdoorsTitleText = { +const outdoorsTitleText: TitleText = { description: 'Организуем незабываемый праздник в новом формате: выгодные комбо, ' + 'тематические программы, творческие мастер-классы и многое другое ждёт вас в нашем мире развлечений', title: 'Выездной праздник', }; -const questsTitleText = { +const questsTitleText: TitleText = { description: 'Выбираете квест для ребенка? Может, для компании своих друзей/коллег? ' + 'Или просто хотите отдохнуть всей семьей?\\n\\n ' - + 'У нас есть решения под любые цели и для любых возрастов!\n', + + 'У нас есть решения под любые цели и для любых возрастов!\\n', title: 'Квесты', }; -const faqTitleText = { +const faqTitleText: TitleText = { description: 'Раздел с подробной информацией по каждой услуге. Чтобы посмотреть ответы на вопросы, выберите интересующую Вас категорию', title: 'Часто задаваемые вопросы', }; -const contactsTitleText = { +const contactsTitleText: TitleText = { description: 'Раздел с подробной информацией о способах связи. Если у Вас остались вопросы, оставьте заявку на обратный звонок', title: 'Контактная информация', }; -const aboutTitleText = { +const aboutTitleText: TitleText = { description: 'История открытия и развития Аркидс Парка\\n и то, что мы делаем для Вас сегодня', title: 'Информация о парке', }; -const masterClassesTitleText = { +const masterClassesTitleText: TitleText = { description: 'Сделайте праздник ярче, добавив фирменный мастер-класс\\n ' + 'к любой комбо-программе из категорий «День Рождения»,\\n «Выпускной», «Выездной праздник»', title: 'Мастер-классы', }; -const showProgramsTitleText = { +const showProgramsTitleText: TitleText = { description: 'Сделайте праздник ярче, добавив фирменное шоу\\n' + ' к любой комбо-программе из категорий «День Рождения», «Выпускной», «Выездной праздник»', - title: 'ШОУ-ПРОГРАММЫ\\n И ДИСКОТЕКИ', + title: 'ШОУ-ПРОГРАММЫ\n И ДИСКОТЕКИ', }; -const priceTitleText = { - description: 'Чтобы ознакомиться со стоимостью услуг,\n' +const priceTitleText: TitleText = { + description: 'Чтобы ознакомиться со стоимостью услуг,\\n' + 'выберите интересующую Вас категорию', + mobileDescription: 'Чтобы ознакомиться\\n' + + 'со стоимостью услуг, выберите\\n' + + 'интересующую Вас категорию', title: 'Ценовая политика ', }; -const maintenanceTitleText = { - description: 'Едете с детьми на свадьбу, корпоратив или сами организуете\n' - + 'выездное мероприятие? Мы знаем, как помочь Вам отдохнуть\n' +const maintenanceTitleText: TitleText = { + description: 'Едете с детьми на свадьбу, корпоратив или сами организуете\\n' + + 'выездное мероприятие? Мы знаем, как помочь Вам отдохнуть\\n' + 'и организовать детский досуг!', subtitle: 'на мероприятиях', title: 'СОПРОВОЖДЕНИЕ ДЕТЕЙ', @@ -99,7 +132,7 @@ const maintenanceSteps = [ }, ]; -const themedCombosTitleText = { +const themedCombosTitleText: TitleText = { age: { text: '2-15', }, @@ -178,8 +211,8 @@ const contactsInfo = { }; const parkInfo = { - text: '- интерактивный парк нового поколения,\n' - + ' объединяющий популярные услуги\n' + text: '- интерактивный парк нового поколения,\\n' + + ' объединяющий популярные услуги\\n' + ' и развлечения для детей и взрослых', title: 'Аркидс Парк', }; diff --git a/static/images/master-classes/desktop/cakes.png b/static/images/master-classes/desktop/cakes.png index dab21df..7536c6a 100644 Binary files a/static/images/master-classes/desktop/cakes.png and b/static/images/master-classes/desktop/cakes.png differ diff --git a/static/images/master-classes/desktop/cup.png b/static/images/master-classes/desktop/cup.png index 4c271c2..04ef236 100644 Binary files a/static/images/master-classes/desktop/cup.png and b/static/images/master-classes/desktop/cup.png differ diff --git a/static/images/master-classes/desktop/cut.png b/static/images/master-classes/desktop/cut.png index 41e0468..8330c59 100644 Binary files a/static/images/master-classes/desktop/cut.png and b/static/images/master-classes/desktop/cut.png differ diff --git a/static/images/master-classes/desktop/fish.png b/static/images/master-classes/desktop/fish.png index 9fc8782..3308afd 100644 Binary files a/static/images/master-classes/desktop/fish.png and b/static/images/master-classes/desktop/fish.png differ diff --git a/static/images/master-classes/desktop/paint.png b/static/images/master-classes/desktop/paint.png index c941a75..a1f8c3d 100644 Binary files a/static/images/master-classes/desktop/paint.png and b/static/images/master-classes/desktop/paint.png differ diff --git a/static/images/master-classes/desktop/shop.png b/static/images/master-classes/desktop/shop.png index 8f09bea..bb9d9bb 100644 Binary files a/static/images/master-classes/desktop/shop.png and b/static/images/master-classes/desktop/shop.png differ diff --git a/static/images/master-classes/mobile/cakes.png b/static/images/master-classes/mobile/cakes.png index 15e7a17..fa9e819 100644 Binary files a/static/images/master-classes/mobile/cakes.png and b/static/images/master-classes/mobile/cakes.png differ diff --git a/static/images/master-classes/mobile/cup.png b/static/images/master-classes/mobile/cup.png index a148367..58585fa 100644 Binary files a/static/images/master-classes/mobile/cup.png and b/static/images/master-classes/mobile/cup.png differ diff --git a/static/images/master-classes/mobile/cut.png b/static/images/master-classes/mobile/cut.png index 743eaa1..efb55dd 100644 Binary files a/static/images/master-classes/mobile/cut.png and b/static/images/master-classes/mobile/cut.png differ diff --git a/static/images/master-classes/mobile/fish.png b/static/images/master-classes/mobile/fish.png index 8088cf6..b582d2c 100644 Binary files a/static/images/master-classes/mobile/fish.png and b/static/images/master-classes/mobile/fish.png differ diff --git a/static/images/master-classes/mobile/paint.png b/static/images/master-classes/mobile/paint.png index bec5fae..61cdf0d 100644 Binary files a/static/images/master-classes/mobile/paint.png and b/static/images/master-classes/mobile/paint.png differ diff --git a/static/images/master-classes/mobile/shop.png b/static/images/master-classes/mobile/shop.png index d583c35..95e981a 100644 Binary files a/static/images/master-classes/mobile/shop.png and b/static/images/master-classes/mobile/shop.png differ diff --git a/static/images/rate/base.png b/static/images/rate/base.png index c4f0917..bc9fb54 100644 Binary files a/static/images/rate/base.png and b/static/images/rate/base.png differ diff --git a/static/images/rate/premium.png b/static/images/rate/premium.png index ff7725c..558c881 100644 Binary files a/static/images/rate/premium.png and b/static/images/rate/premium.png differ diff --git a/static/images/rate/standart.png b/static/images/rate/standart.png index 22a8c8f..e451ef1 100644 Binary files a/static/images/rate/standart.png and b/static/images/rate/standart.png differ diff --git a/static/images/rate/vip.png b/static/images/rate/vip.png index 10824ec..fea82ea 100644 Binary files a/static/images/rate/vip.png and b/static/images/rate/vip.png differ diff --git a/static/images/show-programs/desktop/bubble.png b/static/images/show-programs/desktop/bubble.png index 316870e..0b38be8 100644 Binary files a/static/images/show-programs/desktop/bubble.png and b/static/images/show-programs/desktop/bubble.png differ diff --git a/static/images/show-programs/desktop/chemistry.png b/static/images/show-programs/desktop/chemistry.png index e1c8e1a..2dd5eef 100644 Binary files a/static/images/show-programs/desktop/chemistry.png and b/static/images/show-programs/desktop/chemistry.png differ diff --git a/static/images/show-programs/desktop/disko.png b/static/images/show-programs/desktop/disko.png index 0b9de2f..f47d6a5 100644 Binary files a/static/images/show-programs/desktop/disko.png and b/static/images/show-programs/desktop/disko.png differ diff --git a/static/images/show-programs/desktop/eger.png b/static/images/show-programs/desktop/eger.png index 5d7dbef..0678004 100644 Binary files a/static/images/show-programs/desktop/eger.png and b/static/images/show-programs/desktop/eger.png differ diff --git a/static/images/show-programs/desktop/magic.png b/static/images/show-programs/desktop/magic.png index e40f8fb..aed0804 100644 Binary files a/static/images/show-programs/desktop/magic.png and b/static/images/show-programs/desktop/magic.png differ diff --git a/static/images/show-programs/desktop/neon.png b/static/images/show-programs/desktop/neon.png index 4ee909c..8740e47 100644 Binary files a/static/images/show-programs/desktop/neon.png and b/static/images/show-programs/desktop/neon.png differ diff --git a/static/images/show-programs/mobile/bubble.png b/static/images/show-programs/mobile/bubble.png index 690cd3f..7f59c79 100644 Binary files a/static/images/show-programs/mobile/bubble.png and b/static/images/show-programs/mobile/bubble.png differ diff --git a/static/images/show-programs/mobile/chemistry.png b/static/images/show-programs/mobile/chemistry.png index 97edd49..b91fdf3 100644 Binary files a/static/images/show-programs/mobile/chemistry.png and b/static/images/show-programs/mobile/chemistry.png differ diff --git a/static/images/show-programs/mobile/disko.png b/static/images/show-programs/mobile/disko.png index 4ef9ea3..13ec4a3 100644 Binary files a/static/images/show-programs/mobile/disko.png and b/static/images/show-programs/mobile/disko.png differ diff --git a/static/images/show-programs/mobile/eger.png b/static/images/show-programs/mobile/eger.png index 7eb3dfd..5a28f5e 100644 Binary files a/static/images/show-programs/mobile/eger.png and b/static/images/show-programs/mobile/eger.png differ diff --git a/static/images/show-programs/mobile/magic.png b/static/images/show-programs/mobile/magic.png index d75196b..e5c9392 100644 Binary files a/static/images/show-programs/mobile/magic.png and b/static/images/show-programs/mobile/magic.png differ diff --git a/static/images/show-programs/mobile/neon.png b/static/images/show-programs/mobile/neon.png index 9de2be7..673eb28 100644 Binary files a/static/images/show-programs/mobile/neon.png and b/static/images/show-programs/mobile/neon.png differ diff --git a/static/images/stories/birthday/faq.png b/static/images/stories/birthday/faq.png index 3805094..1675696 100644 Binary files a/static/images/stories/birthday/faq.png and b/static/images/stories/birthday/faq.png differ diff --git a/static/images/stories/birthday/faq_mobile.png b/static/images/stories/birthday/faq_mobile.png index f95d1ce..46a410a 100644 Binary files a/static/images/stories/birthday/faq_mobile.png and b/static/images/stories/birthday/faq_mobile.png differ diff --git a/static/images/stories/birthday/feedback.png b/static/images/stories/birthday/feedback.png index 9b337da..8820ad2 100644 Binary files a/static/images/stories/birthday/feedback.png and b/static/images/stories/birthday/feedback.png differ diff --git a/static/images/stories/birthday/feedback_mobile.png b/static/images/stories/birthday/feedback_mobile.png index e2f1ef6..04fea98 100644 Binary files a/static/images/stories/birthday/feedback_mobile.png and b/static/images/stories/birthday/feedback_mobile.png differ diff --git a/static/images/stories/birthday/photo.png b/static/images/stories/birthday/photo.png index b48f86f..8919d27 100644 Binary files a/static/images/stories/birthday/photo.png and b/static/images/stories/birthday/photo.png differ diff --git a/static/images/stories/birthday/photo_mobile.png b/static/images/stories/birthday/photo_mobile.png index 50404d6..4120f36 100644 Binary files a/static/images/stories/birthday/photo_mobile.png and b/static/images/stories/birthday/photo_mobile.png differ diff --git a/static/images/title/price/desktop.png b/static/images/title/price/desktop.png index 1bb2fcc..5e7b274 100644 Binary files a/static/images/title/price/desktop.png and b/static/images/title/price/desktop.png differ diff --git a/static/images/title/price/mobile.png b/static/images/title/price/mobile.png index c3aa7db..323426d 100644 Binary files a/static/images/title/price/mobile.png and b/static/images/title/price/mobile.png differ