From 9a03a676838123e09e3c95a63685217da54c004d Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 17 Jan 2022 21:56:28 +0200 Subject: [PATCH 1/9] Cleanup env-files --- .env.development | 4 ---- .env.local.example | 3 +++ .env.prod | 4 ---- README.md | 3 ++- 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 .env.development create mode 100644 .env.local.example delete mode 100644 .env.prod diff --git a/.env.development b/.env.development deleted file mode 100644 index 54ea330..0000000 --- a/.env.development +++ /dev/null @@ -1,4 +0,0 @@ -NEXT_PUBLIC_DEPLOY_ENV=development -NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885 -NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api -NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi diff --git a/.env.local.example b/.env.local.example new file mode 100644 index 0000000..3b145f9 --- /dev/null +++ b/.env.local.example @@ -0,0 +1,3 @@ +NEXT_PUBLIC_DEPLOY_ENV=local +NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api +NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi diff --git a/.env.prod b/.env.prod deleted file mode 100644 index f0723ea..0000000 --- a/.env.prod +++ /dev/null @@ -1,4 +0,0 @@ -NEXT_PUBLIC_DEPLOY_ENV=production -NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885 -NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api -NEXT_PUBLIC_SITE_URL=https://sahkoinsinoorikilta.fi diff --git a/README.md b/README.md index d347b20..3b60936 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next 1. Clone/download repo 2. Install node v16 ([`nvm`](https://github.com/nvm-sh/nvm)) -3. `npm install` +3. `cp .env.local.example .env.local` +4. `npm install` ## Getting Started From 736a5e7eb77b30ec3c3ef370199f8a5435fbcef5 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 17 Jan 2022 21:57:13 +0200 Subject: [PATCH 2/9] update next version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b60936..8d175d2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next * **[React](https://facebook.github.io/react/)** (17.x) * **[Typescript](https://www.typescriptlang.org/)** (4.x) -* **[Next.js](https://nextjs.org/)** (10.x) +* **[Next.js](https://nextjs.org/)** (12.x) * [Testcafe](https://devexpress.github.io/testcafe/) - E2E Testing framework ## Installation From 6899c1c94038967ceac4df6554cff76547f8f06b Mon Sep 17 00:00:00 2001 From: Justus Ojala Date: Mon, 31 Jan 2022 18:22:28 +0200 Subject: [PATCH 3/9] 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 4/9] 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 fb1368f31e16966d32a65425bac698fc9966c65d Mon Sep 17 00:00:00 2001 From: e-k1 Date: Mon, 31 Jan 2022 18:30:50 +0200 Subject: [PATCH 5/9] 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" + } + + ] } ] } From d5abc1cb10f8aa7e6c3f9232177a31585d602ac4 Mon Sep 17 00:00:00 2001 From: Justus Ojala Date: Mon, 31 Jan 2022 18:34:32 +0200 Subject: [PATCH 6/9] 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" } ] } From 70149535af1dd5f7a247e264749726793fe3760b Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Mon, 31 Jan 2022 18:46:13 +0200 Subject: [PATCH 7/9] Honorary and tmks --- src/views/ContactsPage/ContactsPageView.tsx | 12 ++--- src/views/ContactsPage/others.json | 56 +++++++++++++++------ src/views/ContactsPage/utmk.json | 45 ++++++++++++++--- src/views/ContactsPage/ytmk.json | 27 +++++----- src/views/HonoraryPage/HonoraryPageView.tsx | 13 +++++ 5 files changed, 113 insertions(+), 40 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 8026300..bd9c1c4 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -12,9 +12,9 @@ import BoardJson from "./board.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"; +import UtmkJson from "./utmk.json"; +import YtmkJson from "./ytmk.json"; +import Others from "./others.json"; const orderedCommittees = [ BoardJson, @@ -25,9 +25,9 @@ const orderedCommittees = [ // EPtmkJson, // SstmkJson, // TtmkJson, - // UtmkJson, - // YtmkJson, - // Others, + UtmkJson, + YtmkJson, + Others, ]; const blankProfile = "/img/blank_profile.png"; diff --git a/src/views/ContactsPage/others.json b/src/views/ContactsPage/others.json index c5ba19e..04e777e 100644 --- a/src/views/ContactsPage/others.json +++ b/src/views/ContactsPage/others.json @@ -8,7 +8,7 @@ "name_en": "Guild elder", "representatives": [ { - "name": "Erna Virtanen", + "name": "Toni Lyttinen", "phone_number": null, "email": null }, @@ -16,6 +16,16 @@ "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 } ] }, @@ -24,18 +34,7 @@ "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", + "name": "Oskari Ponkala", "phone_number": null, "email": null } @@ -46,12 +45,39 @@ "name_en": "Archivist", "representatives": [ { - "name": "Antti Mäki", + "name": "Timi Tiira", + "phone_number": null, + "email": null + } + ] + }, + { + "name_fi": "Häirintäyhdydyshenkilö", + "name_en": "", + "representatives": [ + { + "name": "Toni Ojala", "phone_number": null, "email": null }, { - "name": "Jonna Tammikivi", + "name": "Aino Suomi", + "phone_number": null, + "email": null + }, + { + "name": "Sauli Norja", + "phone_number": null, + "email": null + } + ] + }, + { + "name_fi": "Somevastaava", + "name_en": "", + "representatives": [ + { + "name": "Aaron Löfgren", "phone_number": null, "email": null } diff --git a/src/views/ContactsPage/utmk.json b/src/views/ContactsPage/utmk.json index 30b38b3..74e44ce 100644 --- a/src/views/ContactsPage/utmk.json +++ b/src/views/ContactsPage/utmk.json @@ -8,7 +8,16 @@ "name_en": "Master of External Affairs", "representatives": [ { - "name": "Oliver Hiekkamies" + "name": "Heidi Mäkitalo" + } + ] + }, + { + "name_fi": "Kv-Fuksikapteeni", + "name_en": "", + "representatives": [ + { + "name": "Suvi Karanta" } ] }, @@ -17,7 +26,7 @@ "name_en": "International Tutor Coordinator", "representatives": [ { - "name": "Elias Hirvonen" + "name": "Pyry Vaara" } ] }, @@ -26,7 +35,17 @@ "name_en": "International Helper", "representatives": [ { - "name": "Ville-Pekka Laakkonen" + "name": "Aaro Niskanen" + }, + { + "name": "Eerik Eskola" + } + , + { + "name": "Oona Karjalainen" + }, + { + "name": "Aleksi Helin" } ] }, @@ -35,22 +54,34 @@ "name_en": "Apprentice of External Affairs", "representatives": [ { - "name": "Leo Müller" + "name": "Nestori Yrjönkoski" + }, + { + "name": "Johannes Ora" }, { "name": "Eino Tyrvänen" }, { - "name": "Pekka Aho" + "name": "Jenni Marttinen" } ] }, { - "name_fi": "Ulkowanhus", + "name_fi": "Ulkowanhus & Ulkopatruuna", "name_en": "", "representatives": [ { - "name": "Jyri Korhonen" + "name": "Oliver Hiekkamies" + } + ] + }, + { + "name_fi": "KVummisetä", + "name_en": "", + "representatives": [ + { + "name": "Elias Hirvonen" } ] } diff --git a/src/views/ContactsPage/ytmk.json b/src/views/ContactsPage/ytmk.json index 88aa98e..7725f27 100644 --- a/src/views/ContactsPage/ytmk.json +++ b/src/views/ContactsPage/ytmk.json @@ -8,7 +8,7 @@ "name_en": "Master of Corporate Relations", "representatives": [ { - "name": "Otto Julkunen" + "name": "Tommi Oinonen" } ] }, @@ -21,30 +21,33 @@ } ] }, + { + "name_fi": "Excursiovastaava", + "name_en": "", + "representatives": [ + { + "name": "Visa Kurvi" + } + ] + }, { "name_fi": "Yrityssuhdevastaava", "name_en": "Apprentice of Corporate Relations", "representatives": [ { - "name": "Iikka Huttu" - }, - { - "name": "Arkadii Kolchin" - }, - { - "name": "Oskari Luukkonen" - }, - { - "name": "Niilo Ojala" + "name": "Melina Sundell" }, { "name": "Emma Reinikainen" }, { - "name": "Melina Sundell" + "name": "Iida Luoma" }, { "name": "Elma Tuohimetsä" + }, + { + "name": "Nestori Yrjönkoski" } ] } diff --git a/src/views/HonoraryPage/HonoraryPageView.tsx b/src/views/HonoraryPage/HonoraryPageView.tsx index 317133d..8386ef5 100644 --- a/src/views/HonoraryPage/HonoraryPageView.tsx +++ b/src/views/HonoraryPage/HonoraryPageView.tsx @@ -530,6 +530,19 @@ const HonoraryPageView: React.FC = () => (
  • 2020 Tuomas Lampinen
  • 2020 Toni Ojala
    • +
      +
    • 2021 Elma Tuohimetsä
      • +
    • 2021 Emmaleena Ahonen
      • +
    • 2021 Jonna Tammikivi
      • +
    • 2021 Samuel Laine
      • +
    • 2021 Ilari Ojakorpi
      • +
    • 2021 Jyri Korhonen
      • +
    • 2021 Oskari Luostarinen
      • +
    • 2021 Mikko Suhonen
      • +
    • 2021 Jesse Räisänen
      • +
    • 2021 Sofia Öhman
      • +
    • 2021 Suvi Karanta
      • +
    From f7e97f3020ddc89199584ea5aef4619161595f4f Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Mon, 31 Jan 2022 19:55:19 +0200 Subject: [PATCH 8/9] seems i misspoke --- src/views/ContactsPage/ContactsPageView.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index 7360bb3..fd6f16e 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -5,31 +5,22 @@ import colors from "@theme/colors"; import ContactCard from "@components/ContactCard"; import BoardJson from "./board.json"; -<<<<<<< HEAD -import UtmkJson from "./utmk.json"; -import YtmkJson from "./ytmk.json"; -import Others from "./others.json"; -======= import HvtmkJson from "./hvtmk.json"; import MtmkJson from "./mtmk.json"; import OptmkJson from "./optmk.json"; ->>>>>>> ed6e32dc3fd6e70654686ac34422dcc6a09edc75 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"; +import YtmkJson from "./ytmk.json"; +import Others from "./others.json"; const orderedCommittees = [ BoardJson, -<<<<<<< HEAD - UtmkJson, - YtmkJson, - Others, -======= HvtmkJson, MtmkJson, OptmkJson, ->>>>>>> ed6e32dc3fd6e70654686ac34422dcc6a09edc75 OtmkJson, EPtmkJson, SstmkJson, From 0b810e04d05efcb50405a2b453e3a150da7fe86d Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Mon, 31 Jan 2022 22:50:16 +0200 Subject: [PATCH 9/9] Added missing comittees --- src/views/ContactsPage/ContactsPageView.tsx | 6 ++ src/views/ContactsPage/ntmk.json | 82 +++++++++++++++++++++ src/views/ContactsPage/shntmk.json | 37 ++++++++++ src/views/ContactsPage/shtmk.json | 34 +++++++++ 4 files changed, 159 insertions(+) create mode 100644 src/views/ContactsPage/ntmk.json create mode 100644 src/views/ContactsPage/shntmk.json create mode 100644 src/views/ContactsPage/shtmk.json diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index fd6f16e..a7ac998 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -7,10 +7,13 @@ 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"; @@ -20,10 +23,13 @@ const orderedCommittees = [ BoardJson, HvtmkJson, MtmkJson, + NtmkJson, OptmkJson, OtmkJson, EPtmkJson, SstmkJson, + ShntmkJson, + ShtmkJson, TtmkJson, UtmkJson, YtmkJson, diff --git a/src/views/ContactsPage/ntmk.json b/src/views/ContactsPage/ntmk.json new file mode 100644 index 0000000..cb8a886 --- /dev/null +++ b/src/views/ContactsPage/ntmk.json @@ -0,0 +1,82 @@ +{ + "slug": "ntmk", + "name_fi": "N-Toimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "N-toimikunnan puheenjohtaja", + "name_en": "", + "representatives": [ + { + "name": "Ville Kaakinen" + } + ] + }, + { + "name_fi": "N-toimikunnan varapuheenjohtaja", + "name_en": "", + "representatives": [ + { + "name": "Jami Hyytiäinen" + } + ] + }, + { + "name_fi": "Sklubi-yhdyshenkilö", + "name_en": "", + "representatives": [ + { + "name": "Ville-Pekka Laakkonen" + } + ] + }, + { + "name_fi": "Alumivastaava", + "name_en": "", + "representatives": [ + { + "name": "Ella Eilola" + } + ] + }, + { + "name_fi": "N-Toimihenkilö", + "name_en": "", + "representatives": [ + { + "name": "Timi Tiira" + }, + { + "name": "Erna Virtanen" + }, + { + "name": "Emmaleena Ahonen" + }, + { + "name": "Jarno Mustonen" + }, + { + "name": "Pekka Aho" + }, + { + "name": "Mikko Haapamäki" + }, + { + "name": "Jonna Tammikivi" + }, + { + "name": "Juuli Leppänen" + }, + { + "name": "Simo Hakanummi" + }, + { + "name": "Tuomo Leino" + }, + { + "name": "Sasu Saalasti" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/views/ContactsPage/shntmk.json b/src/views/ContactsPage/shntmk.json new file mode 100644 index 0000000..a4ac062 --- /dev/null +++ b/src/views/ContactsPage/shntmk.json @@ -0,0 +1,37 @@ +{ + "slug": "shntmk", + "name_fi": "SIK100-historianäyttelytiimi", + "name_en": "", + "roles": [ + { + "name_fi": "SIK100-historianäyttelyvastaava", + "name_en": "", + "representatives": [ + { + "name": "Timi Tiira" + } + ] + }, + { + "name_fi": "Yrityssuhdevastaava", + "name_en": "", + "representatives": [ + { + "name": "Ella Eilola" + }, + { + "name": "Taneli Myllykangas" + }, + { + "name": "Jesse Räisänen" + }, + { + "name": "Ville Kaakinen" + }, + { + "name": "Ville-Pekka Laakkonen" + } + ] + } + ] + } \ No newline at end of file diff --git a/src/views/ContactsPage/shtmk.json b/src/views/ContactsPage/shtmk.json new file mode 100644 index 0000000..9896e86 --- /dev/null +++ b/src/views/ContactsPage/shtmk.json @@ -0,0 +1,34 @@ +{ + "slug": "shntmk", + "name_fi": "SIK100-historiatoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "SIK100-historiatoimikunnan puheenjohtaja", + "name_en": "", + "representatives": [ + { + "name": "Joni Kurvinen" + } + ] + }, + { + "name_fi": "SIK100-historiatoimihenkilö", + "name_en": "", + "representatives": [ + { + "name": "Anni Parkkila" + }, + { + "name": "Erna Virtanen" + }, + { + "name": "Tommi Askola" + }, + { + "name": "Mikko Leino" + } + ] + } + ] +} \ No newline at end of file