From eae9061ab79fd487c5895d95df0e38e80b26a94a Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sat, 8 May 2021 02:30:10 +0300 Subject: [PATCH 01/14] cleanup ContactsPageView, add index and format json files --- src/views/ContactsPage/ContactsPageView.tsx | 130 ++++---- src/views/ContactsPage/board.json | 319 ++++++++++---------- src/views/ContactsPage/eptmk.json | 52 ++++ src/views/ContactsPage/hvtmk.json | 129 ++++---- src/views/ContactsPage/mtmk.json | 217 +++++++------ src/views/ContactsPage/optmk.json | 69 +++-- src/views/ContactsPage/others.json | 6 + src/views/ContactsPage/otmk.json | 173 +++++++---- src/views/ContactsPage/ptmk.json | 29 -- src/views/ContactsPage/sstmk.json | 155 ++++++---- src/views/ContactsPage/ttmk.json | 82 +++-- src/views/ContactsPage/utmk.json | 93 +++--- src/views/ContactsPage/ytmk.json | 77 +++-- 13 files changed, 885 insertions(+), 646 deletions(-) create mode 100644 src/views/ContactsPage/eptmk.json create mode 100644 src/views/ContactsPage/others.json delete mode 100644 src/views/ContactsPage/ptmk.json diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 770b178..c88bdef 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -9,11 +9,26 @@ import HvtmkJson from "./hvtmk.json"; import MtmkJson from "./mtmk.json"; import OptmkJson from "./optmk.json"; import OtmkJson from "./otmk.json"; -import PtmkJson from "./ptmk.json"; +import EPtmkJson from "./eptmk.json"; import SstmkJson from "./sstmk.json"; import TtmkJson from "./ttmk.json"; import UtmkJson from "./utmk.json"; import YtmkJson from "./ytmk.json"; +import Others from "./others.json"; + +const orderedCommittees = [ + BoardJson, + HvtmkJson, + MtmkJson, + OptmkJson, + OtmkJson, + EPtmkJson, + SstmkJson, + TtmkJson, + UtmkJson, + YtmkJson, + Others, +]; const blank_profile = "/img/blank_profile.png"; @@ -25,6 +40,28 @@ const BlueLink = styled(Link)` } `; +const IndexUL = styled.ul` + padding: 0; + list-style: none; + + li:before { + content: attr(data-icon); + margin-right: 4px; + } +`; + +const Index: React.FC<{ committees: typeof orderedCommittees }> = ({ committees }) => ( + + {committees.map(({ slug, name_fi }) => ( + +
  • + {name_fi} +
    • +     + ))} +     +); + const Container = styled.div` color: ${colors.darkBlue}; @@ -92,74 +129,33 @@ const ContactsPageView: React.FC = () => ( Asiaa olisi, mutta kehen ottaa yhteyttä?
    Tämä sivu yrittää valottaa sen oikean ihmisen puhelinnumeroa ja sähköpostiosoitetta.

    + - - -

    - {"Hallitukseen saa yhteyden lähettämällä sähköpostia "} - - hallitus@sahkoinsinoorikilta.fi - -

    -     -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {orderedCommittees.map((json, idx) => ( + + {(idx !== 0) && ( + + )} + + + {(idx === 0) && ( +

    + {"Hallitukseen saa yhteyden lähettämällä sähköpostia "} + + hallitus@sahkoinsinoorikilta.fi + +

    + )} +     +     +     + ))} ); diff --git a/src/views/ContactsPage/board.json b/src/views/ContactsPage/board.json index cebc94f..fb58e92 100644 --- a/src/views/ContactsPage/board.json +++ b/src/views/ContactsPage/board.json @@ -1,160 +1,161 @@ { - "name_fi": "Hallitus", - "name_en": "Board", - "roles": [ - { - "name_fi": "Puheenjohtaja", - "name_en": "Chairman of the Board", - "representatives": [ - { - "name": "Johannes Ora", - "image": "https://static.sahkoinsinoorikilta.fi/img/board/chairman.jpg" - } - ] - }, - { - "name_fi": "Sihteeri", - "name_en": "Secretary", - "representatives": [ - { - "name": "Salla Lyytikäinen", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/secretary.jpg" - } - ] - }, - { - "name_fi": "Rahastonhoitaja", - "name_en": "Treasurer", - "representatives": [ - { - "name": "Santeri Huhtala", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/treasurer.jpg" - } - ] - }, - { - "name_fi": "Fuksitoimikunnan Puheenjohtaja", - "name_en": "", - "representatives": [ - { - "name": "Toni Ojala", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg" - } - ] - }, - { - "name_fi": "Fuksitoimikunnan puheenjohtajan adjutantti", - "name_en": "", - "representatives": [ - { - "name": "Toni Lyttinen", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg" - } - ] - }, - { - "name_fi": "Hovimestari", - "name_en": "", - "representatives": [ - { - "name": "Eveliina Ahonen", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/ceremonies.jpg" - } - ] - }, - { - "name_fi": "Hovineuvos", - "name_en": "", - "representatives": [ - { - "name": "Melisa Dönmez", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/court_cancelor.jpg" - } - ] - }, - { - "name_fi": "ISOvastaava", - "name_en": "", - "representatives": [ - { - "name": "Heidi Mäkitalo", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg" - } - ] - }, - { - "name_fi": "Hyvinvointimestari", - "name_en": "", - "representatives": [ - { - "name": "Sauli Norja", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/wellbeing.jpg" - } - ] - }, - { - "name_fi": "Opintomestari", - "name_en": "", - "representatives": [ - { - "name": "Simo Hakanummi", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/studies.jpg" - } - ] - }, - { - "name_fi": "Teknologiamestari", - "name_en": "", - "representatives": [ - { - "name": "Oskari Ponkala", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/technology.jpg" - } - ] - }, - { - "name_fi": "Ulkomestari", - "name_en": "", - "representatives": [ - { - "name": "Oliver Hiekkamies", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg" - } - ] - }, - { - "name_fi": "Yrityssuhdemestari", - "name_en": "", - "representatives": [ - { - "name": "Otto Julkunen", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/corporate.jpg" - } - ] - } - ] - } + "slug": "board", + "name_fi": "Hallitus", + "name_en": "Board", + "roles": [ + { + "name_fi": "Puheenjohtaja", + "name_en": "Chairman of the Board", + "representatives": [ + { + "name": "Johannes Ora", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/chairman.jpg" + } + ] + }, + { + "name_fi": "Sihteeri", + "name_en": "Secretary", + "representatives": [ + { + "name": "Salla Lyytikäinen", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/secretary.jpg" + } + ] + }, + { + "name_fi": "Rahastonhoitaja", + "name_en": "Treasurer", + "representatives": [ + { + "name": "Santeri Huhtala", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/treasurer.jpg" + } + ] + }, + { + "name_fi": "Fuksitoimikunnan Puheenjohtaja", + "name_en": "", + "representatives": [ + { + "name": "Toni Ojala", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg" + } + ] + }, + { + "name_fi": "Fuksitoimikunnan puheenjohtajan adjutantti", + "name_en": "", + "representatives": [ + { + "name": "Toni Lyttinen", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg" + } + ] + }, + { + "name_fi": "Hovimestari", + "name_en": "", + "representatives": [ + { + "name": "Eveliina Ahonen", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/ceremonies.jpg" + } + ] + }, + { + "name_fi": "Hovineuvos", + "name_en": "", + "representatives": [ + { + "name": "Melisa Dönmez", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/court_cancelor.jpg" + } + ] + }, + { + "name_fi": "ISOvastaava", + "name_en": "", + "representatives": [ + { + "name": "Heidi Mäkitalo", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg" + } + ] + }, + { + "name_fi": "Hyvinvointimestari", + "name_en": "", + "representatives": [ + { + "name": "Sauli Norja", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/wellbeing.jpg" + } + ] + }, + { + "name_fi": "Opintomestari", + "name_en": "", + "representatives": [ + { + "name": "Simo Hakanummi", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/studies.jpg" + } + ] + }, + { + "name_fi": "Teknologiamestari", + "name_en": "", + "representatives": [ + { + "name": "Oskari Ponkala", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/technology.jpg" + } + ] + }, + { + "name_fi": "Ulkomestari", + "name_en": "", + "representatives": [ + { + "name": "Oliver Hiekkamies", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg" + } + ] + }, + { + "name_fi": "Yrityssuhdemestari", + "name_en": "", + "representatives": [ + { + "name": "Otto Julkunen", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/corporate.jpg" + } + ] + } + ] +} diff --git a/src/views/ContactsPage/eptmk.json b/src/views/ContactsPage/eptmk.json new file mode 100644 index 0000000..f190257 --- /dev/null +++ b/src/views/ContactsPage/eptmk.json @@ -0,0 +1,52 @@ +{ + "slug": "eptmk", + "name_fi": "Elepajatoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Pajavastaava", + "name_en": "", + "representatives": [ + { + "name": "Karl Lipping" + } + ] + }, + { + "name_fi": "Pajakisälli", + "name_en": "", + "representatives": [ + { + "name": "Tommi Sytelä" + }, + { + "name": "Eerikki Eskola" + }, + { + "name": "Arkadii Kolchin" + }, + { + "name": "Samu Nyman" + }, + { + "name": "Konsta Langi" + }, + { + "name": "Johannes Viirimäki" + }, + { + "name": "Justus Ojala" + }, + { + "name": "Ville Tujunen" + }, + { + "name": "Antti Tarkka" + }, + { + "name": "Pyry Vaara" + } + ] + } + ] +} diff --git a/src/views/ContactsPage/hvtmk.json b/src/views/ContactsPage/hvtmk.json index bd6264e..a6c2852 100644 --- a/src/views/ContactsPage/hvtmk.json +++ b/src/views/ContactsPage/hvtmk.json @@ -1,55 +1,82 @@ { - "name_fi": "Hyvinvointitoimikunta", - "name_en": "Committee of Wellbeing", - "roles": [ + "slug": "hvtmk", + "name_fi": "Hyvinvointitoimikunta", + "name_en": "Committee of Wellbeing", + "roles": [ + { + "name_fi": "Hyvinvointimestari", + "name_en": "Master of Wellbeing", + "representatives": [ { - "name_fi": "Hyvinvointimestari", - "name_en": "Master of Wellbeing", - "representatives": [ - { "name": "Sauli Norja" } - ] - }, - { - "name_fi": "Kulttuurivastaava", - "name_en": "Culture Representative", - "representatives": [ - { "name": "Juha Anttila" }, - { "name": "Aino Suomi" }, - { "name": "Nestori Yrjönkoski" } - ] - }, - { - "name_fi": "Liikuntavastaava", - "name_en": "Sports Representative", - "representatives": [ - { "name": "Elmeri Pälikkö" }, - { "name": "Joel Wickström" } - ] - }, - { - "name_fi": "Kiltahuonevastaava", - "name_en": "Guild Room Representative", - "representatives": [ - { "name": "Ilari Ojakorpi" } - ] - }, - { - "name_fi": "Kiltapäiväkerhovastaava", - "name_en": "", - "representatives": [ - { "name": "Samuel Laine" }, - { "name": "Aleksanteri Vesala" } - ] - }, - { - "name_fi": "Retkivastaava", - "name_en": "", - "representatives": [ - { "name": "Jarno Mustonen" }, - { "name": "Suvi Karanta" }, - { "name": "Jesse Räisänen" }, - { "name": "Mikko Suhonen" } - ] + "name": "Sauli Norja" } - ] + ] + }, + { + "name_fi": "Kulttuurivastaava", + "name_en": "Culture Representative", + "representatives": [ + { + "name": "Juha Anttila" + }, + { + "name": "Aino Suomi" + }, + { + "name": "Nestori Yrjönkoski" + } + ] + }, + { + "name_fi": "Liikuntavastaava", + "name_en": "Sports Representative", + "representatives": [ + { + "name": "Elmeri Pälikkö" + }, + { + "name": "Joel Wickström" + } + ] + }, + { + "name_fi": "Kiltahuonevastaava", + "name_en": "Guild Room Representative", + "representatives": [ + { + "name": "Ilari Ojakorpi" + } + ] + }, + { + "name_fi": "Kiltapäiväkerhovastaava", + "name_en": "", + "representatives": [ + { + "name": "Samuel Laine" + }, + { + "name": "Aleksanteri Vesala" + } + ] + }, + { + "name_fi": "Retkivastaava", + "name_en": "", + "representatives": [ + { + "name": "Jarno Mustonen" + }, + { + "name": "Suvi Karanta" + }, + { + "name": "Jesse Räisänen" + }, + { + "name": "Mikko Suhonen" + } + ] + } + ] } diff --git a/src/views/ContactsPage/mtmk.json b/src/views/ContactsPage/mtmk.json index a7b4177..cb83d8f 100644 --- a/src/views/ContactsPage/mtmk.json +++ b/src/views/ContactsPage/mtmk.json @@ -1,89 +1,136 @@ { - "name_fi": "Mediatoimikunta", - "name_en": "Media Committee", - "roles": [ + "slug": "mtmk", + "name_fi": "Mediatoimikunta", + "name_en": "Media Committee", + "roles": [ + { + "name_fi": "Puheenjohtaja, Päätoimittaja", + "name_en": "Chair, Editor in Chief", + "representatives": [ { - "name_fi": "Puheenjohtaja, Päätoimittaja", - "name_en": "Chair, Editor in Chief", - "representatives": [ - { - "name": "Sasu Saalasti", - "phone_number": null, - "email": null, - "image": null - } - ] - }, - { - "name_fi": "Mediamestari", - "name_en": "Master of Media", - "representatives": [ - { "name": "Salla Lyytikäinen" } - ] - }, - { - "name_fi": "Toimittaja", - "name_en": "Journalist", - "representatives": [ - { "name": "Tuukka Syrjänen" }, - { "name": "Ilmari Kasvi" }, - { "name": "Elias Hirvonen" }, - { "name": "Miika Koskela" }, - { "name": "Taneli Myllykangas" }, - { "name": "Emmaleena Ahonen" }, - { "name": "Ville-Pekka Laakkonen" }, - { "name": "Sofia Öhman" }, - { "name": "Nestori Yrjönkoski" }, - { "name": "Jami Hyytiäinen" }, - { "name": "Aleksanteri Vesala" } - ] - }, - { - "name_fi": "Toimittaja & Valokuvaaja", - "name_en": "Journalist & Photographer", - "representatives": [ - { "name": "Kiia Einola" } - ] - }, - { - "name_fi": "Taittaja", - "name_en": "Layout Artist", - "representatives": [ - { "name": "Aino Suomi" }, - { "name": "Olli Komulainen" }, - { "name": "Emilia Kortelainen" } - ] - }, - { - "name_fi": "Taittaja & Valokuvaaja", - "name_en": "Layout Artist & Photographer", - "representatives": [ - { "name": "Jonna Tammikivi" } - ] - }, - { - "name_fi": "Valokuvaaja", - "name_en": "Photographer", - "representatives": [ - { "name": "Suvi Karanta" }, - { "name": "Mikko Haaparanta" }, - { "name": "Johannes Viirimäki" } - ] - }, - { - "name_fi": "Valokuvaaja & Graafikko", - "name_en": "Photographer & Graphic Artist", - "representatives": [ - { "name": "Kalle Petäjäaho" }, - { "name": "Maria Pöllä" } - ] - }, - { - "name_fi": "Videokuvaaja", - "name_en": "Videographer", - "representatives": [ - { "name": "Aaro Rasilainen" } - ] + "name": "Sasu Saalasti", + "phone_number": null, + "email": null, + "image": null } - ] + ] + }, + { + "name_fi": "Mediamestari", + "name_en": "Master of Media", + "representatives": [ + { + "name": "Salla Lyytikäinen" + } + ] + }, + { + "name_fi": "Toimittaja", + "name_en": "Journalist", + "representatives": [ + { + "name": "Tuukka Syrjänen" + }, + { + "name": "Ilmari Kasvi" + }, + { + "name": "Elias Hirvonen" + }, + { + "name": "Miika Koskela" + }, + { + "name": "Taneli Myllykangas" + }, + { + "name": "Emmaleena Ahonen" + }, + { + "name": "Ville-Pekka Laakkonen" + }, + { + "name": "Sofia Öhman" + }, + { + "name": "Nestori Yrjönkoski" + }, + { + "name": "Jami Hyytiäinen" + }, + { + "name": "Aleksanteri Vesala" + } + ] + }, + { + "name_fi": "Toimittaja & Valokuvaaja", + "name_en": "Journalist & Photographer", + "representatives": [ + { + "name": "Kiia Einola" + } + ] + }, + { + "name_fi": "Taittaja", + "name_en": "Layout Artist", + "representatives": [ + { + "name": "Aino Suomi" + }, + { + "name": "Olli Komulainen" + }, + { + "name": "Emilia Kortelainen" + } + ] + }, + { + "name_fi": "Taittaja & Valokuvaaja", + "name_en": "Layout Artist & Photographer", + "representatives": [ + { + "name": "Jonna Tammikivi" + } + ] + }, + { + "name_fi": "Valokuvaaja", + "name_en": "Photographer", + "representatives": [ + { + "name": "Suvi Karanta" + }, + { + "name": "Mikko Haaparanta" + }, + { + "name": "Johannes Viirimäki" + } + ] + }, + { + "name_fi": "Valokuvaaja & Graafikko", + "name_en": "Photographer & Graphic Artist", + "representatives": [ + { + "name": "Kalle Petäjäaho" + }, + { + "name": "Maria Pöllä" + } + ] + }, + { + "name_fi": "Videokuvaaja", + "name_en": "Videographer", + "representatives": [ + { + "name": "Aaro Rasilainen" + } + ] + } + ] } diff --git a/src/views/ContactsPage/optmk.json b/src/views/ContactsPage/optmk.json index da8cd6b..3b024b9 100644 --- a/src/views/ContactsPage/optmk.json +++ b/src/views/ContactsPage/optmk.json @@ -1,31 +1,46 @@ { - "name_fi": "Opintotoimikunta", - "name_en": "Study Committee", - "roles": [ + "slug": "optmk", + "name_fi": "Opintotoimikunta", + "name_en": "Study Committee", + "roles": [ + { + "name_fi": "Opintomestari", + "name_en": "Master of Studies", + "representatives": [ { - "name_fi": "Opintomestari", - "name_en": "Master of Studies", - "representatives": [ - { "name": "Simo Hakanummi" } - ] - }, - { - "name_fi": "Opintovastaava", - "name_en": "Study Coordinator", - "representatives": [ - { "name": "Miina-Maija Simonen" }, - { "name": "Tomi Valkonen" }, - { "name": "Leo Lahti" }, - { "name": "Ville-Pekka Laakkonen" }, - { "name": "Samu Nyman" } - ] - }, - { - "name_fi": "Abimarkkinointi Vastaava", - "name_en": "", - "representatives": [ - { "name": "Iikka Huttu" } - ] + "name": "Simo Hakanummi" } - ] + ] + }, + { + "name_fi": "Opintovastaava", + "name_en": "Study Coordinator", + "representatives": [ + { + "name": "Miina-Maija Simonen" + }, + { + "name": "Tomi Valkonen" + }, + { + "name": "Leo Lahti" + }, + { + "name": "Ville-Pekka Laakkonen" + }, + { + "name": "Samu Nyman" + } + ] + }, + { + "name_fi": "Abimarkkinointi Vastaava", + "name_en": "", + "representatives": [ + { + "name": "Iikka Huttu" + } + ] + } + ] } diff --git a/src/views/ContactsPage/others.json b/src/views/ContactsPage/others.json new file mode 100644 index 0000000..89df82d --- /dev/null +++ b/src/views/ContactsPage/others.json @@ -0,0 +1,6 @@ +{ + "slug": "others", + "name_fi": "Toimikunnattomat", + "name_en": "Other officials", + "roles": [] +} diff --git a/src/views/ContactsPage/otmk.json b/src/views/ContactsPage/otmk.json index 42b4e0b..4fabefa 100644 --- a/src/views/ContactsPage/otmk.json +++ b/src/views/ContactsPage/otmk.json @@ -1,66 +1,115 @@ { - "name_fi": "Ohjelmatoimikunta", - "name_en": "Entertainment Committee", - "roles": [ + "slug": "otmk", + "name_fi": "Ohjelmatoimikunta", + "name_en": "Entertainment Committee", + "roles": [ + { + "name_fi": "Hovimestari", + "name_en": "Master of Ceremonies", + "representatives": [ { - "name_fi": "Hovimestari", - "name_en": "Master of Ceremonies", - "representatives": [ - { "name": "Eveliina Ahonen" } - ] - }, - { - "name_fi": "Hovineuvos", - "name_en": "Court Counsellor", - "representatives": [ - { "name": "Melisa Dönmez" } - ] - }, - { - "name_fi": "Emäntä", - "name_en": "", - "representatives": [ - { "name": "Oona Karjalainen" }, - { "name": "Emilia Kortelainen" }, - { "name": "Venla Vastamäki" } - ] - }, - { - "name_fi": "Isäntä", - "name_en": "", - "representatives": [ - { "name": "Henry Jaakkola" }, - { "name": "Sakke Kangas" }, - { "name": "Otto Torkkeli" }, - { "name": "Tommi Oinonen" }, - { "name": "Eero Ketonen" } - ] - }, - { - "name_fi": "Lukkari", - "name_en": "", - "representatives": [ - { "name": "Tuomo Leino" }, - { "name": "Jami Hyytiäinen" }, - { "name": "Tuomas Pajunpää" }, - { "name": "Samuel Laine" }, - { "name": "Toni Miilunpalo" }, - { "name": "Ville Kaakinen"}, - { "name": "Eero Torpo"}, - { "name": "Sauli Norja"} - ] - }, - { - "name_fi": "Lukkarikisällit", - "name_en": "", - "representatives": [ - { "name": "Jesse Räisänen" }, - { "name": "Eino Laakso" }, - { "name": "Sakari Harjunpää" }, - { "name": "Niilo Ojala" }, - { "name": "Iikka Huttu" }, - { "name": "Akseli Järvinen" } - ] + "name": "Eveliina Ahonen" } - ] + ] + }, + { + "name_fi": "Hovineuvos", + "name_en": "Court Counsellor", + "representatives": [ + { + "name": "Melisa Dönmez" + } + ] + }, + { + "name_fi": "Emäntä", + "name_en": "", + "representatives": [ + { + "name": "Oona Karjalainen" + }, + { + "name": "Emilia Kortelainen" + }, + { + "name": "Venla Vastamäki" + } + ] + }, + { + "name_fi": "Isäntä", + "name_en": "", + "representatives": [ + { + "name": "Henry Jaakkola" + }, + { + "name": "Sakke Kangas" + }, + { + "name": "Otto Torkkeli" + }, + { + "name": "Tommi Oinonen" + }, + { + "name": "Eero Ketonen" + } + ] + }, + { + "name_fi": "Lukkari", + "name_en": "", + "representatives": [ + { + "name": "Tuomo Leino" + }, + { + "name": "Jami Hyytiäinen" + }, + { + "name": "Tuomas Pajunpää" + }, + { + "name": "Samuel Laine" + }, + { + "name": "Toni Miilunpalo" + }, + { + "name": "Ville Kaakinen" + }, + { + "name": "Eero Torpo" + }, + { + "name": "Sauli Norja" + } + ] + }, + { + "name_fi": "Lukkarikisällit", + "name_en": "", + "representatives": [ + { + "name": "Jesse Räisänen" + }, + { + "name": "Eino Laakso" + }, + { + "name": "Sakari Harjunpää" + }, + { + "name": "Niilo Ojala" + }, + { + "name": "Iikka Huttu" + }, + { + "name": "Akseli Järvinen" + } + ] + } + ] } diff --git a/src/views/ContactsPage/ptmk.json b/src/views/ContactsPage/ptmk.json deleted file mode 100644 index 45a0c1f..0000000 --- a/src/views/ContactsPage/ptmk.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name_fi": "Elepajatoimikunta", - "name_en": "", - "roles": [ - { - "name_fi": "Pajavastaava", - "name_en": "", - "representatives": [ - { "name": "Karl Lipping" } - ] - }, - { - "name_fi": "Pajakisälli", - "name_en": "", - "representatives": [ - { "name": "Tommi Sytelä" }, - { "name": "Eerikki Eskola" }, - { "name": "Arkadii Kolchin" }, - { "name": "Samu Nyman" }, - { "name": "Konsta Langi" }, - { "name": "Johannes Viirimäki" }, - { "name": "Justus Ojala" }, - { "name": "Ville Tujunen" }, - { "name": "Antti Tarkka" }, - { "name": "Pyry Vaara" } - ] - } - ] -} \ No newline at end of file diff --git a/src/views/ContactsPage/sstmk.json b/src/views/ContactsPage/sstmk.json index 9ebccf6..6a64edf 100644 --- a/src/views/ContactsPage/sstmk.json +++ b/src/views/ContactsPage/sstmk.json @@ -1,70 +1,91 @@ { - "name_fi": "SIK100-toimikunta", - "name_en": "", - "roles": [ + "slug": "sstmk", + "name_fi": "SIK100-toimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Puheenjohtaja", + "name_en": "", + "representatives": [ { - "name_fi": "Puheenjohtaja", - "name_en": "", - "representatives": [ - { "name": "Erna Virtanen" } - ] - }, - { - "name_fi": "Webivastaava", - "name_en": "", - "representatives": [ - { "name": "Jaakko Koskela" } - ] - }, - { - "name_fi": "Markkinointivastaava", - "name_en": "", - "representatives": [ - { "name": "Sasu Saalasti" } - ] - }, - { - "name_fi": "Yritysvastaava", - "name_en": "", - "representatives": [ - { "name": "Juuli Leppänen" } - ] - }, - { - "name_fi": "Seminaarivastaava", - "name_en": "", - "representatives": [ - { "name": "Sini Huhtinen" } - ] - }, - { - "name_fi": "Kevätkarnevaalimajuri", - "name_en": "", - "representatives": [ - { "name": "Olli Komulainen" } - ] - }, - { - "name_fi": "PoTa100-pääjuhlatirehtööri", - "name_en": "", - "representatives": [ - { "name": "Emmaleena Ahonen" }, - { "name": "Jonna Tammikivi" } - ] - }, - { - "name_fi": "PoTa100-jatkokuvernööri", - "name_en": "", - "representatives": [ - { "name": "Mikael Liimatainen" } - ] - }, - { - "name_fi": "PoTa100-sillistirehtööri", - "name_en": "", - "representatives": [ - { "name": "Tuomo Leino" } - ] + "name": "Erna Virtanen" } - ] -} \ No newline at end of file + ] + }, + { + "name_fi": "Webivastaava", + "name_en": "", + "representatives": [ + { + "name": "Jaakko Koskela" + } + ] + }, + { + "name_fi": "Markkinointivastaava", + "name_en": "", + "representatives": [ + { + "name": "Sasu Saalasti" + } + ] + }, + { + "name_fi": "Yritysvastaava", + "name_en": "", + "representatives": [ + { + "name": "Juuli Leppänen" + } + ] + }, + { + "name_fi": "Seminaarivastaava", + "name_en": "", + "representatives": [ + { + "name": "Sini Huhtinen" + } + ] + }, + { + "name_fi": "Kevätkarnevaalimajuri", + "name_en": "", + "representatives": [ + { + "name": "Olli Komulainen" + } + ] + }, + { + "name_fi": "PoTa100-pääjuhlatirehtööri", + "name_en": "", + "representatives": [ + { + "name": "Emmaleena Ahonen" + }, + { + "name": "Jonna Tammikivi" + } + ] + }, + { + "name_fi": "PoTa100-jatkokuvernööri", + "name_en": "", + "representatives": [ + { + "name": "Mikael Liimatainen" + } + ] + }, + { + "name_fi": "PoTa100-sillistirehtööri", + "name_en": "", + "representatives": [ + { + "name": "Tuomo Leino" + } + ] + } + ] +} diff --git a/src/views/ContactsPage/ttmk.json b/src/views/ContactsPage/ttmk.json index c87b0f0..1d3b476 100644 --- a/src/views/ContactsPage/ttmk.json +++ b/src/views/ContactsPage/ttmk.json @@ -1,35 +1,55 @@ { - "name_fi": "Teknologiatoimikunta", - "name_en": "", - "roles": [ + "slug": "ttmk", + "name_fi": "Teknologiatoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Teknologiamestari", + "name_en": "", + "representatives": [ { - "name_fi": "Teknologiamestari", - "name_en": "", - "representatives": [ - { "name": "Oskari Ponkala" } - ] - }, - { - "name_fi": "Tekniikkavastaava", - "name_en": "", - "representatives": [ - { "name": "Antti Mäki" } - ] - }, - { - "name_fi": "Web-Kisälli", - "name_en": "", - "representatives": [ - { "name": "Ilari Ojakorpi" }, - { "name": "Leo Lahti" }, - { "name": "Jyri Korhonen" }, - { "name": "Tuukka Syrjänen" }, - { "name": "Emmaleena Ahonen" }, - { "name": "Mikko Suhonen" }, - { "name": "Jaakko Koskela" }, - { "name": "Justus Ojala" } - ] + "name": "Oskari Ponkala" } - ] + ] + }, + { + "name_fi": "Tekniikkavastaava", + "name_en": "", + "representatives": [ + { + "name": "Antti Mäki" + } + ] + }, + { + "name_fi": "Web-Kisälli", + "name_en": "", + "representatives": [ + { + "name": "Ilari Ojakorpi" + }, + { + "name": "Leo Lahti" + }, + { + "name": "Jyri Korhonen" + }, + { + "name": "Tuukka Syrjänen" + }, + { + "name": "Emmaleena Ahonen" + }, + { + "name": "Mikko Suhonen" + }, + { + "name": "Jaakko Koskela" + }, + { + "name": "Justus Ojala" + } + ] + } + ] } - \ No newline at end of file diff --git a/src/views/ContactsPage/utmk.json b/src/views/ContactsPage/utmk.json index 7e90a90..30b38b3 100644 --- a/src/views/ContactsPage/utmk.json +++ b/src/views/ContactsPage/utmk.json @@ -1,43 +1,58 @@ { - "name_fi": "Ulkotoimikunta", - "name_en": "External Affairs Committeee", - "roles": [ + "slug": "utmk", + "name_fi": "Ulkotoimikunta", + "name_en": "External Affairs Committeee", + "roles": [ + { + "name_fi": "Ulkomestari", + "name_en": "Master of External Affairs", + "representatives": [ { - "name_fi": "Ulkomestari", - "name_en": "Master of External Affairs", - "representatives": [ - { "name": "Oliver Hiekkamies" } - ] - }, - { - "name_fi": "Kv-ISOvastaava", - "name_en": "International Tutor Coordinator", - "representatives": [ - { "name": "Elias Hirvonen" } - ] - }, - { - "name_fi": "International Helper", - "name_en": "International Helper", - "representatives": [ - { "name": "Ville-Pekka Laakkonen" } - ] - }, - { - "name_fi": "Ulkosuhdevastaava", - "name_en": "Apprentice of External Affairs", - "representatives": [ - { "name": "Leo Müller" }, - { "name": "Eino Tyrvänen" }, - { "name": "Pekka Aho" } - ] - }, - { - "name_fi": "Ulkowanhus", - "name_en": "", - "representatives": [ - { "name": "Jyri Korhonen" } - ] + "name": "Oliver Hiekkamies" } - ] + ] + }, + { + "name_fi": "Kv-ISOvastaava", + "name_en": "International Tutor Coordinator", + "representatives": [ + { + "name": "Elias Hirvonen" + } + ] + }, + { + "name_fi": "International Helper", + "name_en": "International Helper", + "representatives": [ + { + "name": "Ville-Pekka Laakkonen" + } + ] + }, + { + "name_fi": "Ulkosuhdevastaava", + "name_en": "Apprentice of External Affairs", + "representatives": [ + { + "name": "Leo Müller" + }, + { + "name": "Eino Tyrvänen" + }, + { + "name": "Pekka Aho" + } + ] + }, + { + "name_fi": "Ulkowanhus", + "name_en": "", + "representatives": [ + { + "name": "Jyri Korhonen" + } + ] + } + ] } diff --git a/src/views/ContactsPage/ytmk.json b/src/views/ContactsPage/ytmk.json index 0126405..88aa98e 100644 --- a/src/views/ContactsPage/ytmk.json +++ b/src/views/ContactsPage/ytmk.json @@ -1,33 +1,52 @@ { - "name_fi": "Yrityssuhdetoimikunta", - "name_en": "Corporate Relations Committee", - "roles": [ + "slug": "ytmk", + "name_fi": "Yrityssuhdetoimikunta", + "name_en": "Corporate Relations Committee", + "roles": [ + { + "name_fi": "Yrityssuhdemestari", + "name_en": "Master of Corporate Relations", + "representatives": [ { - "name_fi": "Yrityssuhdemestari", - "name_en": "Master of Corporate Relations", - "representatives": [ - { "name": "Otto Julkunen" } - ] - }, - { - "name_fi": "Excursiopäävastaava", - "name_en": "Head of Excursions", - "representatives": [ - { "name": "Henry Gustafsson" } - ] - }, - { - "name_fi": "Yrityssuhdevastaava", - "name_en": "Apprentice of Corporate Relations", - "representatives": [ - { "name": "Iikka Huttu" }, - { "name": "Arkadii Kolchin" }, - { "name": "Oskari Luukkonen" }, - { "name": "Niilo Ojala" }, - { "name": "Emma Reinikainen" }, - { "name": "Melina Sundell" }, - { "name": "Elma Tuohimetsä" } - ] + "name": "Otto Julkunen" } - ] + ] + }, + { + "name_fi": "Excursiopäävastaava", + "name_en": "Head of Excursions", + "representatives": [ + { + "name": "Henry Gustafsson" + } + ] + }, + { + "name_fi": "Yrityssuhdevastaava", + "name_en": "Apprentice of Corporate Relations", + "representatives": [ + { + "name": "Iikka Huttu" + }, + { + "name": "Arkadii Kolchin" + }, + { + "name": "Oskari Luukkonen" + }, + { + "name": "Niilo Ojala" + }, + { + "name": "Emma Reinikainen" + }, + { + "name": "Melina Sundell" + }, + { + "name": "Elma Tuohimetsä" + } + ] + } + ] } From 2371915a85c60e3fd32a64b3bca31235c1275b4c Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sat, 8 May 2021 02:31:37 +0300 Subject: [PATCH 02/14] improve code readability --- src/views/ContactsPage/ContactsPageView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index c88bdef..63add7c 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -137,14 +137,14 @@ const ContactsPageView: React.FC = () => ( - {orderedCommittees.map((json, idx) => ( + {orderedCommittees.map((json) => ( - {(idx !== 0) && ( + {(json.slug !== "board") && ( )} - {(idx === 0) && ( + {(json.slug === "board") && (

    {"Hallitukseen saa yhteyden lähettämällä sähköpostia "} From 00129980c2809e2f3d1e6ac0150d21016727f6f2 Mon Sep 17 00:00:00 2001 From: Leo Lahti Date: Mon, 17 May 2021 11:11:54 +0300 Subject: [PATCH 03/14] Added current other officials --- src/views/ContactsPage/others.json | 59 +++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/src/views/ContactsPage/others.json b/src/views/ContactsPage/others.json index 89df82d..c5ba19e 100644 --- a/src/views/ContactsPage/others.json +++ b/src/views/ContactsPage/others.json @@ -1,6 +1,61 @@ { "slug": "others", - "name_fi": "Toimikunnattomat", + "name_fi": "Muut", "name_en": "Other officials", - "roles": [] + "roles": [ + { + "name_fi": "Kiltapatruuna", + "name_en": "Guild elder", + "representatives": [ + { + "name": "Erna Virtanen", + "phone_number": null, + "email": null + }, + { + "name": "Emmaleena Ahonen", + "phone_number": null, + "email": null + } + ] + }, + { + "name_fi": "TEK-yhdyshenkilö", + "name_en": "TEK contact person", + "representatives": [ + { + "name": "Mikael Liimatainen", + "phone_number": null, + "email": null + } + ] + }, + { + "name_fi": "Sklubi-yhdyshenkilö", + "name_en": "Sklubi contact person", + "representatives": [ + { + "name": "Ella Eilola", + "phone_number": null, + "email": null + } + ] + }, + { + "name_fi": "Arkistonhoitaja", + "name_en": "Archivist", + "representatives": [ + { + "name": "Antti Mäki", + "phone_number": null, + "email": null + }, + { + "name": "Jonna Tammikivi", + "phone_number": null, + "email": null + } + ] + } + ] } From 04c3eabfee1fd5038048ec87af90e7888e2092ef Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 1 Jun 2021 13:10:14 +0300 Subject: [PATCH 04/14] styling improvements --- src/components/Button.tsx | 2 +- src/components/Hero/Hero.tsx | 2 +- src/pages/_app.tsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 3fc3ec3..37b77e8 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -12,7 +12,7 @@ const StyledButton = styled.button<{ $selected: boolean }>` border-radius: none; padding: 0.8rem 2rem; margin: 0.5rem; - font-size: 0.8rem; + font-size: 0.7rem; background: none; text-transform: uppercase; diff --git a/src/components/Hero/Hero.tsx b/src/components/Hero/Hero.tsx index 0f4b3c8..059143a 100644 --- a/src/components/Hero/Hero.tsx +++ b/src/components/Hero/Hero.tsx @@ -10,7 +10,7 @@ const Container = styled.div` position: relative; padding: 0; - min-height: 75vh; + min-height: 35rem; section { padding: 2rem 6rem; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index a1fd12e..bf7b248 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -47,7 +47,7 @@ body { } p { - font-size: 1.2rem; + font-size: 1.0rem; font-weight: 300; word-break: break-word; hyphens: auto; @@ -55,14 +55,14 @@ p { h1 { line-height: 1.15; - font-size: 2.5rem; + font-size: 1.5rem; font-weight: 200; margin-block-start: 0; margin-block-end: 0; } h2 { - font-size: 1.2rem; + font-size: 1.0rem; font-weight: 700; letter-spacing: 0.1em; margin-block-start: 0; From 0cf105b615c73b445287556e1df58c7d5529a2ad Mon Sep 17 00:00:00 2001 From: Oskari Ponkala Date: Tue, 1 Jun 2021 12:31:52 +0000 Subject: [PATCH 05/14] Revert "styling improvements" This reverts commit 04c3eabfee1fd5038048ec87af90e7888e2092ef --- src/components/Button.tsx | 2 +- src/components/Hero/Hero.tsx | 2 +- src/pages/_app.tsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 37b77e8..3fc3ec3 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -12,7 +12,7 @@ const StyledButton = styled.button<{ $selected: boolean }>` border-radius: none; padding: 0.8rem 2rem; margin: 0.5rem; - font-size: 0.7rem; + font-size: 0.8rem; background: none; text-transform: uppercase; diff --git a/src/components/Hero/Hero.tsx b/src/components/Hero/Hero.tsx index 059143a..0f4b3c8 100644 --- a/src/components/Hero/Hero.tsx +++ b/src/components/Hero/Hero.tsx @@ -10,7 +10,7 @@ const Container = styled.div` position: relative; padding: 0; - min-height: 35rem; + min-height: 75vh; section { padding: 2rem 6rem; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index bf7b248..a1fd12e 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -47,7 +47,7 @@ body { } p { - font-size: 1.0rem; + font-size: 1.2rem; font-weight: 300; word-break: break-word; hyphens: auto; @@ -55,14 +55,14 @@ p { h1 { line-height: 1.15; - font-size: 1.5rem; + font-size: 2.5rem; font-weight: 200; margin-block-start: 0; margin-block-end: 0; } h2 { - font-size: 1.0rem; + font-size: 1.2rem; font-weight: 700; letter-spacing: 0.1em; margin-block-start: 0; From b46f12c52ee5eaa1834b9bf9a796edd974f78b24 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 3 Jun 2021 02:02:17 +0300 Subject: [PATCH 06/14] uninstall stylelint-processor-styled-components --- .stylelintrc | 3 - package-lock.json | 221 ---------------------------------------------- package.json | 1 - 3 files changed, 225 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 77ed1fa..6e4409d 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,7 +1,4 @@ { - "processors": [ - "stylelint-processor-styled-components" - ], "extends": [ "stylelint-config-recommended", "stylelint-config-styled-components" diff --git a/package-lock.json b/package-lock.json index 636978c..a6651d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,6 @@ "stylelint": "^13.13.1", "stylelint-config-recommended": "^5.0.0", "stylelint-config-styled-components": "^0.1.1", - "stylelint-processor-styled-components": "^1.10.0", "testcafe": "^1.14.2", "typescript": "^4.2.4" } @@ -11816,128 +11815,6 @@ "integrity": "sha512-z5Xz/9GmvxO6e/DLzBMwkB85zHxEEjN6K7Cj80Bi+o/9vR9eS3GX3E9VuMnX9WLFYulqbqLtTapGGY28JBiy9Q==", "dev": true }, - "node_modules/stylelint-processor-styled-components": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.10.0.tgz", - "integrity": "sha512-g4HpN9rm0JD0LoHuIOcd/FIjTZCJ0ErQ+dC3VTxp+dSvnkV+MklKCCmCQEdz5K5WxF4vPuzfVgdbSDuPYGZhoA==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.8.3", - "@babel/traverse": "^7.8.3", - "micromatch": "^4.0.2", - "postcss": "^7.0.26" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/stylelint-processor-styled-components/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stylelint-processor-styled-components/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/stylelint/node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -23654,104 +23531,6 @@ "integrity": "sha512-z5Xz/9GmvxO6e/DLzBMwkB85zHxEEjN6K7Cj80Bi+o/9vR9eS3GX3E9VuMnX9WLFYulqbqLtTapGGY28JBiy9Q==", "dev": true }, - "stylelint-processor-styled-components": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.10.0.tgz", - "integrity": "sha512-g4HpN9rm0JD0LoHuIOcd/FIjTZCJ0ErQ+dC3VTxp+dSvnkV+MklKCCmCQEdz5K5WxF4vPuzfVgdbSDuPYGZhoA==", - "dev": true, - "requires": { - "@babel/parser": "^7.8.3", - "@babel/traverse": "^7.8.3", - "micromatch": "^4.0.2", - "postcss": "^7.0.26" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "stylis": { "version": "3.5.4", "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz", diff --git a/package.json b/package.json index 3ab0fbe..3dbc757 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "stylelint": "^13.13.1", "stylelint-config-recommended": "^5.0.0", "stylelint-config-styled-components": "^0.1.1", - "stylelint-processor-styled-components": "^1.10.0", "testcafe": "^1.14.2", "typescript": "^4.2.4" }, From 624b5716adbeaf509aa97b2467bee659c291cc58 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 3 Jun 2021 02:03:12 +0300 Subject: [PATCH 07/14] update next --- package-lock.json | 193 +++++++++++++++++++--------------------------- package.json | 4 +- 2 files changed, 81 insertions(+), 116 deletions(-) diff --git a/package-lock.json b/package-lock.json index a6651d4..c64038e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,13 +8,13 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "@next/bundle-analyzer": "^10.2.0", + "@next/bundle-analyzer": "^10.2.3", "axios": "^0.21.1", "date-fns": "^2.21.3", "fast-deep-equal": "^3.1.3", "js-cookie": "^2.2.1", "lodash": "^4.17.21", - "next": "^10.2.0", + "next": "^10.2.3", "normalize.css": "^8.0.1", "react": "^17.0.2", "react-beautiful-dnd": "^13.1.0", @@ -1773,9 +1773,9 @@ } }, "node_modules/@hapi/accept": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.1.tgz", - "integrity": "sha512-fMr4d7zLzsAXo28PRRQPXR1o2Wmu+6z+VY1UzDp0iFo13Twj8WePakwXBiqn3E1aAlTpSNzCXdnnQXFhst8h8Q==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz", + "integrity": "sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==", "dependencies": { "@hapi/boom": "9.x.x", "@hapi/hoek": "9.x.x" @@ -1814,27 +1814,28 @@ "dev": true }, "node_modules/@next/bundle-analyzer": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-10.2.0.tgz", - "integrity": "sha512-vJI5zer6fp9vtDal/IxwyT3rigu/+nACdKIJHyzls+fz1joyHAKU15Xxz0rsak3cwvE6MozFjoJTrawDV8eQDQ==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-10.2.3.tgz", + "integrity": "sha512-vEfQhGWgJugZOlSUlj3DZWs/KsK0SO2SPKoHSZ7KkzpruKzc/e45G0oUh0rffzdhasMQZM1TuSBkxO+1UcnDNw==", + "license": "MIT", "dependencies": { "webpack-bundle-analyzer": "4.3.0" } }, "node_modules/@next/env": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.0.tgz", - "integrity": "sha512-tsWBsn1Rb6hXRaHc/pWMCpZ4Ipkf3OCbZ54ef5ukgIyEvzzGdGFXQshPP2AF7yb+8yMpunWs7vOMZW3e8oPF6A==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.3.tgz", + "integrity": "sha512-uBOjRBjsWC4C8X3DfmWWP6ekwLnf2JCCwQX9KVnJtJkqfDsv1yQPakdOEwvJzXQc3JC/v5KKffYPVmV2wHXCgQ==" }, "node_modules/@next/polyfill-module": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.0.tgz", - "integrity": "sha512-Nl3GexIUXsmuggkUqrRFyE/2k7UI44JaVzSywtXEyHzxpZm2a5bdMaWuC89pgLiFDDOqmbqyLAbtwm5lNxa7Eg==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.3.tgz", + "integrity": "sha512-OkeY4cLhzfYbXxM4fd+6V4s5pTPuyfKSlavItfNRA6PpS7t1/R6YjO7S7rB8tu1pbTGuDHGIdE1ioDv15bAbDQ==" }, "node_modules/@next/react-dev-overlay": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.0.tgz", - "integrity": "sha512-PRIAoWog41hLN4iJ8dChKp4ysOX0Q8yiNQ/cwzyqEd3EjugkDV5OiKl3mumGKaApJaIra1MX6j1wgQRuLhuWMA==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.3.tgz", + "integrity": "sha512-E6g2jws4YW94l0lMMopBVKIZK2mEHfSBvM0d9dmzKG9L/A/kEq6LZCB4SiwGJbNsAdlk2y3USDa0oNbpA+m5Kw==", "dependencies": { "@babel/code-frame": "7.12.11", "anser": "1.4.9", @@ -1869,9 +1870,9 @@ } }, "node_modules/@next/react-refresh-utils": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.0.tgz", - "integrity": "sha512-3I31K9B4hEQRl7yQ44Umyz+szHtuMJrNdwsgJGhoEnUCXSBRHp5wv5Zv8eDa2NewSbe53b2C0oOpivrzmdBakw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.3.tgz", + "integrity": "sha512-qtBF56vPC6d6a8p7LYd0iRjW89fhY80kAIzmj+VonvIGjK/nymBjcFUhbKiMFqlhsarCksnhwX+Zmn95Dw9qvA==", "peerDependencies": { "react-refresh": "0.8.3", "webpack": "^4 || ^5" @@ -3277,15 +3278,15 @@ } }, "node_modules/browserslist": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", - "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dependencies": { - "caniuse-lite": "^1.0.30001173", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.634", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.69" + "node-releases": "^1.1.71" }, "bin": { "browserslist": "cli.js" @@ -3951,29 +3952,6 @@ "url": "https://opencollective.com/core-js" } }, - "node_modules/core-js-compat/node_modules/browserslist": { - "version": "4.16.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", - "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", - "dev": true, - "dependencies": { - "caniuse-lite": "^1.0.30001219", - "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.723", - "escalade": "^3.1.1", - "node-releases": "^1.1.71" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } - }, "node_modules/core-js-compat/node_modules/semver": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", @@ -8104,23 +8082,23 @@ "dev": true }, "node_modules/next": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/next/-/next-10.2.0.tgz", - "integrity": "sha512-PKDKCSF7s82xudu3kQhOEaokxggpbLEWouEUtzP6OqV0YqKYHF+Ff+BFLycEem8ixtTM2M6ElN0VRJcskJfxPQ==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/next/-/next-10.2.3.tgz", + "integrity": "sha512-dkM1mIfnORtGyzw/Yme8RdqNxlCMZyi4Lqj56F01/yHbe1ZtOaJ0cyqqRB4RGiPhjGGh0319f8ddjDyO1605Ow==", "dependencies": { "@babel/runtime": "7.12.5", - "@hapi/accept": "5.0.1", - "@next/env": "10.2.0", - "@next/polyfill-module": "10.2.0", - "@next/react-dev-overlay": "10.2.0", - "@next/react-refresh-utils": "10.2.0", + "@hapi/accept": "5.0.2", + "@next/env": "10.2.3", + "@next/polyfill-module": "10.2.3", + "@next/react-dev-overlay": "10.2.3", + "@next/react-refresh-utils": "10.2.3", "@opentelemetry/api": "0.14.0", "assert": "2.0.0", "ast-types": "0.13.2", "browserify-zlib": "0.2.0", - "browserslist": "4.16.1", + "browserslist": "4.16.6", "buffer": "5.6.0", - "caniuse-lite": "^1.0.30001179", + "caniuse-lite": "^1.0.30001228", "chalk": "2.4.2", "chokidar": "3.5.1", "constants-browserify": "1.0.0", @@ -13912,9 +13890,9 @@ } }, "node_modules/webpack-bundle-analyzer/node_modules/ws": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "engines": { "node": ">=8.3.0" }, @@ -15619,9 +15597,9 @@ } }, "@hapi/accept": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.1.tgz", - "integrity": "sha512-fMr4d7zLzsAXo28PRRQPXR1o2Wmu+6z+VY1UzDp0iFo13Twj8WePakwXBiqn3E1aAlTpSNzCXdnnQXFhst8h8Q==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz", + "integrity": "sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==", "requires": { "@hapi/boom": "9.x.x", "@hapi/hoek": "9.x.x" @@ -15659,27 +15637,27 @@ } }, "@next/bundle-analyzer": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-10.2.0.tgz", - "integrity": "sha512-vJI5zer6fp9vtDal/IxwyT3rigu/+nACdKIJHyzls+fz1joyHAKU15Xxz0rsak3cwvE6MozFjoJTrawDV8eQDQ==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-10.2.3.tgz", + "integrity": "sha512-vEfQhGWgJugZOlSUlj3DZWs/KsK0SO2SPKoHSZ7KkzpruKzc/e45G0oUh0rffzdhasMQZM1TuSBkxO+1UcnDNw==", "requires": { "webpack-bundle-analyzer": "4.3.0" } }, "@next/env": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.0.tgz", - "integrity": "sha512-tsWBsn1Rb6hXRaHc/pWMCpZ4Ipkf3OCbZ54ef5ukgIyEvzzGdGFXQshPP2AF7yb+8yMpunWs7vOMZW3e8oPF6A==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.3.tgz", + "integrity": "sha512-uBOjRBjsWC4C8X3DfmWWP6ekwLnf2JCCwQX9KVnJtJkqfDsv1yQPakdOEwvJzXQc3JC/v5KKffYPVmV2wHXCgQ==" }, "@next/polyfill-module": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.0.tgz", - "integrity": "sha512-Nl3GexIUXsmuggkUqrRFyE/2k7UI44JaVzSywtXEyHzxpZm2a5bdMaWuC89pgLiFDDOqmbqyLAbtwm5lNxa7Eg==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.3.tgz", + "integrity": "sha512-OkeY4cLhzfYbXxM4fd+6V4s5pTPuyfKSlavItfNRA6PpS7t1/R6YjO7S7rB8tu1pbTGuDHGIdE1ioDv15bAbDQ==" }, "@next/react-dev-overlay": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.0.tgz", - "integrity": "sha512-PRIAoWog41hLN4iJ8dChKp4ysOX0Q8yiNQ/cwzyqEd3EjugkDV5OiKl3mumGKaApJaIra1MX6j1wgQRuLhuWMA==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.3.tgz", + "integrity": "sha512-E6g2jws4YW94l0lMMopBVKIZK2mEHfSBvM0d9dmzKG9L/A/kEq6LZCB4SiwGJbNsAdlk2y3USDa0oNbpA+m5Kw==", "requires": { "@babel/code-frame": "7.12.11", "anser": "1.4.9", @@ -15706,9 +15684,9 @@ } }, "@next/react-refresh-utils": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.0.tgz", - "integrity": "sha512-3I31K9B4hEQRl7yQ44Umyz+szHtuMJrNdwsgJGhoEnUCXSBRHp5wv5Zv8eDa2NewSbe53b2C0oOpivrzmdBakw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.3.tgz", + "integrity": "sha512-qtBF56vPC6d6a8p7LYd0iRjW89fhY80kAIzmj+VonvIGjK/nymBjcFUhbKiMFqlhsarCksnhwX+Zmn95Dw9qvA==", "requires": {} }, "@nodelib/fs.scandir": { @@ -16792,15 +16770,15 @@ } }, "browserslist": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", - "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "requires": { - "caniuse-lite": "^1.0.30001173", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.634", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.69" + "node-releases": "^1.1.71" } }, "buffer": { @@ -17324,19 +17302,6 @@ "semver": "7.0.0" }, "dependencies": { - "browserslist": { - "version": "4.16.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", - "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001219", - "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.723", - "escalade": "^3.1.1", - "node-releases": "^1.1.71" - } - }, "semver": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", @@ -20499,23 +20464,23 @@ "dev": true }, "next": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/next/-/next-10.2.0.tgz", - "integrity": "sha512-PKDKCSF7s82xudu3kQhOEaokxggpbLEWouEUtzP6OqV0YqKYHF+Ff+BFLycEem8ixtTM2M6ElN0VRJcskJfxPQ==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/next/-/next-10.2.3.tgz", + "integrity": "sha512-dkM1mIfnORtGyzw/Yme8RdqNxlCMZyi4Lqj56F01/yHbe1ZtOaJ0cyqqRB4RGiPhjGGh0319f8ddjDyO1605Ow==", "requires": { "@babel/runtime": "7.12.5", - "@hapi/accept": "5.0.1", - "@next/env": "10.2.0", - "@next/polyfill-module": "10.2.0", - "@next/react-dev-overlay": "10.2.0", - "@next/react-refresh-utils": "10.2.0", + "@hapi/accept": "5.0.2", + "@next/env": "10.2.3", + "@next/polyfill-module": "10.2.3", + "@next/react-dev-overlay": "10.2.3", + "@next/react-refresh-utils": "10.2.3", "@opentelemetry/api": "0.14.0", "assert": "2.0.0", "ast-types": "0.13.2", "browserify-zlib": "0.2.0", - "browserslist": "4.16.1", + "browserslist": "4.16.6", "buffer": "5.6.0", - "caniuse-lite": "^1.0.30001179", + "caniuse-lite": "^1.0.30001228", "chalk": "2.4.2", "chokidar": "3.5.1", "constants-browserify": "1.0.0", @@ -25118,9 +25083,9 @@ "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, "ws": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "requires": {} } } diff --git a/package.json b/package.json index 3dbc757..640377b 100644 --- a/package.json +++ b/package.json @@ -60,13 +60,13 @@ "typescript": "^4.2.4" }, "dependencies": { - "@next/bundle-analyzer": "^10.2.0", + "@next/bundle-analyzer": "^10.2.3", "axios": "^0.21.1", "date-fns": "^2.21.3", "fast-deep-equal": "^3.1.3", "js-cookie": "^2.2.1", "lodash": "^4.17.21", - "next": "^10.2.0", + "next": "^10.2.3", "normalize.css": "^8.0.1", "react": "^17.0.2", "react-beautiful-dnd": "^13.1.0", From 2740061c2e8ac042f2ff72f23d2796e32a24d8f0 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 3 Jun 2021 02:10:50 +0300 Subject: [PATCH 08/14] bump minor versions --- package-lock.json | 1257 ++++++++++++++++++++----------------------- package.json | 20 +- src/theme/colors.ts | 4 +- 3 files changed, 605 insertions(+), 676 deletions(-) diff --git a/package-lock.json b/package-lock.json index c64038e..88a2797 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@next/bundle-analyzer": "^10.2.3", "axios": "^0.21.1", - "date-fns": "^2.21.3", + "date-fns": "^2.22.1", "fast-deep-equal": "^3.1.3", "js-cookie": "^2.2.1", "lodash": "^4.17.21", @@ -33,30 +33,30 @@ }, "devDependencies": { "@types/js-cookie": "^2.2.6", - "@types/react": "^17.0.5", + "@types/react": "^17.0.9", "@types/react-beautiful-dnd": "^13.0.0", "@types/react-csv": "^1.1.1", - "@types/react-dom": "^17.0.5", + "@types/react-dom": "^17.0.6", "@types/react-jsonschema-form": "^1.7.5", "@types/shortid": "^0.0.29", "@types/styled-components": "^5.1.9", - "@typescript-eslint/eslint-plugin": "^4.23.0", - "@typescript-eslint/parser": "^4.23.0", + "@typescript-eslint/eslint-plugin": "^4.26.0", + "@typescript-eslint/parser": "^4.26.0", "babel-plugin-styled-components": "^1.12.0", - "eslint": "^7.26.0", + "eslint": "^7.27.0", "eslint-config-airbnb-typescript": "^12.3.1", - "eslint-plugin-import": "^2.23.1", + "eslint-plugin-import": "^2.23.4", "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-react": "^7.23.2", + "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0", "husky": "^6.0.0", - "next-sitemap": "^1.6.57", + "next-sitemap": "^1.6.99", "npm-run-all": "^4.1.5", "stylelint": "^13.13.1", "stylelint-config-recommended": "^5.0.0", "stylelint-config-styled-components": "^0.1.1", "testcafe": "^1.14.2", - "typescript": "^4.2.4" + "typescript": "^4.3.2" } }, "node_modules/@babel/code-frame": { @@ -68,23 +68,23 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz", + "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==", "dev": true }, "node_modules/@babel/core": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.2.tgz", - "integrity": "sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz", + "integrity": "sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.2", + "@babel/generator": "^7.14.3", "@babel/helper-compilation-targets": "^7.13.16", "@babel/helper-module-transforms": "^7.14.2", "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.2", + "@babel/parser": "^7.14.3", "@babel/template": "^7.12.13", "@babel/traverse": "^7.14.2", "@babel/types": "^7.14.2", @@ -146,9 +146,9 @@ } }, "node_modules/@babel/generator": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz", - "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz", + "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==", "dependencies": { "@babel/types": "^7.14.2", "jsesc": "^2.5.1", @@ -182,14 +182,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz", + "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.13.15", + "@babel/compat-data": "^7.14.4", "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", + "browserslist": "^4.16.6", "semver": "^6.3.0" }, "peerDependencies": { @@ -206,16 +206,16 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.2.tgz", - "integrity": "sha512-6YctwVsmlkchxfGUogvVrrhzyD3grFJyluj5JgDlQrwfMLJSt5tdAzFZfPf4H2Xoi5YLcQ6BxfJlaOBHuctyIw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz", + "integrity": "sha512-idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-function-name": "^7.14.2", "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-replace-supers": "^7.13.12", + "@babel/helper-replace-supers": "^7.14.4", "@babel/helper-split-export-declaration": "^7.12.13" }, "peerDependencies": { @@ -223,9 +223,9 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.12.17", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz", - "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz", + "integrity": "sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.12.13", @@ -236,9 +236,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz", - "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", + "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", "dev": true, "dependencies": { "@babel/helper-compilation-targets": "^7.13.0", @@ -360,15 +360,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz", - "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz", + "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==", "dev": true, "dependencies": { "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/traverse": "^7.13.0", - "@babel/types": "^7.13.12" + "@babel/traverse": "^7.14.2", + "@babel/types": "^7.14.4" } }, "node_modules/@babel/helper-simple-access": { @@ -506,9 +506,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz", - "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz", + "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==", "bin": { "parser": "bin/babel-parser.js" }, @@ -558,11 +558,12 @@ } }, "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.13.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz", - "integrity": "sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz", + "integrity": "sha512-HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ==", "dev": true, "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.14.3", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-class-static-block": "^7.12.13" }, @@ -663,13 +664,13 @@ } }, "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz", - "integrity": "sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz", + "integrity": "sha512-AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", + "@babel/compat-data": "^7.14.4", + "@babel/helper-compilation-targets": "^7.14.4", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-transform-parameters": "^7.14.2" @@ -1004,9 +1005,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz", - "integrity": "sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz", + "integrity": "sha512-5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" @@ -1016,16 +1017,16 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz", - "integrity": "sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz", + "integrity": "sha512-p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-function-name": "^7.14.2", "@babel/helper-optimise-call-expression": "^7.12.13", "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-replace-supers": "^7.13.12", + "@babel/helper-replace-supers": "^7.14.4", "@babel/helper-split-export-declaration": "^7.12.13", "globals": "^11.1.0" }, @@ -1055,9 +1056,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.13.17", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz", - "integrity": "sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz", + "integrity": "sha512-JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.13.0" @@ -1298,16 +1299,16 @@ } }, "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz", - "integrity": "sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz", + "integrity": "sha512-uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-module-imports": "^7.13.12", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-jsx": "^7.12.13", - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.2" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -1363,9 +1364,9 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.2.tgz", - "integrity": "sha512-LyA2AiPkaYzI7G5e2YI4NCasTfFe7mZvlupNprDOB7CdNUHb2DQC4uV6oeZ0396gOcicUzUCh0MShL6wiUgk+Q==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz", + "integrity": "sha512-t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg==", "dev": true, "dependencies": { "@babel/helper-module-imports": "^7.13.12", @@ -1475,26 +1476,26 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.2.tgz", - "integrity": "sha512-7dD7lVT8GMrE73v4lvDEb85cgcQhdES91BSD7jS/xjC6QY8PnRhux35ac+GCpbiRhp8crexBvZZqnaL6VrY8TQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz", + "integrity": "sha512-GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", + "@babel/compat-data": "^7.14.4", + "@babel/helper-compilation-targets": "^7.14.4", "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-validator-option": "^7.12.17", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12", "@babel/plugin-proposal-async-generator-functions": "^7.14.2", "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-class-static-block": "^7.13.11", + "@babel/plugin-proposal-class-static-block": "^7.14.3", "@babel/plugin-proposal-dynamic-import": "^7.14.2", "@babel/plugin-proposal-export-namespace-from": "^7.14.2", "@babel/plugin-proposal-json-strings": "^7.14.2", "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2", "@babel/plugin-proposal-numeric-separator": "^7.14.2", - "@babel/plugin-proposal-object-rest-spread": "^7.14.2", + "@babel/plugin-proposal-object-rest-spread": "^7.14.4", "@babel/plugin-proposal-optional-catch-binding": "^7.14.2", "@babel/plugin-proposal-optional-chaining": "^7.14.2", "@babel/plugin-proposal-private-methods": "^7.13.0", @@ -1517,10 +1518,10 @@ "@babel/plugin-transform-arrow-functions": "^7.13.0", "@babel/plugin-transform-async-to-generator": "^7.13.0", "@babel/plugin-transform-block-scoped-functions": "^7.12.13", - "@babel/plugin-transform-block-scoping": "^7.14.2", - "@babel/plugin-transform-classes": "^7.14.2", + "@babel/plugin-transform-block-scoping": "^7.14.4", + "@babel/plugin-transform-classes": "^7.14.4", "@babel/plugin-transform-computed-properties": "^7.13.0", - "@babel/plugin-transform-destructuring": "^7.13.17", + "@babel/plugin-transform-destructuring": "^7.14.4", "@babel/plugin-transform-dotall-regex": "^7.12.13", "@babel/plugin-transform-duplicate-keys": "^7.12.13", "@babel/plugin-transform-exponentiation-operator": "^7.12.13", @@ -1547,7 +1548,7 @@ "@babel/plugin-transform-unicode-escapes": "^7.12.13", "@babel/plugin-transform-unicode-regex": "^7.12.13", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.2", + "@babel/types": "^7.14.4", "babel-plugin-polyfill-corejs2": "^0.2.0", "babel-plugin-polyfill-corejs3": "^0.2.0", "babel-plugin-polyfill-regenerator": "^0.2.0", @@ -1691,18 +1692,18 @@ } }, "node_modules/@babel/types": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz", - "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", "dependencies": { "@babel/helper-validator-identifier": "^7.14.0", "to-fast-properties": "^2.0.0" } }, "node_modules/@corex/deepmerge": { - "version": "2.5.11", - "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-2.5.11.tgz", - "integrity": "sha512-lQjrug/WENKZFTPJpl4d0mKYnmFXx9pslOnAp5mjNuoKRz/Xm5kk88f11/mKNXdBzSaeLKgGUABnIKy1W7PtTA==", + "version": "2.6.20", + "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-2.6.20.tgz", + "integrity": "sha512-oZZxwDtV0bf8VPcSIhZPvdBFUkVIC8zRblUjrrVAsbGRiqUuZJfoXw2M6NDiIXWcUCfOqbkFND6Yf3b9ej9AjA==", "dev": true }, "node_modules/@emotion/is-prop-valid": { @@ -1938,9 +1939,9 @@ } }, "node_modules/@polka/url": { - "version": "1.0.0-next.12", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz", - "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==" + "version": "1.0.0-next.15", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz", + "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==" }, "node_modules/@stylelint/postcss-css-in-js": { "version": "0.37.2", @@ -2012,8 +2013,7 @@ "version": "2.2.6", "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.6.tgz", "integrity": "sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/json-schema": { "version": "7.0.7", @@ -2028,9 +2028,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.14.169", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.169.tgz", - "integrity": "sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw==", + "version": "4.14.170", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz", + "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==", "dev": true }, "node_modules/@types/mdast": { @@ -2054,9 +2054,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz", - "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==" + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.9.0.tgz", + "integrity": "sha512-AR1Vq1Ei1GaA5FjKL5PBqblTZsL5M+monvGSZwe6sSIdGiuu7Xr/pNwWJY+0ZQuN8AapD/XMB5IzBAyYRFbocA==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.0", @@ -2081,9 +2081,9 @@ "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "node_modules/@types/react": { - "version": "17.0.5", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.5.tgz", - "integrity": "sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw==", + "version": "17.0.9", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.9.tgz", + "integrity": "sha512-2Cw7FvevpJxQrCb+k5t6GH1KIvmadj5uBbjPaLlJB/nZWUj56e1ZqcD6zsoMFB47MsJUTFl9RJ132A7hb3QFJA==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2095,7 +2095,6 @@ "resolved": "https://registry.npmjs.org/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz", "integrity": "sha512-by80tJ8aTTDXT256Gl+RfLRtFjYbUWOnZuEigJgNsJrSEGxvFe5eY6k3g4VIvf0M/6+xoLgfYWoWonlOo6Wqdg==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } @@ -2105,15 +2104,14 @@ "resolved": "https://registry.npmjs.org/@types/react-csv/-/react-csv-1.1.1.tgz", "integrity": "sha512-sP8AxGrFJ/kb7ygFpGkssdD/vKSTqdZDJbw3pJKTCa1C0UoT+0+rdUWy2fZqvhvvdpHG+OCJ4G8O7OZqVIa+BA==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-dom": { - "version": "17.0.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.5.tgz", - "integrity": "sha512-ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ==", + "version": "17.0.6", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.6.tgz", + "integrity": "sha512-MGTI+TudxAnGTj8aco8mogaPSJGK2Whje7OZh1CxNLRyhJpTZg/pGQpIbCT0eCVFQyH7UFpdvCqQEThHIp/gsA==", "dev": true, "dependencies": { "@types/react": "*" @@ -2124,7 +2122,6 @@ "resolved": "https://registry.npmjs.org/@types/react-jsonschema-form/-/react-jsonschema-form-1.7.5.tgz", "integrity": "sha512-Ovhmu9WOAHee0GNCncNiTRtUmrVZgj8vkdEwc3f0CgvkNIYss9ucQ1F6TNLuakXumAg25P1zGgeCqr37iJo5FQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/json-schema": "*", "@types/react": "*" @@ -2150,8 +2147,7 @@ "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/shortid/-/shortid-0.0.29.tgz", "integrity": "sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/styled-components": { "version": "5.1.9", @@ -2170,19 +2166,19 @@ "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz", - "integrity": "sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz", + "integrity": "sha512-yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg==", "dev": true, "dependencies": { - "@typescript-eslint/experimental-utils": "4.23.0", - "@typescript-eslint/scope-manager": "4.23.0", - "debug": "^4.1.1", + "@typescript-eslint/experimental-utils": "4.26.0", + "@typescript-eslint/scope-manager": "4.26.0", + "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "lodash": "^4.17.21", + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "engines": { "node": "^10.12.0 || >=12.0.0" @@ -2202,17 +2198,17 @@ } }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz", - "integrity": "sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz", + "integrity": "sha512-TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.23.0", - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/typescript-estree": "4.23.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/typescript-estree": "4.26.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" }, "engines": { "node": "^10.12.0 || >=12.0.0" @@ -2226,15 +2222,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.23.0.tgz", - "integrity": "sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz", + "integrity": "sha512-b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "4.23.0", - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/typescript-estree": "4.23.0", - "debug": "^4.1.1" + "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/typescript-estree": "4.26.0", + "debug": "^4.3.1" }, "engines": { "node": "^10.12.0 || >=12.0.0" @@ -2253,13 +2249,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz", - "integrity": "sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz", + "integrity": "sha512-G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/visitor-keys": "4.23.0" + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/visitor-keys": "4.26.0" }, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -2270,9 +2266,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.23.0.tgz", - "integrity": "sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz", + "integrity": "sha512-rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A==", "dev": true, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -2283,18 +2279,18 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz", - "integrity": "sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz", + "integrity": "sha512-GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/visitor-keys": "4.23.0", - "debug": "^4.1.1", - "globby": "^11.0.1", + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/visitor-keys": "4.26.0", + "debug": "^4.3.1", + "globby": "^11.0.3", "is-glob": "^4.0.1", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "engines": { "node": "^10.12.0 || >=12.0.0" @@ -2310,12 +2306,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz", - "integrity": "sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz", + "integrity": "sha512-cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.23.0", + "@typescript-eslint/types": "4.26.0", "eslint-visitor-keys": "^2.0.0" }, "engines": { @@ -2458,14 +2454,6 @@ "node": ">= 8" } }, - "node_modules/anymatch/node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -2515,11 +2503,6 @@ "node": ">=0.10.0" } }, - "node_modules/array-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", - "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" - }, "node_modules/array-find": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", @@ -2874,12 +2857,9 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz", - "integrity": "sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==", - "dependencies": { - "array-filter": "^1.0.0" - }, + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz", + "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==", "engines": { "node": ">= 0.4" }, @@ -2888,9 +2868,9 @@ } }, "node_modules/axe-core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.0.tgz", - "integrity": "sha512-1uIESzroqpaTzt9uX48HO+6gfnKu3RwvWdCcWSrX4csMInJfCo1yvKPNXCwXFRpJqRW25tiASb6No0YH57PXqg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.1.tgz", + "integrity": "sha512-evY7DN8qSIbsW2H/TWQ1bX3sXN1d4MNb5Vb4n7BzPuCwRHdkZ1H2eNLuSh73EoQqkGKUtju2G2HCcjCfhvZIAA==", "dev": true, "engines": { "node": ">=4" @@ -3000,13 +2980,13 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz", - "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", + "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", "dev": true, "dependencies": { "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.0", + "@babel/helper-define-polyfill-provider": "^0.2.2", "semver": "^6.1.1" }, "peerDependencies": { @@ -3023,12 +3003,12 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz", - "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz", + "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.0", + "@babel/helper-define-polyfill-provider": "^0.2.2", "core-js-compat": "^3.9.1" }, "peerDependencies": { @@ -3036,12 +3016,12 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz", - "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", + "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.0" + "@babel/helper-define-polyfill-provider": "^0.2.2" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -3507,9 +3487,9 @@ "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, "node_modules/caniuse-lite": { - "version": "1.0.30001228", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", - "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==", + "version": "1.0.30001233", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001233.tgz", + "integrity": "sha512-BmkbxLfStqiPA7IEzQpIk0UFZFf3A4E6fzjPJ6OR+bFC2L8ES9J8zGA/asoi47p8XDVkev+WJo2I2Nc8c/34Yg==", "funding": { "type": "opencollective", "url": "https://opencollective.com/browserslist" @@ -3603,14 +3583,6 @@ "fsevents": "~2.3.1" } }, - "node_modules/chokidar/node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/chrome-remote-interface": { "version": "0.25.7", "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.25.7.tgz", @@ -3896,19 +3868,6 @@ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, - "node_modules/contains-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz", - "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=", - "dev": true, - "dependencies": { - "normalize-path": "^2.1.1", - "path-starts-with": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -3939,9 +3898,9 @@ "hasInstallScript": true }, "node_modules/core-js-compat": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.12.1.tgz", - "integrity": "sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz", + "integrity": "sha512-mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ==", "dev": true, "dependencies": { "browserslist": "^4.16.6", @@ -3962,9 +3921,9 @@ } }, "node_modules/core-js-pure": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.12.1.tgz", - "integrity": "sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.1.tgz", + "integrity": "sha512-wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw==", "dev": true, "hasInstallScript": true, "funding": { @@ -4210,9 +4169,9 @@ } }, "node_modules/date-fns": { - "version": "2.21.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.3.tgz", - "integrity": "sha512-HeYdzCaFflc1i4tGbj7JKMjM4cKGYoyxwcIIkHzNgCkX8xXDNJDZXgDDVchIWpN4eQc3lH37WarduXFZJOtxfw==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.22.1.tgz", + "integrity": "sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==", "engines": { "node": ">=0.11" }, @@ -4543,9 +4502,9 @@ "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" }, "node_modules/electron-to-chromium": { - "version": "1.3.728", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz", - "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==" + "version": "1.3.744", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.744.tgz", + "integrity": "sha512-o/vep/PvSXg+7buwCbVJXHY3zbjYVmFPwnMMnchESXgAzrfcasvbX/hQZHCFGG7YdZgdtwt1KTMyK9CyBxPbLA==" }, "node_modules/elegant-spinner": { "version": "1.0.1", @@ -4683,9 +4642,9 @@ } }, "node_modules/es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "version": "1.18.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", + "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", "dependencies": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", @@ -4695,14 +4654,14 @@ "has-symbols": "^1.0.2", "is-callable": "^1.2.3", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", + "is-regex": "^1.1.3", + "is-string": "^1.0.6", + "object-inspect": "^1.10.3", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" + "unbox-primitive": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -4753,9 +4712,9 @@ } }, "node_modules/eslint": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz", - "integrity": "sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz", + "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==", "dev": true, "dependencies": { "@babel/code-frame": "7.12.11", @@ -4766,12 +4725,14 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.1", "esquery": "^1.4.0", "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", @@ -4783,7 +4744,7 @@ "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.21", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", @@ -4792,7 +4753,7 @@ "semver": "^7.2.1", "strip-ansi": "^6.0.0", "strip-json-comments": "^3.1.0", - "table": "^6.0.4", + "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, @@ -4850,6 +4811,7 @@ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-12.3.1.tgz", "integrity": "sha512-ql/Pe6/hppYuRp4m3iPaHJqkBB7dgeEmGPQ6X0UNmrQOfTF+dXw29/ZjU2kQ6RDoLxaxOA+Xqv07Vbef6oVTWw==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/parser": "^4.4.1", "eslint-config-airbnb": "^18.2.0", @@ -4904,14 +4866,13 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.23.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.1.tgz", - "integrity": "sha512-epW62znqcFCyQeixVrqy26WpdN1Y3LZH5G9XCuiiTCVuksjC4Je+4o1z5mIpa6P1KMyz1n4RT436VSrZoA5+5A==", + "version": "2.23.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz", + "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==", "dev": true, "dependencies": { "array-includes": "^3.1.3", "array.prototype.flat": "^1.2.4", - "contains-path": "^1.0.0", "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.4", @@ -4986,9 +4947,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz", - "integrity": "sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz", + "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==", "dev": true, "dependencies": { "array-includes": "^3.1.3", @@ -4997,12 +4958,12 @@ "has": "^1.0.3", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.0.4", - "object.entries": "^1.1.3", + "object.entries": "^1.1.4", "object.fromentries": "^2.0.4", - "object.values": "^1.1.3", + "object.values": "^1.1.4", "prop-types": "^15.7.2", "resolve": "^2.0.0-next.3", - "string.prototype.matchall": "^4.0.4" + "string.prototype.matchall": "^4.0.5" }, "engines": { "node": ">=4" @@ -5062,6 +5023,33 @@ } }, "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/eslint-utils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", @@ -5076,7 +5064,7 @@ "url": "https://github.com/sponsors/mysticatea" } }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", @@ -5085,15 +5073,6 @@ "node": ">=4" } }, - "node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/esotope-hammerhead": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/esotope-hammerhead/-/esotope-hammerhead-0.6.1.tgz", @@ -5903,9 +5882,9 @@ } }, "node_modules/globals": { - "version": "13.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz", - "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==", + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz", + "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -6454,9 +6433,9 @@ } }, "node_modules/iconv-lite": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz", - "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -7322,6 +7301,12 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "node_modules/lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -7910,9 +7895,9 @@ } }, "node_modules/mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "dev": true, "engines": { "node": ">= 0.6" @@ -8163,12 +8148,12 @@ } }, "node_modules/next-sitemap": { - "version": "1.6.57", - "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.57.tgz", - "integrity": "sha512-pv6NgKGI3k8bCl98FOJ6ISAHBuUwYAy3kV8xqse3rcLQW0/AnK+02yPT+VC5d4abrNP6HqhSf1fKuIYoTzrx7Q==", + "version": "1.6.99", + "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.99.tgz", + "integrity": "sha512-2ZSIBOslKJO0bz0ShCVAU2UUzE/SBIBA1MT7e7uOlOMw9u+OD1Uc4XDzKLhNdjbCuic707xYMW5E0jsnOljhUA==", "dev": true, "dependencies": { - "@corex/deepmerge": "^2.5.11", + "@corex/deepmerge": "^2.6.20", "matcher": "^4.0.0", "minimist": "^1.2.5" }, @@ -8456,13 +8441,9 @@ } }, "node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "engines": { "node": ">=0.10.0" } @@ -8485,7 +8466,8 @@ "node_modules/normalize.css": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", - "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==" + "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", + "license": "MIT" }, "node_modules/npm-run-all": { "version": "4.1.5", @@ -8837,15 +8819,14 @@ } }, "node_modules/object.entries": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz", - "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", + "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "es-abstract": "^1.18.2" }, "engines": { "node": ">= 0.4" @@ -8882,15 +8863,14 @@ } }, "node_modules/object.values": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", - "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", + "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.18.2" }, "engines": { "node": ">= 0.4" @@ -9159,23 +9139,11 @@ } }, "node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "node_modules/path-starts-with": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz", - "integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=", - "dev": true, - "dependencies": { - "normalize-path": "^2.1.1" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -9210,9 +9178,9 @@ } }, "node_modules/picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "engines": { "node": ">=8.6" }, @@ -10478,7 +10446,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-5.1.0.tgz", "integrity": "sha512-MDvHAb/5mUnif2R+0IPCYJU8WjHa9UzGtM/F4AVy5GixPlDZ1z3HacYy4xojDU+uBa+0X/3PIfyQI26/2ljJNA==", - "license": "MIT", "dependencies": { "hast-util-raw": "^6.1.0" }, @@ -10491,7 +10458,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/rehype-sanitize/-/rehype-sanitize-4.0.0.tgz", "integrity": "sha512-ZCr/iQRr4JeqPjun5i9CHHILVY7i45VnLu1CkkibDrSyFQ7dTLSvw8OIQpHhS4RSh9h/9GidxFw1bRb0LOxIag==", - "license": "MIT", "dependencies": { "hast-util-sanitize": "^3.0.0" }, @@ -10552,12 +10518,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, "node_modules/repeat-element": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", @@ -10592,9 +10552,9 @@ } }, "node_modules/replicator": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/replicator/-/replicator-1.0.3.tgz", - "integrity": "sha512-WsKsraaM0x0QHy5CtzdgFXUxyowoBhyNkmPqmZShW6h+rOWnyT6Od3zRdTX9r616rAA6kDC9MKQGnSM/CJKfVQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/replicator/-/replicator-1.0.5.tgz", + "integrity": "sha512-saxS4y7NFkLMa92BR4bPHR41GD+f/qoDAwD2xZmN+MpDXgibkxwLO2qk7dCHYtskSkd/bWS8Jy6kC5MZUkg1tw==", "dev": true }, "node_modules/require-from-string": { @@ -10917,11 +10877,11 @@ "dev": true }, "node_modules/sirv": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz", - "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz", + "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==", "dependencies": { - "@polka/url": "^1.0.0-next.9", + "@polka/url": "^1.0.0-next.15", "mime": "^2.3.1", "totalist": "^1.0.0" }, @@ -11260,9 +11220,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz", + "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==", "dev": true }, "node_modules/specificity": { @@ -11502,15 +11462,16 @@ "dev": true }, "node_modules/string.prototype.matchall": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz", - "integrity": "sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz", + "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has-symbols": "^1.0.1", + "es-abstract": "^1.18.2", + "get-intrinsic": "^1.1.1", + "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", "regexp.prototype.flags": "^1.3.1", "side-channel": "^1.0.4" @@ -12105,9 +12066,9 @@ } }, "node_modules/table/node_modules/ajv": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.4.0.tgz", - "integrity": "sha512-7QD2l6+KBSLwf+7MuYocbWvRPdOu63/trReTLu2KFwkgctnub1auoF+Y1WYcm09CTM7quuscrzqmASaLHC/K4Q==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz", + "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -12131,6 +12092,7 @@ "resolved": "https://registry.npmjs.org/testcafe/-/testcafe-1.14.2.tgz", "integrity": "sha512-QSvCwS4J3jzXRMcDBAlnm+SUf/PoWEkKZEnsIYzdbFheJYFNNIOXL/SeNA9L4cDWH7AjsOQxfALlRQOkQVSamw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.12.1", "@babel/plugin-proposal-async-generator-functions": "^7.12.1", @@ -12584,9 +12546,9 @@ } }, "node_modules/testcafe/node_modules/@types/node": { - "version": "12.20.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.13.tgz", - "integrity": "sha512-1x8W5OpxPq+T85OUsHRP6BqXeosKmeXRtjoF39STcdf/UWLqUsoehstZKOi0CunhVqHG17AyZgpj20eRVooK6A==", + "version": "12.20.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.14.tgz", + "integrity": "sha512-iFJOS5Q470FF+r4Ol2pSley7/wCNVqf+jgjhtxLLaJcDs+To2iCxlXIkJXrGLD9w9G/oJ9ibySu7z92DCwr7Pg==", "dev": true }, "node_modules/testcafe/node_modules/ansi-styles": { @@ -13255,9 +13217,9 @@ } }, "node_modules/trim-newlines": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", - "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true, "engines": { "node": ">=8" @@ -13387,9 +13349,9 @@ } }, "node_modules/typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", + "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -13871,9 +13833,9 @@ } }, "node_modules/webpack-bundle-analyzer/node_modules/acorn": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz", - "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz", + "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==", "bin": { "acorn": "bin/acorn" }, @@ -14189,23 +14151,23 @@ } }, "@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz", + "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==", "dev": true }, "@babel/core": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.2.tgz", - "integrity": "sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz", + "integrity": "sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==", "dev": true, "requires": { "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.2", + "@babel/generator": "^7.14.3", "@babel/helper-compilation-targets": "^7.13.16", "@babel/helper-module-transforms": "^7.14.2", "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.2", + "@babel/parser": "^7.14.3", "@babel/template": "^7.12.13", "@babel/traverse": "^7.14.2", "@babel/types": "^7.14.2", @@ -14250,9 +14212,9 @@ } }, "@babel/generator": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz", - "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz", + "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==", "requires": { "@babel/types": "^7.14.2", "jsesc": "^2.5.1", @@ -14285,14 +14247,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz", + "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==", "dev": true, "requires": { - "@babel/compat-data": "^7.13.15", + "@babel/compat-data": "^7.14.4", "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", + "browserslist": "^4.16.6", "semver": "^6.3.0" }, "dependencies": { @@ -14305,23 +14267,23 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.2.tgz", - "integrity": "sha512-6YctwVsmlkchxfGUogvVrrhzyD3grFJyluj5JgDlQrwfMLJSt5tdAzFZfPf4H2Xoi5YLcQ6BxfJlaOBHuctyIw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz", + "integrity": "sha512-idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-function-name": "^7.14.2", "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-replace-supers": "^7.13.12", + "@babel/helper-replace-supers": "^7.14.4", "@babel/helper-split-export-declaration": "^7.12.13" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.12.17", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz", - "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz", + "integrity": "sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.12.13", @@ -14329,9 +14291,9 @@ } }, "@babel/helper-define-polyfill-provider": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz", - "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", + "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", "dev": true, "requires": { "@babel/helper-compilation-targets": "^7.13.0", @@ -14449,15 +14411,15 @@ } }, "@babel/helper-replace-supers": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz", - "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz", + "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/traverse": "^7.13.0", - "@babel/types": "^7.13.12" + "@babel/traverse": "^7.14.2", + "@babel/types": "^7.14.4" } }, "@babel/helper-simple-access": { @@ -14582,9 +14544,9 @@ } }, "@babel/parser": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz", - "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==" + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz", + "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==" }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { "version": "7.13.12", @@ -14619,11 +14581,12 @@ } }, "@babel/plugin-proposal-class-static-block": { - "version": "7.13.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz", - "integrity": "sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz", + "integrity": "sha512-HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ==", "dev": true, "requires": { + "@babel/helper-create-class-features-plugin": "^7.14.3", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-class-static-block": "^7.12.13" } @@ -14700,13 +14663,13 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz", - "integrity": "sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz", + "integrity": "sha512-AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA==", "dev": true, "requires": { - "@babel/compat-data": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", + "@babel/compat-data": "^7.14.4", + "@babel/helper-compilation-targets": "^7.14.4", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-transform-parameters": "^7.14.2" @@ -14957,25 +14920,25 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz", - "integrity": "sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz", + "integrity": "sha512-5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-classes": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz", - "integrity": "sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz", + "integrity": "sha512-p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-function-name": "^7.14.2", "@babel/helper-optimise-call-expression": "^7.12.13", "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-replace-supers": "^7.13.12", + "@babel/helper-replace-supers": "^7.14.4", "@babel/helper-split-export-declaration": "^7.12.13", "globals": "^11.1.0" }, @@ -14998,9 +14961,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.13.17", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz", - "integrity": "sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz", + "integrity": "sha512-JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.13.0" @@ -15184,16 +15147,16 @@ } }, "@babel/plugin-transform-react-jsx": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz", - "integrity": "sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz", + "integrity": "sha512-uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.12.13", "@babel/helper-module-imports": "^7.13.12", "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-jsx": "^7.12.13", - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.2" } }, "@babel/plugin-transform-react-jsx-development": { @@ -15234,9 +15197,9 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.2.tgz", - "integrity": "sha512-LyA2AiPkaYzI7G5e2YI4NCasTfFe7mZvlupNprDOB7CdNUHb2DQC4uV6oeZ0396gOcicUzUCh0MShL6wiUgk+Q==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz", + "integrity": "sha512-t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.13.12", @@ -15321,26 +15284,26 @@ } }, "@babel/preset-env": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.2.tgz", - "integrity": "sha512-7dD7lVT8GMrE73v4lvDEb85cgcQhdES91BSD7jS/xjC6QY8PnRhux35ac+GCpbiRhp8crexBvZZqnaL6VrY8TQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz", + "integrity": "sha512-GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA==", "dev": true, "requires": { - "@babel/compat-data": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", + "@babel/compat-data": "^7.14.4", + "@babel/helper-compilation-targets": "^7.14.4", "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-validator-option": "^7.12.17", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12", "@babel/plugin-proposal-async-generator-functions": "^7.14.2", "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-class-static-block": "^7.13.11", + "@babel/plugin-proposal-class-static-block": "^7.14.3", "@babel/plugin-proposal-dynamic-import": "^7.14.2", "@babel/plugin-proposal-export-namespace-from": "^7.14.2", "@babel/plugin-proposal-json-strings": "^7.14.2", "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2", "@babel/plugin-proposal-numeric-separator": "^7.14.2", - "@babel/plugin-proposal-object-rest-spread": "^7.14.2", + "@babel/plugin-proposal-object-rest-spread": "^7.14.4", "@babel/plugin-proposal-optional-catch-binding": "^7.14.2", "@babel/plugin-proposal-optional-chaining": "^7.14.2", "@babel/plugin-proposal-private-methods": "^7.13.0", @@ -15363,10 +15326,10 @@ "@babel/plugin-transform-arrow-functions": "^7.13.0", "@babel/plugin-transform-async-to-generator": "^7.13.0", "@babel/plugin-transform-block-scoped-functions": "^7.12.13", - "@babel/plugin-transform-block-scoping": "^7.14.2", - "@babel/plugin-transform-classes": "^7.14.2", + "@babel/plugin-transform-block-scoping": "^7.14.4", + "@babel/plugin-transform-classes": "^7.14.4", "@babel/plugin-transform-computed-properties": "^7.13.0", - "@babel/plugin-transform-destructuring": "^7.13.17", + "@babel/plugin-transform-destructuring": "^7.14.4", "@babel/plugin-transform-dotall-regex": "^7.12.13", "@babel/plugin-transform-duplicate-keys": "^7.12.13", "@babel/plugin-transform-exponentiation-operator": "^7.12.13", @@ -15393,7 +15356,7 @@ "@babel/plugin-transform-unicode-escapes": "^7.12.13", "@babel/plugin-transform-unicode-regex": "^7.12.13", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.2", + "@babel/types": "^7.14.4", "babel-plugin-polyfill-corejs2": "^0.2.0", "babel-plugin-polyfill-corejs3": "^0.2.0", "babel-plugin-polyfill-regenerator": "^0.2.0", @@ -15525,18 +15488,18 @@ } }, "@babel/types": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz", - "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", "requires": { "@babel/helper-validator-identifier": "^7.14.0", "to-fast-properties": "^2.0.0" } }, "@corex/deepmerge": { - "version": "2.5.11", - "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-2.5.11.tgz", - "integrity": "sha512-lQjrug/WENKZFTPJpl4d0mKYnmFXx9pslOnAp5mjNuoKRz/Xm5kk88f11/mKNXdBzSaeLKgGUABnIKy1W7PtTA==", + "version": "2.6.20", + "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-2.6.20.tgz", + "integrity": "sha512-oZZxwDtV0bf8VPcSIhZPvdBFUkVIC8zRblUjrrVAsbGRiqUuZJfoXw2M6NDiIXWcUCfOqbkFND6Yf3b9ej9AjA==", "dev": true }, "@emotion/is-prop-valid": { @@ -15729,9 +15692,9 @@ "integrity": "sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw==" }, "@polka/url": { - "version": "1.0.0-next.12", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz", - "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==" + "version": "1.0.0-next.15", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz", + "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==" }, "@stylelint/postcss-css-in-js": { "version": "0.37.2", @@ -15810,9 +15773,9 @@ "dev": true }, "@types/lodash": { - "version": "4.14.169", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.169.tgz", - "integrity": "sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw==", + "version": "4.14.170", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz", + "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==", "dev": true }, "@types/mdast": { @@ -15836,9 +15799,9 @@ "dev": true }, "@types/node": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz", - "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==" + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.9.0.tgz", + "integrity": "sha512-AR1Vq1Ei1GaA5FjKL5PBqblTZsL5M+monvGSZwe6sSIdGiuu7Xr/pNwWJY+0ZQuN8AapD/XMB5IzBAyYRFbocA==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -15863,9 +15826,9 @@ "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "@types/react": { - "version": "17.0.5", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.5.tgz", - "integrity": "sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw==", + "version": "17.0.9", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.9.tgz", + "integrity": "sha512-2Cw7FvevpJxQrCb+k5t6GH1KIvmadj5uBbjPaLlJB/nZWUj56e1ZqcD6zsoMFB47MsJUTFl9RJ132A7hb3QFJA==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -15891,9 +15854,9 @@ } }, "@types/react-dom": { - "version": "17.0.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.5.tgz", - "integrity": "sha512-ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ==", + "version": "17.0.6", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.6.tgz", + "integrity": "sha512-MGTI+TudxAnGTj8aco8mogaPSJGK2Whje7OZh1CxNLRyhJpTZg/pGQpIbCT0eCVFQyH7UFpdvCqQEThHIp/gsA==", "dev": true, "requires": { "@types/react": "*" @@ -15948,85 +15911,85 @@ "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" }, "@typescript-eslint/eslint-plugin": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz", - "integrity": "sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz", + "integrity": "sha512-yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.23.0", - "@typescript-eslint/scope-manager": "4.23.0", - "debug": "^4.1.1", + "@typescript-eslint/experimental-utils": "4.26.0", + "@typescript-eslint/scope-manager": "4.26.0", + "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "lodash": "^4.17.21", + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" } }, "@typescript-eslint/experimental-utils": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz", - "integrity": "sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz", + "integrity": "sha512-TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw==", "dev": true, "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.23.0", - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/typescript-estree": "4.23.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/typescript-estree": "4.26.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" } }, "@typescript-eslint/parser": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.23.0.tgz", - "integrity": "sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz", + "integrity": "sha512-b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.23.0", - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/typescript-estree": "4.23.0", - "debug": "^4.1.1" + "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/typescript-estree": "4.26.0", + "debug": "^4.3.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz", - "integrity": "sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz", + "integrity": "sha512-G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/visitor-keys": "4.23.0" + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/visitor-keys": "4.26.0" } }, "@typescript-eslint/types": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.23.0.tgz", - "integrity": "sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz", + "integrity": "sha512-rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz", - "integrity": "sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz", + "integrity": "sha512-GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/visitor-keys": "4.23.0", - "debug": "^4.1.1", - "globby": "^11.0.1", + "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/visitor-keys": "4.26.0", + "debug": "^4.3.1", + "globby": "^11.0.3", "is-glob": "^4.0.1", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "semver": "^7.3.5", + "tsutils": "^3.21.0" } }, "@typescript-eslint/visitor-keys": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz", - "integrity": "sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz", + "integrity": "sha512-cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.23.0", + "@typescript-eslint/types": "4.26.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -16121,13 +16084,6 @@ "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" - }, - "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } } }, "argparse": { @@ -16167,11 +16123,6 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, - "array-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", - "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" - }, "array-find": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", @@ -16438,17 +16389,14 @@ } }, "available-typed-arrays": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz", - "integrity": "sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==", - "requires": { - "array-filter": "^1.0.0" - } + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz", + "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==" }, "axe-core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.0.tgz", - "integrity": "sha512-1uIESzroqpaTzt9uX48HO+6gfnKu3RwvWdCcWSrX4csMInJfCo1yvKPNXCwXFRpJqRW25tiASb6No0YH57PXqg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.1.tgz", + "integrity": "sha512-evY7DN8qSIbsW2H/TWQ1bX3sXN1d4MNb5Vb4n7BzPuCwRHdkZ1H2eNLuSh73EoQqkGKUtju2G2HCcjCfhvZIAA==", "dev": true }, "axios": { @@ -16536,13 +16484,13 @@ } }, "babel-plugin-polyfill-corejs2": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz", - "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", + "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", "dev": true, "requires": { "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.0", + "@babel/helper-define-polyfill-provider": "^0.2.2", "semver": "^6.1.1" }, "dependencies": { @@ -16555,22 +16503,22 @@ } }, "babel-plugin-polyfill-corejs3": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz", - "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz", + "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.0", + "@babel/helper-define-polyfill-provider": "^0.2.2", "core-js-compat": "^3.9.1" } }, "babel-plugin-polyfill-regenerator": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz", - "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", + "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.0" + "@babel/helper-define-polyfill-provider": "^0.2.2" } }, "babel-plugin-styled-components": { @@ -16952,9 +16900,9 @@ "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, "caniuse-lite": { - "version": "1.0.30001228", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz", - "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==" + "version": "1.0.30001233", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001233.tgz", + "integrity": "sha512-BmkbxLfStqiPA7IEzQpIk0UFZFf3A4E6fzjPJ6OR+bFC2L8ES9J8zGA/asoi47p8XDVkev+WJo2I2Nc8c/34Yg==" }, "chai": { "version": "4.3.4", @@ -17013,13 +16961,6 @@ "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.5.0" - }, - "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } } }, "chrome-remote-interface": { @@ -17256,16 +17197,6 @@ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, - "contains-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz", - "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=", - "dev": true, - "requires": { - "normalize-path": "^2.1.1", - "path-starts-with": "^1.0.0" - } - }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -17293,9 +17224,9 @@ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-js-compat": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.12.1.tgz", - "integrity": "sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz", + "integrity": "sha512-mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -17311,9 +17242,9 @@ } }, "core-js-pure": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.12.1.tgz", - "integrity": "sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.1.tgz", + "integrity": "sha512-wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw==", "dev": true }, "core-util-is": { @@ -17520,9 +17451,9 @@ "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==" }, "date-fns": { - "version": "2.21.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.3.tgz", - "integrity": "sha512-HeYdzCaFflc1i4tGbj7JKMjM4cKGYoyxwcIIkHzNgCkX8xXDNJDZXgDDVchIWpN4eQc3lH37WarduXFZJOtxfw==" + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.22.1.tgz", + "integrity": "sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==" }, "debug": { "version": "4.3.1", @@ -17782,9 +17713,9 @@ "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" }, "electron-to-chromium": { - "version": "1.3.728", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz", - "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==" + "version": "1.3.744", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.744.tgz", + "integrity": "sha512-o/vep/PvSXg+7buwCbVJXHY3zbjYVmFPwnMMnchESXgAzrfcasvbX/hQZHCFGG7YdZgdtwt1KTMyK9CyBxPbLA==" }, "elegant-spinner": { "version": "1.0.1", @@ -17908,9 +17839,9 @@ } }, "es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "version": "1.18.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", + "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", @@ -17920,14 +17851,14 @@ "has-symbols": "^1.0.2", "is-callable": "^1.2.3", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", + "is-regex": "^1.1.3", + "is-string": "^1.0.6", + "object-inspect": "^1.10.3", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" + "unbox-primitive": "^1.0.1" } }, "es-to-primitive": { @@ -17957,9 +17888,9 @@ "dev": true }, "eslint": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz", - "integrity": "sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz", + "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", @@ -17970,12 +17901,14 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.1", "esquery": "^1.4.0", "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", @@ -17987,7 +17920,7 @@ "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.21", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", @@ -17996,9 +17929,28 @@ "semver": "^7.2.1", "strip-ansi": "^6.0.0", "strip-json-comments": "^3.1.0", - "table": "^6.0.4", + "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + } } }, "eslint-config-airbnb": { @@ -18083,14 +18035,13 @@ } }, "eslint-plugin-import": { - "version": "2.23.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.1.tgz", - "integrity": "sha512-epW62znqcFCyQeixVrqy26WpdN1Y3LZH5G9XCuiiTCVuksjC4Je+4o1z5mIpa6P1KMyz1n4RT436VSrZoA5+5A==", + "version": "2.23.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz", + "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==", "dev": true, "requires": { "array-includes": "^3.1.3", "array.prototype.flat": "^1.2.4", - "contains-path": "^1.0.0", "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.4", @@ -18152,9 +18103,9 @@ } }, "eslint-plugin-react": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz", - "integrity": "sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz", + "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==", "dev": true, "requires": { "array-includes": "^3.1.3", @@ -18163,12 +18114,12 @@ "has": "^1.0.3", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.0.4", - "object.entries": "^1.1.3", + "object.entries": "^1.1.4", "object.fromentries": "^2.0.4", - "object.values": "^1.1.3", + "object.values": "^1.1.4", "prop-types": "^15.7.2", "resolve": "^2.0.0-next.3", - "string.prototype.matchall": "^4.0.4" + "string.prototype.matchall": "^4.0.5" }, "dependencies": { "doctrine": { @@ -18210,20 +18161,12 @@ } }, "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } + "eslint-visitor-keys": "^2.0.0" } }, "eslint-visitor-keys": { @@ -18853,9 +18796,9 @@ } }, "globals": { - "version": "13.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz", - "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==", + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz", + "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -19286,9 +19229,9 @@ "dev": true }, "iconv-lite": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz", - "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "requires": { "safer-buffer": ">= 2.1.2 < 3.0.0" } @@ -19890,6 +19833,12 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -20331,9 +20280,9 @@ "dev": true }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "dev": true }, "mimic-fn": { @@ -20585,12 +20534,12 @@ } }, "next-sitemap": { - "version": "1.6.57", - "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.57.tgz", - "integrity": "sha512-pv6NgKGI3k8bCl98FOJ6ISAHBuUwYAy3kV8xqse3rcLQW0/AnK+02yPT+VC5d4abrNP6HqhSf1fKuIYoTzrx7Q==", + "version": "1.6.99", + "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.99.tgz", + "integrity": "sha512-2ZSIBOslKJO0bz0ShCVAU2UUzE/SBIBA1MT7e7uOlOMw9u+OD1Uc4XDzKLhNdjbCuic707xYMW5E0jsnOljhUA==", "dev": true, "requires": { - "@corex/deepmerge": "^2.5.11", + "@corex/deepmerge": "^2.6.20", "matcher": "^4.0.0", "minimist": "^1.2.5" } @@ -20788,13 +20737,9 @@ } }, "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "normalize-range": { "version": "0.1.2", @@ -21077,15 +21022,14 @@ } }, "object.entries": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz", - "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz", + "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==", "dev": true, "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "es-abstract": "^1.18.2" } }, "object.fromentries": { @@ -21110,15 +21054,14 @@ } }, "object.values": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", - "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", + "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" + "es-abstract": "^1.18.2" } }, "once": { @@ -21322,20 +21265,11 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "path-starts-with": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz", - "integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=", - "dev": true, - "requires": { - "normalize-path": "^2.1.1" - } - }, "path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -21361,9 +21295,9 @@ } }, "picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==" }, "pidtree": { "version": "0.3.1", @@ -22394,12 +22328,6 @@ "mdast-util-to-markdown": "^0.6.0" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, "repeat-element": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", @@ -22422,9 +22350,9 @@ } }, "replicator": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/replicator/-/replicator-1.0.3.tgz", - "integrity": "sha512-WsKsraaM0x0QHy5CtzdgFXUxyowoBhyNkmPqmZShW6h+rOWnyT6Od3zRdTX9r616rAA6kDC9MKQGnSM/CJKfVQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/replicator/-/replicator-1.0.5.tgz", + "integrity": "sha512-saxS4y7NFkLMa92BR4bPHR41GD+f/qoDAwD2xZmN+MpDXgibkxwLO2qk7dCHYtskSkd/bWS8Jy6kC5MZUkg1tw==", "dev": true }, "require-from-string": { @@ -22669,11 +22597,11 @@ "dev": true }, "sirv": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz", - "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz", + "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==", "requires": { - "@polka/url": "^1.0.0-next.9", + "@polka/url": "^1.0.0-next.15", "mime": "^2.3.1", "totalist": "^1.0.0" }, @@ -22953,9 +22881,9 @@ } }, "spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz", + "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==", "dev": true }, "specificity": { @@ -23165,15 +23093,16 @@ } }, "string.prototype.matchall": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz", - "integrity": "sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz", + "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has-symbols": "^1.0.1", + "es-abstract": "^1.18.2", + "get-intrinsic": "^1.1.1", + "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", "regexp.prototype.flags": "^1.3.1", "side-channel": "^1.0.4" @@ -23639,9 +23568,9 @@ }, "dependencies": { "ajv": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.4.0.tgz", - "integrity": "sha512-7QD2l6+KBSLwf+7MuYocbWvRPdOu63/trReTLu2KFwkgctnub1auoF+Y1WYcm09CTM7quuscrzqmASaLHC/K4Q==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz", + "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -23760,9 +23689,9 @@ "dev": true }, "@types/node": { - "version": "12.20.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.13.tgz", - "integrity": "sha512-1x8W5OpxPq+T85OUsHRP6BqXeosKmeXRtjoF39STcdf/UWLqUsoehstZKOi0CunhVqHG17AyZgpj20eRVooK6A==", + "version": "12.20.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.14.tgz", + "integrity": "sha512-iFJOS5Q470FF+r4Ol2pSley7/wCNVqf+jgjhtxLLaJcDs+To2iCxlXIkJXrGLD9w9G/oJ9ibySu7z92DCwr7Pg==", "dev": true }, "ansi-styles": { @@ -24606,9 +24535,9 @@ "dev": true }, "trim-newlines": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", - "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true }, "trough": { @@ -24702,9 +24631,9 @@ } }, "typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", + "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", "dev": true }, "ultron": { @@ -25073,9 +25002,9 @@ }, "dependencies": { "acorn": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz", - "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==" + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz", + "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==" }, "commander": { "version": "6.2.1", diff --git a/package.json b/package.json index 640377b..ae72e72 100644 --- a/package.json +++ b/package.json @@ -34,35 +34,35 @@ }, "devDependencies": { "@types/js-cookie": "^2.2.6", - "@types/react": "^17.0.5", + "@types/react": "^17.0.9", "@types/react-beautiful-dnd": "^13.0.0", "@types/react-csv": "^1.1.1", - "@types/react-dom": "^17.0.5", + "@types/react-dom": "^17.0.6", "@types/react-jsonschema-form": "^1.7.5", "@types/shortid": "^0.0.29", "@types/styled-components": "^5.1.9", - "@typescript-eslint/eslint-plugin": "^4.23.0", - "@typescript-eslint/parser": "^4.23.0", + "@typescript-eslint/eslint-plugin": "^4.26.0", + "@typescript-eslint/parser": "^4.26.0", "babel-plugin-styled-components": "^1.12.0", - "eslint": "^7.26.0", + "eslint": "^7.27.0", "eslint-config-airbnb-typescript": "^12.3.1", - "eslint-plugin-import": "^2.23.1", + "eslint-plugin-import": "^2.23.4", "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-react": "^7.23.2", + "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0", "husky": "^6.0.0", - "next-sitemap": "^1.6.57", + "next-sitemap": "^1.6.99", "npm-run-all": "^4.1.5", "stylelint": "^13.13.1", "stylelint-config-recommended": "^5.0.0", "stylelint-config-styled-components": "^0.1.1", "testcafe": "^1.14.2", - "typescript": "^4.2.4" + "typescript": "^4.3.2" }, "dependencies": { "@next/bundle-analyzer": "^10.2.3", "axios": "^0.21.1", - "date-fns": "^2.21.3", + "date-fns": "^2.22.1", "fast-deep-equal": "^3.1.3", "js-cookie": "^2.2.1", "lodash": "^4.17.21", diff --git a/src/theme/colors.ts b/src/theme/colors.ts index d702179..ea83e2b 100644 --- a/src/theme/colors.ts +++ b/src/theme/colors.ts @@ -1,6 +1,6 @@ export type Colors = - "sik100-gold"| - "sik100-blue"| + "sik100-gold" | + "sik100-blue" | "dark-blue" | "light-blue" | "white1" | From d314552997128f509e4db1391acdb865b0e87aa0 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 3 Jun 2021 02:14:33 +0300 Subject: [PATCH 09/14] use default import for colors --- src/components/Accordion/Accordion.tsx | 2 +- src/components/Accordion/AccordionIcon.tsx | 2 +- src/components/AddLink.tsx | 2 +- src/components/AdminHeader.tsx | 2 +- src/components/Button.tsx | 2 +- src/components/Card.tsx | 2 +- src/components/ContactCard.tsx | 2 +- src/components/Divider.tsx | 2 +- src/components/DropDownBox.tsx | 2 +- src/components/Hero/HeroAside.tsx | 2 +- src/components/Hero/HeroPrimaryButtons.tsx | 2 +- src/components/Hero/HeroSecondarySection.tsx | 2 +- src/components/Loader.tsx | 2 +- src/components/NavigationMobile.tsx | 2 +- src/components/PageLink.tsx | 2 +- src/components/Sections/CTASection.tsx | 2 +- src/components/Widgets/Checkbox/Checkbox.tsx | 2 +- src/components/Widgets/SignupQuestionsWidget/Question.tsx | 2 +- src/components/Widgets/SignupQuestionsWidget/QuestionList.tsx | 2 +- src/pages/_app.tsx | 2 +- src/views/ContactsPage/ContactsPageView.tsx | 2 +- src/views/FrontPage/FrontPageView.tsx | 2 +- src/views/SignUpPage/SignUpPageView.tsx | 2 +- src/views/admin/AdminCreateCommon.tsx | 2 +- src/views/admin/AdminListCommon.tsx | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx index a3a7b43..77d17b4 100644 --- a/src/components/Accordion/Accordion.tsx +++ b/src/components/Accordion/Accordion.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import AccordionIcon from "./AccordionIcon"; const Container = styled.div` diff --git a/src/components/Accordion/AccordionIcon.tsx b/src/components/Accordion/AccordionIcon.tsx index 4264b61..f2698b3 100644 --- a/src/components/Accordion/AccordionIcon.tsx +++ b/src/components/Accordion/AccordionIcon.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "../../theme/colors"; +import colors from "../../theme/colors"; interface AccordionIconProps { open: boolean; diff --git a/src/components/AddLink.tsx b/src/components/AddLink.tsx index bac3b8d..774e53b 100644 --- a/src/components/AddLink.tsx +++ b/src/components/AddLink.tsx @@ -1,6 +1,6 @@ import React, { ComponentProps } from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { Link } from "@components/index"; import AddIcon from "@components/AddIcon"; diff --git a/src/components/AdminHeader.tsx b/src/components/AdminHeader.tsx index 7280b49..d0f0147 100644 --- a/src/components/AdminHeader.tsx +++ b/src/components/AdminHeader.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import HeaderLogo from "./HeaderLogo"; const Header = styled.header` diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 3fc3ec3..a845c6a 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; interface ButtonProps { onClick: () => void; diff --git a/src/components/Card.tsx b/src/components/Card.tsx index 3b2c6ad..576ce7a 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -1,7 +1,7 @@ import React from "react"; import Image from "next/image"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { Link } from "@components/index"; import breakpoints from "@theme/breakpoints"; diff --git a/src/components/ContactCard.tsx b/src/components/ContactCard.tsx index 1262c3f..c21a804 100644 --- a/src/components/ContactCard.tsx +++ b/src/components/ContactCard.tsx @@ -1,7 +1,7 @@ import React from "react"; import Image from "next/image"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const Card = styled.article` display: flex; diff --git a/src/components/Divider.tsx b/src/components/Divider.tsx index 1093cdd..8934689 100644 --- a/src/components/Divider.tsx +++ b/src/components/Divider.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const Divider = styled.hr` width: 98%; diff --git a/src/components/DropDownBox.tsx b/src/components/DropDownBox.tsx index 8af3658..9833ef4 100644 --- a/src/components/DropDownBox.tsx +++ b/src/components/DropDownBox.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; interface DropDownBoxProps { onMouseEnter: () => void; diff --git a/src/components/Hero/HeroAside.tsx b/src/components/Hero/HeroAside.tsx index 5490e15..f607ac2 100644 --- a/src/components/Hero/HeroAside.tsx +++ b/src/components/Hero/HeroAside.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { Link } from "@components/index"; interface HeroAsideItemProps { diff --git a/src/components/Hero/HeroPrimaryButtons.tsx b/src/components/Hero/HeroPrimaryButtons.tsx index c81f279..37b7a60 100644 --- a/src/components/Hero/HeroPrimaryButtons.tsx +++ b/src/components/Hero/HeroPrimaryButtons.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const Buttons = styled.div<{ row?: boolean }>` min-width: 20%; diff --git a/src/components/Hero/HeroSecondarySection.tsx b/src/components/Hero/HeroSecondarySection.tsx index b11e990..f8dad40 100644 --- a/src/components/Hero/HeroSecondarySection.tsx +++ b/src/components/Hero/HeroSecondarySection.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const Note = styled.span` color: white; diff --git a/src/components/Loader.tsx b/src/components/Loader.tsx index 68f93fc..e4e26a4 100644 --- a/src/components/Loader.tsx +++ b/src/components/Loader.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const Loader = styled((props) => (

    diff --git a/src/components/NavigationMobile.tsx b/src/components/NavigationMobile.tsx index 53c3457..85531e5 100644 --- a/src/components/NavigationMobile.tsx +++ b/src/components/NavigationMobile.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { renderNavigationItems } from "./Navigation"; const Nav = styled.nav` diff --git a/src/components/PageLink.tsx b/src/components/PageLink.tsx index 93941a4..7639ea5 100644 --- a/src/components/PageLink.tsx +++ b/src/components/PageLink.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { Link } from "@components/index"; interface PageLinkProps { diff --git a/src/components/Sections/CTASection.tsx b/src/components/Sections/CTASection.tsx index 57659b8..6d3a020 100644 --- a/src/components/Sections/CTASection.tsx +++ b/src/components/Sections/CTASection.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { Link } from "@components/index"; const Section = styled.section<{ colors: string }>` diff --git a/src/components/Widgets/Checkbox/Checkbox.tsx b/src/components/Widgets/Checkbox/Checkbox.tsx index bc4deba..4f2895b 100644 --- a/src/components/Widgets/Checkbox/Checkbox.tsx +++ b/src/components/Widgets/Checkbox/Checkbox.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const Container = styled.label` display: block; diff --git a/src/components/Widgets/SignupQuestionsWidget/Question.tsx b/src/components/Widgets/SignupQuestionsWidget/Question.tsx index d271bf9..404d477 100644 --- a/src/components/Widgets/SignupQuestionsWidget/Question.tsx +++ b/src/components/Widgets/SignupQuestionsWidget/Question.tsx @@ -1,6 +1,6 @@ import React, { ButtonHTMLAttributes } from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; const RemoveButton = styled.button` background-color: ${colors.orange1} !important; diff --git a/src/components/Widgets/SignupQuestionsWidget/QuestionList.tsx b/src/components/Widgets/SignupQuestionsWidget/QuestionList.tsx index 2b3dbb2..1743953 100644 --- a/src/components/Widgets/SignupQuestionsWidget/QuestionList.tsx +++ b/src/components/Widgets/SignupQuestionsWidget/QuestionList.tsx @@ -1,7 +1,7 @@ import React, { ReactNode } from "react"; import styled from "styled-components"; import { Draggable } from "react-beautiful-dnd"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import { Question, InputProps } from "./common"; import OptionsWidget from "./OptionsWidget"; import TypeWidget from "./TypeWidget"; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index a1fd12e..3104358 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -3,7 +3,7 @@ import Head from "next/head"; import { AppProps } from "next/app"; import styled, { createGlobalStyle } from "styled-components"; import { ToastContainer } from "react-toastify"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import breakpoints from "@theme/breakpoints"; import LocaleStore from "../i18n"; diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 770b178..dc9103e 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { Divider, TextSection, Link } from "@components/index"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import ContactCard from "@components/ContactCard"; import BoardJson from "./board.json"; diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index f3a893b..1233304 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -11,7 +11,7 @@ import { } from "@components/index"; import Event from "@models/Event"; import Post from "@models/Feed"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import FullWidthSection from "@components/Sections/FullWidthSection"; import noop from "@utils/noop"; diff --git a/src/views/SignUpPage/SignUpPageView.tsx b/src/views/SignUpPage/SignUpPageView.tsx index c9bffe9..c5268d1 100644 --- a/src/views/SignUpPage/SignUpPageView.tsx +++ b/src/views/SignUpPage/SignUpPageView.tsx @@ -5,7 +5,7 @@ import { SignupForm } from "@models/Signup"; import Checkboxes from "@components/Widgets/Checkbox/Checkboxes"; import RadioButtonWidget from "@components/Widgets/RadioButton/RadioButtonWidget"; import { TextSection, ChangeLanguageButton } from "@components/index"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import FormWrapper from "@views/common/FormWrapper"; import Loader from "@components/Loader"; import { buildFormSchema, buildUISchema } from "./FormUtils"; diff --git a/src/views/admin/AdminCreateCommon.tsx b/src/views/admin/AdminCreateCommon.tsx index e05b673..b0e2bd5 100644 --- a/src/views/admin/AdminCreateCommon.tsx +++ b/src/views/admin/AdminCreateCommon.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { ISubmitEvent, IChangeEvent, ErrorSchema } from "react-jsonschema-form"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import Event from "@models/Event"; import Post from "@models/Feed"; import { SignupForm } from "@models/Signup"; diff --git a/src/views/admin/AdminListCommon.tsx b/src/views/admin/AdminListCommon.tsx index 5b57170..7e7ec55 100644 --- a/src/views/admin/AdminListCommon.tsx +++ b/src/views/admin/AdminListCommon.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { colors } from "@theme/colors"; +import colors from "@theme/colors"; import AdminPageWrapper from "@views/common/AdminPageWrapper"; const Main = styled.div` From fa4ae2c8126dd0023e85a30cd9c6efaae3e2f4e4 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 3 Jun 2021 02:14:50 +0300 Subject: [PATCH 10/14] clean colors.ts --- src/theme/colors.ts | 46 +-------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/src/theme/colors.ts b/src/theme/colors.ts index ea83e2b..03da1be 100644 --- a/src/theme/colors.ts +++ b/src/theme/colors.ts @@ -1,41 +1,4 @@ -export type Colors = - "sik100-gold" | - "sik100-blue" | - "dark-blue" | - "light-blue" | - "white1" | - "black1" | - "grey1" | - "grey2" | - "orange1" | - "orange2" | - "blue1" | - "light-turquoise" | - "green1" | - "sand" | - "transparent" | - "inherit"; - -export const ColorMapper = new Map([ - ["sik100-gold", "#fee469"], - ["sik100-blue", "#12123d"], - ["dark-blue", "#002d3a"], - ["light-blue", "#bfdbd9"], - ["white1", "#fff"], - ["black1", "#000"], - ["grey1", "#d4d0c7"], - ["grey2", "#efece4"], - ["orange1", "#d57a2d"], - ["orange2", "#dd934e"], - ["blue1", "#57b2df"], - ["light-turquoise", "#beddeb"], - ["green1", "#c0dcd9"], - ["sand", "#fdf9d7"], - ["transparent", "transparent"], - ["inherit", "inherit"], -]); - -export const colors = { +const colors = { sik100Gold: "#fee469", sik100Blue: "#12123d", darkBlue: "#002d3a", @@ -54,11 +17,4 @@ export const colors = { inherit: "inherit", }; -export type Colors2 = keyof typeof colors; - -export const colorToClass = (color: Colors): string => (color ? `color-div__${color}` : undefined); -export const bgColorToClass = (color: Colors): string => (color ? `color-div__background_${color}` : undefined); -export const hoverColorToClass = (color: Colors): string => (color ? `color-div__${color}Hoverable` : undefined); -export const bgHoverColorToClass = (color: Colors): string => (color ? `color-div__background_${color}Hoverable` : undefined); - export default colors; From c330a21f59e4e32a561364b6146ceba93e7746b7 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 3 Jun 2021 02:25:35 +0300 Subject: [PATCH 11/14] fix stylelint --- .stylelintrc | 2 +- package-lock.json | 23 +++- package.json | 2 +- src/components/Accordion/Accordion.tsx | 1 - src/components/Card.tsx | 4 +- src/components/CrossFadeImages.tsx | 13 +- src/components/Footer/FooterContent.tsx | 3 + src/components/Header.tsx | 3 +- src/components/Hero/Hero.tsx | 3 +- src/components/Hero/HeroAside.tsx | 2 +- src/components/Hero/HeroPrimaryButtons.tsx | 2 +- src/components/Hero/HeroPrimarySection.tsx | 2 +- src/components/Loader.tsx | 6 +- src/components/Navigation.tsx | 2 - src/components/PageLink.tsx | 2 +- src/components/Sections/CTASection.tsx | 116 ++++++++++-------- src/components/Sections/CardSection.tsx | 1 - src/components/Sections/FullWidthSection.tsx | 1 - src/components/Sections/TextSection.tsx | 8 +- src/components/Widgets/Checkbox/Checkbox.tsx | 2 +- .../Widgets/RadioButton/RadioButton.tsx | 4 +- .../SignupQuestionsWidget.tsx | 2 - src/pages/404.tsx | 1 + src/pages/_app.tsx | 2 +- src/views/ActualPage/ActualPageView.tsx | 1 + src/views/CorporatePage/JobAdList.tsx | 1 + src/views/EventPage/EventPageView.tsx | 1 + src/views/FeedPage/FeedPageView.tsx | 1 + src/views/FreshmenPage/FreshmenPageView.tsx | 2 +- src/views/FrontPage/FrontPageView.tsx | 2 + src/views/GuildPage/GuildPageView.tsx | 4 +- src/views/InEnglishPage/InEnglishPageView.tsx | 1 + src/views/SignUpPage/SignUpPageView.tsx | 1 + src/views/common/FormWrapper.tsx | 3 +- src/views/common/LoadingView.tsx | 23 ++-- src/views/common/MarkdownStyles.tsx | 3 +- 36 files changed, 151 insertions(+), 99 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 6e4409d..7c25601 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,6 +1,6 @@ { "extends": [ - "stylelint-config-recommended", + "stylelint-config-standard", "stylelint-config-styled-components" ], "syntax": "css" diff --git a/package-lock.json b/package-lock.json index 88a2797..dbae5ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "next-sitemap": "^1.6.99", "npm-run-all": "^4.1.5", "stylelint": "^13.13.1", - "stylelint-config-recommended": "^5.0.0", + "stylelint-config-standard": "^22.0.0", "stylelint-config-styled-components": "^0.1.1", "testcafe": "^1.14.2", "typescript": "^4.3.2" @@ -11748,6 +11748,18 @@ "stylelint": "^13.13.0" } }, + "node_modules/stylelint-config-standard": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz", + "integrity": "sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw==", + "dev": true, + "dependencies": { + "stylelint-config-recommended": "^5.0.0" + }, + "peerDependencies": { + "stylelint": "^13.13.0" + } + }, "node_modules/stylelint-config-styled-components": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz", @@ -23419,6 +23431,15 @@ "dev": true, "requires": {} }, + "stylelint-config-standard": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz", + "integrity": "sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw==", + "dev": true, + "requires": { + "stylelint-config-recommended": "^5.0.0" + } + }, "stylelint-config-styled-components": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz", diff --git a/package.json b/package.json index ae72e72..5ff493b 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "next-sitemap": "^1.6.99", "npm-run-all": "^4.1.5", "stylelint": "^13.13.1", - "stylelint-config-recommended": "^5.0.0", + "stylelint-config-standard": "^22.0.0", "stylelint-config-styled-components": "^0.1.1", "testcafe": "^1.14.2", "typescript": "^4.3.2" diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx index 77d17b4..c2353f9 100644 --- a/src/components/Accordion/Accordion.tsx +++ b/src/components/Accordion/Accordion.tsx @@ -30,7 +30,6 @@ const Container = styled.div` font-size: 1.125rem; margin: auto; } - } & > div { diff --git a/src/components/Card.tsx b/src/components/Card.tsx index 576ce7a..b5826b2 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -42,7 +42,6 @@ const StyledCard = styled.article` } } - h3 { padding: 0.5rem; font-size: 1.5rem; @@ -54,7 +53,6 @@ const StyledCard = styled.article` button { cursor: pointer; - padding: 0.8rem 2rem; margin: 0.5rem; font-size: 0.8rem; @@ -74,7 +72,7 @@ const WrappedCard: React.FC = ({ }) => ( {image && ( - {image.alt} + {image.alt} )}

    {startTime}

    {title}

    diff --git a/src/components/CrossFadeImages.tsx b/src/components/CrossFadeImages.tsx index 3be53b2..adc1c75 100644 --- a/src/components/CrossFadeImages.tsx +++ b/src/components/CrossFadeImages.tsx @@ -45,21 +45,22 @@ const CrossFadeImages: React.FC = ({ const animation = keyframes` 0% { - opacity:1; + opacity: 1; } ${(presentationTime / TOTAL_TIME) * 100}% { - opacity:1; + opacity: 1; } ${(1 / len) * 100}% { - opacity:0; + opacity: 0; } ${100 - ((fadeTime / TOTAL_TIME) * 100)}% { - opacity:0; + opacity: 0; } + 100% { - opacity:1; + opacity: 1; } - `; +`; const delays = images.map((_, idx) => idx * SINGLE_IMAGE_TIME).reverse(); diff --git a/src/components/Footer/FooterContent.tsx b/src/components/Footer/FooterContent.tsx index 5afc07a..91374d8 100644 --- a/src/components/Footer/FooterContent.tsx +++ b/src/components/Footer/FooterContent.tsx @@ -7,6 +7,7 @@ import breakpoints from "@theme/breakpoints"; const Columns = styled.div` display: flex; justify-content: space-between; + & > div > div { margin-bottom: 1rem; } @@ -56,9 +57,11 @@ const MarginSpace = styled.div` const Map = styled.div` flex: 1; + @media screen and (max-width: ${breakpoints.mobile}) { display: none; } + iframe { border: none; } diff --git a/src/components/Header.tsx b/src/components/Header.tsx index edd5da7..477985b 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -11,6 +11,7 @@ import BlockScroll from "./BlockScroll"; const StyledHeader = styled.header` display: flex; flex-flow: row nowrap; + @media screen and (max-width: ${breakpoints.mobile}) { flex-flow: column nowrap; } @@ -20,11 +21,9 @@ const Sticky = styled.div<{ $isHidden?: boolean; $mobileMenuOpen?: boolean }>` position: sticky; top: 0; z-index: 10; - padding: 0 1rem; background-color: ${colors.darkBlue}; transition: all 200ms ease-out; - height: ${(p) => (p.$mobileMenuOpen ? "100vh" : "unset")}; ${(p) => (p.$isHidden ? (` diff --git a/src/components/Hero/Hero.tsx b/src/components/Hero/Hero.tsx index 0f4b3c8..d26409a 100644 --- a/src/components/Hero/Hero.tsx +++ b/src/components/Hero/Hero.tsx @@ -9,11 +9,11 @@ const Container = styled.div` justify-content: space-between; position: relative; padding: 0; - min-height: 75vh; section { padding: 2rem 6rem; + @media screen and (max-width: ${breakpoints.mobile}) { padding: 1rem; } @@ -40,6 +40,7 @@ const Container = styled.div` color: ${colors.white}; background-color: ${colors.darkBlue}; + a:hover { color: ${colors.white}; } diff --git a/src/components/Hero/HeroAside.tsx b/src/components/Hero/HeroAside.tsx index f607ac2..3032d6f 100644 --- a/src/components/Hero/HeroAside.tsx +++ b/src/components/Hero/HeroAside.tsx @@ -39,6 +39,7 @@ interface HeroAsideProps { // TODO: Color combos const Aside = styled.aside<{ colors: string }>` ${(p) => p.colors} + flex: 4; display: flex; flex-direction: column; @@ -58,7 +59,6 @@ const Aside = styled.aside<{ colors: string }>` line-height: 2rem; } - & > p { font-weight: 600; margin-bottom: 2rem; diff --git a/src/components/Hero/HeroPrimaryButtons.tsx b/src/components/Hero/HeroPrimaryButtons.tsx index 37b7a60..5cc521e 100644 --- a/src/components/Hero/HeroPrimaryButtons.tsx +++ b/src/components/Hero/HeroPrimaryButtons.tsx @@ -20,7 +20,7 @@ const Buttons = styled.div<{ row?: boolean }>` margin: 0.5rem; font-size: 0.8rem; font-weight: 800; - letter-spacing: .1em; + letter-spacing: 0.1em; text-transform: uppercase; border: 1px solid ${colors.lightTurquoise}; diff --git a/src/components/Hero/HeroPrimarySection.tsx b/src/components/Hero/HeroPrimarySection.tsx index d5d8cd2..555df48 100644 --- a/src/components/Hero/HeroPrimarySection.tsx +++ b/src/components/Hero/HeroPrimarySection.tsx @@ -29,7 +29,7 @@ const Section = styled.section` &:hover { color: ${colors.white}; - text-decoration: none + text-decoration: none; } } `; diff --git a/src/components/Loader.tsx b/src/components/Loader.tsx index e4e26a4..8887527 100644 --- a/src/components/Loader.tsx +++ b/src/components/Loader.tsx @@ -15,9 +15,9 @@ const Loader = styled((props) => ( height: 1em; @keyframes rotation { - 0% { transform: rotate(0deg) } - 50% { transform: rotate(180deg) } - 100% { transform: rotate(360deg) } + 0% { transform: rotate(0deg); } + 50% { transform: rotate(180deg); } + 100% { transform: rotate(360deg); } } & > div { diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx index 2843a4e..144a69c 100644 --- a/src/components/Navigation.tsx +++ b/src/components/Navigation.tsx @@ -30,7 +30,6 @@ const Nav = styled.div` flex-flow: row nowrap; justify-content: space-between; align-items: center; - font-size: 0.8rem; color: ${colors.lightBlue}; margin-left: 5rem; @@ -53,7 +52,6 @@ const Nav = styled.div` svg { width: 1.5rem; height: 1.5rem; - fill: ${colors.white}; color: ${colors.white}; } diff --git a/src/components/PageLink.tsx b/src/components/PageLink.tsx index 7639ea5..f5e813c 100644 --- a/src/components/PageLink.tsx +++ b/src/components/PageLink.tsx @@ -32,8 +32,8 @@ const StyledPageLink = styled.div` margin-left: 1rem; text-decoration: none; font-weight: normal; - color: ${colors.blue1}; + &:hover { color: ${colors.darkBlue}; } diff --git a/src/components/Sections/CTASection.tsx b/src/components/Sections/CTASection.tsx index 6d3a020..c160cd2 100644 --- a/src/components/Sections/CTASection.tsx +++ b/src/components/Sections/CTASection.tsx @@ -3,15 +3,73 @@ import styled from "styled-components"; import colors from "@theme/colors"; import { Link } from "@components/index"; -const Section = styled.section<{ colors: string }>` - ${(p) => p.colors} +type Colors = "orange1" | "lightBlue" | "darkBlue" | "blue1" | "lightTurquoise" | "sik100Blue"; + +const textColors = (bgColor: Colors) => { + switch (bgColor) { + case "orange1": return ( + ` + color: ${colors.white}; + background-color: ${colors[bgColor]}; + a:hover { + color: ${colors.darkBlue}; + } + ` + ); + case "sik100Blue": return ( + ` + background-color: ${colors[bgColor]}; + color: ${colors.sik100Gold}; + ` + ); + case "darkBlue": return ( + ` + background-color: ${colors[bgColor]}; + color: ${colors.white}; + ` + ); + + case "lightBlue": return ( + ` + background-color: ${colors[bgColor]}; + color: ${colors.darkBlue}; + a:hover { + color: ${colors.white}; + } + ` + ); + + case "lightTurquoise": return ( + ` + background-color: ${colors[bgColor]}; + color: ${colors.darkBlue}; + a:hover { + color: ${colors.white}; + } + ` + ); + case "blue1": return ( + ` + background-color: ${colors[bgColor]}; + color: ${colors.white}; + a:hover { + color: ${colors.darkBlue}; + } + ` + ); + default: return ""; + } +}; + +const Section = styled.section<{ bgColor: Colors }>` + ${({ bgColor }) => textColors(bgColor)} display: flex; justify-content: center; text-align: center; align-items: baseline; padding: 2rem 0; - border: 0.5rem colors.sik100Gold; + border: 0.5rem ${colors.sik100Gold}; flex-flow: row wrap; a { @@ -29,71 +87,25 @@ const Section = styled.section<{ colors: string }>` & > h1 { a { - - text-decoration: underline; + text-decoration: underline; } + a:hover { text-decoration: none; } } `; -type Colors = "orange1" | "lightBlue" | "darkBlue" | "blue1" | "lightTurquoise" | "sik100Blue"; - interface CTASectionProps extends React.HTMLAttributes { bgColor?: Colors; link?: string; linkText?: string; } -const textColors = (bgColor: Colors) => { - switch (bgColor) { - case "orange1": return ` -color: ${colors.white}; -background-color: ${colors[bgColor]}; -a:hover { - color: ${colors.darkBlue}; -} -`; - case "sik100Blue": return ` -background-color: ${colors[bgColor]}; -color: ${colors.sik100Gold}; - `; - case "darkBlue": return ` -background-color: ${colors[bgColor]}; -color: ${colors.white}; - `; - - case "lightBlue": return ` -background-color: ${colors[bgColor]}; -color: ${colors.darkBlue}; -a:hover { - color: ${colors.white}; -} - `; - - case "lightTurquoise": return ` -background-color: ${colors[bgColor]}; -color: ${colors.darkBlue}; -a:hover { - color: ${colors.white}; -} - `; - case "blue1": return ` -background-color: ${colors[bgColor]}; -color: ${colors.white}; -a:hover { - color: ${colors.darkBlue}; -} - `; - default: return ""; - } -}; - const CTASection: React.FC = ({ bgColor = "orange1", link, linkText, children, ...props }) => ( -
    +

    {children}

    {link && ( diff --git a/src/components/Sections/CardSection.tsx b/src/components/Sections/CardSection.tsx index 29d7ceb..d4292d2 100644 --- a/src/components/Sections/CardSection.tsx +++ b/src/components/Sections/CardSection.tsx @@ -3,7 +3,6 @@ import colors from "@theme/colors"; import breakpoints from "@theme/breakpoints"; const CardSection = styled.section` - h6 { color: ${colors.orange1}; } diff --git a/src/components/Sections/FullWidthSection.tsx b/src/components/Sections/FullWidthSection.tsx index c61e1ab..5e77302 100644 --- a/src/components/Sections/FullWidthSection.tsx +++ b/src/components/Sections/FullWidthSection.tsx @@ -4,7 +4,6 @@ import styled from "styled-components"; const StyledSection = styled.section` display: block; padding: 1.5rem; - grid-template-columns: 1fr auto; grid-template-rows: auto 1fr; grid-template-areas: diff --git a/src/components/Sections/TextSection.tsx b/src/components/Sections/TextSection.tsx index f73b140..54d8a78 100644 --- a/src/components/Sections/TextSection.tsx +++ b/src/components/Sections/TextSection.tsx @@ -6,10 +6,8 @@ import breakpoints from "@theme/breakpoints"; const StyledSection = styled.section` display: grid; padding: 1.5rem; - word-break: break-word; hyphens: auto; - grid-template-columns: 1fr 2fr 1fr; grid-template-rows: 1fr auto; grid-template-areas: @@ -45,7 +43,8 @@ const StyledSection = styled.section` margin-top: 0; } - & > div, p { + & > div, + p { grid-area: content; } @@ -69,13 +68,16 @@ const StyledSection = styled.section` & > aside:first-of-type { grid-area: rightaside; padding-left: 1.5rem; + @media screen and (max-width: ${breakpoints.mobile}) { padding-left: 0; } } + & > aside:nth-of-type(2) { grid-area: leftaside; padding-right: 1.5rem; + @media screen and (max-width: ${breakpoints.mobile}) { padding-left: 0; } diff --git a/src/components/Widgets/Checkbox/Checkbox.tsx b/src/components/Widgets/Checkbox/Checkbox.tsx index 4f2895b..2353e1d 100644 --- a/src/components/Widgets/Checkbox/Checkbox.tsx +++ b/src/components/Widgets/Checkbox/Checkbox.tsx @@ -34,7 +34,7 @@ const CustomCBoxElement = styled.span<{ checked?: boolean }>` width: 1em; background-color: ${(props) => (props.checked ? colors.blue1 : colors.grey2)}; - &:focus &:before { + &:focus &::before { transition: box-shadow 150ms ease; content: ''; display: block; diff --git a/src/components/Widgets/RadioButton/RadioButton.tsx b/src/components/Widgets/RadioButton/RadioButton.tsx index 67287e9..22d9f80 100644 --- a/src/components/Widgets/RadioButton/RadioButton.tsx +++ b/src/components/Widgets/RadioButton/RadioButton.tsx @@ -28,7 +28,9 @@ const CustomRadioElement = styled.span<{ checked?: boolean }>` left: 0; height: 1em; width: 1em; - background-color: ${(props) => (props.checked ? "#57b2df" : "#efece4")}; /* blue1 or grey2 */ + + /* blue1 or grey2 */ + background-color: ${(props) => (props.checked ? "#57b2df" : "#efece4")}; border-radius: 50%; `; diff --git a/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx b/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx index 63a67e7..7e3c084 100644 --- a/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx +++ b/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx @@ -12,7 +12,6 @@ const Widget = styled.div` display: flex; flex-flow: row nowrap; align-items: center; - background: none; padding: 0; margin: 1rem 0; @@ -21,7 +20,6 @@ const Widget = styled.div` margin-right: 8px !important; margin-top: -2px !important; } - } `; diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 1638247..6c47ce5 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -9,6 +9,7 @@ const NotFound = styled.main` display: flex; justify-content: center; align-items: center; + p { text-align: center; font-size: 4rem; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 3104358..e9c4bfd 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -21,6 +21,7 @@ const GlobalCommonStyles = createGlobalStyle` html { font-family: ${fontFamily}; + /* 12px */ font-size: ${fontSize * 0.75}pt; line-height: ${lineHeight}; @@ -106,7 +107,6 @@ li { font-weight: 600; } - a { text-decoration: underline; color: ${colors.blue1}; diff --git a/src/views/ActualPage/ActualPageView.tsx b/src/views/ActualPage/ActualPageView.tsx index ca99f99..22dc2e7 100644 --- a/src/views/ActualPage/ActualPageView.tsx +++ b/src/views/ActualPage/ActualPageView.tsx @@ -22,6 +22,7 @@ const Gallery = styled.div` @media screen and (max-width: ${breakpoints.mobile}) { flex-flow: column; + & > div { min-height: 100vw; } diff --git a/src/views/CorporatePage/JobAdList.tsx b/src/views/CorporatePage/JobAdList.tsx index 26fb11f..7ea856f 100644 --- a/src/views/CorporatePage/JobAdList.tsx +++ b/src/views/CorporatePage/JobAdList.tsx @@ -12,6 +12,7 @@ interface JobAdListProps { const List = styled.ul` padding: 0; + li { margin: 1rem 0; list-style: none; diff --git a/src/views/EventPage/EventPageView.tsx b/src/views/EventPage/EventPageView.tsx index cfd45a0..c90419d 100644 --- a/src/views/EventPage/EventPageView.tsx +++ b/src/views/EventPage/EventPageView.tsx @@ -22,6 +22,7 @@ const StyledTextSection = styled(TextSection)` & > h1 { color: ${colors.darkBlue}; + p { color: ${colors.orange1}; } diff --git a/src/views/FeedPage/FeedPageView.tsx b/src/views/FeedPage/FeedPageView.tsx index 4014395..6a9675e 100644 --- a/src/views/FeedPage/FeedPageView.tsx +++ b/src/views/FeedPage/FeedPageView.tsx @@ -19,6 +19,7 @@ const StyledTextSection = styled(TextSection)` & > h1 { color: ${colors.darkBlue}; + p { color: ${colors.orange1}; } diff --git a/src/views/FreshmenPage/FreshmenPageView.tsx b/src/views/FreshmenPage/FreshmenPageView.tsx index 1f03055..1ed4c36 100644 --- a/src/views/FreshmenPage/FreshmenPageView.tsx +++ b/src/views/FreshmenPage/FreshmenPageView.tsx @@ -14,7 +14,7 @@ const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`; const ImageContainer = styled.div` width: 100%; - display: block + display: block; `; const FreshmenPageView: React.FC = () => ( diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index 1233304..aa5cece 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -42,6 +42,7 @@ const cardTimeOpts: Intl.DateTimeFormatOptions = { const SponsorReel = styled.div` text-align: center; + & > div { display: flex; flex-flow: row wrap; @@ -54,6 +55,7 @@ const SponsorReel = styled.div` min-width: 200px; } } + a { color: ${colors.blue1}; text-decoration: underline; diff --git a/src/views/GuildPage/GuildPageView.tsx b/src/views/GuildPage/GuildPageView.tsx index 779081c..2c150c0 100644 --- a/src/views/GuildPage/GuildPageView.tsx +++ b/src/views/GuildPage/GuildPageView.tsx @@ -30,16 +30,18 @@ const Column = styled.div` section:last-of-type { background-color: ${colors.lightBlue}; + p { a { font-weight: normal; } } } + ul { list-style: none; - li:before { + li::before { content: attr(data-icon); margin-right: 4px; } diff --git a/src/views/InEnglishPage/InEnglishPageView.tsx b/src/views/InEnglishPage/InEnglishPageView.tsx index dcf7950..674a6d8 100644 --- a/src/views/InEnglishPage/InEnglishPageView.tsx +++ b/src/views/InEnglishPage/InEnglishPageView.tsx @@ -22,6 +22,7 @@ const Gallery = styled.div` @media screen and (max-width: ${breakpoints.mobile}) { flex-flow: column; + & > div { min-height: 100vw; } diff --git a/src/views/SignUpPage/SignUpPageView.tsx b/src/views/SignUpPage/SignUpPageView.tsx index c5268d1..f40e9ae 100644 --- a/src/views/SignUpPage/SignUpPageView.tsx +++ b/src/views/SignUpPage/SignUpPageView.tsx @@ -32,6 +32,7 @@ const StyledSection = styled(TextSection)` & > aside { justify-content: start; + li { padding-bottom: 0.3rem; } diff --git a/src/views/common/FormWrapper.tsx b/src/views/common/FormWrapper.tsx index 25d1a70..e3b6c17 100644 --- a/src/views/common/FormWrapper.tsx +++ b/src/views/common/FormWrapper.tsx @@ -53,8 +53,7 @@ const FormStyleWrapper = styled(Form)` input[type="email"], input[type="number"], textarea, - select - { + select { display: block; width: 100%; } diff --git a/src/views/common/LoadingView.tsx b/src/views/common/LoadingView.tsx index 59fdd2a..87128ae 100644 --- a/src/views/common/LoadingView.tsx +++ b/src/views/common/LoadingView.tsx @@ -22,10 +22,13 @@ const DotPulse = styled.div` 0% { box-shadow: 9984px 0 0 -5px ${colors.white}; } + 30% { box-shadow: 9984px 0 0 2px ${colors.white}; } - 60%, 100% { + + 60%, + 100% { box-shadow: 9984px 0 0 -5px ${colors.white}; } } @@ -34,10 +37,13 @@ const DotPulse = styled.div` 0% { box-shadow: 9999px 0 0 -5px ${colors.white}; } + 30% { box-shadow: 9999px 0 0 2px ${colors.white}; } - 60%, 100% { + + 60%, + 100% { box-shadow: 9999px 0 0 -5px ${colors.white}; } } @@ -46,17 +52,19 @@ const DotPulse = styled.div` 0% { box-shadow: 10014px 0 0 -5px ${colors.white}; } + 30% { box-shadow: 10014px 0 0 2px ${colors.white}; } - 60%, 100% { + + 60%, + 100% { box-shadow: 10014px 0 0 -5px ${colors.white}; } } display: inline-block; margin-left: 1.5rem; - position: relative; left: -9999px; width: 10px; @@ -66,9 +74,10 @@ const DotPulse = styled.div` color: ${colors.white}; box-shadow: 9999px 0 0 -5px ${colors.white}; animation: dotPulse 1.5s infinite linear; - animation-delay: .25s; + animation-delay: 0.25s; - &::before, &::after { + &::before, + &::after { content: ''; display: inline-block; position: absolute; @@ -89,7 +98,7 @@ const DotPulse = styled.div` &::after { box-shadow: 10014px 0 0 -5px ${colors.white}; animation: dotPulseAfter 1.5s infinite linear; - animation-delay: .5s; + animation-delay: 0.5s; } `; diff --git a/src/views/common/MarkdownStyles.tsx b/src/views/common/MarkdownStyles.tsx index 113d5df..1829882 100644 --- a/src/views/common/MarkdownStyles.tsx +++ b/src/views/common/MarkdownStyles.tsx @@ -7,7 +7,8 @@ const MarkdownStyles = styled(ReactMarkdown)` color: ${colors.black}; } - h1, h3 { + h1, + h3 { color: ${colors.orange2}; } From 876d10cf21205fcd23645e179e4f25f181ee19fe Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 15 Jun 2021 21:31:30 +0300 Subject: [PATCH 12/14] bump minor versions --- package-lock.json | 275 ++++++++++++++++++++-------------------------- package.json | 14 +-- 2 files changed, 124 insertions(+), 165 deletions(-) diff --git a/package-lock.json b/package-lock.json index dbae5ae..2d94fa0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,24 +33,24 @@ }, "devDependencies": { "@types/js-cookie": "^2.2.6", - "@types/react": "^17.0.9", + "@types/react": "^17.0.11", "@types/react-beautiful-dnd": "^13.0.0", "@types/react-csv": "^1.1.1", - "@types/react-dom": "^17.0.6", + "@types/react-dom": "^17.0.7", "@types/react-jsonschema-form": "^1.7.5", "@types/shortid": "^0.0.29", - "@types/styled-components": "^5.1.9", - "@typescript-eslint/eslint-plugin": "^4.26.0", - "@typescript-eslint/parser": "^4.26.0", + "@types/styled-components": "^5.1.10", + "@typescript-eslint/eslint-plugin": "^4.27.0", + "@typescript-eslint/parser": "^4.27.0", "babel-plugin-styled-components": "^1.12.0", - "eslint": "^7.27.0", + "eslint": "^7.28.0", "eslint-config-airbnb-typescript": "^12.3.1", "eslint-plugin-import": "^2.23.4", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0", "husky": "^6.0.0", - "next-sitemap": "^1.6.99", + "next-sitemap": "^1.6.116", "npm-run-all": "^4.1.5", "stylelint": "^13.13.1", "stylelint-config-standard": "^22.0.0", @@ -1730,15 +1730,15 @@ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, "node_modules/@eslint/eslintrc": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz", - "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz", + "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.1.1", "espree": "^7.3.0", - "globals": "^12.1.0", + "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", "js-yaml": "^3.13.1", @@ -1749,30 +1749,6 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", - "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", - "dev": true, - "dependencies": { - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@hapi/accept": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz", @@ -2081,9 +2057,9 @@ "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "node_modules/@types/react": { - "version": "17.0.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.9.tgz", - "integrity": "sha512-2Cw7FvevpJxQrCb+k5t6GH1KIvmadj5uBbjPaLlJB/nZWUj56e1ZqcD6zsoMFB47MsJUTFl9RJ132A7hb3QFJA==", + "version": "17.0.11", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.11.tgz", + "integrity": "sha512-yFRQbD+whVonItSk7ZzP/L+gPTJVBkL/7shLEF+i9GC/1cV3JmUxEQz6+9ylhUpWSDuqo1N9qEvqS6vTj4USUA==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2109,9 +2085,9 @@ } }, "node_modules/@types/react-dom": { - "version": "17.0.6", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.6.tgz", - "integrity": "sha512-MGTI+TudxAnGTj8aco8mogaPSJGK2Whje7OZh1CxNLRyhJpTZg/pGQpIbCT0eCVFQyH7UFpdvCqQEThHIp/gsA==", + "version": "17.0.7", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.7.tgz", + "integrity": "sha512-Wd5xvZRlccOrCTej8jZkoFZuZRKHzanDDv1xglI33oBNFMWrqOSzrvWFw7ngSiZjrpJAzPKFtX7JvuXpkNmQHA==", "dev": true, "dependencies": { "@types/react": "*" @@ -2150,9 +2126,9 @@ "dev": true }, "node_modules/@types/styled-components": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.9.tgz", - "integrity": "sha512-kbEG6YlwK8rucITpKEr6pA4Ho9KSQHUUOzZ9lY3va1mtcjvS3D0wDciFyHEiNHKLL/npZCKDQJqm0x44sPO9oA==", + "version": "5.1.10", + "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.10.tgz", + "integrity": "sha512-g3ZfWlTiyXktASIhcfCicZtqB/fFFnq0a7kPYYxKXNggdrohp8m/9bMmmt3zDvHj2gplWDGCkZByfFnEXfbSWg==", "dev": true, "dependencies": { "@types/hoist-non-react-statics": "*", @@ -2166,13 +2142,13 @@ "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz", - "integrity": "sha512-yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz", + "integrity": "sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ==", "dev": true, "dependencies": { - "@typescript-eslint/experimental-utils": "4.26.0", - "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/experimental-utils": "4.27.0", + "@typescript-eslint/scope-manager": "4.27.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "lodash": "^4.17.21", @@ -2198,15 +2174,15 @@ } }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz", - "integrity": "sha512-TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz", + "integrity": "sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.26.0", - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/typescript-estree": "4.26.0", + "@typescript-eslint/scope-manager": "4.27.0", + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/typescript-estree": "4.27.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -2222,14 +2198,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz", - "integrity": "sha512-b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.27.0.tgz", + "integrity": "sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "4.26.0", - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/typescript-estree": "4.26.0", + "@typescript-eslint/scope-manager": "4.27.0", + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/typescript-estree": "4.27.0", "debug": "^4.3.1" }, "engines": { @@ -2249,13 +2225,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz", - "integrity": "sha512-G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz", + "integrity": "sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/visitor-keys": "4.26.0" + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/visitor-keys": "4.27.0" }, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -2266,9 +2242,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz", - "integrity": "sha512-rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.27.0.tgz", + "integrity": "sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==", "dev": true, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -2279,13 +2255,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz", - "integrity": "sha512-GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz", + "integrity": "sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/visitor-keys": "4.26.0", + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/visitor-keys": "4.27.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -2306,12 +2282,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz", - "integrity": "sha512-cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz", + "integrity": "sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/types": "4.27.0", "eslint-visitor-keys": "^2.0.0" }, "engines": { @@ -4712,13 +4688,13 @@ } }, "node_modules/eslint": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz", - "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz", + "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==", "dev": true, "dependencies": { "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.1", + "@eslint/eslintrc": "^0.4.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -4735,7 +4711,7 @@ "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", + "glob-parent": "^5.1.2", "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", @@ -8148,9 +8124,9 @@ } }, "node_modules/next-sitemap": { - "version": "1.6.99", - "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.99.tgz", - "integrity": "sha512-2ZSIBOslKJO0bz0ShCVAU2UUzE/SBIBA1MT7e7uOlOMw9u+OD1Uc4XDzKLhNdjbCuic707xYMW5E0jsnOljhUA==", + "version": "1.6.116", + "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.116.tgz", + "integrity": "sha512-UvxjiJ8X02h6aaGnZiRueSaacVWznzGnmMi6CqLRf9oxvA+Pg/Q28vMfTJTsOdQ7otWM6HVwHAMeJH/ZzjBnQg==", "dev": true, "dependencies": { "@corex/deepmerge": "^2.6.20", @@ -15538,37 +15514,20 @@ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, "@eslint/eslintrc": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz", - "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz", + "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.1.1", "espree": "^7.3.0", - "globals": "^12.1.0", + "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", "js-yaml": "^3.13.1", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "globals": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", - "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", - "dev": true, - "requires": { - "type-fest": "^0.8.1" - } - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } } }, "@hapi/accept": { @@ -15838,9 +15797,9 @@ "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "@types/react": { - "version": "17.0.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.9.tgz", - "integrity": "sha512-2Cw7FvevpJxQrCb+k5t6GH1KIvmadj5uBbjPaLlJB/nZWUj56e1ZqcD6zsoMFB47MsJUTFl9RJ132A7hb3QFJA==", + "version": "17.0.11", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.11.tgz", + "integrity": "sha512-yFRQbD+whVonItSk7ZzP/L+gPTJVBkL/7shLEF+i9GC/1cV3JmUxEQz6+9ylhUpWSDuqo1N9qEvqS6vTj4USUA==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -15866,9 +15825,9 @@ } }, "@types/react-dom": { - "version": "17.0.6", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.6.tgz", - "integrity": "sha512-MGTI+TudxAnGTj8aco8mogaPSJGK2Whje7OZh1CxNLRyhJpTZg/pGQpIbCT0eCVFQyH7UFpdvCqQEThHIp/gsA==", + "version": "17.0.7", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.7.tgz", + "integrity": "sha512-Wd5xvZRlccOrCTej8jZkoFZuZRKHzanDDv1xglI33oBNFMWrqOSzrvWFw7ngSiZjrpJAzPKFtX7JvuXpkNmQHA==", "dev": true, "requires": { "@types/react": "*" @@ -15907,9 +15866,9 @@ "dev": true }, "@types/styled-components": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.9.tgz", - "integrity": "sha512-kbEG6YlwK8rucITpKEr6pA4Ho9KSQHUUOzZ9lY3va1mtcjvS3D0wDciFyHEiNHKLL/npZCKDQJqm0x44sPO9oA==", + "version": "5.1.10", + "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.10.tgz", + "integrity": "sha512-g3ZfWlTiyXktASIhcfCicZtqB/fFFnq0a7kPYYxKXNggdrohp8m/9bMmmt3zDvHj2gplWDGCkZByfFnEXfbSWg==", "dev": true, "requires": { "@types/hoist-non-react-statics": "*", @@ -15923,13 +15882,13 @@ "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" }, "@typescript-eslint/eslint-plugin": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz", - "integrity": "sha512-yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz", + "integrity": "sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.26.0", - "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/experimental-utils": "4.27.0", + "@typescript-eslint/scope-manager": "4.27.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "lodash": "^4.17.21", @@ -15939,55 +15898,55 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz", - "integrity": "sha512-TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz", + "integrity": "sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.26.0", - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/typescript-estree": "4.26.0", + "@typescript-eslint/scope-manager": "4.27.0", + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/typescript-estree": "4.27.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/parser": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz", - "integrity": "sha512-b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.27.0.tgz", + "integrity": "sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.26.0", - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/typescript-estree": "4.26.0", + "@typescript-eslint/scope-manager": "4.27.0", + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/typescript-estree": "4.27.0", "debug": "^4.3.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz", - "integrity": "sha512-G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz", + "integrity": "sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/visitor-keys": "4.26.0" + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/visitor-keys": "4.27.0" } }, "@typescript-eslint/types": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz", - "integrity": "sha512-rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.27.0.tgz", + "integrity": "sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz", - "integrity": "sha512-GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz", + "integrity": "sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/visitor-keys": "4.26.0", + "@typescript-eslint/types": "4.27.0", + "@typescript-eslint/visitor-keys": "4.27.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -15996,12 +15955,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz", - "integrity": "sha512-cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz", + "integrity": "sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/types": "4.27.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -17900,13 +17859,13 @@ "dev": true }, "eslint": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz", - "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz", + "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.1", + "@eslint/eslintrc": "^0.4.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -17923,7 +17882,7 @@ "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", + "glob-parent": "^5.1.2", "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", @@ -20546,9 +20505,9 @@ } }, "next-sitemap": { - "version": "1.6.99", - "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.99.tgz", - "integrity": "sha512-2ZSIBOslKJO0bz0ShCVAU2UUzE/SBIBA1MT7e7uOlOMw9u+OD1Uc4XDzKLhNdjbCuic707xYMW5E0jsnOljhUA==", + "version": "1.6.116", + "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.116.tgz", + "integrity": "sha512-UvxjiJ8X02h6aaGnZiRueSaacVWznzGnmMi6CqLRf9oxvA+Pg/Q28vMfTJTsOdQ7otWM6HVwHAMeJH/ZzjBnQg==", "dev": true, "requires": { "@corex/deepmerge": "^2.6.20", diff --git a/package.json b/package.json index 5ff493b..3c7034b 100644 --- a/package.json +++ b/package.json @@ -34,24 +34,24 @@ }, "devDependencies": { "@types/js-cookie": "^2.2.6", - "@types/react": "^17.0.9", + "@types/react": "^17.0.11", "@types/react-beautiful-dnd": "^13.0.0", "@types/react-csv": "^1.1.1", - "@types/react-dom": "^17.0.6", + "@types/react-dom": "^17.0.7", "@types/react-jsonschema-form": "^1.7.5", "@types/shortid": "^0.0.29", - "@types/styled-components": "^5.1.9", - "@typescript-eslint/eslint-plugin": "^4.26.0", - "@typescript-eslint/parser": "^4.26.0", + "@types/styled-components": "^5.1.10", + "@typescript-eslint/eslint-plugin": "^4.27.0", + "@typescript-eslint/parser": "^4.27.0", "babel-plugin-styled-components": "^1.12.0", - "eslint": "^7.27.0", + "eslint": "^7.28.0", "eslint-config-airbnb-typescript": "^12.3.1", "eslint-plugin-import": "^2.23.4", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0", "husky": "^6.0.0", - "next-sitemap": "^1.6.99", + "next-sitemap": "^1.6.116", "npm-run-all": "^4.1.5", "stylelint": "^13.13.1", "stylelint-config-standard": "^22.0.0", From 2df083e1d7433a7c32d729c617a9347cb0f8cc4d Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 15 Jun 2021 21:38:30 +0300 Subject: [PATCH 13/14] npm audit fix --- package-lock.json | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2d94fa0..61800e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2794,9 +2794,9 @@ } }, "node_modules/autoprefixer/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -9378,9 +9378,9 @@ } }, "node_modules/postcss-less/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -9512,9 +9512,9 @@ } }, "node_modules/postcss-safe-parser/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -9632,9 +9632,9 @@ } }, "node_modules/postcss-sass/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -9754,9 +9754,9 @@ } }, "node_modules/postcss-scss/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -11803,9 +11803,9 @@ } }, "node_modules/stylelint/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -11970,9 +11970,9 @@ } }, "node_modules/sugarss/node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "dependencies": { "chalk": "^2.4.2", @@ -16332,9 +16332,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -21434,9 +21434,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -21541,9 +21541,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -21637,9 +21637,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -21732,9 +21732,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -23326,9 +23326,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -23484,9 +23484,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", From 35027e5b1b90f81a505024013102d6d2c90c163a Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 15 Jun 2021 23:04:09 +0300 Subject: [PATCH 14/14] fix lint --- src/views/ContactsPage/ContactsPageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 5d8a6f9..5356fe1 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -44,7 +44,7 @@ const IndexUL = styled.ul` padding: 0; list-style: none; - li:before { + li::before { content: attr(data-icon); margin-right: 4px; }