From 912e151d169dae28ffc2f04e8ff6666df45a8548 Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Wed, 8 Oct 2025 09:31:26 +0100 Subject: [PATCH 01/11] feat(VCST-4048): add red theme --- client-app/assets/presets/red.json | 148 +++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 client-app/assets/presets/red.json diff --git a/client-app/assets/presets/red.json b/client-app/assets/presets/red.json new file mode 100644 index 0000000000..860db2fe0d --- /dev/null +++ b/client-app/assets/presets/red.json @@ -0,0 +1,148 @@ +{ + "color_primary_50": "#f2e2e2", + "color_primary_100": "#f0d3d4", + "color_primary_200": "#ecafaf", + "color_primary_300": "#ec8a8b", + "color_primary_400": "#ef5759", + "color_primary_500": "#e31e24", + "color_primary_600": "#c12a2d", + "color_primary_700": "#9e292b", + "color_primary_800": "#812728", + "color_primary_900": "#652324", + "color_primary_950": "#552323", + + "color_secondary_50": "#f7f7f7", + "color_secondary_100": "#ebebeb", + "color_secondary_200": "#d1d1d1", + "color_secondary_300": "#bababa", + "color_secondary_400": "#a1a1a1", + "color_secondary_500": "#757575", + "color_secondary_600": "#5e5e5e", + "color_secondary_700": "#474747", + "color_secondary_800": "#2e2e2e", + "color_secondary_900": "#171717", + "color_secondary_950": "#0d0d0d", + + "color_accent_50": "#dbebff", + "color_accent_100": "#b8d7ff", + "color_accent_200": "#6babff", + "color_accent_300": "#2483ff", + "color_accent_400": "#005dd6", + "color_accent_500": "#003d8d", + "color_accent_600": "#003170", + "color_accent_700": "#002657", + "color_accent_800": "#001838", + "color_accent_900": "#000d1f", + "color_accent_950": "#00070f", + + "color_neutral_50": "#fafafa", + "color_neutral_100": "#f5f5f5", + "color_neutral_200": "#e7e7e7", + "color_neutral_300": "#cccccc", + "color_neutral_400": "#a3a3a3", + "color_neutral_500": "#737373", + "color_neutral_600": "#525252", + "color_neutral_700": "#404040", + "color_neutral_800": "#262626", + "color_neutral_900": "#171717", + "color_neutral_950": "#0a0a0a", + + "color_warning_50": "#fff8e5", + "color_warning_100": "#fff1cc", + "color_warning_200": "#ffe599", + "color_warning_300": "#ffd166", + "color_warning_400": "#ffb733", + "color_warning_500": "#fc9e00", + "color_warning_600": "#db8b00", + "color_warning_700": "#b46b0f", + "color_warning_800": "#8c4f00", + "color_warning_900": "#542d00", + "color_warning_950": "#381d00", + + "color_danger_50": "#fff2f1", + "color_danger_100": "#fad6d6", + "color_danger_300": "#f18484", + "color_danger_200": "#f5adad", + "color_danger_400": "#ec5b5b", + "color_danger_500": "#de3131", + "color_danger_600": "#bb1616", + "color_danger_800": "#800f0f", + "color_danger_700": "#a01313", + "color_danger_900": "#400000", + "color_danger_950": "#240000", + + "color_success_50": "#ebf5ef", + "color_success_100": "#c8e9cb", + "color_success_200": "#add6be", + "color_success_300": "#84c29e", + "color_success_400": "#5bae7e", + "color_success_500": "#3e845b", + "color_success_600": "#3b7754", + "color_success_700": "#316144", + "color_success_800": "#1e3c2a", + "color_success_900": "#0b1b12", + "color_success_950": "#091610", + + "color_info_50": "#ecf6fc", + "color_info_100": "#d9eaf2", + "color_info_200": "#b3d4e5", + "color_info_300": "#8dbfd8", + "color_info_400": "#55a3d0", + "color_info_500": "#2b7ea8", + "color_info_600": "#336b8c", + "color_info_700": "#325c76", + "color_info_800": "#2e4c60", + "color_info_900": "#283b4a", + "color_info_950": "#26343f", + + "color_additional_50": "#ffffff", + "color_additional_950": "#000000", + + "color_body_bg": "#f7f7f7", + "color_body_text": "#0a0a0a", + + "color_link": "#003d8d", + "color_link_hover": "#652324", + + "color_shape_icon_bg": "#757575", + "color_shape_icon": "#ffffff", + + "color_empty_list_icon": "#e31e24", + + "color_mobile_menu_bg": "#c12a2d", + "color_mobile_menu_text": "#ffffff", + "color_mobile_menu_link": "#d1d1d1", + "color_mobile_menu_link_active": "#ffffff", + "color_mobile_menu_icon": "#a1a1a1", + "color_mobile_menu_icon_active": "#005dd6", + "color_mobile_menu_navigation": "#005dd6", + "color_mobile_active_control": "#757575", + + "color_mobile_search_bar_bg": "#2e2e2e", + + "color_header_top_bg": "#812728", + "color_header_top_text": "#ffffff", + "color_header_top_link": "#f0d3d4", + "color_header_top_link_hover": "#ffffff", + "color_header_top_link_active": "#ffffff", + + "color_header_bottom_bg": "#2e2e2e", + "color_header_bottom_text": "#ffffff", + "color_header_bottom_link": "#ffffff", + "color_header_bottom_link_hover": "#d1d1d1", + "color_header_bottom_link_active": "#d1d1d1", + + "color_footer_top_bg": "#2e2e2e", + "color_footer_top_text": "#ffffff", + "color_footer_top_link": "#ebebeb", + "color_footer_top_link_hover": "#ffffff", + "color_footer_top_link_active": "#d1d1d1", + + "color_footer_bottom_bg": "#171717", + "color_footer_bottom_text": "#ffffff", + "color_footer_bottom_link": "#ebebeb", + "color_footer_bottom_link_hover": "#ffffff", + "color_footer_bottom_link_active": "#f5f5f5", + + "color_price": "#171717" +} From 25b0adad679fc18b042f5c3a29fa3a0598a62c7b Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Wed, 8 Oct 2025 09:34:05 +0100 Subject: [PATCH 02/11] fix: theme variable name --- client-app/core/types/theme-config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client-app/core/types/theme-config.ts b/client-app/core/types/theme-config.ts index 71d405c6ba..1a535d9277 100644 --- a/client-app/core/types/theme-config.ts +++ b/client-app/core/types/theme-config.ts @@ -116,8 +116,8 @@ export interface IThemeConfigPreset { color_price?: string; - color_hexagon_icon_bg?: string; - color_hexagon_icon?: string; + color_shape_icon_bg?: string; + color_shape_icon?: string; color_header_top_bg?: string; color_header_top_text?: string; From ece425b311480b74b19384b067700af74ea7eeea Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Wed, 8 Oct 2025 09:54:14 +0100 Subject: [PATCH 03/11] fix: use proper variable for company name in header --- client-app/assets/presets/index.ts | 2 ++ .../shared/layout/components/header/_internal/bottom-header.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client-app/assets/presets/index.ts b/client-app/assets/presets/index.ts index 0f0936ed43..f9f416b1d6 100644 --- a/client-app/assets/presets/index.ts +++ b/client-app/assets/presets/index.ts @@ -3,6 +3,7 @@ import coffee from './coffee.json' import defaultPreset from './default.json' import mercury from './mercury.json' import purplePink from './purple-pink.json' +import red from './red.json' import watermelon from './watermelon.json' import type { IThemeConfigPreset } from "@/core/types"; @@ -13,4 +14,5 @@ export const presets: Record = { ['purple-pink']: purplePink, watermelon: watermelon, coffee: coffee, + red: red, } as const; diff --git a/client-app/shared/layout/components/header/_internal/bottom-header.vue b/client-app/shared/layout/components/header/_internal/bottom-header.vue index 2dd45e0aa3..47f1020286 100644 --- a/client-app/shared/layout/components/header/_internal/bottom-header.vue +++ b/client-app/shared/layout/components/header/_internal/bottom-header.vue @@ -12,7 +12,7 @@ From 339688de415ea408cf0f95da6a27212dc43680fd Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Wed, 8 Oct 2025 10:02:26 +0100 Subject: [PATCH 04/11] fix: search input text color --- client-app/shared/layout/components/search-bar/search-bar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/shared/layout/components/search-bar/search-bar.vue b/client-app/shared/layout/components/search-bar/search-bar.vue index 412882e2da..8f74cd5000 100644 --- a/client-app/shared/layout/components/search-bar/search-bar.vue +++ b/client-app/shared/layout/components/search-bar/search-bar.vue @@ -557,7 +557,7 @@ watch( @apply relative flex grow items-stretch; &__input { - @apply w-full; + @apply w-full text-neutral-800; } &__button { From a90ace6f08363ca37c11e3db4ffb29d5e6727c3e Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Wed, 8 Oct 2025 11:18:48 +0100 Subject: [PATCH 05/11] fix: adjustments --- client-app/assets/presets/red.json | 12 +++++++----- client-app/assets/styles/_colors.scss | 1 + client-app/core/types/theme-config.ts | 1 + .../header/_internal/bottom-header-link.vue | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/client-app/assets/presets/red.json b/client-app/assets/presets/red.json index 860db2fe0d..85d68d1215 100644 --- a/client-app/assets/presets/red.json +++ b/client-app/assets/presets/red.json @@ -109,13 +109,13 @@ "color_empty_list_icon": "#e31e24", - "color_mobile_menu_bg": "#c12a2d", + "color_mobile_menu_bg": "#27282b ", "color_mobile_menu_text": "#ffffff", - "color_mobile_menu_link": "#d1d1d1", + "color_mobile_menu_link": "#bee1b2", "color_mobile_menu_link_active": "#ffffff", - "color_mobile_menu_icon": "#a1a1a1", - "color_mobile_menu_icon_active": "#005dd6", - "color_mobile_menu_navigation": "#005dd6", + "color_mobile_menu_icon": "#7fc568", + "color_mobile_menu_icon_active": "#e15695", + "color_mobile_menu_navigation": "#e15695", "color_mobile_active_control": "#757575", "color_mobile_search_bar_bg": "#2e2e2e", @@ -131,6 +131,7 @@ "color_header_bottom_link": "#ffffff", "color_header_bottom_link_hover": "#d1d1d1", "color_header_bottom_link_active": "#d1d1d1", + "color_header_bottom_link_icon": "#ffffff", "color_footer_top_bg": "#2e2e2e", "color_footer_top_text": "#ffffff", @@ -144,5 +145,6 @@ "color_footer_bottom_link_hover": "#ffffff", "color_footer_bottom_link_active": "#f5f5f5", + "color_price": "#171717" } diff --git a/client-app/assets/styles/_colors.scss b/client-app/assets/styles/_colors.scss index 15f3585f27..95e50d016c 100644 --- a/client-app/assets/styles/_colors.scss +++ b/client-app/assets/styles/_colors.scss @@ -24,6 +24,7 @@ --header-bottom-link-color: var(--color-header-bottom-link, var(--color-secondary-700)); --header-bottom-link-hover-color: var(--color-header-bottom-link-hover, var(--color-neutral-900)); --header-bottom-link-active-color: var(--color-header-bottom-link-active, var(--color-neutral-900)); +--header-bottom-link-icon-color: var(--color-header-bottom-link-icon, var(--color-primary-900)); --footer-top-bg-color: var(--color-footer-top-bg, var(--color-secondary-900)); --footer-top-text-color: var(--color-footer-top-text, var(--color-additional-50)); diff --git a/client-app/core/types/theme-config.ts b/client-app/core/types/theme-config.ts index 1a535d9277..7ef568c3f8 100644 --- a/client-app/core/types/theme-config.ts +++ b/client-app/core/types/theme-config.ts @@ -129,6 +129,7 @@ export interface IThemeConfigPreset { color_header_bottom_link?: string; color_header_bottom_link_hover?: string; color_header_bottom_link_active?: string; + color_header_bottom_link_icon?: string; color_footer_top_bg?: string; color_footer_top_text?: string; diff --git a/client-app/shared/layout/components/header/_internal/bottom-header-link.vue b/client-app/shared/layout/components/header/_internal/bottom-header-link.vue index a8f62613f6..e61d6caa88 100644 --- a/client-app/shared/layout/components/header/_internal/bottom-header-link.vue +++ b/client-app/shared/layout/components/header/_internal/bottom-header-link.vue @@ -19,7 +19,7 @@ > - + From a6aa181541b2f1b18478e6314dfaca3c8f8f7dc4 Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Wed, 8 Oct 2025 17:25:40 +0100 Subject: [PATCH 06/11] fix: adjustments --- client-app/assets/presets/red.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client-app/assets/presets/red.json b/client-app/assets/presets/red.json index 85d68d1215..91a4ffca9a 100644 --- a/client-app/assets/presets/red.json +++ b/client-app/assets/presets/red.json @@ -104,7 +104,7 @@ "color_link": "#003d8d", "color_link_hover": "#652324", - "color_shape_icon_bg": "#757575", + "color_shape_icon_bg": "#5baa3f", "color_shape_icon": "#ffffff", "color_empty_list_icon": "#e31e24", @@ -120,18 +120,18 @@ "color_mobile_search_bar_bg": "#2e2e2e", - "color_header_top_bg": "#812728", + "color_header_top_bg": "#000000", "color_header_top_text": "#ffffff", - "color_header_top_link": "#f0d3d4", - "color_header_top_link_hover": "#ffffff", - "color_header_top_link_active": "#ffffff", + "color_header_top_link": "#ffffff", + "color_header_top_link_hover": "#d1d1d1", + "color_header_top_link_active": "#d1d1d1", "color_header_bottom_bg": "#2e2e2e", "color_header_bottom_text": "#ffffff", "color_header_bottom_link": "#ffffff", "color_header_bottom_link_hover": "#d1d1d1", "color_header_bottom_link_active": "#d1d1d1", - "color_header_bottom_link_icon": "#ffffff", + "color_header_bottom_link_icon": "#ff4141", "color_footer_top_bg": "#2e2e2e", "color_footer_top_text": "#ffffff", From 30df8580a77a362b80b99f33a178c08f4490a5d5 Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Thu, 9 Oct 2025 10:54:57 +0100 Subject: [PATCH 07/11] fix: adjustments --- client-app/assets/presets/red.json | 13 ++----------- client-app/assets/styles/_colors.scss | 2 +- client-app/pages/home.vue | 2 +- .../layout/components/search-bar/search-bar.vue | 2 +- .../ui-kit/components/molecules/input/vc-input.vue | 2 +- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/client-app/assets/presets/red.json b/client-app/assets/presets/red.json index 91a4ffca9a..5bde6d4c38 100644 --- a/client-app/assets/presets/red.json +++ b/client-app/assets/presets/red.json @@ -104,20 +104,11 @@ "color_link": "#003d8d", "color_link_hover": "#652324", - "color_shape_icon_bg": "#5baa3f", + "color_shape_icon_bg": "#9e292b", "color_shape_icon": "#ffffff", "color_empty_list_icon": "#e31e24", - "color_mobile_menu_bg": "#27282b ", - "color_mobile_menu_text": "#ffffff", - "color_mobile_menu_link": "#bee1b2", - "color_mobile_menu_link_active": "#ffffff", - "color_mobile_menu_icon": "#7fc568", - "color_mobile_menu_icon_active": "#e15695", - "color_mobile_menu_navigation": "#e15695", - "color_mobile_active_control": "#757575", - "color_mobile_search_bar_bg": "#2e2e2e", "color_header_top_bg": "#000000", @@ -131,7 +122,7 @@ "color_header_bottom_link": "#ffffff", "color_header_bottom_link_hover": "#d1d1d1", "color_header_bottom_link_active": "#d1d1d1", - "color_header_bottom_link_icon": "#ff4141", + "color_header_bottom_link_icon": "#ffffff", "color_footer_top_bg": "#2e2e2e", "color_footer_top_text": "#ffffff", diff --git a/client-app/assets/styles/_colors.scss b/client-app/assets/styles/_colors.scss index 95e50d016c..4fa815eaf6 100644 --- a/client-app/assets/styles/_colors.scss +++ b/client-app/assets/styles/_colors.scss @@ -24,7 +24,7 @@ --header-bottom-link-color: var(--color-header-bottom-link, var(--color-secondary-700)); --header-bottom-link-hover-color: var(--color-header-bottom-link-hover, var(--color-neutral-900)); --header-bottom-link-active-color: var(--color-header-bottom-link-active, var(--color-neutral-900)); ---header-bottom-link-icon-color: var(--color-header-bottom-link-icon, var(--color-primary-900)); +--header-bottom-link-icon-color: var(--color-header-bottom-link-icon, var(--color-primary-500)); --footer-top-bg-color: var(--color-footer-top-bg, var(--color-secondary-900)); --footer-top-text-color: var(--color-footer-top-text, var(--color-additional-50)); diff --git a/client-app/pages/home.vue b/client-app/pages/home.vue index 3f11a788a7..3362563189 100644 --- a/client-app/pages/home.vue +++ b/client-app/pages/home.vue @@ -68,7 +68,7 @@ -
+

{{ $t("pages.home.subscription_block.subscribe_now") }} diff --git a/client-app/shared/layout/components/search-bar/search-bar.vue b/client-app/shared/layout/components/search-bar/search-bar.vue index 8f74cd5000..412882e2da 100644 --- a/client-app/shared/layout/components/search-bar/search-bar.vue +++ b/client-app/shared/layout/components/search-bar/search-bar.vue @@ -557,7 +557,7 @@ watch( @apply relative flex grow items-stretch; &__input { - @apply w-full text-neutral-800; + @apply w-full; } &__button { diff --git a/client-app/ui-kit/components/molecules/input/vc-input.vue b/client-app/ui-kit/components/molecules/input/vc-input.vue index 08c914d5f0..f974731de8 100644 --- a/client-app/ui-kit/components/molecules/input/vc-input.vue +++ b/client-app/ui-kit/components/molecules/input/vc-input.vue @@ -323,7 +323,7 @@ provide("inputContext", { } &__input { - @apply relative m-px px-2 bg-transparent rounded-[3px] leading-none w-full min-w-0 appearance-none font-normal; + @apply relative m-px px-2 bg-transparent rounded-[3px] leading-none w-full min-w-0 appearance-none font-normal text-neutral-800; &::-webkit-search-cancel-button { @apply appearance-none; From 91da88e40328884a4f1aed8dfad70f54217746d3 Mon Sep 17 00:00:00 2001 From: Ivan Kalachikov Date: Thu, 9 Oct 2025 11:15:32 +0100 Subject: [PATCH 08/11] fix: adjustments --- client-app/config/settings_data.json | 2 +- .../push-messages/components/link-push-messages.vue | 2 +- .../push-messages/components/push-messages-mobile.vue | 2 +- .../layout/components/header/_internal/mobile-header.vue | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client-app/config/settings_data.json b/client-app/config/settings_data.json index 94c98e9921..b4ccd5334a 100644 --- a/client-app/config/settings_data.json +++ b/client-app/config/settings_data.json @@ -39,7 +39,7 @@ "logo_image": "logo.svg", "logo_inverted_image": "logo-white.svg", "favicon_image": "/static/icons/favicon-32x32.png", - "homepage_background_image": "main-banner.webp", + "homepage_background_image": "CCTV-banner.webp", "catalog_pagination_mode": "infinite_scroll", "desktop_menu_mode": "horizontal", diff --git a/client-app/modules/push-messages/components/link-push-messages.vue b/client-app/modules/push-messages/components/link-push-messages.vue index 2d4c354d59..6f9fbe6a3d 100644 --- a/client-app/modules/push-messages/components/link-push-messages.vue +++ b/client-app/modules/push-messages/components/link-push-messages.vue @@ -4,7 +4,7 @@ diff --git a/client-app/modules/push-messages/components/push-messages-mobile.vue b/client-app/modules/push-messages/components/push-messages-mobile.vue index fd90c9c1df..6d3ed367d1 100644 --- a/client-app/modules/push-messages/components/push-messages-mobile.vue +++ b/client-app/modules/push-messages/components/push-messages-mobile.vue @@ -3,7 +3,7 @@