From eec4528e71da1fd04d1af59a16b7316c3187452c Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:08:03 +0200 Subject: [PATCH 01/42] Made a base file for a new topicalPage to work on in this ticket. --- packages/app/src/pages/nieuw-actueel.tsx | 120 +++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 packages/app/src/pages/nieuw-actueel.tsx diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx new file mode 100644 index 0000000000..6af66a8be2 --- /dev/null +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -0,0 +1,120 @@ +import { Box, Spacer } from '~/components/base'; +import { MaxWidth } from '~/components'; +import { Layout } from '~/domain/layout'; +import { ArticleList, TopicalSectionHeader } from '~/domain/topical'; +import { isPresent } from 'ts-is-present'; +import { Search } from '~/domain/topical/components/search'; +import { Languages, SiteText } from '~/locale'; +import { + createGetStaticProps, + StaticProps, +} from '~/static-props/create-get-static-props'; +import { getTopicalPageData } from '~/queries/get-topical-page-data'; +import { + getLastGeneratedDate, + selectNlData, + getLokalizeTexts, +} from '~/static-props/get-data'; +import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts'; + +const selectLokalizeTexts = (siteText: SiteText) => ({ + hospitalText: siteText.pages.hospital_page.nl, + intensiveCareText: siteText.pages.intensive_care_page.nl, + sewerText: siteText.pages.sewer_page.shared, + positiveTestsText: siteText.pages.positive_tests_page.shared, + textNl: siteText.pages.topical_page.nl, + textShared: siteText.pages.topical_page.shared, +}); + +type LokalizeTexts = ReturnType; + +export const getStaticProps = createGetStaticProps( + ({ locale }: { locale: keyof Languages }) => + getLokalizeTexts(selectLokalizeTexts, locale), + getLastGeneratedDate, + getTopicalPageData('nl', [ + 'intensive_care_nice', + 'hospital_nice', + 'tested_overall', + 'vaccine_administered_total', + 'vaccine_coverage_per_age_group_estimated', + ]), + () => { + const { selectedNlData: data } = selectNlData( + 'intensive_care_nice', + 'intensive_care_lcps', + 'hospital_nice', + 'tested_overall', + 'tested_ggd', + 'hospital_lcps', + 'difference', + 'vaccine_administered_total', + 'vaccine_coverage_per_age_group_estimated', + 'booster_coverage', + 'sewer' + )(); + + return { + selectedNlData: { + ...data, + }, + }; + } +); + +const Home = (props: StaticProps) => { + const { pageText, content, lastGenerated } = props; + + const { textNl, textShared } = useDynamicLokalizeTexts( + pageText, + selectLokalizeTexts + ); + + const metadata = { + ...textNl.nationaal_metadata, + title: textNl.metadata.title, + description: textNl.metadata.description, + }; + + return ( + + + + + + + + + + + + + + + + + {isPresent(content.articles) && ( + + )} + + + + + ); +}; + +export default Home; From 243e54d0bf7f7b8bfe340253dd21b87820ac772a Mon Sep 17 00:00:00 2001 From: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> Date: Wed, 17 Aug 2022 12:39:51 +0200 Subject: [PATCH 02/42] COR-995 Topical page redesign schema (#4355) * feat: setup schema for topical themes * feat: first version of topcial page schema * feat: support for new topical.json * feat: implement multilang, cleanup schemas * feat: extend schema with translations and indices * feat: add valid icon values * feat: implement loading of TOPICAL json file data * feat: implement selectTopcialData * feat: extend iconset * fix: remove anys Co-authored-by: VWSCoronaDashboard24 --- packages/app/schema/topical/__index.json | 33 +++ packages/app/schema/topical/icon.json | 190 ++++++++++++++ packages/app/schema/topical/link.json | 18 ++ packages/app/schema/topical/measure_tile.json | 18 ++ packages/app/schema/topical/measures.json | 25 ++ .../schema/topical/multilanguage_string.json | 15 ++ packages/app/schema/topical/theme.json | 63 +++++ packages/app/schema/topical/theme_tile.json | 56 ++++ packages/app/src/pages/nieuw-actueel.tsx | 37 +-- packages/app/src/static-props/get-data.ts | 69 +++++ packages/cli/src/schema/schema-info.ts | 4 + packages/common/src/types/data.ts | 241 ++++++++++++++++++ packages/common/src/types/feature-flags.ts | 6 +- 13 files changed, 744 insertions(+), 31 deletions(-) create mode 100644 packages/app/schema/topical/__index.json create mode 100644 packages/app/schema/topical/icon.json create mode 100644 packages/app/schema/topical/link.json create mode 100644 packages/app/schema/topical/measure_tile.json create mode 100644 packages/app/schema/topical/measures.json create mode 100644 packages/app/schema/topical/multilanguage_string.json create mode 100644 packages/app/schema/topical/theme.json create mode 100644 packages/app/schema/topical/theme_tile.json diff --git a/packages/app/schema/topical/__index.json b/packages/app/schema/topical/__index.json new file mode 100644 index 0000000000..60d6dcab26 --- /dev/null +++ b/packages/app/schema/topical/__index.json @@ -0,0 +1,33 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "title": "topical", + "additionalProperties": false, + "required": ["version", "title", "dynamicDescription", "themes", "measures"], + "properties": { + "version": { + "type": "string" + }, + "title": { + "$ref": "multilanguage_string.json" + }, + "dynamicDescription": { + "type": "array", + "minItems": 1, + "items": { + "$ref": "multilanguage_string.json" + } + }, + "themes": { + "type": "array", + "minItems": 1, + "maxItems": 2, + "items": { + "$ref": "theme.json" + } + }, + "measures": { + "$ref": "measures.json" + } + } +} diff --git a/packages/app/schema/topical/icon.json b/packages/app/schema/topical/icon.json new file mode 100644 index 0000000000..e7710025c4 --- /dev/null +++ b/packages/app/schema/topical/icon.json @@ -0,0 +1,190 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "topical_icon", + "type": "string", + "enum": [ + "Afstand", + "AfstandSporten", + "AlcoholVerkoop", + "Arrow", + "Arts", + "ArtsSmall", + "AvoidCrowds", + "Avondklok", + "BarChart", + "BasisregelsAfstand", + "BasisregelsBlijfThuis", + "BasisregelsDrukte", + "BasisregelsElleboog", + "BasisregelsGeenBezoek", + "BasisregelsHandenwassen", + "BasisregelsMondkapje", + "BasisregelsTesten", + "Bevolking", + "Bezoek", + "Bibliotheken", + "BinnenMetZitplaats", + "BinnenZonderZitplaats", + "Binnensporten", + "Binnensportlocaties", + "Boosterprik", + "Calendar", + "Chart", + "Check", + "CheckSmall", + "Checked", + "Chevron", + "ChevronDown", + "ChevronDownMagenta", + "ChevronLarge", + "Clock", + "Close", + "CloseThick", + "Contactberoepen", + "Coronavirus", + "Cross", + "CrossSmall", + "Curfew", + "Database", + "Doorstroomevenementen", + "Dot", + "Down", + "Download", + "EenPersoonDoorgestreept", + "Elderly", + "Elleboog", + "Expand", + "Experimenteel", + "External", + "Eye", + "Frame2", + "FrisseLucht", + "Gathering", + "GedeeltelijkOpenRugzak", + "Gedrag", + "GeenEntertainment", + "GeenMaxAantalBezoekers", + "GeenWedstrijden", + "GehandicaptenZorg", + "Gehandicaptenzorg", + "Gelijk", + "GeorganiseerdeKunstEnCultuurbeoefening", + "GgdTesten", + "Groepen", + "Handenwassen", + "HealthCare", + "HomeAndVisits", + "HorecaEnEvenementenBestellen", + "HorecaEnEvenementenEtendrinken", + "HorecaEnEvenementenEvenementen", + "HorecaEvenementen", + "Hospitality", + "Information", + "KeepDistance", + "Klachten", + "Klok2100", + "KunstCultuur", + "KunstcultuurMusea", + "Line", + "Locatie", + "Locaties", + "Lopend", + "Maatregelen", + "MaxAantalBezoekers", + "MaxVisitors", + "MedischeScreening", + "MeerInformatie", + "MeerdaagseEvenementen", + "Menu", + "Mondkapje", + "Nederland", + "NederlandGroot", + "Notification", + "OnderwijsEnKinderopvangKinderopvang", + "OnderwijsEnKinderopvangNoodopvang", + "OnderwijsEnKinderopvangOpAfstand", + "OntmoetingenBezoek", + "OpenbaarVervoer", + "Openingstijden", + "Other", + "Overig", + "Oversterfte", + "Phone", + "PositiefGetesteMensen", + "PubliekToegankelijkeLocaties", + "Recreatie", + "Reizen", + "ReproductieGraf", + "Reproductiegetal", + "ReproductiegetalSmall", + "Reset", + "Rioolvirus", + "RioolwaterMonitoring", + "SchoolAndDayCare", + "Search", + "SearchIcon", + "SearchIconBold", + "SneezeCoughElbow", + "SportBinnensportlocaties", + "SportBuiten", + "SportWedstrijden", + "SporterMetZweetband", + "Stap1Avondklok", + "Stap1HorecaMax", + "Stap1HorecaPertafel", + "Stap1HorecaReserveren", + "Stap1HorecaSportaccomodaties", + "Stap1HorecaTerras", + "Stap1HorecaVerplaatsen", + "Stap1OnderwijsBibliotheek", + "Stap1OnderwijsOpen", + "Stap1Theorie", + "Stap1Thuisbezoek", + "Stap1Uitvaarten", + "Stap1WinkelsAlleen", + "Stap1WinkelsMarkten", + "Stap1WinkelsMax", + "Stap1WinkelsOpen", + "Sterfte", + "Stopwatch", + "SymptomsGetTested", + "SymptomsStayHome", + "Taxi", + "Test", + "Testbewijs", + "Testen", + "Teststraat", + "Thuis", + "Thuisblijven", + "Thuiswerken", + "Toegangsbewijzen", + "Travel", + "Unchecked", + "Up", + "Vaccinaties", + "Vaccine", + "VaccineBoosterThird", + "Varianten", + "Vermijd", + "Verpleeghuis", + "Verpleeghuiszorg", + "VervoerEnReizenBlijfthuis", + "VervoerEnReizenBuitenland", + "VervoerEnReizenOv", + "Vliegen", + "Warn", + "Warning", + "WashHands", + "WearMaskPublicIndoors", + "WearMaskPublicTransport", + "WhiteArrow", + "WhiteArrowLg", + "WinkelenEnBoodschappenAlcohol", + "WinkelenEnBoodschappenOpen", + "Work", + "WorkFromHome", + "Ziekenhuis", + "ZiekenhuisSmall", + "Ziektegolf" + ] +} diff --git a/packages/app/schema/topical/link.json b/packages/app/schema/topical/link.json new file mode 100644 index 0000000000..a91796a1d7 --- /dev/null +++ b/packages/app/schema/topical/link.json @@ -0,0 +1,18 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "topical_theme_link", + "type": "object", + "additionalProperties": false, + "required": ["index", "label", "href"], + "properties": { + "index": { + "type": "number" + }, + "label": { + "$ref": "multilanguage_string.json" + }, + "href": { + "$ref": "multilanguage_string.json" + } + } +} diff --git a/packages/app/schema/topical/measure_tile.json b/packages/app/schema/topical/measure_tile.json new file mode 100644 index 0000000000..c0ceaa1b5d --- /dev/null +++ b/packages/app/schema/topical/measure_tile.json @@ -0,0 +1,18 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "topical_measures_tile", + "type": "object", + "additionalProperties": false, + "required": ["index", "title", "icon"], + "properties": { + "index": { + "type": "number" + }, + "title": { + "$ref": "multilanguage_string.json" + }, + "icon": { + "$ref": "icon.json" + } + } +} diff --git a/packages/app/schema/topical/measures.json b/packages/app/schema/topical/measures.json new file mode 100644 index 0000000000..7480fdc015 --- /dev/null +++ b/packages/app/schema/topical/measures.json @@ -0,0 +1,25 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "title": "topical_measures", + "additionalProperties": false, + "required": ["title", "dynamicSubtitle", "icon", "measureTiles"], + "properties": { + "title": { + "$ref": "multilanguage_string.json" + }, + "dynamicSubtitle": { + "$ref": "multilanguage_string.json" + }, + "icon": { + "$ref": "icon.json" + }, + "measureTiles": { + "type": "array", + "minItems": 1, + "items": { + "$ref": "measure_tile.json" + } + } + } +} diff --git a/packages/app/schema/topical/multilanguage_string.json b/packages/app/schema/topical/multilanguage_string.json new file mode 100644 index 0000000000..bf6db3b7c2 --- /dev/null +++ b/packages/app/schema/topical/multilanguage_string.json @@ -0,0 +1,15 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "title": "multilanguage_string", + "additionalProperties": false, + "required": ["NL", "EN"], + "properties": { + "NL": { + "type": "string" + }, + "EN": { + "type": "string" + } + } +} diff --git a/packages/app/schema/topical/theme.json b/packages/app/schema/topical/theme.json new file mode 100644 index 0000000000..aa1a823c0e --- /dev/null +++ b/packages/app/schema/topical/theme.json @@ -0,0 +1,63 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "topical_theme", + "type": "object", + "additionalProperties": false, + "required": [ + "index", + "title", + "dynamicSubtitle", + "icon", + "themeTiles", + "moreLinks" + ], + "properties": { + "index": { + "type": "number" + }, + "title": { + "$ref": "multilanguage_string.json" + }, + "dynamicSubtitle": { + "$ref": "multilanguage_string.json" + }, + "icon": { + "$ref": "icon.json" + }, + "themeTiles": { + "type": "array", + "minItems": 1, + "maxItems": 3, + "items": { + "$ref": "theme_tile.json" + } + }, + "moreLinks": { + "type": "object", + "additionalProperties": false, + "required": ["label", "links"], + "properties": { + "label": { + "type": "object", + "additionalProperties": false, + "required": ["DESKTOP", "MOBILE"], + "properties": { + "DESKTOP": { + "$ref": "multilanguage_string.json" + }, + "MOBILE": { + "$ref": "multilanguage_string.json" + } + } + }, + "links": { + "type": "array", + "minItems": 1, + "items": { + "$ref": "link.json" + } + } + } + } + } +} diff --git a/packages/app/schema/topical/theme_tile.json b/packages/app/schema/topical/theme_tile.json new file mode 100644 index 0000000000..23f39c3b4d --- /dev/null +++ b/packages/app/schema/topical/theme_tile.json @@ -0,0 +1,56 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "topical_theme_tile", + "type": "object", + "additionalProperties": false, + "required": [ + "index", + "title", + "dynamicDescription", + "trendIcon", + "tileIcon", + "cta" + ], + "properties": { + "index": { + "type": "number" + }, + "title": { + "$ref": "multilanguage_string.json" + }, + "dynamicDescription": { + "$ref": "multilanguage_string.json" + }, + "trendIcon": { + "type": ["object", "null"], + "required": ["direction", "color"], + "additionalProperties": false, + "properties": { + "direction": { + "type": "string", + "enum": ["UP", "DOWN"] + }, + "color": { + "type": "string", + "enum": ["GREEN", "RED"] + } + } + }, + "tileIcon": { + "$ref": "icon.json" + }, + "cta": { + "type": ["object", "null"], + "required": ["label", "href"], + "additionalProperties": false, + "properties": { + "label": { + "$ref": "multilanguage_string.json" + }, + "href": { + "$ref": "multilanguage_string.json" + } + } + } + } +} diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 6af66a8be2..3563e6f6b5 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -12,8 +12,8 @@ import { import { getTopicalPageData } from '~/queries/get-topical-page-data'; import { getLastGeneratedDate, - selectNlData, getLokalizeTexts, + selectTopicalData, } from '~/static-props/get-data'; import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts'; @@ -32,38 +32,14 @@ export const getStaticProps = createGetStaticProps( ({ locale }: { locale: keyof Languages }) => getLokalizeTexts(selectLokalizeTexts, locale), getLastGeneratedDate, - getTopicalPageData('nl', [ - 'intensive_care_nice', - 'hospital_nice', - 'tested_overall', - 'vaccine_administered_total', - 'vaccine_coverage_per_age_group_estimated', - ]), - () => { - const { selectedNlData: data } = selectNlData( - 'intensive_care_nice', - 'intensive_care_lcps', - 'hospital_nice', - 'tested_overall', - 'tested_ggd', - 'hospital_lcps', - 'difference', - 'vaccine_administered_total', - 'vaccine_coverage_per_age_group_estimated', - 'booster_coverage', - 'sewer' - )(); - - return { - selectedNlData: { - ...data, - }, - }; - } + getTopicalPageData('nl', []), + ({ locale }: { locale: keyof Languages }) => ({ + selectedTopicalData: selectTopicalData(locale), + }) ); const Home = (props: StaticProps) => { - const { pageText, content, lastGenerated } = props; + const { pageText, content, lastGenerated, selectedTopicalData } = props; const { textNl, textShared } = useDynamicLokalizeTexts( pageText, @@ -78,6 +54,7 @@ const Home = (props: StaticProps) => { return ( + {selectedTopicalData.title} ('GM_COLLECTION.json'), 'gm_collection' ), + topical: initializeFeatureFlaggedData( + loadJsonFromDataFile('TOPICAL.json'), + 'topical' + ), }; export function getLastGeneratedDate() { @@ -202,6 +207,70 @@ export function getNlData() { return { data }; } +export function getTopicalData() { + // clone data to prevent mutation of the original + const data = JSON.parse(JSON.stringify(json.topical)) as Topical; + + sortTimeSeriesInDataInPlace(data, { setDatesToMiddleOfDay: true }); + + return { data }; +} + +export function selectTopicalData(locale: keyof Languages) { + const topicalData = getTopicalData().data; + const localeKey = locale === 'nl' ? 'NL' : 'EN'; + + return { + version: topicalData.version, + title: topicalData.title[localeKey], + dynamicDescription: topicalData.dynamicDescription.map( + (description) => description[localeKey] + ), + themes: topicalData.themes.map((theme) => ({ + index: theme.index, + title: theme.title[localeKey], + dynamicSubtitle: theme.dynamicSubtitle[localeKey], + icon: theme.icon, + themeTiles: theme.themeTiles.map((tile) => ({ + index: tile.index, + title: tile.title[localeKey], + dynamicDescription: tile.dynamicDescription[localeKey], + trendIcon: tile.trendIcon, + tileIcon: tile.tileIcon, + cta: tile.cta + ? { + label: tile.cta.label[localeKey], + href: tile.cta.href[localeKey], + } + : null, + })), + moreLinks: { + label: { + DESKTOP: theme.moreLinks.label.DESKTOP[localeKey], + MOBILE: theme.moreLinks.label.MOBILE[localeKey], + }, + links: theme.moreLinks.links.map((link) => ({ + index: link.index, + label: link.label[localeKey], + href: link.href[localeKey], + })), + }, + })), + measures: { + title: topicalData.measures.title[localeKey], + dynamicSubtitle: topicalData.measures.dynamicSubtitle[localeKey], + icon: topicalData.measures.icon, + measureTiles: topicalData.measures.measureTiles.map((tile) => ({ + index: tile.index, + title: tile.title[localeKey], + icon: tile.icon, + })), + }, + }; +} + +export type TopicalData = ReturnType; + /** * This method selects the specified metric properties from the region data * diff --git a/packages/cli/src/schema/schema-info.ts b/packages/cli/src/schema/schema-info.ts index 61bbb3932d..ba08e8fad9 100644 --- a/packages/cli/src/schema/schema-info.ts +++ b/packages/cli/src/schema/schema-info.ts @@ -26,6 +26,10 @@ export function getSchemaInfo( const fileList = fs.readdirSync(jsonDirectory); return { + topical: { + files: ['TOPICAL.json'], + basePath: jsonDirectory, + }, nl: { files: ['NL.json'], basePath: jsonDirectory, diff --git a/packages/common/src/types/data.ts b/packages/common/src/types/data.ts index a47f20c70c..9b0322d94c 100644 --- a/packages/common/src/types/data.ts +++ b/packages/common/src/types/data.ts @@ -1028,6 +1028,247 @@ export interface NlVariantsVariantValue { date_of_report_unix: number; } +export type TopicalIcon = + | "Afstand" + | "AfstandSporten" + | "AlcoholVerkoop" + | "Arrow" + | "Arts" + | "ArtsSmall" + | "AvoidCrowds" + | "Avondklok" + | "BarChart" + | "BasisregelsAfstand" + | "BasisregelsBlijfThuis" + | "BasisregelsDrukte" + | "BasisregelsElleboog" + | "BasisregelsGeenBezoek" + | "BasisregelsHandenwassen" + | "BasisregelsMondkapje" + | "BasisregelsTesten" + | "Bevolking" + | "Bezoek" + | "Bibliotheken" + | "BinnenMetZitplaats" + | "BinnenZonderZitplaats" + | "Binnensporten" + | "Binnensportlocaties" + | "Boosterprik" + | "Calendar" + | "Chart" + | "Check" + | "CheckSmall" + | "Checked" + | "Chevron" + | "ChevronDown" + | "ChevronDownMagenta" + | "ChevronLarge" + | "Clock" + | "Close" + | "CloseThick" + | "Contactberoepen" + | "Coronavirus" + | "Cross" + | "CrossSmall" + | "Curfew" + | "Database" + | "Doorstroomevenementen" + | "Dot" + | "Down" + | "Download" + | "EenPersoonDoorgestreept" + | "Elderly" + | "Elleboog" + | "Expand" + | "Experimenteel" + | "External" + | "Eye" + | "Frame2" + | "FrisseLucht" + | "Gathering" + | "GedeeltelijkOpenRugzak" + | "Gedrag" + | "GeenEntertainment" + | "GeenMaxAantalBezoekers" + | "GeenWedstrijden" + | "GehandicaptenZorg" + | "Gehandicaptenzorg" + | "Gelijk" + | "GeorganiseerdeKunstEnCultuurbeoefening" + | "GgdTesten" + | "Groepen" + | "Handenwassen" + | "HealthCare" + | "HomeAndVisits" + | "HorecaEnEvenementenBestellen" + | "HorecaEnEvenementenEtendrinken" + | "HorecaEnEvenementenEvenementen" + | "HorecaEvenementen" + | "Hospitality" + | "Information" + | "KeepDistance" + | "Klachten" + | "Klok2100" + | "KunstCultuur" + | "KunstcultuurMusea" + | "Line" + | "Locatie" + | "Locaties" + | "Lopend" + | "Maatregelen" + | "MaxAantalBezoekers" + | "MaxVisitors" + | "MedischeScreening" + | "MeerInformatie" + | "MeerdaagseEvenementen" + | "Menu" + | "Mondkapje" + | "Nederland" + | "NederlandGroot" + | "Notification" + | "OnderwijsEnKinderopvangKinderopvang" + | "OnderwijsEnKinderopvangNoodopvang" + | "OnderwijsEnKinderopvangOpAfstand" + | "OntmoetingenBezoek" + | "OpenbaarVervoer" + | "Openingstijden" + | "Other" + | "Overig" + | "Oversterfte" + | "Phone" + | "PositiefGetesteMensen" + | "PubliekToegankelijkeLocaties" + | "Recreatie" + | "Reizen" + | "ReproductieGraf" + | "Reproductiegetal" + | "ReproductiegetalSmall" + | "Reset" + | "Rioolvirus" + | "RioolwaterMonitoring" + | "SchoolAndDayCare" + | "Search" + | "SearchIcon" + | "SearchIconBold" + | "SneezeCoughElbow" + | "SportBinnensportlocaties" + | "SportBuiten" + | "SportWedstrijden" + | "SporterMetZweetband" + | "Stap1Avondklok" + | "Stap1HorecaMax" + | "Stap1HorecaPertafel" + | "Stap1HorecaReserveren" + | "Stap1HorecaSportaccomodaties" + | "Stap1HorecaTerras" + | "Stap1HorecaVerplaatsen" + | "Stap1OnderwijsBibliotheek" + | "Stap1OnderwijsOpen" + | "Stap1Theorie" + | "Stap1Thuisbezoek" + | "Stap1Uitvaarten" + | "Stap1WinkelsAlleen" + | "Stap1WinkelsMarkten" + | "Stap1WinkelsMax" + | "Stap1WinkelsOpen" + | "Sterfte" + | "Stopwatch" + | "SymptomsGetTested" + | "SymptomsStayHome" + | "Taxi" + | "Test" + | "Testbewijs" + | "Testen" + | "Teststraat" + | "Thuis" + | "Thuisblijven" + | "Thuiswerken" + | "Toegangsbewijzen" + | "Travel" + | "Unchecked" + | "Up" + | "Vaccinaties" + | "Vaccine" + | "VaccineBoosterThird" + | "Varianten" + | "Vermijd" + | "Verpleeghuis" + | "Verpleeghuiszorg" + | "VervoerEnReizenBlijfthuis" + | "VervoerEnReizenBuitenland" + | "VervoerEnReizenOv" + | "Vliegen" + | "Warn" + | "Warning" + | "WashHands" + | "WearMaskPublicIndoors" + | "WearMaskPublicTransport" + | "WhiteArrow" + | "WhiteArrowLg" + | "WinkelenEnBoodschappenAlcohol" + | "WinkelenEnBoodschappenOpen" + | "Work" + | "WorkFromHome" + | "Ziekenhuis" + | "ZiekenhuisSmall" + | "Ziektegolf"; + +export interface Topical { + version: string; + title: MultilanguageString; + dynamicDescription: MultilanguageString[]; + themes: TopicalTheme[]; + measures: TopicalMeasures; +} +export interface MultilanguageString { + NL: string; + EN: string; +} +export interface TopicalTheme { + index: number; + title: MultilanguageString; + dynamicSubtitle: MultilanguageString; + icon: TopicalIcon; + themeTiles: TopicalThemeTile[]; + moreLinks: { + label: { + DESKTOP: MultilanguageString; + MOBILE: MultilanguageString; + }; + links: TopicalThemeLink[]; + }; +} +export interface TopicalThemeTile { + index: number; + title: MultilanguageString; + dynamicDescription: MultilanguageString; + trendIcon: { + direction: "UP" | "DOWN"; + color: "GREEN" | "RED"; + } | null; + tileIcon: TopicalIcon; + cta: { + label: MultilanguageString; + href: MultilanguageString; + } | null; +} +export interface TopicalThemeLink { + index: number; + label: MultilanguageString; + href: MultilanguageString; +} +export interface TopicalMeasures { + title: MultilanguageString; + dynamicSubtitle: MultilanguageString; + icon: TopicalIcon; + measureTiles: TopicalMeasuresTile[]; +} +export interface TopicalMeasuresTile { + index: number; + title: MultilanguageString; + icon: TopicalIcon; +} + export type VrCode = string; export interface Vr { diff --git a/packages/common/src/types/feature-flags.ts b/packages/common/src/types/feature-flags.ts index 8e3d1c984d..b6d1534a1e 100644 --- a/packages/common/src/types/feature-flags.ts +++ b/packages/common/src/types/feature-flags.ts @@ -39,4 +39,8 @@ export type VerboseFeature = { metricProperties?: string[]; } & SimpleFeature; -export type JsonDataScope = DataScopeKey | 'vr_collection' | 'gm_collection'; +export type JsonDataScope = + | DataScopeKey + | 'vr_collection' + | 'gm_collection' + | 'topical'; From ab5cb1a7b55022c727283872bd3925d353ae4fb1 Mon Sep 17 00:00:00 2001 From: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> Date: Wed, 17 Aug 2022 14:56:40 +0200 Subject: [PATCH 03/42] Feature/cor 959/dynamic icons (#4361) * Get an icon dynamically * feat: make dynamic icon work including typings * fix: code cleanup * feat: extend type info in icon build * feat: add eye icon Co-authored-by: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Co-authored-by: VWSCoronaDashboard24 --- .../app/src/components/get-icon-by-name.tsx | 38 +++++++++++++++++++ packages/app/src/pages/nieuw-actueel.tsx | 4 ++ .../kpi-configuration/kpi-icon-input.tsx | 20 +++++++--- packages/icons/bin/generate.js | 5 ++- packages/icons/src/svg/eye.svg | 1 + 5 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 packages/app/src/components/get-icon-by-name.tsx create mode 100644 packages/icons/src/svg/eye.svg diff --git a/packages/app/src/components/get-icon-by-name.tsx b/packages/app/src/components/get-icon-by-name.tsx new file mode 100644 index 0000000000..cd5801502d --- /dev/null +++ b/packages/app/src/components/get-icon-by-name.tsx @@ -0,0 +1,38 @@ +import * as allIcons from '@corona-dashboard/icons'; +import { iconName2filename, IconProps } from '@corona-dashboard/icons'; +import React from 'react'; +import { isDefined } from 'ts-is-present'; +import { assert } from '~/utils/assert'; + +type IconName = keyof typeof iconName2filename; +type IconCollection = Record; + +interface DynamicIconProps extends IconProps { + name: IconName; +} + +/** + * Returns an icon component by the name of the icon + * Throws when requested component was not found + */ +function getIconByName(name: IconName) { + const icons: IconCollection = allIcons; + const DynamicIcon = icons[name]; + + assert( + isDefined(DynamicIcon), + `[${getIconByName.name}] Icon with name "${name}" does not exist` + ); + + return DynamicIcon; +} + +/** + * Renders an icon component by the name of the icon + */ +function DynamicIcon({ name, ...otherProps }: DynamicIconProps) { + const Icon = getIconByName(name); + return ; +} + +export default DynamicIcon; diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 3563e6f6b5..c44612acb5 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -5,6 +5,7 @@ import { ArticleList, TopicalSectionHeader } from '~/domain/topical'; import { isPresent } from 'ts-is-present'; import { Search } from '~/domain/topical/components/search'; import { Languages, SiteText } from '~/locale'; +import DynamicIcon from '~/components/get-icon-by-name'; import { createGetStaticProps, StaticProps, @@ -62,6 +63,9 @@ const Home = (props: StaticProps) => { pt={{ _: 3, md: 5 }} px={{ _: 3, sm: 4 }} > + + + diff --git a/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx b/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx index f888fd0619..cd817ba51a 100644 --- a/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx +++ b/packages/cms/src/components/portable-text/kpi-configuration/kpi-icon-input.tsx @@ -18,10 +18,15 @@ import { PatchEvent, set, unset } from 'part:@sanity/form-builder/patch-event'; import React, { forwardRef, useCallback, useState } from 'react'; import { isDefined } from 'ts-is-present'; -const filename2IconName = Object.keys(iconName2filename).reduce((aggr, key) => { - aggr[iconName2filename[key]] = key; - return aggr; -}, {} as Record); +const allIconsToFilename: Record = iconName2filename; + +const filename2IconName = Object.keys(allIconsToFilename).reduce( + (aggr, key) => { + aggr[allIconsToFilename[key]] = key; + return aggr; + }, + {} as Record +); export type KpiIconKey = keyof typeof allIcons; @@ -83,11 +88,14 @@ export const KpiIconInput = forwardRef((props: any, ref: any) => { key={id} direction="column" align="center" - onClick={() => onChangeIcon(iconName2filename[id])} + onClick={() => onChangeIcon(allIconsToFilename[id])} title={id} > - + ))} diff --git a/packages/icons/bin/generate.js b/packages/icons/bin/generate.js index e8fa4101d0..548f8a8dfe 100644 --- a/packages/icons/bin/generate.js +++ b/packages/icons/bin/generate.js @@ -83,9 +83,12 @@ const attrsToString = (attrs) => { }; const lookup = icons.sort().map((x) => `${pascalcase(x)}: '${x}.svg'`); +const iconNames = icons.sort().map((x) => `'${pascalcase(x)}'`); const iconName2filename = [ - 'export const iconName2filename: Record = {', + `export type IconName = ${iconNames.join(' | ')};`, + '', + 'export const iconName2filename: Record = {', ] .concat(lookup.join(',')) .concat(['}', '']); diff --git a/packages/icons/src/svg/eye.svg b/packages/icons/src/svg/eye.svg new file mode 100644 index 0000000000..9ccad4bf50 --- /dev/null +++ b/packages/icons/src/svg/eye.svg @@ -0,0 +1 @@ + From 60540f16be1e194609a2222e288c941e3d421cfd Mon Sep 17 00:00:00 2001 From: J <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Thu, 18 Aug 2022 08:56:04 +0200 Subject: [PATCH 04/42] COR-990 the topical page component (#4363) * the topical page component * Restore old topical-tile component * Fixed data input instead of static mockup * fixed width and height * set right padding for kpiIcon * Update packages/app/src/domain/topical/components/topical-tile/index.ts Thanks for noticing Co-authored-by: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> * Update packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx Nice, I bet it's from some old mockup. Co-authored-by: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> Co-authored-by: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> --- .../topical/components/topical-tile/index.ts | 1 + .../components/topical-tile/topical-tile.tsx | 137 ++++++++++++++++++ packages/app/src/pages/nieuw-actueel.tsx | 42 +++++- 3 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 packages/app/src/domain/topical/components/topical-tile/index.ts create mode 100644 packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx diff --git a/packages/app/src/domain/topical/components/topical-tile/index.ts b/packages/app/src/domain/topical/components/topical-tile/index.ts new file mode 100644 index 0000000000..756e929d08 --- /dev/null +++ b/packages/app/src/domain/topical/components/topical-tile/index.ts @@ -0,0 +1 @@ +export * from './topical-tile'; \ No newline at end of file diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx new file mode 100644 index 0000000000..09138b33be --- /dev/null +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -0,0 +1,137 @@ +import { Box } from '~/components/base'; +import css from '@styled-system/css'; +import styled from 'styled-components'; +import { Heading } from '~/components/typography'; +import { LinkWithIcon } from '~/components/link-with-icon'; +import { asResponsiveArray } from '~/style/utils'; +import { colors } from '@corona-dashboard/common'; +import DynamicIcon from '~/components/get-icon-by-name'; +import { Chevron, Down, Up } from '@corona-dashboard/icons'; +import { Markdown } from '~/components/markdown'; +import { TopicalIcon } from '@corona-dashboard/common/src/types'; +import { isDefined } from 'ts-is-present'; + +interface IconWrapperProps { + iconColor: string; +} + +type TrendIcon = { + direction: 'UP' | 'DOWN'; + color: 'GREEN' | 'RED'; +} | null; + +type Cta = { + label: string; + href: string; +} | null; + +interface TopicalTileProps { + title: string; + tileIcon: TopicalIcon; + trendIcon?: TrendIcon; + dynamicDescription: string; + cta?: Cta; +} + +export function TopicalTile({ + title, + tileIcon, + trendIcon, + dynamicDescription, + cta, +}: TopicalTileProps) { + return ( + + + + + + + + + {title} + {isDefined(trendIcon) && trendIcon !== null && ( + + {trendIcon.direction === 'DOWN' && } + {trendIcon.direction === 'UP' && } + + )} + + + + + + + + + + {isDefined(cta) && cta !== null && ( + } + iconPlacement="right" + > + {cta.label} + + )} + + + ); +} + +const IconWrapper = styled.span((x) => + css({ + color: x.iconColor, + display: 'inline-flex', + alignItems: 'center', + width: '20px', + marginLeft: '15px;', + }) +); + +const KpiIcon = styled.span( + css({ + color: colors.white, + backgroundColor: colors.blue, + position: 'absolute', + display: 'block', + width: asResponsiveArray({ _: 40, sm: 50 }), + height: asResponsiveArray({ _: 40, sm: 50 }), + right: 0, + top: 0, + padding: asResponsiveArray(2), + }) +); diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index c44612acb5..fcfe68b037 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -4,8 +4,8 @@ import { Layout } from '~/domain/layout'; import { ArticleList, TopicalSectionHeader } from '~/domain/topical'; import { isPresent } from 'ts-is-present'; import { Search } from '~/domain/topical/components/search'; +import { TopicalTile } from '~/domain/topical/components/topical-tile'; import { Languages, SiteText } from '~/locale'; -import DynamicIcon from '~/components/get-icon-by-name'; import { createGetStaticProps, StaticProps, @@ -17,6 +17,7 @@ import { selectTopicalData, } from '~/static-props/get-data'; import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts'; +import { colors } from '@corona-dashboard/common'; const selectLokalizeTexts = (siteText: SiteText) => ({ hospitalText: siteText.pages.hospital_page.nl, @@ -55,17 +56,46 @@ const Home = (props: StaticProps) => { return ( - {selectedTopicalData.title} - + + {selectedTopicalData.title} - - - + {selectedTopicalData.themes + .sort((a, b) => a.index - b.index) + .map((theme) => { + return ( + + {theme.themeTiles + .sort((a, b) => a.index - b.index) + .map((themeTile) => { + return ( + + ); + })} + + ); + })} From d5b8d60de475d15eaa11288cd1e27b689a364b52 Mon Sep 17 00:00:00 2001 From: J <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Thu, 18 Aug 2022 12:20:39 +0200 Subject: [PATCH 05/42] COR-993 measurement tile (#4364) * New measurement tile because of rebase issues * Fixed data input instead of static mokup --- .../components/measurement-tile/index.ts | 1 + .../measurement-tile/measurement-tile.tsx | 57 +++++++++++++++++++ packages/app/src/pages/nieuw-actueel.tsx | 24 +++++++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 packages/app/src/domain/topical/components/measurement-tile/index.ts create mode 100644 packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx diff --git a/packages/app/src/domain/topical/components/measurement-tile/index.ts b/packages/app/src/domain/topical/components/measurement-tile/index.ts new file mode 100644 index 0000000000..be74697d02 --- /dev/null +++ b/packages/app/src/domain/topical/components/measurement-tile/index.ts @@ -0,0 +1 @@ +export * from './measurement-tile'; \ No newline at end of file diff --git a/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx b/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx new file mode 100644 index 0000000000..b210d327ea --- /dev/null +++ b/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx @@ -0,0 +1,57 @@ +import { Box } from '~/components/base'; +import css from '@styled-system/css'; +import styled from 'styled-components'; +import { asResponsiveArray } from '~/style/utils'; +import { colors } from '@corona-dashboard/common'; +import DynamicIcon from '~/components/get-icon-by-name'; +import { Markdown } from '~/components/markdown'; +import { TopicalIcon } from '@corona-dashboard/common/src/types'; + +interface MeasurementTileProps { + icon: TopicalIcon; + title: string; +} + +export function MeasurementTile({ icon, title }: MeasurementTileProps) { + return ( + + + + + + + + + + + + ); +} + +const KpiIcon = styled.div( + css({ + color: colors.blue, + display: 'flex', + minWidth: asResponsiveArray(40), + marginRight: 3, + }) +); diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index fcfe68b037..d7e78233ce 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -18,6 +18,7 @@ import { } from '~/static-props/get-data'; import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts'; import { colors } from '@corona-dashboard/common'; +import { MeasurementTile } from '~/domain/topical/components/measurement-tile'; const selectLokalizeTexts = (siteText: SiteText) => ({ hospitalText: siteText.pages.hospital_page.nl, @@ -57,7 +58,6 @@ const Home = (props: StaticProps) => { return ( - {selectedTopicalData.title} ) => { ); })} + + {selectedTopicalData.measures.measureTiles + .sort((a, b) => a.index - b.index) + .map((measureTile) => { + return ( + + ); + })} + From d68ce9fdffc8bf530edf28c1926886d42f2ed323 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard24 Date: Wed, 17 Aug 2022 15:07:57 +0200 Subject: [PATCH 06/42] feat: redirect to vr/gm page instead of topical vr/gm --- .../domain/topical/components/search/use-search-results.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/src/domain/topical/components/search/use-search-results.ts b/packages/app/src/domain/topical/components/search/use-search-results.ts index 2f3749a929..8c3df30f17 100644 --- a/packages/app/src/domain/topical/components/search/use-search-results.ts +++ b/packages/app/src/domain/topical/components/search/use-search-results.ts @@ -39,8 +39,8 @@ export function useSearchResults(term: string, activeResult?: string) { const hits: Hit ); })} - - {selectedTopicalData.measures.measureTiles - .sort((a, b) => a.index - b.index) - .map((measureTile) => { - return ( - - ); - })} - - - + + {selectedTopicalData.measures.measureTiles + .sort((a, b) => a.index - b.index) + .map((measureTile) => { + return ( + + ); + })} - + + + + + + + + + Date: Thu, 18 Aug 2022 14:42:59 +0200 Subject: [PATCH 09/42] Update eye.svg and generate script after rebase (on develop with the icon PR) --- packages/icons/bin/generate.js | 2 +- packages/icons/src/icon-name2filename.ts | 132 ++++++++++++++++++++++- packages/icons/src/svg/eye.svg | 2 +- 3 files changed, 133 insertions(+), 3 deletions(-) diff --git a/packages/icons/bin/generate.js b/packages/icons/bin/generate.js index 548f8a8dfe..ddd1276ed0 100644 --- a/packages/icons/bin/generate.js +++ b/packages/icons/bin/generate.js @@ -185,4 +185,4 @@ icons fs.copyFileSync(path.join(svgDir, x), path.join(destSvgDir, x)); }); -console.log('Done writing Icons'); +console.log('Done writing Icons'); \ No newline at end of file diff --git a/packages/icons/src/icon-name2filename.ts b/packages/icons/src/icon-name2filename.ts index 890bf4c840..6545282298 100644 --- a/packages/icons/src/icon-name2filename.ts +++ b/packages/icons/src/icon-name2filename.ts @@ -1,4 +1,133 @@ -export const iconName2filename: Record = { +export type IconName = + | 'AfstandSporten' + | 'AlcoholVerkoop' + | 'Arrow' + | 'Arts' + | 'Avondklok' + | 'BarChart' + | 'BasisregelsAfstand' + | 'BasisregelsDrukte' + | 'BasisregelsElleboog' + | 'BasisregelsGeenBezoek' + | 'BasisregelsHandenwassen' + | 'BasisregelsMondkapje' + | 'BasisregelsTesten' + | 'Bevolking' + | 'Bezoek' + | 'Bibliotheek' + | 'BinnenMetZitplaats' + | 'BinnenZonderZitplaats' + | 'Binnensporten' + | 'Binnensportlocaties' + | 'Boosterprik' + | 'Calendar' + | 'Check' + | 'Checked' + | 'ChevronDown' + | 'ChevronRight' + | 'Clock' + | 'Close' + | 'CloseThick' + | 'ContactBeroepen' + | 'Coronavirus' + | 'Cross' + | 'Database' + | 'DoorstroomEvenementen' + | 'Dot' + | 'Down' + | 'Download' + | 'EenPersoonDoorgestreept' + | 'Elderly' + | 'Expand' + | 'Experimenteel' + | 'External' + | 'Eye' + | 'FrisseLucht' + | 'GedeeltelijkOpenRugzak' + | 'GeenEntertainment' + | 'GeenMaxAantalBezoekers' + | 'GeenWedstrijden' + | 'Gehandicaptenzorg' + | 'GeorganiseerdeKunstEnCultuurbeoefening' + | 'GgdTesten' + | 'Groepen' + | 'HealthCare' + | 'HomeAndVisits' + | 'HorecaEnEvenementenBestellen' + | 'HorecaEnEvenementenEtendrinken' + | 'HorecaEnEvenementenEvenementen' + | 'HorecaEvenementen' + | 'Hospitality' + | 'Information' + | 'Klachten' + | 'Klok210001' + | 'KunstCultuur' + | 'KunstcultuurMusea' + | 'Line' + | 'Locaties' + | 'Location' + | 'Lopend' + | 'Maatregelen' + | 'MaxAantalBezoekers' + | 'MaxVisitors' + | 'MedischeScreening' + | 'MeerInformatie' + | 'MeerdaagseEvenementen' + | 'Menu' + | 'Mondkapje' + | 'Nederland' + | 'Notification' + | 'OnderwijsEnKinderopvangNoodopvang' + | 'OnderwijsEnKinderopvangOpAfstand' + | 'OntmoetingenBezoek' + | 'OpenbaarVervoer' + | 'Openingstijden' + | 'Other' + | 'Overige' + | 'Phone' + | 'Recreatie' + | 'Reizen' + | 'ReproductieGraf' + | 'Reproductiegetal' + | 'Rioolvirus' + | 'SearchIcon' + | 'SearchIconBold' + | 'SportBuiten' + | 'SportMetZweetband' + | 'SportWedstrijden' + | 'Stap1HorecaMax' + | 'Stap1HorecaPertafel' + | 'Stap1HorecaVerplaatsen' + | 'Stap1OnderwijsBibliotheek' + | 'Stap1OnderwijsOpen' + | 'Stap1Theorie' + | 'Stap1Thuisbezoek' + | 'Stap1Uitvaarten' + | 'Stap1WinkelsAlleen' + | 'Stap1WinkelsMarkten' + | 'Stap1WinkelsOpen' + | 'Stopwatch' + | 'Taxi' + | 'Testbewijs' + | 'Toegangsbewijzen' + | 'Travel' + | 'Unchecked' + | 'Up' + | 'Vaccinaties' + | 'Varianten' + | 'Verpleeghuis' + | 'VervoerEnReizenBuitenland' + | 'VervoerEnReizenOv' + | 'Vliegen' + | 'Warn' + | 'Warning' + | 'WinkelenEnBoodschappenAlcohol' + | 'WinkelenEnBoodschappenOpen' + | 'Work' + | 'Ziekenhuis' + | 'Ziektegolf'; + +export const iconName2filename: Record = { AfstandSporten: 'afstand_sporten.svg', AlcoholVerkoop: 'alcohol_verkoop.svg', Arrow: 'arrow.svg', @@ -41,6 +170,7 @@ export const iconName2filename: Record = { Expand: 'expand.svg', Experimenteel: 'experimenteel.svg', External: 'external.svg', + Eye: 'eye.svg', FrisseLucht: 'frisse_lucht.svg', GedeeltelijkOpenRugzak: 'gedeeltelijk_open_rugzak.svg', GeenEntertainment: 'geen_entertainment.svg', diff --git a/packages/icons/src/svg/eye.svg b/packages/icons/src/svg/eye.svg index 9ccad4bf50..4320b27515 100644 --- a/packages/icons/src/svg/eye.svg +++ b/packages/icons/src/svg/eye.svg @@ -1 +1 @@ - + From a0131ab7bf15f97a0be5d3315ea614c94255c8e8 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Thu, 18 Aug 2022 15:04:14 +0200 Subject: [PATCH 10/42] Fix typing issues on icon cahnges --- packages/app/schema/topical/icon.json | 72 +++---------------- .../components/topical-tile/topical-tile.tsx | 4 +- 2 files changed, 10 insertions(+), 66 deletions(-) diff --git a/packages/app/schema/topical/icon.json b/packages/app/schema/topical/icon.json index e7710025c4..2049d01def 100644 --- a/packages/app/schema/topical/icon.json +++ b/packages/app/schema/topical/icon.json @@ -3,17 +3,13 @@ "title": "topical_icon", "type": "string", "enum": [ - "Afstand", "AfstandSporten", "AlcoholVerkoop", "Arrow", "Arts", - "ArtsSmall", - "AvoidCrowds", "Avondklok", "BarChart", "BasisregelsAfstand", - "BasisregelsBlijfThuis", "BasisregelsDrukte", "BasisregelsElleboog", "BasisregelsGeenBezoek", @@ -22,56 +18,43 @@ "BasisregelsTesten", "Bevolking", "Bezoek", - "Bibliotheken", + "Bibliotheek", "BinnenMetZitplaats", "BinnenZonderZitplaats", "Binnensporten", "Binnensportlocaties", "Boosterprik", "Calendar", - "Chart", "Check", - "CheckSmall", "Checked", - "Chevron", "ChevronDown", - "ChevronDownMagenta", - "ChevronLarge", + "ChevronRight", "Clock", "Close", "CloseThick", - "Contactberoepen", + "ContactBeroepen", "Coronavirus", "Cross", - "CrossSmall", - "Curfew", "Database", - "Doorstroomevenementen", + "DoorstroomEvenementen", "Dot", "Down", "Download", "EenPersoonDoorgestreept", "Elderly", - "Elleboog", "Expand", "Experimenteel", "External", "Eye", - "Frame2", "FrisseLucht", - "Gathering", "GedeeltelijkOpenRugzak", - "Gedrag", "GeenEntertainment", "GeenMaxAantalBezoekers", "GeenWedstrijden", - "GehandicaptenZorg", "Gehandicaptenzorg", - "Gelijk", "GeorganiseerdeKunstEnCultuurbeoefening", "GgdTesten", "Groepen", - "Handenwassen", "HealthCare", "HomeAndVisits", "HorecaEnEvenementenBestellen", @@ -80,14 +63,13 @@ "HorecaEvenementen", "Hospitality", "Information", - "KeepDistance", "Klachten", - "Klok2100", + "Klok210001", "KunstCultuur", "KunstcultuurMusea", "Line", - "Locatie", "Locaties", + "Location", "Lopend", "Maatregelen", "MaxAantalBezoekers", @@ -98,43 +80,27 @@ "Menu", "Mondkapje", "Nederland", - "NederlandGroot", "Notification", - "OnderwijsEnKinderopvangKinderopvang", "OnderwijsEnKinderopvangNoodopvang", "OnderwijsEnKinderopvangOpAfstand", "OntmoetingenBezoek", "OpenbaarVervoer", "Openingstijden", "Other", - "Overig", - "Oversterfte", + "Overige", "Phone", - "PositiefGetesteMensen", - "PubliekToegankelijkeLocaties", "Recreatie", "Reizen", "ReproductieGraf", "Reproductiegetal", - "ReproductiegetalSmall", - "Reset", "Rioolvirus", - "RioolwaterMonitoring", - "SchoolAndDayCare", - "Search", "SearchIcon", "SearchIconBold", - "SneezeCoughElbow", - "SportBinnensportlocaties", "SportBuiten", + "SportMetZweetband", "SportWedstrijden", - "SporterMetZweetband", - "Stap1Avondklok", "Stap1HorecaMax", "Stap1HorecaPertafel", - "Stap1HorecaReserveren", - "Stap1HorecaSportaccomodaties", - "Stap1HorecaTerras", "Stap1HorecaVerplaatsen", "Stap1OnderwijsBibliotheek", "Stap1OnderwijsOpen", @@ -143,48 +109,26 @@ "Stap1Uitvaarten", "Stap1WinkelsAlleen", "Stap1WinkelsMarkten", - "Stap1WinkelsMax", "Stap1WinkelsOpen", - "Sterfte", "Stopwatch", - "SymptomsGetTested", - "SymptomsStayHome", "Taxi", - "Test", "Testbewijs", - "Testen", - "Teststraat", - "Thuis", - "Thuisblijven", - "Thuiswerken", "Toegangsbewijzen", "Travel", "Unchecked", "Up", "Vaccinaties", - "Vaccine", - "VaccineBoosterThird", "Varianten", - "Vermijd", "Verpleeghuis", - "Verpleeghuiszorg", - "VervoerEnReizenBlijfthuis", "VervoerEnReizenBuitenland", "VervoerEnReizenOv", "Vliegen", "Warn", "Warning", - "WashHands", - "WearMaskPublicIndoors", - "WearMaskPublicTransport", - "WhiteArrow", - "WhiteArrowLg", "WinkelenEnBoodschappenAlcohol", "WinkelenEnBoodschappenOpen", "Work", - "WorkFromHome", "Ziekenhuis", - "ZiekenhuisSmall", "Ziektegolf" ] } diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 09138b33be..9e8283b121 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -6,7 +6,7 @@ import { LinkWithIcon } from '~/components/link-with-icon'; import { asResponsiveArray } from '~/style/utils'; import { colors } from '@corona-dashboard/common'; import DynamicIcon from '~/components/get-icon-by-name'; -import { Chevron, Down, Up } from '@corona-dashboard/icons'; +import { ChevronRight, Down, Up } from '@corona-dashboard/icons'; import { Markdown } from '~/components/markdown'; import { TopicalIcon } from '@corona-dashboard/common/src/types'; import { isDefined } from 'ts-is-present'; @@ -101,7 +101,7 @@ export function TopicalTile({ {isDefined(cta) && cta !== null && ( } + icon={} iconPlacement="right" > {cta.label} From 49988ad42735f575c33f14e864e473f86283c08c Mon Sep 17 00:00:00 2001 From: AT <93994194+VWSCoronaDashboard21@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:11:07 +0200 Subject: [PATCH 11/42] Feature/cor 959/subjects-list (#4354) --- .../app/src/components/link-with-icon.tsx | 45 +++++++++- .../topical/components/subjects-list/index.ts | 1 + .../subjects-list/subjects-list.tsx | 86 +++++++++++++++++++ packages/app/src/pages/nieuw-actueel.tsx | 56 ++++++------ packages/common/src/types/data.ts | 72 ++-------------- 5 files changed, 168 insertions(+), 92 deletions(-) create mode 100644 packages/app/src/domain/topical/components/subjects-list/index.ts create mode 100644 packages/app/src/domain/topical/components/subjects-list/subjects-list.tsx diff --git a/packages/app/src/components/link-with-icon.tsx b/packages/app/src/components/link-with-icon.tsx index bfab305042..f981f511ed 100644 --- a/packages/app/src/components/link-with-icon.tsx +++ b/packages/app/src/components/link-with-icon.tsx @@ -1,3 +1,5 @@ +import { colors } from '@corona-dashboard/common'; +import { space } from '~/style/theme'; import css from '@styled-system/css'; import { ReactNode } from 'react'; import styled from 'styled-components'; @@ -5,6 +7,7 @@ import { UrlObject } from 'url'; import { Link } from '~/utils/link'; import { Box } from './base'; import { Anchor } from './typography'; +import { asResponsiveArray } from '~/style/utils'; interface LinkWithIconProps { href: UrlObject | string; @@ -13,6 +16,7 @@ interface LinkWithIconProps { iconPlacement?: 'left' | 'right'; underline?: boolean; fontWeight?: 'normal' | 'bold'; + showAsButton?: boolean; } interface IconProps { @@ -23,18 +27,23 @@ interface IconProps { mr?: number | string; } +interface buttonBoxProps { + showAsButton: boolean; +} + export function LinkWithIcon({ href, icon, children, iconPlacement = 'left', fontWeight, + showAsButton = false, }: LinkWithIconProps) { const words = children.split(' '); const firstWords = `${words.slice(0, -1).join(' ')} `; return ( - + - + ); } @@ -136,3 +145,35 @@ const IconWrapper = styled.span( textDecoration: 'inherit', }) ); + +const ButtonBox = styled.span((x: buttonBoxProps) => + css({ + display: 'inline-block', + position: 'relative', + a: x.showAsButton + ? asResponsiveArray({ + _: { + color: colors.blue, + }, + sm: { + backgroundColor: colors.lightBlue, + color: colors.blue, + px: 12, + py: space[3], + '&:hover': { + backgroundColor: colors.blue, + color: colors.offWhite, + }, + '&:focus': { + outline: '#000000 dotted 2px', + }, + '&:hover, &:focus': { + textDecoration: 'none', + }, + }, + }) + : { + color: 'inherit', + }, + }) +); diff --git a/packages/app/src/domain/topical/components/subjects-list/index.ts b/packages/app/src/domain/topical/components/subjects-list/index.ts new file mode 100644 index 0000000000..4d9c2ea49a --- /dev/null +++ b/packages/app/src/domain/topical/components/subjects-list/index.ts @@ -0,0 +1 @@ +export * from './subjects-list'; diff --git a/packages/app/src/domain/topical/components/subjects-list/subjects-list.tsx b/packages/app/src/domain/topical/components/subjects-list/subjects-list.tsx new file mode 100644 index 0000000000..70088ed940 --- /dev/null +++ b/packages/app/src/domain/topical/components/subjects-list/subjects-list.tsx @@ -0,0 +1,86 @@ +import { css } from '@styled-system/css'; +import { Box } from '~/components/base'; +import { space } from '~/style/theme'; +import { ChevronRight } from '@corona-dashboard/icons'; +import { useBreakpointsAsync } from '~/utils/use-breakpoints'; +import { LinkWithIcon } from '~/components/link-with-icon'; +import { Text } from '~/components/typography'; +import { asResponsiveArray } from '~/style/utils'; +import { v4 as uuidv4 } from 'uuid'; + +type TopicalThemeLink = { + index: number; + label: string; + href: string; +}; + +type MoreLinks = { + label: { + DESKTOP: string; + MOBILE: string; + }; + links: TopicalThemeLink[]; +}; + +interface SubjectsListProps { + moreLinks: MoreLinks; +} + +export const SubjectsList = ({ moreLinks }: SubjectsListProps) => { + const breakpoints = useBreakpointsAsync(); + + // Prevents flickering; don't show anything until breakpoints are loaded + if (!breakpoints) { + return null; + } + + const labelledById = uuidv4(); + + return ( + + + {breakpoints.sm ? moreLinks.label.DESKTOP : moreLinks.label.MOBILE} + +
    + {moreLinks.links + .sort((a, b) => a.index - b.index) + .map((link) => ( +
  • + } + iconPlacement="right" + showAsButton={true} + > + {link.label} + +
    • + ))} +
+ + ); +}; diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index f861ac4cf1..3a684dd4d8 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -18,6 +18,7 @@ import { } from '~/static-props/get-data'; import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts'; import { colors } from '@corona-dashboard/common'; +import { SubjectsList } from '~/domain/topical/components/subjects-list'; import { MeasurementTile } from '~/domain/topical/components/measurement-tile'; const selectLokalizeTexts = (siteText: SiteText) => ({ @@ -68,32 +69,35 @@ const Home = (props: StaticProps) => { .sort((a, b) => a.index - b.index) .map((theme) => { return ( - - {theme.themeTiles - .sort((a, b) => a.index - b.index) - .map((themeTile) => { - return ( - - ); - })} - + <> + + {theme.themeTiles + .sort((a, b) => a.index - b.index) + .map((themeTile) => { + return ( + + ); + })} + + + ); })} Date: Thu, 18 Aug 2022 18:19:22 +0200 Subject: [PATCH 12/42] Feature/cor 959/page header (#4356) * add topical-header * Updated schema for index of dynamicDescription * Combining components and setting the right spaces Co-authored-by: VWSCoronaDashboard21 Co-authored-by: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> --- packages/app/schema/topical/__index.json | 2 +- .../schema/topical/dynamic_description.json | 15 +++ .../topical/components/topical-header.tsx | 29 +++++ .../components/topical-tile/topical-tile.tsx | 106 +++++++++--------- packages/app/src/pages/nieuw-actueel.tsx | 19 +++- packages/app/src/static-props/get-data.ts | 5 +- packages/common/src/types/data.ts | 6 +- 7 files changed, 122 insertions(+), 60 deletions(-) create mode 100644 packages/app/schema/topical/dynamic_description.json create mode 100644 packages/app/src/domain/topical/components/topical-header.tsx diff --git a/packages/app/schema/topical/__index.json b/packages/app/schema/topical/__index.json index 60d6dcab26..f82c3183b1 100644 --- a/packages/app/schema/topical/__index.json +++ b/packages/app/schema/topical/__index.json @@ -15,7 +15,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "multilanguage_string.json" + "$ref": "dynamic_description.json" } }, "themes": { diff --git a/packages/app/schema/topical/dynamic_description.json b/packages/app/schema/topical/dynamic_description.json new file mode 100644 index 0000000000..3725e287d3 --- /dev/null +++ b/packages/app/schema/topical/dynamic_description.json @@ -0,0 +1,15 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "topical_dynamic_description", + "type": "object", + "additionalProperties": false, + "required": ["index", "content"], + "properties": { + "index": { + "type": "number" + }, + "content": { + "$ref": "multilanguage_string.json" + } + } +} diff --git a/packages/app/src/domain/topical/components/topical-header.tsx b/packages/app/src/domain/topical/components/topical-header.tsx new file mode 100644 index 0000000000..fb895ebea2 --- /dev/null +++ b/packages/app/src/domain/topical/components/topical-header.tsx @@ -0,0 +1,29 @@ +import { Box } from '~/components/base'; +import { Heading } from '~/components/typography'; +import { Markdown } from '~/components/markdown'; + +export interface TopicalDynamicDescription { + index: number; + content: string; +} + +interface TopicalHeaderProps { + title: string; + dynamicDescription: TopicalDynamicDescription[]; +} + +export function TopicalHeader({ + title, + dynamicDescription, +}: TopicalHeaderProps) { + return ( + + {title} + + {dynamicDescription.map((description) => ( + + ))} + + + ); +} diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 9e8283b121..b2ba4f013e 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -51,54 +51,60 @@ export function TopicalTile({ flexDirection={'column'} justifyContent={'space-between'} > - - - - - + - - {title} - {isDefined(trendIcon) && trendIcon !== null && ( - - {trendIcon.direction === 'DOWN' && } - {trendIcon.direction === 'UP' && } - - )} - - + + + - - + + + {title} + {isDefined(trendIcon) && trendIcon !== null && ( + + {trendIcon.direction === 'DOWN' && } + {trendIcon.direction === 'UP' && } + + )} + + + + + + + - - {isDefined(cta) && cta !== null && ( + {isDefined(cta) && cta !== null && ( + } @@ -106,8 +112,8 @@ export function TopicalTile({ > {cta.label} - )} - + + )} ); } @@ -115,9 +121,9 @@ export function TopicalTile({ const IconWrapper = styled.span((x) => css({ color: x.iconColor, - display: 'inline-flex', - alignItems: 'center', + display: 'inline', width: '20px', + minWidth: '20px', marginLeft: '15px;', }) ); @@ -126,12 +132,10 @@ const KpiIcon = styled.span( css({ color: colors.white, backgroundColor: colors.blue, - position: 'absolute', - display: 'block', width: asResponsiveArray({ _: 40, sm: 50 }), + minWidth: asResponsiveArray({ _: 40, sm: 50 }), height: asResponsiveArray({ _: 40, sm: 50 }), - right: 0, - top: 0, - padding: asResponsiveArray(2), + padding: 2, + alignSelf: asResponsiveArray({ _: 'inherit', xs: 'end', sm: 'inherit' }), }) ); diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 3a684dd4d8..0b39dbf924 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -1,10 +1,12 @@ import { Box, Spacer } from '~/components/base'; +import css from '@styled-system/css'; import { MaxWidth } from '~/components'; import { Layout } from '~/domain/layout'; import { ArticleList, TopicalSectionHeader } from '~/domain/topical'; import { isPresent } from 'ts-is-present'; import { Search } from '~/domain/topical/components/search'; import { TopicalTile } from '~/domain/topical/components/topical-tile'; +import { TopicalHeader } from '~/domain/topical/components/topical-header'; import { Languages, SiteText } from '~/locale'; import { createGetStaticProps, @@ -61,25 +63,30 @@ const Home = (props: StaticProps) => { + + + {selectedTopicalData.themes .sort((a, b) => a.index - b.index) .map((theme) => { return ( - <> + {theme.themeTiles .sort((a, b) => a.index - b.index) @@ -97,7 +104,7 @@ const Home = (props: StaticProps) => { })} - + ); })} description[localeKey] + (description) => { + return { + index: description.index, + content: description.content[localeKey] }} ), themes: topicalData.themes.map((theme) => ({ index: theme.index, diff --git a/packages/common/src/types/data.ts b/packages/common/src/types/data.ts index 9afdaaebd3..2c8503405c 100644 --- a/packages/common/src/types/data.ts +++ b/packages/common/src/types/data.ts @@ -1160,7 +1160,7 @@ export type TopicalIcon = export interface Topical { version: string; title: MultilanguageString; - dynamicDescription: MultilanguageString[]; + dynamicDescription: TopicalDynamicDescription[]; themes: TopicalTheme[]; measures: TopicalMeasures; } @@ -1168,6 +1168,10 @@ export interface MultilanguageString { NL: string; EN: string; } +export interface TopicalDynamicDescription { + index: number; + content: MultilanguageString; +} export interface TopicalTheme { index: number; title: MultilanguageString; From fbc0260fe01d8383201c22d7448066df9c01107e Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:32:54 +0200 Subject: [PATCH 13/42] remove access import --- packages/app/src/pages/nieuw-actueel.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 0b39dbf924..372d29967d 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -1,5 +1,4 @@ import { Box, Spacer } from '~/components/base'; -import css from '@styled-system/css'; import { MaxWidth } from '~/components'; import { Layout } from '~/domain/layout'; import { ArticleList, TopicalSectionHeader } from '~/domain/topical'; From 4317c7b920bc32b49e9c1a431658f36837e71711 Mon Sep 17 00:00:00 2001 From: J <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:40:56 +0200 Subject: [PATCH 14/42] Added currentColor to all icons (#4370) --- packages/icons/src/svg/afstand_sporten.svg | 2 +- packages/icons/src/svg/alcohol_verkoop.svg | 2 +- packages/icons/src/svg/arrow.svg | 2 +- packages/icons/src/svg/arts.svg | 2 +- packages/icons/src/svg/avondklok.svg | 2 +- packages/icons/src/svg/bar_chart.svg | 2 +- packages/icons/src/svg/basisregels_afstand.svg | 2 +- packages/icons/src/svg/basisregels_drukte.svg | 2 +- packages/icons/src/svg/basisregels_elleboog.svg | 2 +- packages/icons/src/svg/basisregels_geen_bezoek.svg | 2 +- packages/icons/src/svg/basisregels_handenwassen.svg | 2 +- packages/icons/src/svg/basisregels_mondkapje.svg | 2 +- packages/icons/src/svg/basisregels_testen.svg | 2 +- packages/icons/src/svg/bevolking.svg | 2 +- packages/icons/src/svg/bezoek.svg | 2 +- packages/icons/src/svg/bibliotheek.svg | 2 +- packages/icons/src/svg/binnen_met_zitplaats.svg | 2 +- packages/icons/src/svg/binnen_zonder_zitplaats.svg | 2 +- packages/icons/src/svg/binnensporten.svg | 2 +- packages/icons/src/svg/binnensportlocaties.svg | 2 +- packages/icons/src/svg/boosterprik.svg | 2 +- packages/icons/src/svg/calendar.svg | 2 +- packages/icons/src/svg/check.svg | 2 +- packages/icons/src/svg/checked.svg | 2 +- packages/icons/src/svg/chevron_down.svg | 2 +- packages/icons/src/svg/chevron_right.svg | 2 +- packages/icons/src/svg/clock.svg | 2 +- packages/icons/src/svg/close.svg | 2 +- packages/icons/src/svg/close_thick.svg | 2 +- packages/icons/src/svg/contact_beroepen.svg | 2 +- packages/icons/src/svg/coronavirus.svg | 2 +- packages/icons/src/svg/cross.svg | 2 +- packages/icons/src/svg/database.svg | 2 +- packages/icons/src/svg/doorstroom_evenementen.svg | 2 +- packages/icons/src/svg/dot.svg | 2 +- packages/icons/src/svg/down.svg | 2 +- packages/icons/src/svg/download.svg | 2 +- packages/icons/src/svg/een_persoon_doorgestreept.svg | 2 +- packages/icons/src/svg/elderly.svg | 2 +- packages/icons/src/svg/expand.svg | 2 +- packages/icons/src/svg/experimenteel.svg | 2 +- packages/icons/src/svg/external.svg | 2 +- packages/icons/src/svg/eye.svg | 2 +- packages/icons/src/svg/frisse_lucht.svg | 2 +- packages/icons/src/svg/gedeeltelijk_open_rugzak.svg | 2 +- packages/icons/src/svg/geen_entertainment.svg | 2 +- packages/icons/src/svg/geen_max_aantal_bezoekers.svg | 2 +- packages/icons/src/svg/geen_wedstrijden.svg | 2 +- packages/icons/src/svg/gehandicaptenzorg.svg | 2 +- .../icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg | 2 +- packages/icons/src/svg/ggd_testen.svg | 2 +- packages/icons/src/svg/groepen.svg | 2 +- packages/icons/src/svg/health_care.svg | 2 +- packages/icons/src/svg/home_and_visits.svg | 2 +- packages/icons/src/svg/horeca_en_evenementen_bestellen.svg | 2 +- packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg | 2 +- packages/icons/src/svg/horeca_en_evenementen_evenementen.svg | 2 +- packages/icons/src/svg/horeca_evenementen.svg | 2 +- packages/icons/src/svg/hospitality.svg | 2 +- packages/icons/src/svg/information.svg | 2 +- packages/icons/src/svg/klachten.svg | 2 +- packages/icons/src/svg/klok_2100-01.svg | 2 +- packages/icons/src/svg/kunst_cultuur.svg | 2 +- packages/icons/src/svg/kunstcultuur_musea.svg | 2 +- packages/icons/src/svg/line.svg | 2 +- packages/icons/src/svg/locaties.svg | 2 +- packages/icons/src/svg/location.svg | 2 +- packages/icons/src/svg/lopend.svg | 2 +- packages/icons/src/svg/maatregelen.svg | 2 +- packages/icons/src/svg/max_aantal_bezoekers.svg | 2 +- packages/icons/src/svg/max_visitors.svg | 2 +- packages/icons/src/svg/medische_screening.svg | 2 +- packages/icons/src/svg/meer_informatie.svg | 2 +- packages/icons/src/svg/meerdaagse_evenementen.svg | 2 +- packages/icons/src/svg/menu.svg | 2 +- packages/icons/src/svg/mondkapje.svg | 2 +- packages/icons/src/svg/nederland.svg | 2 +- packages/icons/src/svg/notification.svg | 2 +- packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg | 2 +- packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg | 2 +- packages/icons/src/svg/ontmoetingen_bezoek.svg | 2 +- packages/icons/src/svg/openbaar_vervoer.svg | 2 +- packages/icons/src/svg/openingstijden.svg | 2 +- packages/icons/src/svg/other.svg | 2 +- packages/icons/src/svg/overige.svg | 2 +- packages/icons/src/svg/phone.svg | 2 +- packages/icons/src/svg/recreatie.svg | 2 +- packages/icons/src/svg/reizen.svg | 2 +- packages/icons/src/svg/reproductie_graf.svg | 2 +- packages/icons/src/svg/reproductiegetal.svg | 2 +- packages/icons/src/svg/rioolvirus.svg | 2 +- packages/icons/src/svg/search-icon.svg | 2 +- packages/icons/src/svg/search_icon_bold.svg | 2 +- packages/icons/src/svg/sport_buiten.svg | 2 +- packages/icons/src/svg/sport_met_zweetband.svg | 2 +- packages/icons/src/svg/sport_wedstrijden.svg | 2 +- packages/icons/src/svg/stap_1_horeca_max.svg | 2 +- packages/icons/src/svg/stap_1_horeca_pertafel.svg | 2 +- packages/icons/src/svg/stap_1_horeca_verplaatsen.svg | 2 +- packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg | 2 +- packages/icons/src/svg/stap_1_onderwijs_open.svg | 2 +- packages/icons/src/svg/stap_1_theorie.svg | 2 +- packages/icons/src/svg/stap_1_thuisbezoek.svg | 2 +- packages/icons/src/svg/stap_1_uitvaarten.svg | 2 +- packages/icons/src/svg/stap_1_winkels_alleen.svg | 2 +- packages/icons/src/svg/stap_1_winkels_markten.svg | 2 +- packages/icons/src/svg/stap_1_winkels_open.svg | 2 +- packages/icons/src/svg/stopwatch.svg | 2 +- packages/icons/src/svg/taxi.svg | 2 +- packages/icons/src/svg/testbewijs.svg | 2 +- packages/icons/src/svg/toegangsbewijzen.svg | 2 +- packages/icons/src/svg/travel.svg | 2 +- packages/icons/src/svg/unchecked.svg | 2 +- packages/icons/src/svg/up.svg | 2 +- packages/icons/src/svg/vaccinaties.svg | 2 +- packages/icons/src/svg/varianten.svg | 2 +- packages/icons/src/svg/verpleeghuis.svg | 2 +- packages/icons/src/svg/vervoer_en_reizen_buitenland.svg | 2 +- packages/icons/src/svg/vervoer_en_reizen_ov.svg | 2 +- packages/icons/src/svg/vliegen.svg | 2 +- packages/icons/src/svg/warn.svg | 2 +- packages/icons/src/svg/warning.svg | 2 +- packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg | 2 +- packages/icons/src/svg/winkelen_en_boodschappen_open.svg | 2 +- packages/icons/src/svg/work.svg | 2 +- packages/icons/src/svg/ziekenhuis.svg | 2 +- packages/icons/src/svg/ziektegolf.svg | 2 +- 127 files changed, 127 insertions(+), 127 deletions(-) diff --git a/packages/icons/src/svg/afstand_sporten.svg b/packages/icons/src/svg/afstand_sporten.svg index b6a824c1b9..e594b4d6d6 100644 --- a/packages/icons/src/svg/afstand_sporten.svg +++ b/packages/icons/src/svg/afstand_sporten.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/alcohol_verkoop.svg b/packages/icons/src/svg/alcohol_verkoop.svg index 6a4e4accde..16bf4dedf3 100644 --- a/packages/icons/src/svg/alcohol_verkoop.svg +++ b/packages/icons/src/svg/alcohol_verkoop.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/arrow.svg b/packages/icons/src/svg/arrow.svg index a5aea31ed6..ac4ef86dbe 100644 --- a/packages/icons/src/svg/arrow.svg +++ b/packages/icons/src/svg/arrow.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/arts.svg b/packages/icons/src/svg/arts.svg index c8ab34e4af..4511a091e2 100644 --- a/packages/icons/src/svg/arts.svg +++ b/packages/icons/src/svg/arts.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/avondklok.svg b/packages/icons/src/svg/avondklok.svg index d8dcb359d5..2809b5af93 100644 --- a/packages/icons/src/svg/avondklok.svg +++ b/packages/icons/src/svg/avondklok.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/bar_chart.svg b/packages/icons/src/svg/bar_chart.svg index 9e2e18115b..e4fdaabe23 100644 --- a/packages/icons/src/svg/bar_chart.svg +++ b/packages/icons/src/svg/bar_chart.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_afstand.svg b/packages/icons/src/svg/basisregels_afstand.svg index f326748a20..f6309417ff 100644 --- a/packages/icons/src/svg/basisregels_afstand.svg +++ b/packages/icons/src/svg/basisregels_afstand.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_drukte.svg b/packages/icons/src/svg/basisregels_drukte.svg index 62ac73031f..2780f93654 100644 --- a/packages/icons/src/svg/basisregels_drukte.svg +++ b/packages/icons/src/svg/basisregels_drukte.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_elleboog.svg b/packages/icons/src/svg/basisregels_elleboog.svg index a795046a5b..02e4204b5a 100644 --- a/packages/icons/src/svg/basisregels_elleboog.svg +++ b/packages/icons/src/svg/basisregels_elleboog.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_geen_bezoek.svg b/packages/icons/src/svg/basisregels_geen_bezoek.svg index 12d4784c7a..5f4e661467 100644 --- a/packages/icons/src/svg/basisregels_geen_bezoek.svg +++ b/packages/icons/src/svg/basisregels_geen_bezoek.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_handenwassen.svg b/packages/icons/src/svg/basisregels_handenwassen.svg index dc2824adfe..71f26bee2a 100644 --- a/packages/icons/src/svg/basisregels_handenwassen.svg +++ b/packages/icons/src/svg/basisregels_handenwassen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_mondkapje.svg b/packages/icons/src/svg/basisregels_mondkapje.svg index b11944bbb0..7474dd683a 100644 --- a/packages/icons/src/svg/basisregels_mondkapje.svg +++ b/packages/icons/src/svg/basisregels_mondkapje.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/basisregels_testen.svg b/packages/icons/src/svg/basisregels_testen.svg index 2bfedba0dd..476035db7b 100644 --- a/packages/icons/src/svg/basisregels_testen.svg +++ b/packages/icons/src/svg/basisregels_testen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/bevolking.svg b/packages/icons/src/svg/bevolking.svg index 58791572c8..d43ce52282 100644 --- a/packages/icons/src/svg/bevolking.svg +++ b/packages/icons/src/svg/bevolking.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/bezoek.svg b/packages/icons/src/svg/bezoek.svg index 5aabac8f42..e804c643b3 100644 --- a/packages/icons/src/svg/bezoek.svg +++ b/packages/icons/src/svg/bezoek.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/bibliotheek.svg b/packages/icons/src/svg/bibliotheek.svg index 98bd613276..3e43a111ff 100644 --- a/packages/icons/src/svg/bibliotheek.svg +++ b/packages/icons/src/svg/bibliotheek.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/binnen_met_zitplaats.svg b/packages/icons/src/svg/binnen_met_zitplaats.svg index 72387f08ab..d408f29963 100644 --- a/packages/icons/src/svg/binnen_met_zitplaats.svg +++ b/packages/icons/src/svg/binnen_met_zitplaats.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/binnen_zonder_zitplaats.svg b/packages/icons/src/svg/binnen_zonder_zitplaats.svg index 6724ff90da..95769e2465 100644 --- a/packages/icons/src/svg/binnen_zonder_zitplaats.svg +++ b/packages/icons/src/svg/binnen_zonder_zitplaats.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/binnensporten.svg b/packages/icons/src/svg/binnensporten.svg index 887e32b9b0..2202d67afb 100644 --- a/packages/icons/src/svg/binnensporten.svg +++ b/packages/icons/src/svg/binnensporten.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/binnensportlocaties.svg b/packages/icons/src/svg/binnensportlocaties.svg index 6851f1d7c3..b4bc4c20ac 100644 --- a/packages/icons/src/svg/binnensportlocaties.svg +++ b/packages/icons/src/svg/binnensportlocaties.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/boosterprik.svg b/packages/icons/src/svg/boosterprik.svg index 9339b602bf..59b2b5bb1a 100644 --- a/packages/icons/src/svg/boosterprik.svg +++ b/packages/icons/src/svg/boosterprik.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/calendar.svg b/packages/icons/src/svg/calendar.svg index 4c85930158..ab628989af 100644 --- a/packages/icons/src/svg/calendar.svg +++ b/packages/icons/src/svg/calendar.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/check.svg b/packages/icons/src/svg/check.svg index a5661c6a23..2bfcfa9e21 100644 --- a/packages/icons/src/svg/check.svg +++ b/packages/icons/src/svg/check.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/checked.svg b/packages/icons/src/svg/checked.svg index 22924557d0..a24489bc08 100644 --- a/packages/icons/src/svg/checked.svg +++ b/packages/icons/src/svg/checked.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/chevron_down.svg b/packages/icons/src/svg/chevron_down.svg index 99313ae92d..51285e5678 100644 --- a/packages/icons/src/svg/chevron_down.svg +++ b/packages/icons/src/svg/chevron_down.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/chevron_right.svg b/packages/icons/src/svg/chevron_right.svg index 4733ddebe2..ed424fc83e 100644 --- a/packages/icons/src/svg/chevron_right.svg +++ b/packages/icons/src/svg/chevron_right.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/packages/icons/src/svg/clock.svg b/packages/icons/src/svg/clock.svg index 04a023a1f5..b9fd091c46 100644 --- a/packages/icons/src/svg/clock.svg +++ b/packages/icons/src/svg/clock.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/close.svg b/packages/icons/src/svg/close.svg index 382fbd9708..9ab9f8d6ac 100644 --- a/packages/icons/src/svg/close.svg +++ b/packages/icons/src/svg/close.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/close_thick.svg b/packages/icons/src/svg/close_thick.svg index 10956ace52..75395694b0 100644 --- a/packages/icons/src/svg/close_thick.svg +++ b/packages/icons/src/svg/close_thick.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/contact_beroepen.svg b/packages/icons/src/svg/contact_beroepen.svg index f2f241ce2c..fb7bca0ded 100644 --- a/packages/icons/src/svg/contact_beroepen.svg +++ b/packages/icons/src/svg/contact_beroepen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/coronavirus.svg b/packages/icons/src/svg/coronavirus.svg index 39fa39af39..ab813531ff 100644 --- a/packages/icons/src/svg/coronavirus.svg +++ b/packages/icons/src/svg/coronavirus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/cross.svg b/packages/icons/src/svg/cross.svg index b7a6ba036b..a8926480cb 100644 --- a/packages/icons/src/svg/cross.svg +++ b/packages/icons/src/svg/cross.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/database.svg b/packages/icons/src/svg/database.svg index d298674b56..8a8e1ddb75 100644 --- a/packages/icons/src/svg/database.svg +++ b/packages/icons/src/svg/database.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/doorstroom_evenementen.svg b/packages/icons/src/svg/doorstroom_evenementen.svg index b31e71098f..8ccaeb0530 100644 --- a/packages/icons/src/svg/doorstroom_evenementen.svg +++ b/packages/icons/src/svg/doorstroom_evenementen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/dot.svg b/packages/icons/src/svg/dot.svg index d5b081ae5f..012c44e375 100644 --- a/packages/icons/src/svg/dot.svg +++ b/packages/icons/src/svg/dot.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/down.svg b/packages/icons/src/svg/down.svg index cb052b0ff3..5d85f9ba59 100644 --- a/packages/icons/src/svg/down.svg +++ b/packages/icons/src/svg/down.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/download.svg b/packages/icons/src/svg/download.svg index 6c82d26510..3662ee8764 100644 --- a/packages/icons/src/svg/download.svg +++ b/packages/icons/src/svg/download.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/een_persoon_doorgestreept.svg b/packages/icons/src/svg/een_persoon_doorgestreept.svg index 4c2d85298d..6a83f5cf89 100644 --- a/packages/icons/src/svg/een_persoon_doorgestreept.svg +++ b/packages/icons/src/svg/een_persoon_doorgestreept.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/elderly.svg b/packages/icons/src/svg/elderly.svg index a68b28191a..4b7f1c2ef0 100644 --- a/packages/icons/src/svg/elderly.svg +++ b/packages/icons/src/svg/elderly.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/expand.svg b/packages/icons/src/svg/expand.svg index fcfc2e6ff4..ae6e99aeef 100644 --- a/packages/icons/src/svg/expand.svg +++ b/packages/icons/src/svg/expand.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/experimenteel.svg b/packages/icons/src/svg/experimenteel.svg index df2ed3be3f..7cd83a52a5 100644 --- a/packages/icons/src/svg/experimenteel.svg +++ b/packages/icons/src/svg/experimenteel.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/external.svg b/packages/icons/src/svg/external.svg index 6abdada06a..b8d64b2658 100644 --- a/packages/icons/src/svg/external.svg +++ b/packages/icons/src/svg/external.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/eye.svg b/packages/icons/src/svg/eye.svg index 4320b27515..30cceabbfa 100644 --- a/packages/icons/src/svg/eye.svg +++ b/packages/icons/src/svg/eye.svg @@ -1 +1 @@ - + diff --git a/packages/icons/src/svg/frisse_lucht.svg b/packages/icons/src/svg/frisse_lucht.svg index dec6b7c571..5766792d7e 100644 --- a/packages/icons/src/svg/frisse_lucht.svg +++ b/packages/icons/src/svg/frisse_lucht.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg b/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg index 88938dbce1..3185c57a7b 100644 --- a/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg +++ b/packages/icons/src/svg/gedeeltelijk_open_rugzak.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/geen_entertainment.svg b/packages/icons/src/svg/geen_entertainment.svg index f72cd751c0..ad0eb3c68d 100644 --- a/packages/icons/src/svg/geen_entertainment.svg +++ b/packages/icons/src/svg/geen_entertainment.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/geen_max_aantal_bezoekers.svg b/packages/icons/src/svg/geen_max_aantal_bezoekers.svg index d63dd9faef..7e8ce4325c 100644 --- a/packages/icons/src/svg/geen_max_aantal_bezoekers.svg +++ b/packages/icons/src/svg/geen_max_aantal_bezoekers.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/geen_wedstrijden.svg b/packages/icons/src/svg/geen_wedstrijden.svg index cdb8d73d8c..1b726c5863 100644 --- a/packages/icons/src/svg/geen_wedstrijden.svg +++ b/packages/icons/src/svg/geen_wedstrijden.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/gehandicaptenzorg.svg b/packages/icons/src/svg/gehandicaptenzorg.svg index 066bdf79c4..6c359c2926 100644 --- a/packages/icons/src/svg/gehandicaptenzorg.svg +++ b/packages/icons/src/svg/gehandicaptenzorg.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg b/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg index 5ee1011b63..780b37d46f 100644 --- a/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg +++ b/packages/icons/src/svg/georganiseerde_kunst_en_cultuurbeoefening.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/ggd_testen.svg b/packages/icons/src/svg/ggd_testen.svg index be54622cb7..8f8b92af86 100644 --- a/packages/icons/src/svg/ggd_testen.svg +++ b/packages/icons/src/svg/ggd_testen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/groepen.svg b/packages/icons/src/svg/groepen.svg index 741a26139f..aaf43c8767 100644 --- a/packages/icons/src/svg/groepen.svg +++ b/packages/icons/src/svg/groepen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/health_care.svg b/packages/icons/src/svg/health_care.svg index 69a93389af..b376c91ac8 100644 --- a/packages/icons/src/svg/health_care.svg +++ b/packages/icons/src/svg/health_care.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/home_and_visits.svg b/packages/icons/src/svg/home_and_visits.svg index 4380335fc8..4ae0aa09fe 100644 --- a/packages/icons/src/svg/home_and_visits.svg +++ b/packages/icons/src/svg/home_and_visits.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg b/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg index 2a1e24c0bd..2f09a85c5c 100644 --- a/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg +++ b/packages/icons/src/svg/horeca_en_evenementen_bestellen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg b/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg index 13d9871dde..f5d19778af 100644 --- a/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg +++ b/packages/icons/src/svg/horeca_en_evenementen_etendrinken.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg b/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg index 36e26c4f3f..89a78da22c 100644 --- a/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg +++ b/packages/icons/src/svg/horeca_en_evenementen_evenementen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/horeca_evenementen.svg b/packages/icons/src/svg/horeca_evenementen.svg index f3424074a2..29b7df719f 100644 --- a/packages/icons/src/svg/horeca_evenementen.svg +++ b/packages/icons/src/svg/horeca_evenementen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/hospitality.svg b/packages/icons/src/svg/hospitality.svg index 2066f6edaf..abf0b7acaa 100644 --- a/packages/icons/src/svg/hospitality.svg +++ b/packages/icons/src/svg/hospitality.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/information.svg b/packages/icons/src/svg/information.svg index cc933edb79..e23ecce607 100644 --- a/packages/icons/src/svg/information.svg +++ b/packages/icons/src/svg/information.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/klachten.svg b/packages/icons/src/svg/klachten.svg index 3db9f0eac5..336db67de0 100644 --- a/packages/icons/src/svg/klachten.svg +++ b/packages/icons/src/svg/klachten.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/klok_2100-01.svg b/packages/icons/src/svg/klok_2100-01.svg index 7f26f3d2bf..0f791fa542 100644 --- a/packages/icons/src/svg/klok_2100-01.svg +++ b/packages/icons/src/svg/klok_2100-01.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/kunst_cultuur.svg b/packages/icons/src/svg/kunst_cultuur.svg index 379a9b4cb7..9a6885eb65 100644 --- a/packages/icons/src/svg/kunst_cultuur.svg +++ b/packages/icons/src/svg/kunst_cultuur.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/kunstcultuur_musea.svg b/packages/icons/src/svg/kunstcultuur_musea.svg index ce1a08b9e8..c7d541e81e 100644 --- a/packages/icons/src/svg/kunstcultuur_musea.svg +++ b/packages/icons/src/svg/kunstcultuur_musea.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/line.svg b/packages/icons/src/svg/line.svg index 4f9e8716b9..aac92e652f 100644 --- a/packages/icons/src/svg/line.svg +++ b/packages/icons/src/svg/line.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/locaties.svg b/packages/icons/src/svg/locaties.svg index 69140ee1c4..069b083126 100644 --- a/packages/icons/src/svg/locaties.svg +++ b/packages/icons/src/svg/locaties.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/location.svg b/packages/icons/src/svg/location.svg index 20e71c0c28..57ed8e7486 100644 --- a/packages/icons/src/svg/location.svg +++ b/packages/icons/src/svg/location.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/lopend.svg b/packages/icons/src/svg/lopend.svg index cffb07e4f6..dd9c51aee7 100644 --- a/packages/icons/src/svg/lopend.svg +++ b/packages/icons/src/svg/lopend.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/maatregelen.svg b/packages/icons/src/svg/maatregelen.svg index 4c47587c8a..24c60e3d1a 100644 --- a/packages/icons/src/svg/maatregelen.svg +++ b/packages/icons/src/svg/maatregelen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/max_aantal_bezoekers.svg b/packages/icons/src/svg/max_aantal_bezoekers.svg index 782430c699..6533875cc5 100644 --- a/packages/icons/src/svg/max_aantal_bezoekers.svg +++ b/packages/icons/src/svg/max_aantal_bezoekers.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/max_visitors.svg b/packages/icons/src/svg/max_visitors.svg index ffcfc4a2bd..38c12b9fcf 100644 --- a/packages/icons/src/svg/max_visitors.svg +++ b/packages/icons/src/svg/max_visitors.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/medische_screening.svg b/packages/icons/src/svg/medische_screening.svg index 415ac0ce71..78feacfe61 100644 --- a/packages/icons/src/svg/medische_screening.svg +++ b/packages/icons/src/svg/medische_screening.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/meer_informatie.svg b/packages/icons/src/svg/meer_informatie.svg index cad11589af..6d963bb0ee 100644 --- a/packages/icons/src/svg/meer_informatie.svg +++ b/packages/icons/src/svg/meer_informatie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/meerdaagse_evenementen.svg b/packages/icons/src/svg/meerdaagse_evenementen.svg index 39925f4f3f..952b51f193 100644 --- a/packages/icons/src/svg/meerdaagse_evenementen.svg +++ b/packages/icons/src/svg/meerdaagse_evenementen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/menu.svg b/packages/icons/src/svg/menu.svg index ccf490652c..793ba623d3 100644 --- a/packages/icons/src/svg/menu.svg +++ b/packages/icons/src/svg/menu.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/mondkapje.svg b/packages/icons/src/svg/mondkapje.svg index e0ed94c28f..ceda9b7129 100644 --- a/packages/icons/src/svg/mondkapje.svg +++ b/packages/icons/src/svg/mondkapje.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/nederland.svg b/packages/icons/src/svg/nederland.svg index b610d302b8..81a99c5ec5 100644 --- a/packages/icons/src/svg/nederland.svg +++ b/packages/icons/src/svg/nederland.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/notification.svg b/packages/icons/src/svg/notification.svg index b5c1bf516b..d2541b3f9d 100644 --- a/packages/icons/src/svg/notification.svg +++ b/packages/icons/src/svg/notification.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg b/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg index f4eb3ed446..62432a5cfe 100644 --- a/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg +++ b/packages/icons/src/svg/onderwijs_en_kinderopvang_noodopvang.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg b/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg index 3f6c59cf02..9902953a44 100644 --- a/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg +++ b/packages/icons/src/svg/onderwijs_en_kinderopvang_op_afstand.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/ontmoetingen_bezoek.svg b/packages/icons/src/svg/ontmoetingen_bezoek.svg index cf1dc72ef9..8bad556144 100644 --- a/packages/icons/src/svg/ontmoetingen_bezoek.svg +++ b/packages/icons/src/svg/ontmoetingen_bezoek.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/openbaar_vervoer.svg b/packages/icons/src/svg/openbaar_vervoer.svg index cc7c87c267..e898dbf6a4 100644 --- a/packages/icons/src/svg/openbaar_vervoer.svg +++ b/packages/icons/src/svg/openbaar_vervoer.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/openingstijden.svg b/packages/icons/src/svg/openingstijden.svg index 1c19135c8e..2babcf9489 100644 --- a/packages/icons/src/svg/openingstijden.svg +++ b/packages/icons/src/svg/openingstijden.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/other.svg b/packages/icons/src/svg/other.svg index 261c62bea9..55db279f7f 100644 --- a/packages/icons/src/svg/other.svg +++ b/packages/icons/src/svg/other.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/overige.svg b/packages/icons/src/svg/overige.svg index 786068cb23..a77f6a2ee3 100644 --- a/packages/icons/src/svg/overige.svg +++ b/packages/icons/src/svg/overige.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/phone.svg b/packages/icons/src/svg/phone.svg index ae24d49fcc..0c4b89c67b 100644 --- a/packages/icons/src/svg/phone.svg +++ b/packages/icons/src/svg/phone.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/recreatie.svg b/packages/icons/src/svg/recreatie.svg index 1143b5187a..90aefa7b88 100644 --- a/packages/icons/src/svg/recreatie.svg +++ b/packages/icons/src/svg/recreatie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/reizen.svg b/packages/icons/src/svg/reizen.svg index 4f88b308cf..7aa18fdc7d 100644 --- a/packages/icons/src/svg/reizen.svg +++ b/packages/icons/src/svg/reizen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/reproductie_graf.svg b/packages/icons/src/svg/reproductie_graf.svg index ac0d4a087c..304b16f72d 100644 --- a/packages/icons/src/svg/reproductie_graf.svg +++ b/packages/icons/src/svg/reproductie_graf.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/reproductiegetal.svg b/packages/icons/src/svg/reproductiegetal.svg index f0c0155b1e..c245c73452 100644 --- a/packages/icons/src/svg/reproductiegetal.svg +++ b/packages/icons/src/svg/reproductiegetal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/rioolvirus.svg b/packages/icons/src/svg/rioolvirus.svg index f34689b48d..10ffb0b853 100644 --- a/packages/icons/src/svg/rioolvirus.svg +++ b/packages/icons/src/svg/rioolvirus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/search-icon.svg b/packages/icons/src/svg/search-icon.svg index 8fc9076697..2d582c322b 100644 --- a/packages/icons/src/svg/search-icon.svg +++ b/packages/icons/src/svg/search-icon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/search_icon_bold.svg b/packages/icons/src/svg/search_icon_bold.svg index 66c6d09697..5153a169c1 100644 --- a/packages/icons/src/svg/search_icon_bold.svg +++ b/packages/icons/src/svg/search_icon_bold.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/sport_buiten.svg b/packages/icons/src/svg/sport_buiten.svg index e9a3286579..d959e4ddea 100644 --- a/packages/icons/src/svg/sport_buiten.svg +++ b/packages/icons/src/svg/sport_buiten.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/sport_met_zweetband.svg b/packages/icons/src/svg/sport_met_zweetband.svg index f1e65c1c52..0628c78636 100644 --- a/packages/icons/src/svg/sport_met_zweetband.svg +++ b/packages/icons/src/svg/sport_met_zweetband.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/sport_wedstrijden.svg b/packages/icons/src/svg/sport_wedstrijden.svg index 13b128d2d1..b03ae7fc44 100644 --- a/packages/icons/src/svg/sport_wedstrijden.svg +++ b/packages/icons/src/svg/sport_wedstrijden.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_horeca_max.svg b/packages/icons/src/svg/stap_1_horeca_max.svg index ac50935a09..d9917d0c8a 100644 --- a/packages/icons/src/svg/stap_1_horeca_max.svg +++ b/packages/icons/src/svg/stap_1_horeca_max.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_horeca_pertafel.svg b/packages/icons/src/svg/stap_1_horeca_pertafel.svg index eacbf8baf8..99629259fe 100644 --- a/packages/icons/src/svg/stap_1_horeca_pertafel.svg +++ b/packages/icons/src/svg/stap_1_horeca_pertafel.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg b/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg index f080e6bfb2..58676483e7 100644 --- a/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg +++ b/packages/icons/src/svg/stap_1_horeca_verplaatsen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg b/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg index c670b25d4e..bc165e72ea 100644 --- a/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg +++ b/packages/icons/src/svg/stap_1_onderwijs_bibliotheek.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_onderwijs_open.svg b/packages/icons/src/svg/stap_1_onderwijs_open.svg index b41fce1617..2b89474302 100644 --- a/packages/icons/src/svg/stap_1_onderwijs_open.svg +++ b/packages/icons/src/svg/stap_1_onderwijs_open.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_theorie.svg b/packages/icons/src/svg/stap_1_theorie.svg index 8a155e96e5..cff37ddc9c 100644 --- a/packages/icons/src/svg/stap_1_theorie.svg +++ b/packages/icons/src/svg/stap_1_theorie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_thuisbezoek.svg b/packages/icons/src/svg/stap_1_thuisbezoek.svg index 907b49a869..556ec0b40d 100644 --- a/packages/icons/src/svg/stap_1_thuisbezoek.svg +++ b/packages/icons/src/svg/stap_1_thuisbezoek.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_uitvaarten.svg b/packages/icons/src/svg/stap_1_uitvaarten.svg index 0c65183795..1afff1611a 100644 --- a/packages/icons/src/svg/stap_1_uitvaarten.svg +++ b/packages/icons/src/svg/stap_1_uitvaarten.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_winkels_alleen.svg b/packages/icons/src/svg/stap_1_winkels_alleen.svg index 6a9c803eed..9a0b35404e 100644 --- a/packages/icons/src/svg/stap_1_winkels_alleen.svg +++ b/packages/icons/src/svg/stap_1_winkels_alleen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_winkels_markten.svg b/packages/icons/src/svg/stap_1_winkels_markten.svg index bb91ddaecf..e6f4f03fb4 100644 --- a/packages/icons/src/svg/stap_1_winkels_markten.svg +++ b/packages/icons/src/svg/stap_1_winkels_markten.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stap_1_winkels_open.svg b/packages/icons/src/svg/stap_1_winkels_open.svg index 83da7a1a28..4a1b72d1db 100644 --- a/packages/icons/src/svg/stap_1_winkels_open.svg +++ b/packages/icons/src/svg/stap_1_winkels_open.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/stopwatch.svg b/packages/icons/src/svg/stopwatch.svg index 872daf4fbe..a45e0b9c0a 100644 --- a/packages/icons/src/svg/stopwatch.svg +++ b/packages/icons/src/svg/stopwatch.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/taxi.svg b/packages/icons/src/svg/taxi.svg index fbc2a5e391..29f0270b03 100644 --- a/packages/icons/src/svg/taxi.svg +++ b/packages/icons/src/svg/taxi.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/testbewijs.svg b/packages/icons/src/svg/testbewijs.svg index b096ca0c79..0e9c990afc 100644 --- a/packages/icons/src/svg/testbewijs.svg +++ b/packages/icons/src/svg/testbewijs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/toegangsbewijzen.svg b/packages/icons/src/svg/toegangsbewijzen.svg index df2f0231fa..5d4144b7b2 100644 --- a/packages/icons/src/svg/toegangsbewijzen.svg +++ b/packages/icons/src/svg/toegangsbewijzen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/travel.svg b/packages/icons/src/svg/travel.svg index 9fcc6b3fa4..8d8695332d 100644 --- a/packages/icons/src/svg/travel.svg +++ b/packages/icons/src/svg/travel.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/unchecked.svg b/packages/icons/src/svg/unchecked.svg index 1646e26d25..7522cb1fd4 100644 --- a/packages/icons/src/svg/unchecked.svg +++ b/packages/icons/src/svg/unchecked.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/up.svg b/packages/icons/src/svg/up.svg index 273a9526b9..6fdba19e6f 100644 --- a/packages/icons/src/svg/up.svg +++ b/packages/icons/src/svg/up.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/vaccinaties.svg b/packages/icons/src/svg/vaccinaties.svg index ec395fc203..89f1c8d185 100644 --- a/packages/icons/src/svg/vaccinaties.svg +++ b/packages/icons/src/svg/vaccinaties.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/varianten.svg b/packages/icons/src/svg/varianten.svg index 4458bdde9e..76552dc34c 100644 --- a/packages/icons/src/svg/varianten.svg +++ b/packages/icons/src/svg/varianten.svg @@ -1,5 +1,5 @@ - + diff --git a/packages/icons/src/svg/verpleeghuis.svg b/packages/icons/src/svg/verpleeghuis.svg index 3b587fdd26..7a1a722d69 100644 --- a/packages/icons/src/svg/verpleeghuis.svg +++ b/packages/icons/src/svg/verpleeghuis.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg b/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg index f1f867b02a..4aa2e40c42 100644 --- a/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg +++ b/packages/icons/src/svg/vervoer_en_reizen_buitenland.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/vervoer_en_reizen_ov.svg b/packages/icons/src/svg/vervoer_en_reizen_ov.svg index 8122fe01e1..bf84fb0eea 100644 --- a/packages/icons/src/svg/vervoer_en_reizen_ov.svg +++ b/packages/icons/src/svg/vervoer_en_reizen_ov.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/vliegen.svg b/packages/icons/src/svg/vliegen.svg index 203ae2539c..d9daa1103c 100644 --- a/packages/icons/src/svg/vliegen.svg +++ b/packages/icons/src/svg/vliegen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/warn.svg b/packages/icons/src/svg/warn.svg index c6f008aaf6..ef78e8d247 100644 --- a/packages/icons/src/svg/warn.svg +++ b/packages/icons/src/svg/warn.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/warning.svg b/packages/icons/src/svg/warning.svg index 3f33bb13be..838d94678d 100644 --- a/packages/icons/src/svg/warning.svg +++ b/packages/icons/src/svg/warning.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg b/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg index 4f1eb9ebaa..f72d8aae07 100644 --- a/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg +++ b/packages/icons/src/svg/winkelen_en_boodschappen_alcohol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/winkelen_en_boodschappen_open.svg b/packages/icons/src/svg/winkelen_en_boodschappen_open.svg index 01a304d9f5..fd3abe33ba 100644 --- a/packages/icons/src/svg/winkelen_en_boodschappen_open.svg +++ b/packages/icons/src/svg/winkelen_en_boodschappen_open.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/work.svg b/packages/icons/src/svg/work.svg index e8801de52f..7fb749edfb 100644 --- a/packages/icons/src/svg/work.svg +++ b/packages/icons/src/svg/work.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/ziekenhuis.svg b/packages/icons/src/svg/ziekenhuis.svg index 085811a4f8..2c42a3b61f 100644 --- a/packages/icons/src/svg/ziekenhuis.svg +++ b/packages/icons/src/svg/ziekenhuis.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/svg/ziektegolf.svg b/packages/icons/src/svg/ziektegolf.svg index 6d2b2f33d5..3858992bf1 100644 --- a/packages/icons/src/svg/ziektegolf.svg +++ b/packages/icons/src/svg/ziektegolf.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From ae39525217085e4958d3e7d57844f94654ea2dc8 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Fri, 19 Aug 2022 08:32:37 +0200 Subject: [PATCH 15/42] added theme header --- .../topical/components/theme-header.tsx | 42 +++++++++++++++++++ .../topical/components/topical-header.tsx | 4 +- packages/app/src/pages/nieuw-actueel.tsx | 19 ++++++++- 3 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 packages/app/src/domain/topical/components/theme-header.tsx diff --git a/packages/app/src/domain/topical/components/theme-header.tsx b/packages/app/src/domain/topical/components/theme-header.tsx new file mode 100644 index 0000000000..66af40c79a --- /dev/null +++ b/packages/app/src/domain/topical/components/theme-header.tsx @@ -0,0 +1,42 @@ +import { Box } from '~/components/base'; +import css from '@styled-system/css'; +import styled from 'styled-components'; +import { Heading } from '~/components/typography'; +import { Markdown } from '~/components/markdown'; +import { TopicalIcon } from '@corona-dashboard/common/src/types'; +import DynamicIcon from '~/components/get-icon-by-name'; + +interface TopicalHeaderProps { + title: string; + dynamicSubtitle: string; + icon: TopicalIcon; +} + +export function ThemeHeader({ + title, + dynamicSubtitle, + icon, +}: TopicalHeaderProps) { + return ( + + + {icon !== null && ( + + + + )} + {title} + + + + ); +} + +const ThemaIcon = styled.span( + css({ + display: 'inline', + width: '20px', + minWidth: '20px', + marginRight: '15px;', + }) +); diff --git a/packages/app/src/domain/topical/components/topical-header.tsx b/packages/app/src/domain/topical/components/topical-header.tsx index fb895ebea2..9bb3361787 100644 --- a/packages/app/src/domain/topical/components/topical-header.tsx +++ b/packages/app/src/domain/topical/components/topical-header.tsx @@ -2,10 +2,10 @@ import { Box } from '~/components/base'; import { Heading } from '~/components/typography'; import { Markdown } from '~/components/markdown'; -export interface TopicalDynamicDescription { +type TopicalDynamicDescription = { index: number; content: string; -} +}; interface TopicalHeaderProps { title: string; diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 372d29967d..3c5c392601 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -6,6 +6,7 @@ import { isPresent } from 'ts-is-present'; import { Search } from '~/domain/topical/components/search'; import { TopicalTile } from '~/domain/topical/components/topical-tile'; import { TopicalHeader } from '~/domain/topical/components/topical-header'; +import { ThemeHeader } from '~/domain/topical/components/theme-header'; import { Languages, SiteText } from '~/locale'; import { createGetStaticProps, @@ -76,7 +77,14 @@ const Home = (props: StaticProps) => { .sort((a, b) => a.index - b.index) .map((theme) => { return ( - + + + + ) => { }} gridColumnGap={{ _: 4, md: 5 }} gridRowGap={{ _: 4, md: 5 }} + marginBottom={5} > {theme.themeTiles .sort((a, b) => a.index - b.index) @@ -106,6 +115,14 @@ const Home = (props: StaticProps) => { ); })} + + + + Date: Mon, 22 Aug 2022 08:58:58 +0200 Subject: [PATCH 16/42] Fixing issues. --- .../topical/components/theme-header.tsx | 12 +- .../components/topical-tile/topical-tile.tsx | 152 ++++++++++-------- packages/app/src/pages/nieuw-actueel.tsx | 59 +++---- 3 files changed, 122 insertions(+), 101 deletions(-) diff --git a/packages/app/src/domain/topical/components/theme-header.tsx b/packages/app/src/domain/topical/components/theme-header.tsx index 66af40c79a..bf2c15b83d 100644 --- a/packages/app/src/domain/topical/components/theme-header.tsx +++ b/packages/app/src/domain/topical/components/theme-header.tsx @@ -19,14 +19,14 @@ export function ThemeHeader({ }: TopicalHeaderProps) { return ( - + {icon !== null && ( )} - {title} - + {title} + ); @@ -34,9 +34,9 @@ export function ThemeHeader({ const ThemaIcon = styled.span( css({ - display: 'inline', - width: '20px', - minWidth: '20px', + display: 'flex', + alignItems: 'center', + width: '30px', marginRight: '15px;', }) ); diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index b2ba4f013e..4b813fbe0c 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -41,80 +41,98 @@ export function TopicalTile({ cta, }: TopicalTileProps) { return ( - - - - - - + + + + + + - - - {title} - {isDefined(trendIcon) && trendIcon !== null && ( - - {trendIcon.direction === 'DOWN' && } - {trendIcon.direction === 'UP' && } - - )} - + + + {title} + {isDefined(trendIcon) && trendIcon !== null && ( + + {trendIcon.direction === 'DOWN' && } + {trendIcon.direction === 'UP' && } + + )} + + - - - - + + + + - - {isDefined(cta) && cta !== null && ( - - } - iconPlacement="right" + {isDefined(cta) && cta !== null && ( + - {cta.label} - - - )} - + } + iconPlacement="right" + > + {cta.label} + + + )} + + ); } diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 3c5c392601..20bec95c9a 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -116,34 +116,37 @@ const Home = (props: StaticProps) => { ); })} - - - - - {selectedTopicalData.measures.measureTiles - .sort((a, b) => a.index - b.index) - .map((measureTile) => { - return ( - - ); - })} + + + + + + {selectedTopicalData.measures.measureTiles + .sort((a, b) => a.index - b.index) + .map((measureTile) => { + return ( + + ); + })} + From d0d61b64bda66c2eb5d3faaccae36adac946eb80 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 09:13:30 +0200 Subject: [PATCH 17/42] Remove replaced Component props --- .../domain/topical/components/topical-tile/topical-tile.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 4b813fbe0c..5b8bb9f229 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -41,11 +41,7 @@ export function TopicalTile({ cta, }: TopicalTileProps) { return ( - + Date: Mon, 22 Aug 2022 09:54:00 +0200 Subject: [PATCH 18/42] all topical tile hover and link --- .../components/topical-tile/topical-tile.tsx | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 5b8bb9f229..50e7bb9a3a 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -40,19 +40,27 @@ export function TopicalTile({ dynamicDescription, cta, }: TopicalTileProps) { + const containtsLink = + isDefined(cta) && cta !== null ? { as: 'a', href: cta.href } : {}; return ( - - + + <> )} - - + + ); } From 58b34ab1190dcb727c4cfa40f4c350a6518e8e4b Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:14:05 +0200 Subject: [PATCH 19/42] (responsive) spacing --- packages/app/src/pages/nieuw-actueel.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 20bec95c9a..721791d41d 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -72,7 +72,7 @@ const Home = (props: StaticProps) => { dynamicDescription={selectedTopicalData.dynamicDescription} /> - + {selectedTopicalData.themes .sort((a, b) => a.index - b.index) .map((theme) => { @@ -94,7 +94,7 @@ const Home = (props: StaticProps) => { }} gridColumnGap={{ _: 4, md: 5 }} gridRowGap={{ _: 4, md: 5 }} - marginBottom={5} + marginBottom={{ _: 4, sm: 5 }} > {theme.themeTiles .sort((a, b) => a.index - b.index) @@ -149,17 +149,17 @@ const Home = (props: StaticProps) => { - - + - - - + + + + - - + + Date: Mon, 22 Aug 2022 12:19:14 +0200 Subject: [PATCH 20/42] updated trend color, Updated Topical Footer, use consistant link and hover color, add alignment to measurement tile --- .../app/src/components/link-with-icon.tsx | 4 +- .../src/components/notification-banner.tsx | 3 +- .../measurement-tile/measurement-tile.tsx | 1 + .../components/topical-tile/topical-tile.tsx | 178 +++++++++--------- packages/app/src/pages/nieuw-actueel.tsx | 14 +- packages/app/src/static-props/get-data.ts | 6 +- 6 files changed, 106 insertions(+), 100 deletions(-) diff --git a/packages/app/src/components/link-with-icon.tsx b/packages/app/src/components/link-with-icon.tsx index f981f511ed..fdd91e53f0 100644 --- a/packages/app/src/components/link-with-icon.tsx +++ b/packages/app/src/components/link-with-icon.tsx @@ -172,8 +172,6 @@ const ButtonBox = styled.span((x: buttonBoxProps) => }, }, }) - : { - color: 'inherit', - }, + : {}, }) ); diff --git a/packages/app/src/components/notification-banner.tsx b/packages/app/src/components/notification-banner.tsx index abe74c3758..65c431dd2d 100644 --- a/packages/app/src/components/notification-banner.tsx +++ b/packages/app/src/components/notification-banner.tsx @@ -5,6 +5,7 @@ import { Markdown } from '~/components/markdown'; import { MaxWidth } from '~/components/max-width'; import { useCollapsible } from '~/utils/use-collapsible'; import { InlineText, BoldText } from './typography'; +import { colors } from '@corona-dashboard/common'; interface NotificationBannerProps { title: string; @@ -22,7 +23,7 @@ export function NotificationBanner({ const hasDescription = description.length !== 0; return ( - + diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 50e7bb9a3a..b4c607c9d2 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -10,6 +10,7 @@ import { ChevronRight, Down, Up } from '@corona-dashboard/icons'; import { Markdown } from '~/components/markdown'; import { TopicalIcon } from '@corona-dashboard/common/src/types'; import { isDefined } from 'ts-is-present'; +import { Link } from '~/utils/link'; interface IconWrapperProps { iconColor: string; @@ -17,7 +18,7 @@ interface IconWrapperProps { type TrendIcon = { direction: 'UP' | 'DOWN'; - color: 'GREEN' | 'RED'; + color: string; } | null; type Cta = { @@ -40,100 +41,101 @@ export function TopicalTile({ dynamicDescription, cta, }: TopicalTileProps) { - const containtsLink = - isDefined(cta) && cta !== null ? { as: 'a', href: cta.href } : {}; return ( - - <> - - - - - + + + <> + + + + + - - - {title} - {isDefined(trendIcon) && trendIcon !== null && ( - - {trendIcon.direction === 'DOWN' && } - {trendIcon.direction === 'UP' && } - - )} - + + + {title} + {isDefined(trendIcon) && trendIcon !== null && ( + + {trendIcon.direction === 'DOWN' && } + {trendIcon.direction === 'UP' && } + + )} + + - - - - + + + + - - {isDefined(cta) && cta !== null && ( - - } - iconPlacement="right" + {isDefined(cta) && cta !== null && ( + - {cta.label} - - - )} - - + } + iconPlacement="right" + > + {cta.label} + + + )} + + + ); } diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 721791d41d..004e39dd70 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -149,17 +149,17 @@ const Home = (props: StaticProps) => { + - + - - - - + + + + - - + Date: Mon, 22 Aug 2022 12:26:26 +0200 Subject: [PATCH 21/42] Fix hover state bug in link on topical tile --- .../topical/components/topical-tile/topical-tile.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index b4c607c9d2..cf31dcb03d 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -55,8 +55,11 @@ export function TopicalTile({ justifyContent={'space-between'} color="#000000" css={css({ - '&:hover .topipical-tile': { + '&:hover .topical-tile-cta': { bg: colors.blue, + }, + '&:hover .topical-tile-cta a': { + textDecoration: 'underline', color: colors.white, }, })} @@ -119,7 +122,7 @@ export function TopicalTile({ bg={colors.lightBlue} color={colors.blue} padding={3} - className="topipical-tile" + className="topical-tile-cta" css={css({ transition: 'background .1s ease-in-out', })} From dc07fa5edaafb1ee0efefebfea53332313af9b69 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 13:02:25 +0200 Subject: [PATCH 22/42] icon size and alignment --- packages/app/src/components/notification-banner.tsx | 2 +- .../components/measurement-tile/measurement-tile.tsx | 4 ++-- .../topical/components/topical-tile/topical-tile.tsx | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/app/src/components/notification-banner.tsx b/packages/app/src/components/notification-banner.tsx index 65c431dd2d..c356179120 100644 --- a/packages/app/src/components/notification-banner.tsx +++ b/packages/app/src/components/notification-banner.tsx @@ -30,7 +30,7 @@ export function NotificationBanner({ display="flex" spacingHorizontal={3} > - + diff --git a/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx b/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx index 91a71b9989..5ec6832c29 100644 --- a/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx +++ b/packages/app/src/domain/topical/components/measurement-tile/measurement-tile.tsx @@ -1,7 +1,6 @@ import { Box } from '~/components/base'; import css from '@styled-system/css'; import styled from 'styled-components'; -import { asResponsiveArray } from '~/style/utils'; import { colors } from '@corona-dashboard/common'; import DynamicIcon from '~/components/get-icon-by-name'; import { Markdown } from '~/components/markdown'; @@ -52,7 +51,8 @@ const KpiIcon = styled.div( css({ color: colors.blue, display: 'flex', - minWidth: asResponsiveArray(40), + minWidth: 40, + width: 40, marginRight: 3, }) ); diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index cf31dcb03d..6cc2a652a7 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -74,6 +74,9 @@ export function TopicalTile({ sm: 'row-reverse', }} justifyContent={'space-between'} + css={css({ + gap: 2, + })} > @@ -145,10 +148,10 @@ export function TopicalTile({ const IconWrapper = styled.span((x) => css({ color: x.iconColor, - display: 'inline', + display: 'inline-flex', width: '20px', minWidth: '20px', - marginLeft: '15px;', + marginLeft: 2, }) ); From a0670a9c0e4b15e5f8a16bfab745ac1855b3e512 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 13:26:28 +0200 Subject: [PATCH 23/42] finetuning and set non link tile --- .../app/src/components/link-with-icon.tsx | 2 +- .../components/topical-tile/topical-tile.tsx | 188 +++++++++--------- packages/app/src/pages/nieuw-actueel.tsx | 18 +- 3 files changed, 102 insertions(+), 106 deletions(-) diff --git a/packages/app/src/components/link-with-icon.tsx b/packages/app/src/components/link-with-icon.tsx index fdd91e53f0..72d2acf5b4 100644 --- a/packages/app/src/components/link-with-icon.tsx +++ b/packages/app/src/components/link-with-icon.tsx @@ -168,7 +168,7 @@ const ButtonBox = styled.span((x: buttonBoxProps) => outline: '#000000 dotted 2px', }, '&:hover, &:focus': { - textDecoration: 'none', + textDecoration: 'underline', }, }, }) diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 6cc2a652a7..2f7ec0d3bb 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -10,7 +10,6 @@ import { ChevronRight, Down, Up } from '@corona-dashboard/icons'; import { Markdown } from '~/components/markdown'; import { TopicalIcon } from '@corona-dashboard/common/src/types'; import { isDefined } from 'ts-is-present'; -import { Link } from '~/utils/link'; interface IconWrapperProps { iconColor: string; @@ -42,106 +41,105 @@ export function TopicalTile({ cta, }: TopicalTileProps) { return ( - - - <> - - - - - + + <> + + + + + - - - {title} - {isDefined(trendIcon) && trendIcon !== null && ( - - {trendIcon.direction === 'DOWN' && } - {trendIcon.direction === 'UP' && } - - )} - - + + + {title} + {isDefined(trendIcon) && trendIcon !== null && ( + + {trendIcon.direction === 'DOWN' && } + {trendIcon.direction === 'UP' && } + + )} + - - - - + + + + + - {isDefined(cta) && cta !== null && ( - + } + iconPlacement="right" > - } - iconPlacement="right" - > - {cta.label} - - - )} - - - + {cta.label} + + + )} + + ); } diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index 004e39dd70..e72c3f2235 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -58,6 +58,12 @@ const Home = (props: StaticProps) => { description: textNl.metadata.description, }; + const tileGridTemplate = { + _: 'repeat(1, 1fr)', + sm: 'repeat(2, 1fr)', + md: 'repeat(3, 1fr)', + }; + return ( @@ -87,11 +93,7 @@ const Home = (props: StaticProps) => { ) => { Date: Wed, 17 Aug 2022 14:56:40 +0200 Subject: [PATCH 24/42] Feature/cor 959/dynamic icons (#4361) * Get an icon dynamically * feat: make dynamic icon work including typings * fix: code cleanup * feat: extend type info in icon build * feat: add eye icon Co-authored-by: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Co-authored-by: VWSCoronaDashboard24 --- packages/app/src/pages/nieuw-actueel.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index e72c3f2235..c9270733ad 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -8,6 +8,7 @@ import { TopicalTile } from '~/domain/topical/components/topical-tile'; import { TopicalHeader } from '~/domain/topical/components/topical-header'; import { ThemeHeader } from '~/domain/topical/components/theme-header'; import { Languages, SiteText } from '~/locale'; +import DynamicIcon from '~/components/get-icon-by-name'; import { createGetStaticProps, StaticProps, From fb5408cd0c3da866e01aad2eb24994d555b980f8 Mon Sep 17 00:00:00 2001 From: J <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Thu, 18 Aug 2022 08:56:04 +0200 Subject: [PATCH 25/42] COR-990 the topical page component (#4363) * the topical page component * Restore old topical-tile component * Fixed data input instead of static mockup * fixed width and height * set right padding for kpiIcon * Update packages/app/src/domain/topical/components/topical-tile/index.ts Thanks for noticing Co-authored-by: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> * Update packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx Nice, I bet it's from some old mockup. Co-authored-by: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> Co-authored-by: MN <97020799+VWSCoronaDashboard24@users.noreply.github.com> --- packages/app/src/pages/nieuw-actueel.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/pages/nieuw-actueel.tsx b/packages/app/src/pages/nieuw-actueel.tsx index c9270733ad..e72c3f2235 100644 --- a/packages/app/src/pages/nieuw-actueel.tsx +++ b/packages/app/src/pages/nieuw-actueel.tsx @@ -8,7 +8,6 @@ import { TopicalTile } from '~/domain/topical/components/topical-tile'; import { TopicalHeader } from '~/domain/topical/components/topical-header'; import { ThemeHeader } from '~/domain/topical/components/theme-header'; import { Languages, SiteText } from '~/locale'; -import DynamicIcon from '~/components/get-icon-by-name'; import { createGetStaticProps, StaticProps, From dce7830c31cb11d50cf6bb68e71166d704857793 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 15:31:34 +0200 Subject: [PATCH 26/42] link fix --- .../topical/components/topical-tile/topical-tile.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 2f7ec0d3bb..212f497e1c 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -9,7 +9,6 @@ import DynamicIcon from '~/components/get-icon-by-name'; import { ChevronRight, Down, Up } from '@corona-dashboard/icons'; import { Markdown } from '~/components/markdown'; import { TopicalIcon } from '@corona-dashboard/common/src/types'; -import { isDefined } from 'ts-is-present'; interface IconWrapperProps { iconColor: string; @@ -42,7 +41,7 @@ export function TopicalTile({ }: TopicalTileProps) { return ( {title} - {isDefined(trendIcon) && trendIcon !== null && ( + {trendIcon && ( {trendIcon.direction === 'DOWN' && } {trendIcon.direction === 'UP' && } @@ -117,7 +116,7 @@ export function TopicalTile({ - {isDefined(cta) && cta !== null && ( + {cta ? ( - )} + ) : null} ); From 0c8c2301fb5ad5d84a6b9ff3e8ed85565e728a96 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 17:50:13 +0200 Subject: [PATCH 27/42] rounded corner for icon square, spacing finetuning --- .../topical/components/topical-tile/topical-tile.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx index 212f497e1c..db7602d1ef 100644 --- a/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx +++ b/packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx @@ -1,4 +1,5 @@ import { Box } from '~/components/base'; +import { space } from '~/style/theme'; import css from '@styled-system/css'; import styled from 'styled-components'; import { Heading } from '~/components/typography'; @@ -43,7 +44,7 @@ export function TopicalTile({ @@ -160,6 +160,6 @@ const KpiIcon = styled.span( minWidth: asResponsiveArray({ _: 40, sm: 50 }), height: asResponsiveArray({ _: 40, sm: 50 }), padding: 2, - alignSelf: asResponsiveArray({ _: 'inherit', xs: 'end', sm: 'inherit' }), + borderBottomLeftRadius: space[1], }) ); From 720bef2a9a3abea7f4f7427faff910a4f96bc82e Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard18 <93984341+VWSCoronaDashboard18@users.noreply.github.com> Date: Mon, 22 Aug 2022 17:50:31 +0200 Subject: [PATCH 28/42] Rename menu's from 'actueel' to 'maatregelen' --- packages/app/src/components/layout/app-footer.tsx | 2 +- .../components/layout/components/top-navigation.tsx | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/app/src/components/layout/app-footer.tsx b/packages/app/src/components/layout/app-footer.tsx index caac0bc9ba..37a3d7f249 100644 --- a/packages/app/src/components/layout/app-footer.tsx +++ b/packages/app/src/components/layout/app-footer.tsx @@ -40,7 +40,7 @@ export function AppFooter() {