From fb1368f31e16966d32a65425bac698fc9966c65d Mon Sep 17 00:00:00 2001 From: e-k1 Date: Mon, 31 Jan 2022 18:30:50 +0200 Subject: [PATCH] Updatet hvtmk, optmk and mtmk --- src/views/ContactsPage/ContactsPageView.tsx | 12 +-- src/views/ContactsPage/hvtmk.json | 32 ++++---- src/views/ContactsPage/mtmk.json | 82 +++++++++------------ src/views/ContactsPage/optmk.json | 32 ++++++-- 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 8026300..209ae7b 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -5,9 +5,9 @@ import colors from "@theme/colors"; import ContactCard from "@components/ContactCard"; import BoardJson from "./board.json"; -// import HvtmkJson from "./hvtmk.json"; -// import MtmkJson from "./mtmk.json"; -// import OptmkJson from "./optmk.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 SstmkJson from "./sstmk.json"; @@ -18,9 +18,9 @@ import BoardJson from "./board.json"; const orderedCommittees = [ BoardJson, - // HvtmkJson, - // MtmkJson, - // OptmkJson, + HvtmkJson, + MtmkJson, + OptmkJson, // OtmkJson, // EPtmkJson, // SstmkJson, diff --git a/src/views/ContactsPage/hvtmk.json b/src/views/ContactsPage/hvtmk.json index a6c2852..5200581 100644 --- a/src/views/ContactsPage/hvtmk.json +++ b/src/views/ContactsPage/hvtmk.json @@ -8,7 +8,7 @@ "name_en": "Master of Wellbeing", "representatives": [ { - "name": "Sauli Norja" + "name": "Sofia Öhman" } ] }, @@ -20,10 +20,10 @@ "name": "Juha Anttila" }, { - "name": "Aino Suomi" + "name": "Aleksi Helin" }, { - "name": "Nestori Yrjönkoski" + "name": "Julia Pykälä-aho" } ] }, @@ -32,10 +32,16 @@ "name_en": "Sports Representative", "representatives": [ { - "name": "Elmeri Pälikkö" + "name": "Aaro Niskanen" }, { - "name": "Joel Wickström" + "name": "Sauli Norja" + }, + { + "name": "Viola Palolahti" + }, + { + "name": "Eero Tihtonen" } ] }, @@ -44,7 +50,7 @@ "name_en": "Guild Room Representative", "representatives": [ { - "name": "Ilari Ojakorpi" + "name": "Patrick Linnanen" } ] }, @@ -53,7 +59,7 @@ "name_en": "", "representatives": [ { - "name": "Samuel Laine" + "name": "Samu Nyman" }, { "name": "Aleksanteri Vesala" @@ -61,20 +67,14 @@ ] }, { - "name_fi": "Retkivastaava", + "name_fi": "Retkeilyvastaava", "name_en": "", "representatives": [ { - "name": "Jarno Mustonen" + "name": "Vilhelmiina Honkanen" }, { - "name": "Suvi Karanta" - }, - { - "name": "Jesse Räisänen" - }, - { - "name": "Mikko Suhonen" + "name": "Pinja Leppänen" } ] } diff --git a/src/views/ContactsPage/mtmk.json b/src/views/ContactsPage/mtmk.json index cb83d8f..bac8b62 100644 --- a/src/views/ContactsPage/mtmk.json +++ b/src/views/ContactsPage/mtmk.json @@ -1,6 +1,6 @@ { "slug": "mtmk", - "name_fi": "Mediatoimikunta", + "name_fi": "Sössö-toimikunta", "name_en": "Media Committee", "roles": [ { @@ -8,55 +8,34 @@ "name_en": "Chair, Editor in Chief", "representatives": [ { - "name": "Sasu Saalasti", + "name": "Aino Suomi", "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": "Emmaleena Ahonen" }, { "name": "Elias Hirvonen" }, { - "name": "Miika Koskela" + "name": "Ville Lairila" }, { - "name": "Taneli Myllykangas" + "name": "Olli Komulainen" }, { - "name": "Emmaleena Ahonen" + "name": "Pinja Salo" }, { - "name": "Ville-Pekka Laakkonen" - }, - { - "name": "Sofia Öhman" - }, - { - "name": "Nestori Yrjönkoski" - }, - { - "name": "Jami Hyytiäinen" + "name": "Tuukka Syrjänen" }, { "name": "Aleksanteri Vesala" @@ -68,22 +47,7 @@ "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": "Jarno Mustonen" } ] }, @@ -93,6 +57,19 @@ "representatives": [ { "name": "Jonna Tammikivi" + }, + { + "name": "Sasu Saalasti" + } + + ] + }, + { + "name_fi": "Taittaja & Toimittaja", + "name_en": "Layout Artist & Journalist", + "representatives": [ + { + "name": "Juuli Leppänen" } ] }, @@ -101,14 +78,15 @@ "name_en": "Photographer", "representatives": [ { - "name": "Suvi Karanta" + "name": "Toni Lyttinen" }, { - "name": "Mikko Haaparanta" + "name": "Sauli Norja" }, { - "name": "Johannes Viirimäki" + "name": "Rasmus Räsänen" } + ] }, { @@ -117,9 +95,15 @@ "representatives": [ { "name": "Kalle Petäjäaho" - }, + } + ] + }, + { + "name_fi": "Graafikko", + "name_en": "Photographer & Graphic Artist", + "representatives": [ { - "name": "Maria Pöllä" + "name": "Otto Julkunen" } ] }, diff --git a/src/views/ContactsPage/optmk.json b/src/views/ContactsPage/optmk.json index 3b024b9..bc83859 100644 --- a/src/views/ContactsPage/optmk.json +++ b/src/views/ContactsPage/optmk.json @@ -8,7 +8,7 @@ "name_en": "Master of Studies", "representatives": [ { - "name": "Simo Hakanummi" + "name": "Iikka Huttu" } ] }, @@ -17,30 +17,46 @@ "name_en": "Study Coordinator", "representatives": [ { - "name": "Miina-Maija Simonen" + "name": "Juulia Härkönen" }, { - "name": "Tomi Valkonen" + "name": "Patrick Linnanen" }, { - "name": "Leo Lahti" + "name": "Veeti Lahtinen" }, { - "name": "Ville-Pekka Laakkonen" + "name": "Pinja Leppänen" }, { - "name": "Samu Nyman" + "name": "Mikko Sandström" } ] }, { - "name_fi": "Abimarkkinointi Vastaava", + "name_fi": "Abimarkkinointipäävastaava", "name_en": "", "representatives": [ { - "name": "Iikka Huttu" + "name": "Vilhelmiina Honkanen" } ] + }, + { + "name_fi": "Abimarkkinointivastaava", + "name_en": "", + "representatives": [ + { + "name": "Liisa Haltia" + }, + { + "name": "Jenni Marttinen" + }, + { + "name": "Venla Vastamäki" + } + + ] } ] }