From e770722ad0fbd0fa34465ee0322e8cdd4c726489 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 10 Jan 2024 17:56:22 +0200 Subject: [PATCH 1/2] update committee info --- src/views/ContactsPage/ContactsPageView.tsx | 52 ++++----- src/views/ContactsPage/board.json | 2 +- src/views/ContactsPage/ftmk.json | 55 +++++++++ src/views/ContactsPage/htmk.json | 55 +++++++++ src/views/ContactsPage/hvtmk.json | 35 ++---- src/views/ContactsPage/ltmk.json | 64 +++++++++++ src/views/ContactsPage/mtmk.json | 104 ++++++++--------- src/views/ContactsPage/ntmk.json | 64 +++++------ src/views/ContactsPage/optmk.json | 52 ++++----- src/views/ContactsPage/others.json | 67 ++++------- src/views/ContactsPage/otmk.json | 106 ------------------ .../ContactsPage/{eptmk.json => ptmk.json} | 29 ++--- src/views/ContactsPage/swtmk.json | 40 +++++++ src/views/ContactsPage/ttmk.json | 23 +--- src/views/ContactsPage/vtmk.json | 37 ++++++ src/views/ContactsPage/ytmk.json | 59 +++++++--- 16 files changed, 473 insertions(+), 371 deletions(-) create mode 100644 src/views/ContactsPage/ftmk.json create mode 100644 src/views/ContactsPage/htmk.json create mode 100644 src/views/ContactsPage/ltmk.json delete mode 100644 src/views/ContactsPage/otmk.json rename src/views/ContactsPage/{eptmk.json => ptmk.json} (59%) create mode 100644 src/views/ContactsPage/swtmk.json create mode 100644 src/views/ContactsPage/vtmk.json diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index d0b0186..073a129 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -5,35 +5,35 @@ 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 NtmkJson from "./ntmk.json"; -// import OptmkJson from "./optmk.json"; -// import OtmkJson from "./otmk.json"; -// import EPtmkJson from "./eptmk.json"; -// import SstmkJson from "./sstmk.json"; -// import ShntmkJson from "./shntmk.json"; -// import ShtmkJson from "./shtmk.json"; -// import TtmkJson from "./ttmk.json"; -// import UtmkJson from "./utmk.json"; -// import YtmkJson from "./ytmk.json"; -// import Others from "./others.json"; +import FtmkJson from "./ftmk.json"; +import HtmkJson from "./htmk.json"; +import HvtmkJson from "./hvtmk.json"; +import MtmkJson from "./mtmk.json"; +import OptmkJson from "./optmk.json"; +import NtmkJson from "./ntmk.json"; +import PtmkJson from "./ptmk.json"; +import TtmkJson from "./ttmk.json"; +import YtmkJson from "./ytmk.json"; +import SwtmkJson from "./swtmk.json"; +import VtmkJson from "./vtmk.json"; +import LtmkJson from "./ltmk.json"; +import Others from "./others.json"; const orderedCommittees = [ BoardJson, - // HvtmkJson, - // MtmkJson, - // NtmkJson, - // OptmkJson, - // OtmkJson, - // EPtmkJson, - // SstmkJson, - // ShntmkJson, - // ShtmkJson, - // TtmkJson, - // UtmkJson, - // YtmkJson, - // Others, + FtmkJson, + HtmkJson, + LtmkJson, + HvtmkJson, + MtmkJson, + OptmkJson, + YtmkJson, + TtmkJson, + PtmkJson, + VtmkJson, + SwtmkJson, + NtmkJson, + Others, ]; const blankProfile = "/img/blank_profile.png"; diff --git a/src/views/ContactsPage/board.json b/src/views/ContactsPage/board.json index 80af6a5..3454aad 100644 --- a/src/views/ContactsPage/board.json +++ b/src/views/ContactsPage/board.json @@ -148,7 +148,7 @@ ] }, { - "name_fi": "Excursiomestari", + "name_fi": "Excursio- ja ulkomestari", "name_en": "", "representatives": [ { diff --git a/src/views/ContactsPage/ftmk.json b/src/views/ContactsPage/ftmk.json new file mode 100644 index 0000000..8b2f8c4 --- /dev/null +++ b/src/views/ContactsPage/ftmk.json @@ -0,0 +1,55 @@ +{ + "slug": "ftmk", + "name_fi": "Fuksitoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Fuksitoimikunnan puheenjohtaja", + "name_en": "", + "representatives": [ + { + "name": "Sauli Hakala" + } + ] + }, + { + "name_fi": "Fuksitoimikunnan puheenjohtajan adjutantti", + "name_en": "", + "representatives": [ + { + "name": "Valentin Juhela" + } + ] + }, + { + "name_fi": "KV-fuksikapteeni", + "name_en": "International Fuksi Captain", + "representatives": [ + { + "name": "Verneri Turkki" + }, + { + "name": "Liisa Haltia" + } + ] + }, + { + "name_fi": "ISOvastaava", + "name_en": "Tutor Coordinator", + "representatives": [ + { + "name": "Auli Purolinna" + } + ] + }, + { + "name_fi": "KV-ISOvastaava", + "name_en": "International Tutor Coordinator", + "representatives": [ + { + "name": "Aleksanteri Vesala" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/views/ContactsPage/htmk.json b/src/views/ContactsPage/htmk.json new file mode 100644 index 0000000..60a34cc --- /dev/null +++ b/src/views/ContactsPage/htmk.json @@ -0,0 +1,55 @@ +{ + "slug": "htmk", + "name_fi": "Hupitoimikunta", + "name_en": "Entertainment Committee", + "roles": [ + { + "name_fi": "Hovimestari", + "name_en": "Master of Ceremonies", + "representatives": [ + { + "name": "Axel Aurola" + } + ] + }, + { + "name_fi": "Hovineuvos", + "name_en": "Court Counsellor", + "representatives": [ + { + "name": "Nelli Liljasto" + } + ] + }, + { + "name_fi": "Emäntä", + "name_en": "Hostess", + "representatives": [ + { + "name": "Aino Tasapuro" + }, + { + "name": "Matilda Ahonen" + } + ] + }, + { + "name_fi": "Isäntä", + "name_en": "Host", + "representatives": [ + { + "name": "Tuomas Rantamäki" + }, + { + "name": "Martti Jokinen" + }, + { + "name": "Joona Maaranen" + }, + { + "name": "Teemu Heikkinen" + } + ] + } + ] +} diff --git a/src/views/ContactsPage/hvtmk.json b/src/views/ContactsPage/hvtmk.json index 5200581..7ff344a 100644 --- a/src/views/ContactsPage/hvtmk.json +++ b/src/views/ContactsPage/hvtmk.json @@ -8,7 +8,7 @@ "name_en": "Master of Wellbeing", "representatives": [ { - "name": "Sofia Öhman" + "name": "Peter Lindahl" } ] }, @@ -17,13 +17,13 @@ "name_en": "Culture Representative", "representatives": [ { - "name": "Juha Anttila" + "name": "Eero Pietiläinen" }, { - "name": "Aleksi Helin" + "name": "Miika Helminen" }, { - "name": "Julia Pykälä-aho" + "name": "Veikko Räty" } ] }, @@ -32,16 +32,16 @@ "name_en": "Sports Representative", "representatives": [ { - "name": "Aaro Niskanen" + "name": "Matias Hendolin" }, { - "name": "Sauli Norja" + "name": "Janne Sjöblom" }, { - "name": "Viola Palolahti" + "name": "Niklas Ritalahti" }, { - "name": "Eero Tihtonen" + "name": "Aino Salmi" } ] }, @@ -50,19 +50,7 @@ "name_en": "Guild Room Representative", "representatives": [ { - "name": "Patrick Linnanen" - } - ] - }, - { - "name_fi": "Kiltapäiväkerhovastaava", - "name_en": "", - "representatives": [ - { - "name": "Samu Nyman" - }, - { - "name": "Aleksanteri Vesala" + "name": "Justus Ojala" } ] }, @@ -71,10 +59,7 @@ "name_en": "", "representatives": [ { - "name": "Vilhelmiina Honkanen" - }, - { - "name": "Pinja Leppänen" + "name": "Juulia Härkönen" } ] } diff --git a/src/views/ContactsPage/ltmk.json b/src/views/ContactsPage/ltmk.json new file mode 100644 index 0000000..a435355 --- /dev/null +++ b/src/views/ContactsPage/ltmk.json @@ -0,0 +1,64 @@ +{ + "slug": "ltmk", + "name_fi": "Lukkaritoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Lukkarimestari", + "name_en": "", + "representatives": [ + { + "name": "Jenni Marttinen" + } + ] + }, + { + "name_fi": "Lukkari", + "name_en": "", + "representatives": [ + { + "name": "Kasper Skog" + }, + { + "name": "Leevi Oikarinen" + }, + { + "name": "Mikko Hokkanen" + }, + { + "name": "Patrick Linnanen" + }, + { + "name": "Patrik Varteva" + } + ] + }, + { + "name_fi": "Lukkarikisälli", + "name_en": "", + "representatives": [ + { + "name": "Arvi Virkkunen" + }, + { + "name": "Aino Salmi" + }, + { + "name": "Igor Oinonen" + }, + { + "name": "Ilmari Reponen" + }, + { + "name": "Karoliine Talvikangas" + }, + { + "name": "Markus Aaltio" + }, + { + "name": "Tapio Immonen" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/views/ContactsPage/mtmk.json b/src/views/ContactsPage/mtmk.json index bac8b62..84a8ffa 100644 --- a/src/views/ContactsPage/mtmk.json +++ b/src/views/ContactsPage/mtmk.json @@ -8,7 +8,7 @@ "name_en": "Chair, Editor in Chief", "representatives": [ { - "name": "Aino Suomi", + "name": "Visa Kurvi", "phone_number": null, "email": null, "image": null @@ -20,81 +20,61 @@ "name_en": "Journalist", "representatives": [ { - "name": "Emmaleena Ahonen" + "name": "Miikka Mäki" }, { - "name": "Elias Hirvonen" + "name": "Elmo Kankkunen" }, { - "name": "Ville Lairila" + "name": "Junias Vasama" }, { - "name": "Olli Komulainen" + "name": "Tapio Immonen" }, { - "name": "Pinja Salo" + "name": "Leevi Oikarinen" }, { - "name": "Tuukka Syrjänen" + "name": "Olli Vaismaa" }, { - "name": "Aleksanteri Vesala" - } - ] - }, - { - "name_fi": "Toimittaja & Valokuvaaja", - "name_en": "Journalist & Photographer", - "representatives": [ - { - "name": "Jarno Mustonen" - } - ] - }, - { - "name_fi": "Taittaja & Valokuvaaja", - "name_en": "Layout Artist & Photographer", - "representatives": [ - { - "name": "Jonna Tammikivi" - }, - { - "name": "Sasu Saalasti" - } - - ] - }, - { - "name_fi": "Taittaja & Toimittaja", - "name_en": "Layout Artist & Journalist", - "representatives": [ - { - "name": "Juuli Leppänen" - } - ] - }, - { - "name_fi": "Valokuvaaja", - "name_en": "Photographer", - "representatives": [ - { - "name": "Toni Lyttinen" + "name": "Tommi Sytelä" }, { "name": "Sauli Norja" }, { - "name": "Rasmus Räsänen" + "name": "Eino Tyrväinen" + }, + { + "name": "Topi Manskinen" + }, + { + "name": "Patrick Linnanen" + }, + { + "name": "Tiitus Koski" } - ] }, { - "name_fi": "Valokuvaaja & Graafikko", - "name_en": "Photographer & Graphic Artist", + "name_fi": "Taittaja", + "name_en": "", "representatives": [ { - "name": "Kalle Petäjäaho" + "name": "Arvi Virkkunen" + }, + { + "name": "Patrik Varteva" + }, + { + "name": "Otto Kievimaa" + }, + { + "name": "Aaron Löfgren" + }, + { + "name": "Atte Vitie" } ] }, @@ -103,14 +83,26 @@ "name_en": "Photographer & Graphic Artist", "representatives": [ { - "name": "Otto Julkunen" + "name": "Elian Salmimaa" + }, + { + "name": "Julia Pykälä-Aho" + }, + { + "name": "Raita Sandberg" } ] }, { - "name_fi": "Videokuvaaja", - "name_en": "Videographer", + "name_fi": "Valokuvaaja", + "name_en": "Photographer", "representatives": [ + { + "name": "Veikko Räty" + }, + { + "name": "Milja Kuusela" + }, { "name": "Aaro Rasilainen" } diff --git a/src/views/ContactsPage/ntmk.json b/src/views/ContactsPage/ntmk.json index cb8a886..177195f 100644 --- a/src/views/ContactsPage/ntmk.json +++ b/src/views/ContactsPage/ntmk.json @@ -4,20 +4,20 @@ "name_en": "", "roles": [ { - "name_fi": "N-toimikunnan puheenjohtaja", + "name_fi": "N-toimikunnan nestori", "name_en": "", "representatives": [ { - "name": "Ville Kaakinen" + "name": "Eveliina Ahonen" } ] }, { - "name_fi": "N-toimikunnan varapuheenjohtaja", + "name_fi": "N-toimikunnan neuvos", "name_en": "", "representatives": [ { - "name": "Jami Hyytiäinen" + "name": "Melisa Dönmez" } ] }, @@ -26,57 +26,57 @@ "name_en": "", "representatives": [ { - "name": "Ville-Pekka Laakkonen" + "name": "Samu Tepponen" } ] }, { - "name_fi": "Alumivastaava", + "name_fi": "Nipsu", "name_en": "", "representatives": [ { - "name": "Ella Eilola" + "name": "Venla Vastamäki" + }, + { + "name": "Mikko Suhonen" + }, + { + "name": "Tommi Oinonen" + }, + { + "name": "Nestori Yrjönkoski" + }, + { + "name": "Henry Gustafsson" + }, + { + "name": "Jenna Lundström" } ] }, { - "name_fi": "N-Toimihenkilö", - "name_en": "", - "representatives": [ + "name_fi": "Kiltapatruuna", + "name_en": "", + "representatives": [ { - "name": "Timi Tiira" + "name": "Otto Julkunen" }, { - "name": "Erna Virtanen" + "name": "Iikka Huttu" }, { - "name": "Emmaleena Ahonen" + "name": "Melisa Dönmez" }, { - "name": "Jarno Mustonen" + "name": "Pyry Vaara" }, { - "name": "Pekka Aho" + "name": "Nette Levijoki" }, { - "name": "Mikko Haapamäki" - }, - { - "name": "Jonna Tammikivi" - }, - { - "name": "Juuli Leppänen" - }, - { - "name": "Simo Hakanummi" - }, - { - "name": "Tuomo Leino" - }, - { - "name": "Sasu Saalasti" + "name": "Juulia Härkönen" } - ] + ] } ] } \ No newline at end of file diff --git a/src/views/ContactsPage/optmk.json b/src/views/ContactsPage/optmk.json index bc83859..4defcca 100644 --- a/src/views/ContactsPage/optmk.json +++ b/src/views/ContactsPage/optmk.json @@ -8,7 +8,7 @@ "name_en": "Master of Studies", "representatives": [ { - "name": "Iikka Huttu" + "name": "Mikko Sandström" } ] }, @@ -17,46 +17,36 @@ "name_en": "Study Coordinator", "representatives": [ { - "name": "Juulia Härkönen" + "name": "Sampo Stranden" }, { - "name": "Patrick Linnanen" + "name": "Janne Sjöblom" }, { - "name": "Veeti Lahtinen" + "name": "Ville Tjeder" }, { - "name": "Pinja Leppänen" + "name": "Otto Rinne" }, { - "name": "Mikko Sandström" + "name": "Oona Karjalainen" + }, + { + "name": "Mikael Siikonen" + }, + { + "name": "Victor Barannik" + }, + { + "name": "Max Laine" + }, + { + "name": "Iida Luoma" + }, + { + "name": "Konsta Langi" } ] - }, - { - "name_fi": "Abimarkkinointipäävastaava", - "name_en": "", - "representatives": [ - { - "name": "Vilhelmiina Honkanen" - } - ] - }, - { - "name_fi": "Abimarkkinointivastaava", - "name_en": "", - "representatives": [ - { - "name": "Liisa Haltia" - }, - { - "name": "Jenni Marttinen" - }, - { - "name": "Venla Vastamäki" - } - - ] } ] } diff --git a/src/views/ContactsPage/others.json b/src/views/ContactsPage/others.json index 04e777e..f52fb8b 100644 --- a/src/views/ContactsPage/others.json +++ b/src/views/ContactsPage/others.json @@ -3,38 +3,12 @@ "name_fi": "Muut", "name_en": "Other officials", "roles": [ - { - "name_fi": "Kiltapatruuna", - "name_en": "Guild elder", - "representatives": [ - { - "name": "Toni Lyttinen", - "phone_number": null, - "email": null - }, - { - "name": "Emmaleena Ahonen", - "phone_number": null, - "email": null - }, - { - "name": "Johannes Ora", - "phone_number": null, - "email": null - }, - { - "name": "Antti Mäki", - "phone_number": null, - "email": null - } - ] - }, { "name_fi": "TEK-yhdyshenkilö", "name_en": "TEK contact person", "representatives": [ { - "name": "Oskari Ponkala", + "name": "Esko Väänänen", "phone_number": null, "email": null } @@ -45,41 +19,42 @@ "name_en": "Archivist", "representatives": [ { - "name": "Timi Tiira", + "name": "Iikka Huttu", "phone_number": null, "email": null } ] }, { - "name_fi": "Häirintäyhdydyshenkilö", + "name_fi": "Teekkarikokouksen kiltaedustaja", "name_en": "", "representatives": [ { - "name": "Toni Ojala", - "phone_number": null, - "email": null - }, - { - "name": "Aino Suomi", - "phone_number": null, - "email": null - }, - { - "name": "Sauli Norja", - "phone_number": null, - "email": null + "name": "Oliver Hiekkamies" } ] }, { - "name_fi": "Somevastaava", + "name_fi": "Yhdenvertaisuusvastaava", "name_en": "", "representatives": [ { - "name": "Aaron Löfgren", - "phone_number": null, - "email": null + "name": "Salla Lyytikäinen" + }, + { + "name": "Emilia Kortelainen" + }, + { + "name": "Arttu Pahta" + }, + { + "name": "Niklas Ritalahti" + }, + { + "name": "Aaron Löfgren" + }, + { + "name": "Aino Suomi" } ] } diff --git a/src/views/ContactsPage/otmk.json b/src/views/ContactsPage/otmk.json deleted file mode 100644 index d7cd4bf..0000000 --- a/src/views/ContactsPage/otmk.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "slug": "otmk", - "name_fi": "Ohjelmatoimikunta", - "name_en": "Entertainment Committee", - "roles": [ - { - "name_fi": "Hovimestari", - "name_en": "Master of Ceremonies", - "representatives": [ - { - "name": "Sakke Kangas" - } - ] - }, - { - "name_fi": "Hovineuvos", - "name_en": "Court Counsellor", - "representatives": [ - { - "name": "Eero Ketonen" - } - ] - }, - { - "name_fi": "Emäntä", - "name_en": "Hostess", - "representatives": [ - { - "name": "Elina Huttunen" - } - ] - }, - { - "name_fi": "Isäntä", - "name_en": "Host", - "representatives": [ - { - "name": "Aleksi Saajakari" - }, - { - "name": "Aaron Löfgren" - }, - { - "name": "Verneri Turkki" - }, - { - "name": "Elias Lindberg" - }, - { - "name": "Roni Vallius" - }, - { - "name": "Elias Damski" - } - ] - }, - { - "name_fi": "Lukkari", - "name_en": "", - "representatives": [ - { - "name": "Sakari Harjunpää" - }, - { - "name": "Eero Torpo" - }, - { - "name": "Niilo Ojala" - }, - { - "name": "Samuel Laine" - }, - { - "name": "Toni Ojala" - }, - { - "name": "Ville Kaakinen" - } - ] - }, - { - "name_fi": "Lukkarikisällit", - "name_en": "", - "representatives": [ - { - "name": "Oona Karjalainen" - }, - { - "name": "Peter Lindahl" - }, - { - "name": "Aino Suomi" - }, - { - "name": "Sauli Norja" - }, - { - "name": "Venla Vastamäki" - }, - { - "name": "Kasper Skog" - } - ] - } - ] -} diff --git a/src/views/ContactsPage/eptmk.json b/src/views/ContactsPage/ptmk.json similarity index 59% rename from src/views/ContactsPage/eptmk.json rename to src/views/ContactsPage/ptmk.json index 90eb3d8..fdbd803 100644 --- a/src/views/ContactsPage/eptmk.json +++ b/src/views/ContactsPage/ptmk.json @@ -1,14 +1,14 @@ { - "slug": "eptmk", - "name_fi": "Elepajatoimikunta", + "slug": "ptmk", + "name_fi": "Pajatoimikunta", "name_en": "", "roles": [ { - "name_fi": "Pajapäävastaava", + "name_fi": "Pajamestari", "name_en": "", "representatives": [ { - "name": "Oskari Ponkala" + "name": "Axel Söderberg" } ] }, @@ -18,6 +18,12 @@ "representatives": [ { "name": "Karl Lipping" + }, + { + "name": "Petrus Asikainen" + }, + { + "name": "Samuel Laine" } ] }, @@ -26,25 +32,22 @@ "name_en": "", "representatives": [ { - "name": "Samu Nyman" + "name": "Patrick Linnanen" }, { - "name": "Veikko Räty" + "name": "Niklas Eloranta" }, { - "name": "Ville Lairila" + "name": "Jere Oinonen" }, { - "name": "Justus Ojala" + "name": "Joonas Kojo" }, { - "name": "Tommi Sytelä" + "name": "Iida Pakarinen" }, { - "name": "Visa Kurvi" - }, - { - "name": "Petrus Asikainen" + "name": "Lisanna Lehtonen" } ] } diff --git a/src/views/ContactsPage/swtmk.json b/src/views/ContactsPage/swtmk.json new file mode 100644 index 0000000..7d7bbbd --- /dev/null +++ b/src/views/ContactsPage/swtmk.json @@ -0,0 +1,40 @@ +{ + "slug": "swtmk", + "name_fi": "SIKin Wapaa-aika -toimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Myymäläpäällikkö", + "name_en": "", + "representatives": [ + { + "name": "Aaron Löfgren" + } + ] + }, + { + "name_fi": "Myyjä", + "name_en": "", + "representatives": [ + { + "name": "Elina Huttunen" + }, + { + "name": "Jere Tahvanainen" + }, + { + "name": "Iida Pakarinen" + }, + { + "name": "Arkadii Kolchin" + }, + { + "name": "Otto Kievimaa" + }, + { + "name": "Aino Salmi" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/views/ContactsPage/ttmk.json b/src/views/ContactsPage/ttmk.json index 2e35ea9..9a15536 100644 --- a/src/views/ContactsPage/ttmk.json +++ b/src/views/ContactsPage/ttmk.json @@ -8,40 +8,25 @@ "name_en": "Master of technology", "representatives": [ { - "name": "Ilari Ojakorpi" + "name": "Johannes Viirimäki" } ] }, { - "name_fi": "Teknologianeuvos", - "name_en": "Technology Advisor", - "representatives": [ - { - "name": "Aarni Halinen" - }, - { - "name": "Jaakko Koskela" - }, - { - "name": "Toni Lyttinen" - } - ] - }, - { - "name_fi": "Teknologiakisälli", + "name_fi": "Teknologiavastaava", "name_en": "", "representatives": [ { "name": "Elmo Kankkunen" }, { - "name": "Antti Eronen" + "name": "Tommi Sytelä" }, { "name": "Justus Ojala" }, { - "name": "Lasse Ruokokoski" + "name": "Niklas Eloranta" } ] } diff --git a/src/views/ContactsPage/vtmk.json b/src/views/ContactsPage/vtmk.json new file mode 100644 index 0000000..5aac884 --- /dev/null +++ b/src/views/ContactsPage/vtmk.json @@ -0,0 +1,37 @@ +{ + "slug": "vtmk", + "name_fi": "Viestintätoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Sihteeri", + "name_en": "Secretary", + "representatives": [ + { + "name": "Akseli Heikkinen" + } + ] + }, + { + "name_fi": "Somevastaava", + "name_en": "", + "representatives": [ + { + "name": "Jan Lahikainen" + }, + { + "name": "Markus Aaltio" + } + ] + }, + { + "name_fi": "Videokuvaaja", + "name_en": "", + "representatives": [ + { + "name": "Mikael Vatiainen" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/views/ContactsPage/ytmk.json b/src/views/ContactsPage/ytmk.json index 7725f27..8949793 100644 --- a/src/views/ContactsPage/ytmk.json +++ b/src/views/ContactsPage/ytmk.json @@ -8,25 +8,16 @@ "name_en": "Master of Corporate Relations", "representatives": [ { - "name": "Tommi Oinonen" + "name": "Emma Uusküla" } ] }, { - "name_fi": "Excursiopäävastaava", - "name_en": "Head of Excursions", + "name_fi": "Excursio- ja ulkomestari", + "name_en": "Head of Excursions and External Relations", "representatives": [ { - "name": "Henry Gustafsson" - } - ] - }, - { - "name_fi": "Excursiovastaava", - "name_en": "", - "representatives": [ - { - "name": "Visa Kurvi" + "name": "Roope Jaskari" } ] }, @@ -41,13 +32,49 @@ "name": "Emma Reinikainen" }, { - "name": "Iida Luoma" + "name": "Nette Levijoki" }, { - "name": "Elma Tuohimetsä" + "name": "Matias Hendolin" }, { - "name": "Nestori Yrjönkoski" + "name": "Suvi Nenonen" + }, + { + "name": "Tuomas Hintikka" + }, + { + "name": "Roman Shalamov" + }, + { + "name": "Yassine Ramid" + } + ] + }, + { + "name_fi": "Excursio- ja ulkovastaava", + "name_en": "", + "representatives": [ + { + "name": "Auli Purolinna" + }, + { + "name": "Jan Lahikainen" + }, + { + "name": "Otto Rinne" + }, + { + "name": "Rudolf Peltonen" + }, + { + "name": "Miika Passila" + }, + { + "name": "Wiljam Laiho" + }, + { + "name": "Elmeri Aulasuo" } ] } From f413435194d56d785fefb7c2693c864c47bfa295 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 10 Jan 2024 22:21:21 +0200 Subject: [PATCH 2/2] update contacts and committees --- src/views/ContactsPage/siwatmk.json | 40 +++++++++++++++++++++++++++ src/views/GuildPage/GuildPageView.tsx | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/views/ContactsPage/siwatmk.json diff --git a/src/views/ContactsPage/siwatmk.json b/src/views/ContactsPage/siwatmk.json new file mode 100644 index 0000000..7d7bbbd --- /dev/null +++ b/src/views/ContactsPage/siwatmk.json @@ -0,0 +1,40 @@ +{ + "slug": "swtmk", + "name_fi": "SIKin Wapaa-aika -toimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Myymäläpäällikkö", + "name_en": "", + "representatives": [ + { + "name": "Aaron Löfgren" + } + ] + }, + { + "name_fi": "Myyjä", + "name_en": "", + "representatives": [ + { + "name": "Elina Huttunen" + }, + { + "name": "Jere Tahvanainen" + }, + { + "name": "Iida Pakarinen" + }, + { + "name": "Arkadii Kolchin" + }, + { + "name": "Otto Kievimaa" + }, + { + "name": "Aino Salmi" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/views/GuildPage/GuildPageView.tsx b/src/views/GuildPage/GuildPageView.tsx index 2c150c0..1aff275 100644 --- a/src/views/GuildPage/GuildPageView.tsx +++ b/src/views/GuildPage/GuildPageView.tsx @@ -163,7 +163,7 @@ const GuildPageView: React.FC = () => (

Kiltalaisten omia projekteja varten kilta ylläpitää Otakaari 1:ssä sijaitsevaa Elektroniikkapajaa, josta löytyy tarvikkeita, työkaluja ja tilat monenlaisia töitä varten. - Jos haluat tutustua tiloihin, ota yhteyttä pajavastaavaan! + Jos haluat tutustua tiloihin, ota yhteyttä pajamestariin!