From 6e121234f1acba8d9d825362fffa322676858193 Mon Sep 17 00:00:00 2001 From: Arkadiusz Wieczorek Date: Wed, 29 Jun 2022 19:31:20 +0200 Subject: [PATCH] Fix bold --- components/toolbar/toolbar.scss | 5 ++ components/toolbar/toolbar.tsx | 90 ++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/components/toolbar/toolbar.scss b/components/toolbar/toolbar.scss index 7e2960b..ad05987 100644 --- a/components/toolbar/toolbar.scss +++ b/components/toolbar/toolbar.scss @@ -109,6 +109,11 @@ body { } .about { + &__no-errors { + text-align: center; + padding-bottom: 1.5rem; + } + p { font-size: 0.875rem; font-weight: 700; diff --git a/components/toolbar/toolbar.tsx b/components/toolbar/toolbar.tsx index 583ed8d..83f5edc 100644 --- a/components/toolbar/toolbar.tsx +++ b/components/toolbar/toolbar.tsx @@ -24,6 +24,10 @@ const Toolbar = () => { null ); + const first_sentence_cookie = 'Strona dokonała zapisu i odczytu plików Cookie dla domen '; + const first_sentence_history = + 'Część informacji o Twojej historii przeglądania została wysłana do '; + React.useEffect(() => { const listener = async () => { const tab = await getCurrentTab(); @@ -51,30 +55,25 @@ const Toolbar = () => { .filter((cluster) => cluster.exposesOrigin()) .map((cluster) => cluster.id); setExposedOriginDomainCopy(''); - const first_sentence = `Strona ${origin} wysłała informacje o części Twojej historii przeglądania do `; switch (exposedOriginDomains.length) { case 0: return null; case 1: - return setExposedOriginDomainCopy(first_sentence + `${exposedOriginDomains[0]}.`); + return setExposedOriginDomainCopy(`${exposedOriginDomains[0]}.`); case 2: return setExposedOriginDomainCopy( - first_sentence + `${exposedOriginDomains[0]} oraz ${exposedOriginDomains[1]}.` + `${exposedOriginDomains[0]} oraz ${exposedOriginDomains[1]}.` ); case 3: return setExposedOriginDomainCopy( - first_sentence + - `${exposedOriginDomains[0]}, ${exposedOriginDomains[1]} oraz ${exposedOriginDomains[2]}.` + `${exposedOriginDomains[0]}, ${exposedOriginDomains[1]} oraz ${exposedOriginDomains[2]}.` ); default: return setExposedOriginDomainCopy( - first_sentence + - `${exposedOriginDomains[0]}, ${exposedOriginDomains[1]} (i ${ - exposedOriginDomains.length - 2 < 2 - ? 2 - : exposedOriginDomains.length - 2 - } innych).` + `${exposedOriginDomains[0]}, ${exposedOriginDomains[1]} (i ${ + exposedOriginDomains.length - 2 < 2 ? 2 : exposedOriginDomains.length - 2 + } innych).` ); } }, [eventCounts['*'], origin]); @@ -84,28 +83,23 @@ const Toolbar = () => { .filter((cluster) => cluster.hasCookies()) .map((cluster) => cluster.id); setCookieDomainCopy(''); - const first_sentence = `Strona ${origin} dokonała zapisu i odczytu plików Cookie dla domen `; switch (cookieDomains.length) { case 0: return null; case 1: - return setCookieDomainCopy(first_sentence + `${cookieDomains[0]}.`); + return setCookieDomainCopy(`${cookieDomains[0]}.`); case 2: - return setCookieDomainCopy( - first_sentence + `${cookieDomains[0]} oraz ${cookieDomains[1]}.` - ); + return setCookieDomainCopy(`${cookieDomains[0]} oraz ${cookieDomains[1]}.`); case 3: return setCookieDomainCopy( - first_sentence + - `${cookieDomains[0]}, ${cookieDomains[1]} oraz ${cookieDomains[2]}.` + `${cookieDomains[0]}, ${cookieDomains[1]} oraz ${cookieDomains[2]}.` ); default: return setCookieDomainCopy( - first_sentence + - `${cookieDomains[0]}, ${cookieDomains[1]} (i ${ - cookieDomains.length - 2 < 2 ? 2 : cookieDomains.length - 2 - } innych).` + `${cookieDomains[0]}, ${cookieDomains[1]} (i ${ + cookieDomains.length - 2 < 2 ? 2 : cookieDomains.length - 2 + } innych).` ); } }, [eventCounts['*'], origin]); @@ -184,27 +178,33 @@ const Toolbar = () => {
-

cluster.exposesOrigin()) - .map((domain) => domain.id) - .join(', ')} - > - {exposedOriginDomainCopy} -

-

cluster.hasCookies()) - .map((domain) => domain.id) - .join(', ')} - > - {cookieDomainCopy} -

+ {exposedOriginDomainCopy ? ( +

cluster.exposesOrigin()) + .map((domain) => domain.id) + .join(', ')} + > + {first_sentence_cookie} + {exposedOriginDomainCopy} +

+ ) : null} + {cookieDomainCopy ? ( +

cluster.hasCookies()) + .map((domain) => domain.id) + .join(', ')} + > + {first_sentence_history} + {cookieDomainCopy} +

+ ) : null}
- {exposedOriginDomainCopy !== null || cookieDomainCopy !== null ? ( + {exposedOriginDomainCopy || cookieDomainCopy ? (

@@ -229,7 +229,13 @@ const Toolbar = () => {

- ) : null} + ) : ( + +
+

Nie znaleziono problemów na tej stronie.

+
+
+ )} ); };