From 6899c1c94038967ceac4df6554cff76547f8f06b Mon Sep 17 00:00:00 2001 From: Justus Ojala Date: Mon, 31 Jan 2022 18:22:28 +0200 Subject: [PATCH 1/3] added otmk and eptmk contacts --- src/views/ContactsPage/ContactsPageView.tsx | 8 +-- src/views/ContactsPage/eptmk.json | 28 ++++----- src/views/ContactsPage/otmk.json | 69 +++++++++------------ 3 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 8026300..aeb80de 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -8,8 +8,8 @@ import BoardJson from "./board.json"; // import HvtmkJson from "./hvtmk.json"; // import MtmkJson from "./mtmk.json"; // import OptmkJson from "./optmk.json"; -// import OtmkJson from "./otmk.json"; -// import EPtmkJson from "./eptmk.json"; +import OtmkJson from "./otmk.json"; +import EPtmkJson from "./eptmk.json"; // import SstmkJson from "./sstmk.json"; // import TtmkJson from "./ttmk.json"; // import UtmkJson from "./utmk.json"; @@ -21,8 +21,8 @@ const orderedCommittees = [ // HvtmkJson, // MtmkJson, // OptmkJson, - // OtmkJson, - // EPtmkJson, + OtmkJson, + EPtmkJson, // SstmkJson, // TtmkJson, // UtmkJson, diff --git a/src/views/ContactsPage/eptmk.json b/src/views/ContactsPage/eptmk.json index f190257..90eb3d8 100644 --- a/src/views/ContactsPage/eptmk.json +++ b/src/views/ContactsPage/eptmk.json @@ -3,6 +3,15 @@ "name_fi": "Elepajatoimikunta", "name_en": "", "roles": [ + { + "name_fi": "Pajapäävastaava", + "name_en": "", + "representatives": [ + { + "name": "Oskari Ponkala" + } + ] + }, { "name_fi": "Pajavastaava", "name_en": "", @@ -16,35 +25,26 @@ "name_fi": "Pajakisälli", "name_en": "", "representatives": [ - { - "name": "Tommi Sytelä" - }, - { - "name": "Eerikki Eskola" - }, - { - "name": "Arkadii Kolchin" - }, { "name": "Samu Nyman" }, { - "name": "Konsta Langi" + "name": "Veikko Räty" }, { - "name": "Johannes Viirimäki" + "name": "Ville Lairila" }, { "name": "Justus Ojala" }, { - "name": "Ville Tujunen" + "name": "Tommi Sytelä" }, { - "name": "Antti Tarkka" + "name": "Visa Kurvi" }, { - "name": "Pyry Vaara" + "name": "Petrus Asikainen" } ] } diff --git a/src/views/ContactsPage/otmk.json b/src/views/ContactsPage/otmk.json index 4fabefa..d7cd4bf 100644 --- a/src/views/ContactsPage/otmk.json +++ b/src/views/ContactsPage/otmk.json @@ -8,7 +8,7 @@ "name_en": "Master of Ceremonies", "representatives": [ { - "name": "Eveliina Ahonen" + "name": "Sakke Kangas" } ] }, @@ -17,43 +17,40 @@ "name_en": "Court Counsellor", "representatives": [ { - "name": "Melisa Dönmez" + "name": "Eero Ketonen" } ] }, { "name_fi": "Emäntä", - "name_en": "", + "name_en": "Hostess", "representatives": [ { - "name": "Oona Karjalainen" - }, - { - "name": "Emilia Kortelainen" - }, - { - "name": "Venla Vastamäki" + "name": "Elina Huttunen" } ] }, { "name_fi": "Isäntä", - "name_en": "", + "name_en": "Host", "representatives": [ { - "name": "Henry Jaakkola" + "name": "Aleksi Saajakari" }, { - "name": "Sakke Kangas" + "name": "Aaron Löfgren" }, { - "name": "Otto Torkkeli" + "name": "Verneri Turkki" }, { - "name": "Tommi Oinonen" + "name": "Elias Lindberg" }, { - "name": "Eero Ketonen" + "name": "Roni Vallius" + }, + { + "name": "Elias Damski" } ] }, @@ -62,28 +59,22 @@ "name_en": "", "representatives": [ { - "name": "Tuomo Leino" - }, - { - "name": "Jami Hyytiäinen" - }, - { - "name": "Tuomas Pajunpää" - }, - { - "name": "Samuel Laine" - }, - { - "name": "Toni Miilunpalo" - }, - { - "name": "Ville Kaakinen" + "name": "Sakari Harjunpää" }, { "name": "Eero Torpo" }, { - "name": "Sauli Norja" + "name": "Niilo Ojala" + }, + { + "name": "Samuel Laine" + }, + { + "name": "Toni Ojala" + }, + { + "name": "Ville Kaakinen" } ] }, @@ -92,22 +83,22 @@ "name_en": "", "representatives": [ { - "name": "Jesse Räisänen" + "name": "Oona Karjalainen" }, { - "name": "Eino Laakso" + "name": "Peter Lindahl" }, { - "name": "Sakari Harjunpää" + "name": "Aino Suomi" }, { - "name": "Niilo Ojala" + "name": "Sauli Norja" }, { - "name": "Iikka Huttu" + "name": "Venla Vastamäki" }, { - "name": "Akseli Järvinen" + "name": "Kasper Skog" } ] } From 3bac8a925a5856c9a944c8f63e5d98190eb4e233 Mon Sep 17 00:00:00 2001 From: Justus Ojala Date: Mon, 31 Jan 2022 18:29:10 +0200 Subject: [PATCH 2/3] Added sstmk contacts --- src/views/ContactsPage/ContactsPageView.tsx | 4 ++-- src/views/ContactsPage/sstmk.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index aeb80de..288b0b3 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -10,7 +10,7 @@ import BoardJson from "./board.json"; // import OptmkJson from "./optmk.json"; import OtmkJson from "./otmk.json"; import EPtmkJson from "./eptmk.json"; -// import SstmkJson from "./sstmk.json"; +import SstmkJson from "./sstmk.json"; // import TtmkJson from "./ttmk.json"; // import UtmkJson from "./utmk.json"; // import YtmkJson from "./ytmk.json"; @@ -23,7 +23,7 @@ const orderedCommittees = [ // OptmkJson, OtmkJson, EPtmkJson, - // SstmkJson, + SstmkJson, // TtmkJson, // UtmkJson, // YtmkJson, diff --git a/src/views/ContactsPage/sstmk.json b/src/views/ContactsPage/sstmk.json index 6a64edf..8728beb 100644 --- a/src/views/ContactsPage/sstmk.json +++ b/src/views/ContactsPage/sstmk.json @@ -70,7 +70,7 @@ ] }, { - "name_fi": "PoTa100-jatkokuvernööri", + "name_fi": "PoTa100-jatkotirehtööri", "name_en": "", "representatives": [ { From d5abc1cb10f8aa7e6c3f9232177a31585d602ac4 Mon Sep 17 00:00:00 2001 From: Justus Ojala Date: Mon, 31 Jan 2022 18:34:32 +0200 Subject: [PATCH 3/3] Added ttmk contacts --- src/views/ContactsPage/ContactsPageView.tsx | 4 +- src/views/ContactsPage/ttmk.json | 60 ++++++++++----------- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 288b0b3..1ea193a 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -11,7 +11,7 @@ import BoardJson from "./board.json"; import OtmkJson from "./otmk.json"; import EPtmkJson from "./eptmk.json"; import SstmkJson from "./sstmk.json"; -// import TtmkJson from "./ttmk.json"; +import TtmkJson from "./ttmk.json"; // import UtmkJson from "./utmk.json"; // import YtmkJson from "./ytmk.json"; // import Others from "./others.json"; @@ -24,7 +24,7 @@ const orderedCommittees = [ OtmkJson, EPtmkJson, SstmkJson, - // TtmkJson, + TtmkJson, // UtmkJson, // YtmkJson, // Others, diff --git a/src/views/ContactsPage/ttmk.json b/src/views/ContactsPage/ttmk.json index 1d3b476..2e35ea9 100644 --- a/src/views/ContactsPage/ttmk.json +++ b/src/views/ContactsPage/ttmk.json @@ -5,49 +5,43 @@ "roles": [ { "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": "", + "name_en": "Master of technology", "representatives": [ { "name": "Ilari Ojakorpi" - }, + } + ] + }, + { + "name_fi": "Teknologianeuvos", + "name_en": "Technology Advisor", + "representatives": [ { - "name": "Leo Lahti" - }, - { - "name": "Jyri Korhonen" - }, - { - "name": "Tuukka Syrjänen" - }, - { - "name": "Emmaleena Ahonen" - }, - { - "name": "Mikko Suhonen" + "name": "Aarni Halinen" }, { "name": "Jaakko Koskela" }, + { + "name": "Toni Lyttinen" + } + ] + }, + { + "name_fi": "Teknologiakisälli", + "name_en": "", + "representatives": [ + { + "name": "Elmo Kankkunen" + }, + { + "name": "Antti Eronen" + }, { "name": "Justus Ojala" + }, + { + "name": "Lasse Ruokokoski" } ] }