TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now?

Browse Source
This commit is contained in:
Ojakoo
2022-01-31 19:04:34 +02:00
parent b9b90121dd ed6e32dc3f
commit 02e7e8c182
4 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/ContactsPage/ContactsPageView.tsx
+12
View File
@@ -5,9 +5,15 @@ 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";
@@ -15,9 +21,15 @@ import TtmkJson from "./ttmk.json";
const orderedCommittees = [
BoardJson,
<<<<<<< HEAD
UtmkJson,
YtmkJson,
Others,
=======
HvtmkJson,
MtmkJson,
OptmkJson,
>>>>>>> ed6e32dc3fd6e70654686ac34422dcc6a09edc75
OtmkJson,
EPtmkJson,
SstmkJson,
src/views/ContactsPage/hvtmk.json
+16 -16
View File
@@ -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"
}
]
}
src/views/ContactsPage/mtmk.json
+33 -49
View File
@@ -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"
}
]
},
src/views/ContactsPage/optmk.json
+24 -8
View File
@@ -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"
}
]
}
]
}