Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Feature/cor 959 topical page redesign #4376

Merged
merged 42 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
eec4528
Made a base file for a new topicalPage to work on in this ticket.
Jorrik-Klijnsma-Work Aug 10, 2022
243e54d
COR-995 Topical page redesign schema (#4355)
VWSCoronaDashboard24 Aug 17, 2022
ab5cb1a
Feature/cor 959/dynamic icons (#4361)
VWSCoronaDashboard24 Aug 17, 2022
60540f1
COR-990 the topical page component (#4363)
Jorrik-Klijnsma-Work Aug 18, 2022
d5b8d60
COR-993 measurement tile (#4364)
Jorrik-Klijnsma-Work Aug 18, 2022
d68ce9f
feat: redirect to vr/gm page instead of topical vr/gm
VWSCoronaDashboard24 Aug 17, 2022
32f8d87
fix: redirect topical GM/VR pages
VWSCoronaDashboard24 Aug 18, 2022
c98187f
fix: layout of searchbox and footer
VWSCoronaDashboard24 Aug 18, 2022
4bb7987
Update eye.svg and generate script after rebase (on develop with the …
Jorrik-Klijnsma-Work Aug 18, 2022
a0131ab
Fix typing issues on icon cahnges
Jorrik-Klijnsma-Work Aug 18, 2022
49988ad
Feature/cor 959/subjects-list (#4354)
Amber-Taal-Work Aug 18, 2022
eb23ba7
Feature/cor 959/page header (#4356)
Amber-Taal-Work Aug 18, 2022
fbc0260
remove access import
Jorrik-Klijnsma-Work Aug 18, 2022
4317c7b
Added currentColor to all icons (#4370)
Jorrik-Klijnsma-Work Aug 18, 2022
ae39525
added theme header
Jorrik-Klijnsma-Work Aug 19, 2022
32dd0e7
Fixing issues.
Jorrik-Klijnsma-Work Aug 22, 2022
d0d61b6
Remove replaced Component props
Jorrik-Klijnsma-Work Aug 22, 2022
231fd00
all topical tile hover and link
Jorrik-Klijnsma-Work Aug 22, 2022
58b34ab
(responsive) spacing
Jorrik-Klijnsma-Work Aug 22, 2022
d45d173
updated trend color, Updated Topical Footer, use consistant link and …
Jorrik-Klijnsma-Work Aug 22, 2022
769a3ad
Fix hover state bug in link on topical tile
Jorrik-Klijnsma-Work Aug 22, 2022
dc07fa5
icon size and alignment
Jorrik-Klijnsma-Work Aug 22, 2022
a0670a9
finetuning and set non link tile
Jorrik-Klijnsma-Work Aug 22, 2022
629b81a
Feature/cor 959/dynamic icons (#4361)
VWSCoronaDashboard24 Aug 17, 2022
fb5408c
COR-990 the topical page component (#4363)
Jorrik-Klijnsma-Work Aug 18, 2022
dce7830
link fix
Jorrik-Klijnsma-Work Aug 22, 2022
0c8c230
rounded corner for icon square, spacing finetuning
Jorrik-Klijnsma-Work Aug 22, 2022
720bef2
Rename menu's from 'actueel' to 'maatregelen'
Jorrik-Klijnsma-Work Aug 22, 2022
6f8ed37
update variants icon
Jorrik-Klijnsma-Work Aug 22, 2022
fe5e5e9
added menu name
Jorrik-Klijnsma-Work Aug 22, 2022
0ab53f3
update uppercase typo name
Jorrik-Klijnsma-Work Aug 22, 2022
07db6ca
removed old topical page and cleaned up after
Jorrik-Klijnsma-Work Aug 23, 2022
2e8273c
updated grid and removed icon from other branch
Jorrik-Klijnsma-Work Aug 23, 2022
71c1741
Rename menu's from 'maatregelen' to 'samenvatting'
Aug 23, 2022
469307b
Generate icons.md + add IntensiveCareOpnames icon (#4374)
VWSCoronaDashboard24 Aug 23, 2022
6fd711b
bring removed components back for typechecking
Jorrik-Klijnsma-Work Aug 23, 2022
107cd3a
Add menu name change to mutations file
Jorrik-Klijnsma-Work Aug 23, 2022
c3862f6
fix: make icons visible on safari
VWSCoronaDashboard24 Aug 23, 2022
5b78f75
reset grid settings, nice word wrap, bring icon's back
Jorrik-Klijnsma-Work Aug 23, 2022
24b69f1
Measurement tile safari fix
Jorrik-Klijnsma-Work Aug 23, 2022
0d6eec6
Restore minWidth
Jorrik-Klijnsma-Work Aug 23, 2022
8479d84
navigation icon size fix
Jorrik-Klijnsma-Work Aug 23, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ give a broad perspective on the subject.

## Contact

If you want to contact the dashboard team, feel free to open an issue for
If you want to contact the dashboard team, feel free to open an issue for
technical questions, bug reports or security findings. If you have a generic question or remark about the
corona policy of the Dutch government, please consult the [frequently asked questions](https://coronadashboard.rijksoverheid.nl/veelgestelde-vragen) or [contact page](https://coronadashboard.rijksoverheid.nl/contact) on the dashboard.

Expand All @@ -31,7 +31,7 @@ multiple packages.
- `common`: Commonly shared code that multiple packages are using, like types
and utils.
- `e2e`: End-to-end tests using Cypress
- `icons`: A React icon component library, used by the CMS and by app
- `icons`: A React icon component library, used by the CMS and by app. [README](/packages/icons/README.md)

## Getting started (quickly)

Expand Down
33 changes: 33 additions & 0 deletions packages/app/schema/topical/__index.json
Original file line number Diff line number Diff line change
@@ -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": "dynamic_description.json"
}
},
"themes": {
"type": "array",
"minItems": 1,
"maxItems": 2,
"items": {
"$ref": "theme.json"
}
},
"measures": {
"$ref": "measures.json"
}
}
}
15 changes: 15 additions & 0 deletions packages/app/schema/topical/dynamic_description.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
135 changes: 135 additions & 0 deletions packages/app/schema/topical/icon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "topical_icon",
"type": "string",
"enum": [
"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",
"IntensiveCareOpnames",
"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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to have the yarn build:icons have this file generated. Now it's manual work.

]
}
18 changes: 18 additions & 0 deletions packages/app/schema/topical/link.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
18 changes: 18 additions & 0 deletions packages/app/schema/topical/measure_tile.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
25 changes: 25 additions & 0 deletions packages/app/schema/topical/measures.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
15 changes: 15 additions & 0 deletions packages/app/schema/topical/multilanguage_string.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
63 changes: 63 additions & 0 deletions packages/app/schema/topical/theme.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
}
Loading