From ad7812bdc7ab4441a294d4f3661d104bd482183e Mon Sep 17 00:00:00 2001 From: Max Makaluk <70341920+FussuChalice@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:38:41 +0200 Subject: [PATCH 1/4] feat(assets): link color variables of SVG illustrations --- src/assets/img/general-error-illustration.svg | 27 + src/assets/img/illustration_no_assigments.svg | 18 +- src/assets/img/illustration_no_persons.svg | 176 +- .../img/illustration_no_search_results.svg | 16 +- .../img/permission-error-illustration.svg | 22 +- .../img/unsupported-browser-illustration.svg | 1546 ++++++++--------- .../shared/unsupported_browser/index.tsx | 10 +- src/layouts/root_layout/index.tsx | 4 +- 8 files changed, 922 insertions(+), 897 deletions(-) create mode 100644 src/assets/img/general-error-illustration.svg diff --git a/src/assets/img/general-error-illustration.svg b/src/assets/img/general-error-illustration.svg new file mode 100644 index 0000000000..a45dfe30e5 --- /dev/null +++ b/src/assets/img/general-error-illustration.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/illustration_no_assigments.svg b/src/assets/img/illustration_no_assigments.svg index f0b20885a0..5f45993980 100644 --- a/src/assets/img/illustration_no_assigments.svg +++ b/src/assets/img/illustration_no_assigments.svg @@ -1,10 +1,10 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/assets/img/illustration_no_persons.svg b/src/assets/img/illustration_no_persons.svg index 306bf0457b..5dee750e1c 100644 --- a/src/assets/img/illustration_no_persons.svg +++ b/src/assets/img/illustration_no_persons.svg @@ -1,98 +1,98 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/assets/img/illustration_no_search_results.svg b/src/assets/img/illustration_no_search_results.svg index a4450f9c6b..5f45993980 100644 --- a/src/assets/img/illustration_no_search_results.svg +++ b/src/assets/img/illustration_no_search_results.svg @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + diff --git a/src/assets/img/permission-error-illustration.svg b/src/assets/img/permission-error-illustration.svg index 8282284d99..d9e45c2183 100644 --- a/src/assets/img/permission-error-illustration.svg +++ b/src/assets/img/permission-error-illustration.svg @@ -1,13 +1,13 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/assets/img/unsupported-browser-illustration.svg b/src/assets/img/unsupported-browser-illustration.svg index 217562f830..5ebbd74b0a 100644 --- a/src/assets/img/unsupported-browser-illustration.svg +++ b/src/assets/img/unsupported-browser-illustration.svg @@ -1,792 +1,792 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + + - - + + diff --git a/src/features/app_start/shared/unsupported_browser/index.tsx b/src/features/app_start/shared/unsupported_browser/index.tsx index 80b5d6db19..6fed010515 100644 --- a/src/features/app_start/shared/unsupported_browser/index.tsx +++ b/src/features/app_start/shared/unsupported_browser/index.tsx @@ -6,7 +6,7 @@ import useUnsupportedBrowser from './useUnsupportedBrowser'; import Button from '@components/button'; import TextMarkup from '@components/text_markup'; import Typography from '@components/typography'; -import UnsupportedBrowserImg from '@assets/img/unsupported-browser-illustration.svg?url'; +import UnsupportedBrowserImg from '@assets/img/unsupported-browser-illustration.svg?component'; const UnsupportedBrowser = () => { const { t } = useAppTranslation(); @@ -38,11 +38,9 @@ const UnsupportedBrowser = () => { flexDirection: { mobile: 'column', tablet: 'row' }, }} > - + + + { marginTop: '24px', }} > - {!isSupported && } + {isSupported && } - {isSupported && ( + {!isSupported && ( <> {isOpenContact && } {isOpenAbout && } From 551839f97f0dff28eef954ce351f8c3417f8feb0 Mon Sep 17 00:00:00 2001 From: Max Makaluk <70341920+FussuChalice@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:39:38 +0200 Subject: [PATCH 2/4] feat(assets): link color variables of SVG illustrations --- src/assets/img/general-error-illustration.svg | 27 + src/assets/img/illustration_no_assigments.svg | 18 +- src/assets/img/illustration_no_persons.svg | 176 +- .../img/illustration_no_search_results.svg | 16 +- .../img/permission-error-illustration.svg | 22 +- .../img/unsupported-browser-illustration.svg | 1546 ++++++++--------- .../shared/unsupported_browser/index.tsx | 10 +- src/layouts/root_layout/index.tsx | 4 +- 8 files changed, 922 insertions(+), 897 deletions(-) create mode 100644 src/assets/img/general-error-illustration.svg diff --git a/src/assets/img/general-error-illustration.svg b/src/assets/img/general-error-illustration.svg new file mode 100644 index 0000000000..a45dfe30e5 --- /dev/null +++ b/src/assets/img/general-error-illustration.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/illustration_no_assigments.svg b/src/assets/img/illustration_no_assigments.svg index f0b20885a0..5f45993980 100644 --- a/src/assets/img/illustration_no_assigments.svg +++ b/src/assets/img/illustration_no_assigments.svg @@ -1,10 +1,10 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/assets/img/illustration_no_persons.svg b/src/assets/img/illustration_no_persons.svg index 306bf0457b..5dee750e1c 100644 --- a/src/assets/img/illustration_no_persons.svg +++ b/src/assets/img/illustration_no_persons.svg @@ -1,98 +1,98 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/assets/img/illustration_no_search_results.svg b/src/assets/img/illustration_no_search_results.svg index a4450f9c6b..5f45993980 100644 --- a/src/assets/img/illustration_no_search_results.svg +++ b/src/assets/img/illustration_no_search_results.svg @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + diff --git a/src/assets/img/permission-error-illustration.svg b/src/assets/img/permission-error-illustration.svg index 8282284d99..d9e45c2183 100644 --- a/src/assets/img/permission-error-illustration.svg +++ b/src/assets/img/permission-error-illustration.svg @@ -1,13 +1,13 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/assets/img/unsupported-browser-illustration.svg b/src/assets/img/unsupported-browser-illustration.svg index 217562f830..5ebbd74b0a 100644 --- a/src/assets/img/unsupported-browser-illustration.svg +++ b/src/assets/img/unsupported-browser-illustration.svg @@ -1,792 +1,792 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + + - - + + diff --git a/src/features/app_start/shared/unsupported_browser/index.tsx b/src/features/app_start/shared/unsupported_browser/index.tsx index 80b5d6db19..6fed010515 100644 --- a/src/features/app_start/shared/unsupported_browser/index.tsx +++ b/src/features/app_start/shared/unsupported_browser/index.tsx @@ -6,7 +6,7 @@ import useUnsupportedBrowser from './useUnsupportedBrowser'; import Button from '@components/button'; import TextMarkup from '@components/text_markup'; import Typography from '@components/typography'; -import UnsupportedBrowserImg from '@assets/img/unsupported-browser-illustration.svg?url'; +import UnsupportedBrowserImg from '@assets/img/unsupported-browser-illustration.svg?component'; const UnsupportedBrowser = () => { const { t } = useAppTranslation(); @@ -38,11 +38,9 @@ const UnsupportedBrowser = () => { flexDirection: { mobile: 'column', tablet: 'row' }, }} > - + + + { marginTop: '24px', }} > - {!isSupported && } + {isSupported && } - {isSupported && ( + {!isSupported && ( <> {isOpenContact && } {isOpenAbout && } From 67988f04736dce6182b6481342786c33aeb338b9 Mon Sep 17 00:00:00 2001 From: Max Makaluk <70341920+FussuChalice@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:42:06 +0200 Subject: [PATCH 3/4] fix(layout): remove debug code --- src/layouts/root_layout/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/root_layout/index.tsx b/src/layouts/root_layout/index.tsx index d4d8b84734..3aa53bd04d 100644 --- a/src/layouts/root_layout/index.tsx +++ b/src/layouts/root_layout/index.tsx @@ -71,9 +71,9 @@ const RootLayout = ({ updatePwa }: { updatePwa: VoidFunction }) => { marginTop: '24px', }} > - {isSupported && } + {!isSupported && } - {!isSupported && ( + {isSupported && ( <> {isOpenContact && } {isOpenAbout && } From f1bdce4bf637936cb9a450da15cd05f2e2b8f3a1 Mon Sep 17 00:00:00 2001 From: Max Makaluk <70341920+FussuChalice@users.noreply.github.com> Date: Tue, 11 Feb 2025 14:05:55 +0200 Subject: [PATCH 4/4] fix(layouts): fix debug code for svg illustrations testing --- src/layouts/root_layout/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/root_layout/index.tsx b/src/layouts/root_layout/index.tsx index d4d8b84734..3aa53bd04d 100644 --- a/src/layouts/root_layout/index.tsx +++ b/src/layouts/root_layout/index.tsx @@ -71,9 +71,9 @@ const RootLayout = ({ updatePwa }: { updatePwa: VoidFunction }) => { marginTop: '24px', }} > - {isSupported && } + {!isSupported && } - {!isSupported && ( + {isSupported && ( <> {isOpenContact && } {isOpenAbout && }