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

Merge branch 'comiteeentries' into 'production'

Browse Source 
Comitee entries

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!198
This commit is contained in:
J4DER4
2026-02-13 16:52:53 +00:00
parent 4fe78fd96d 75cf2e2ce1
commit 771b9eb391
18 changed files with 879 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.husky/pre-push
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npm run lint
# npm run lint ##sori tää o liia haisuli
src/views/CommitteePage/CommitteePageView.tsx
+6
View File
@@ -16,6 +16,9 @@ import YtmkJson from "./ytmk.json";
import SwtmkJson from "./swtmk.json";
import VtmkJson from "./vtmk.json";
import LtmkJson from "./ltmk.json";
import SiccJson from "./sicc.json";
import SptmkJson from "./sptmk.json";
import PotatmkJson from "./potatmk.json";
import Others from "./others.json";
const orderedCommittees = [
@@ -31,6 +34,9 @@ const orderedCommittees = [
VtmkJson,
SwtmkJson,
NtmkJson,
SiccJson,
SptmkJson,
PotatmkJson,
Others,
];
src/views/CommitteePage/ftmk.json
+6 -6
View File
@@ -9,7 +9,7 @@
"name_en": "",
"representatives": [
{
"name": "Teemu Heikkinen"
"name": "Aura Friman"
}
]
},
@@ -18,7 +18,7 @@
"name_en": "",
"representatives": [
{
"name": "Henri Aito"
"name": "Antti Salpakari"
}
]
},
@@ -27,10 +27,10 @@
"name_en": "International Fuksi Captain",
"representatives": [
{
"name": "Markus Aaltio"
"name": "Jere Oinonen"
},
{
"name": "Apollo Ailus"
"name": "Hocine Montenez"
}
]
},
@@ -39,7 +39,7 @@
"name_en": "Tutor Coordinator",
"representatives": [
{
"name": "Axel Aurola"
"name": "Veera Lindroos"
}
]
},
@@ -48,7 +48,7 @@
"name_en": "International Tutor Coordinator",
"representatives": [
{
"name": "Igor Oinonen"
"name": "Janne Yrjölä"
}
]
}
src/views/CommitteePage/htmk.json
+13 -10
View File
@@ -9,7 +9,7 @@
"name_en": "Master of Ceremonies",
"representatives": [
{
"name": "Tuomas Rantamäki"
"name": "Aino Saarela"
}
]
},
@@ -18,7 +18,7 @@
"name_en": "Court Counsellor",
"representatives": [
{
"name": "Matilda Ahonen"
"name": "Rosanna Reims"
}
]
},
@@ -27,16 +27,13 @@
"name_en": "Hostess",
"representatives": [
{
"name": "Veera Lindroos"
"name": "Elina Pyylampi"
},
{
"name": "Aino Saarela"
"name": "Elle Leivo"
},
{
"name": "Nea Kanerva"
},
{
"name": "Rosanna Reims"
"name": "Emma Salmenaho"
}
]
},
@@ -45,10 +42,16 @@
"name_en": "Host",
"representatives": [
{
"name": "Eemeli Hintsanen"
"name": "Aleksi Nuutinen"
},
{
"name": "André Palosaari"
"name": "Juho Rosnell"
},
{
"name": "Julius Härkönen"
},
{
"name": "Joonas Hilvo"
}
]
}
src/views/CommitteePage/hvtmk.json
+24 -22
View File
@@ -9,7 +9,7 @@
"name_en": "Master of Wellbeing",
"representatives": [
{
"name": "Niklas Ritalahti"
"name": "Valentin Juhela"
}
]
},
@@ -18,22 +18,13 @@
"name_en": "Culture Representative",
"representatives": [
{
"name": "Peter Lindahl"
"name": "Johannes Viirimäki"
},
{
"name": "Kuura Janhunen"
"name": "Linnea Viitasalo"
},
{
"name": "Valentin Juhela"
},
{
"name": "Leevi Leinonen"
},
{
"name": "Milla Heino"
},
{
"name": "Hocine Montenez"
"name": "Matilda Ahonen"
}
]
},
@@ -42,10 +33,13 @@
"name_en": "Sports Representative",
"representatives": [
{
"name": "Matias Hendolin"
"name": "Aino Salmi"
},
{
"name": "Sauli Hakala"
"name": "Eeda Alasaari"
},
{
"name": "Iiris Kuulusa"
}
]
},
@@ -57,7 +51,7 @@
"name": "Milja Kuusela"
},
{
"name": "Aaro Rasilainen"
"name": "Tuomas Rantamäki"
}
]
},
@@ -66,15 +60,17 @@
"name_en": "",
"representatives": [
{
"name": "Tommi Sytelä"
"name": "Arvi Virkkunen"
},
{
"name": "Konsta Hakala"
"name": "Auli Purolinna"
},
{
"name": "Ville Lairila"
},
{
"name": "Tiitus Koski"
}
]
},
{
@@ -82,16 +78,22 @@
"name_en": "",
"representatives": [
{
"name": "Saara Rossi"
"name": "Teemu Heikkinen"
},
{
"name": "Aaron Löfgren"
},
{
"name": "Milla Heino"
"name": "Matilda Ahonen"
}
]
},
{
"name": "Sauli Hakala"
"name_fi": "Kiltamuori",
"name_en": "",
"representatives": [
{
"name": "Markus Aaltio"
}
]
}
src/views/CommitteePage/ltmk.json
+15 -12
View File
@@ -9,7 +9,7 @@
"name_en": "",
"representatives": [
{
"name": "Leevi Oikarinen"
"name": "Aino Salmi"
}
]
},
@@ -18,19 +18,16 @@
"name_en": "",
"representatives": [
{
"name": "Aino Salmi"
"name": "Alex Hyytinen"
},
{
"name": "Ilmari Reponen"
},
{
"name": "Jenni Marttinen"
"name": "Iiris Kuulusa"
},
{
"name": "Peter Lindahl"
},
{
"name": "Patrik Varteva"
"name": "Samuel Södervall"
},
{
"name": "Tapio Immonen"
@@ -42,19 +39,25 @@
"name_en": "",
"representatives": [
{
"name": "Alex Hyytinen"
"name": "Aapo Palojärvi"
},
{
"name": "Antti Salpakari"
"name": "André Paloari"
},
{
"name": "Iiris Kuulusa"
"name": "Kaisa Lehtimäki"
},
{
"name": "Roman Shalamov"
"name": "Olav Hamel"
},
{
"name": "Samuel Södervall"
"name": "Otto Tuominen"
},
{
"name": "Panu Leinonen"
},
{
"name": "Terhi Lukkari"
}
]
}
src/views/CommitteePage/mtmk.json
+33 -27
View File
@@ -9,7 +9,7 @@
"name_en": "Editor in Chief",
"representatives": [
{
"name": "Topi Manskinen",
"name": "Joona Komonen",
"phone_number": null,
"email": null,
"image": null
@@ -21,7 +21,7 @@
"name_en": "",
"representatives": [
{
"name": "Visa Kurvi",
"name": "Topi Manskinen",
"phone_number": null,
"email": null,
"image": null
@@ -33,31 +33,34 @@
"name_en": "Journalist",
"representatives": [
{
"name": "Joona Komonen"
"name": "Aake Laukkanen"
},
{
"name": "Olli Vaismaa"
"name": "Alex Hyytinen"
},
{
"name": "Apollo Ailus"
},
{
"name": "Eetu Tossavainen"
},
{
"name": "Jenni Marttinen"
},
{
"name": "Ilmari Reponen"
"name": "Juho Laukka"
},
{
"name": "Igor Oinonen"
"name": "Lauri Anttila"
},
{
"name": "Otto Kievimaa"
}
]
"name": "Otto kievimaa"
},
{
"name_fi": "Toimittaja, Taittaja",
"name_en": "",
"representatives": [
"name": "Sampo Haarala"
},
{
"name": "Atte Vitie"
"name": "Venla Nikkinen"
}
]
},
@@ -65,8 +68,17 @@
"name_fi": "Taittaja",
"name_en": "",
"representatives": [
{
"name": "Atte Vitie"
},
{
"name": "Lauri Anttila"
},
{
"name": "Otto Kievimaa"
},
{
"name": "Partrik Varteva"
}
]
},
@@ -74,29 +86,23 @@
"name_fi": "Graafikko",
"name_en": "Photographer & Graphic Artist",
"representatives": [
{
"name": "Annika Tattari"
},
{
"name": "Elian Salmimaa"
},
{
"name": "Lotta Kähkönen"
}
]
},
{
"name_fi": "Valokuvaaja",
"name_en": "Photographer",
"name_fi": "Heevistriimaaja",
"name_en": "Heevistreamer",
"representatives": [
{
"name": "Veikko Räty"
},
{
"name": "Into Saarinen"
},
{
"name": "Aaro Rasilainen"
},
{
"name": "Anton Niemi"
},
{
"name": "Veera Melvasalo"
}
]
}
src/views/CommitteePage/ntmk.json
+44 -52
View File
@@ -5,32 +5,20 @@
"info": "N-toimikunta järjestää erinäisiä tapahtumia vanhemmille ja vanhemmanmielisille kiltalaisille, kuten sitsejä, aftereita, ulkoilutapahtumia ja mitä ikinä keksitäänkään. N-toimikunta toimii myös matalan kynnyksen välinä Sklubiin, eli alumniyhdistykseemme. N-toimikuntaan kuuluu myös killan kiltapatruunat, jotka pitävät huolta killan jatkuvuudesta.",
"roles": [
{
"name_fi": "N-toimikunnan nestori",
"name_fi": "N-toimikunnan puheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Karoliina Talvikangas"
"name": "Elina Huttunen"
}
]
},
{
"name_fi": "N-toimikunnan varanestori, Kiltapatruuna",
"name_fi": "N-toimikunnan Varapuheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Aaron Löfgren"
}
]
},
{
"name_fi": "Sklubi-yhdyshenkilö",
"name_en": "",
"representatives": [
{
"name": "Melisa Dönmez"
},
{
"name": "Eveliina Ahonen"
"name": "Ville Lairila"
}
]
},
@@ -39,57 +27,61 @@
"name_en": "",
"representatives": [
{
"name": "Ville Lairila"
},
{
"name": "Visa Kurvi"
}
]
},
{
"name_fi":
"Kiltapatruuna, Nipsu",
"name_en": "",
"representatives": [
{
"name": "Mikko Sandström"
},
{
"name": "Liisa Haltia"
},
{
"name": "Elina Huttunen"
}
]
},
{
"name_fi": "Nipsu",
"name_en": "",
"representatives": [
{
"name": "Mikael Siikonen"
"name": "Aaron Löfgren"
},
{
"name": "Axel Aurola"
},
{
"name": "Emma Uusküla"
},
{
"name": "Johannes Viirimäki"
},
{
"name": "Tuomas Rantamäki"
},
{
"name": "Yassine Ramid"
}
]
},
{
"name_fi": "N-vastaava",
"name_en": "",
"representatives": [
{
"name": "Aaron Löfgren"
},
{
"name": "Aleksi Saajakari"
},
{
"name": "Elian Salmimaa"
},
{
"name": "Elias Damski"
"name": "Johannes Viirimäki"
},
{
"name": "Elias Lindberg"
"name": "Karoliina Talvikangas"
},
{
"name": "Eero Ketonen"
"name": "Markus Aaltio"
},
{
"name": "Miika Helminen"
},
{
"name": "Mikael Siikonen"
},
{
"name": "Peter Lindahl"
},
{
"name": "Veikko Räty"
},
{
"name": "Verneri Turkki"
},
{
"name": "Akseli Heikkinen"
}
]
}
src/views/CommitteePage/optmk.json
+20 -7
View File
@@ -9,7 +9,7 @@
"name_en": "Master of Studies",
"representatives": [
{
"name": "Mikael Vatiainen"
"name": "Elida Widgren"
}
]
},
@@ -18,23 +18,36 @@
"name_en": "Study Coordinator",
"representatives": [
{
"name": "Atu Vahla"
},
{
"name": "Antti Lehtonen"
"name": "Aapo Tynninen"
},
{
"name": "Aleksi Liukkonen"
},
{
"name": "Antti Lehtonen"
},
{
"name": "Atu Vahla"
},
{
"name": "Iiris Kuulusa"
},
{
"name": "Ilmari Reponen"
},
{
"name": "Milla Heino"
"name": "Jesper Seppäläinen"
},
{
"name": "Samuel Södervall"
"name": "Mikael Vatiainen"
},
{
"name": "Vi Tam"
},
{
"name": "Yassine Ramid"
}
]
}
]
src/views/CommitteePage/others.json
+28 -8
View File
@@ -5,27 +5,47 @@
"info": "",
"roles": [
{
"name_fi": "Merikapteeni",
"name_en": "Sea captain",
"name_fi": "Arkistovastaava",
"name_en": "",
"representatives": [
{
"name": "Ville Lairila",
"name": "Aaron Löfgren",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "Meripojankloppi",
"name_en": "ship's boy",
"name_fi": "Sklubi-yhdyshenkilö",
"name_en": "",
"representatives": [
{
"name": "Peter Lindahl",
"name": "Ville Kurko",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "Teekkarikokousen kiltaedustaja",
"name_en": "",
"representatives": [
{
"name": "Aaron Löfgren",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "TEK-yhdyshenkilö",
"name_en": "",
"representatives": [
{
"name": "Visa Kurvi",
"phone_number": null,
"email": null
}
]
}
]
src/views/CommitteePage/potatmk.json
+83
View File
@@ -0,0 +1,83 @@
{
"slug": "potatmk",
"name_fi": "Potentiaalin Tasaus 105-toimikunta",
"name_en": "",
"info": "Killan vuosijuhlat",
"roles": [
{
"name_fi": "PoTa-tirehtööri",
"name_en": "",
"representatives": [
{
"name": "Axel Aurola"
},
{
"name": "Karoliina Talvikangas"
}
]
},
{
"name_fi": "Kukkohäntävastaava",
"name_en": "",
"representatives": [
{
"name": "Antti Salpakari"
},
{
"name": "Tuomas Rantamäki"
}
]
},
{
"name_fi": "Seremoniamestari",
"name_en": "",
"representatives": [
{
"name": "Henri Aito"
}
]
},
{
"name_fi": "Jatkovastaava",
"name_en": "",
"representatives": [
{
"name": "Aino Tasapuro"
},
{
"name": "Eemeli Hintsanen"
}
]
},
{
"name_fi": "Koristeluvastaava",
"name_en": "",
"representatives": [
{
"name": "Elina Huttunen"
}
]
},
{
"name_fi": "Sillisvastaava",
"name_en": "",
"representatives": [
{
"name": "Leevi Oikarinen"
},
{
"name": "Valentin Juhela"
}
]
},
{
"name_fi": "Graafikko",
"name_en": "",
"representatives": [
{
"name": "Elian Salmimaa"
}
]
}
]
}
src/views/CommitteePage/ptmk.json
+20 -17
View File
@@ -9,7 +9,19 @@
"name_en": "",
"representatives": [
{
"name": "Jere Oinonen"
"name": "Simeon Pursiainen"
}
]
},
{
"name_fi": "Pajavastaava",
"name_en": "",
"representatives": [
{
"name": "Axel Söderberg"
},
{
"name": "Đình Minh Trần"
}
]
},
@@ -18,34 +30,25 @@
"name_en": "",
"representatives": [
{
"name": "Otto Kievimaa"
"name": "Aapo Tynninen"
},
{
"name": "Đình Minh Trần"
"name": "Aarni Kämppi"
},
{
"name": "Valentin Juhela"
"name": "Atte Elo"
},
{
"name": "Axel Söderberg"
"name": "Emma Uusküla"
},
{
"name": "Auli Purolinna"
"name": "Jusi Seppälä"
},
{
"name": "Karl Lipping"
"name": "Tuomas Rantamäki"
},
{
"name": "Petrus Asikainen"
},
{
"name": "Elmo Kankkunen"
},
{
"name": "Samu Nyman"
},
{
"name": "Hilkka Gröhn"
"name": "Vi Tram"
}
]
}
src/views/CommitteePage/sicc.json
+44
View File
@@ -0,0 +1,44 @@
{
"slug": "sicc",
"name_fi": "SIK International Comittee Counsil",
"name_en": "SIK International Comittee Counsil",
"info": "*coming soon*",
"roles": [
{
"name_fi": "International Ambassador",
"name_en": "International Ambassador",
"representatives": [
{
"name": "Igor Oinonen"
}
]
},
{
"name_fi": "International Attaché",
"name_en": "International Attaché",
"representatives": [
{
"name": "Kuura Janhunen"
}
]
},
{
"name_fi": "International Envoy",
"name_en": "International Envoy",
"representatives": [
{
"name": "Aleksanteri Vesala"
},
{
"name": "Apollo Ailus"
},
{
"name": "Juho Aikio"
},
{
"name": "Léo Di Poi"
}
]
}
]
}
src/views/CommitteePage/sptmk.json
+45
View File
@@ -0,0 +1,45 @@
{
"slug": "sptmk",
"name_fi": "Sähköpäivätoimikunta",
"name_en": "",
"info": "",
"roles": [
{
"name_fi": "Sähköpäivätirehtööri",
"name_en": "",
"representatives": [
{
"name": "Aino Tasapuro"
},
{
"name": "Matilda Ahonen"
}
]
},
{
"name_fi": "Sähköpäivävastaava",
"name_en": "",
"representatives": [
{
"name": "Aapo Nyyssönen"
},
{
"name": "Aapo Saranpää"
},
{
"name": "André Palosaari"
},
{
"name": "Ilmari Reponen"
},
{
"name": "Oliver Hannula"
},
{
"name": "Teemu Heikkinen"
}
]
}
]
}
src/views/CommitteePage/swtmk.json
+15 -6
View File
@@ -9,7 +9,7 @@
"name_en": "Head of sales",
"representatives": [
{
"name": "Tiitus Koski"
"name": "Leevi Oikarinen"
}
]
},
@@ -18,19 +18,28 @@
"name_en": "Clerk",
"representatives": [
{
"name": "Arvi Virkkunen"
"name": "Alexandr Lemin"
},
{
"name": "Valentin Juhela"
"name": "Henri Aito"
},
{
"name": "Otto Rinne"
"name": "Ossi Jalkanen"
},
{
"name": "Auli Purolinna"
"name": "Tiitus Koski"
},
{
"name": "Patrik Varteva"
"name": "Veikko Räty"
}
]
},
{
"name_fi": "Kiltapäiväkerhovastaava",
"name_en": "",
"representatives": [
{
"name": "Matilda Ahonen"
}
]
}
src/views/CommitteePage/ttmk.json
+5 -8
View File
@@ -9,7 +9,7 @@
"name_en": "Master of technology",
"representatives": [
{
"name": "Simeon Pursiainen"
"name": "Joona Maaranen"
}
]
},
@@ -18,19 +18,16 @@
"name_en": "",
"representatives": [
{
"name": "Joona Maaranen"
"name": "Alekdsandr Lemin"
},
{
"name": "Aleksi Liukkonen"
"name": "Atte Elo"
},
{
"name": "Elmo Kankkunen"
"name": "Dat Tram"
},
{
"name": "Justus Ojala"
},
{
"name": "Tommi Sytelä"
"name": "Oiva Haapaniemi"
}
]
}
src/views/CommitteePage/vtmk.json
+38 -24
View File
@@ -9,7 +9,7 @@
"name_en": "Head of communcations",
"representatives": [
{
"name": "Yassine Ramid"
"name": "Aino Svahn"
}
]
},
@@ -18,25 +18,22 @@
"name_en": "",
"representatives": [
{
"name": "Aaron Löfgren"
"name": "Aada Tättilä"
},
{
"name": "Elina Huttunen"
"name": "Ada Minkkinen"
},
{
"name": "Aura Friman"
}
]
"name": "Aino Tasapuro"
},
{
"name_fi": "Somevastaava, Brändivastaava",
"name_en": "",
"representatives": [
{
"name": "Aapo Saranpää"
"name": "Ira Kosunen"
},
{
"name": "Aino Svahn"
"name": "Lukas Iles"
},
{
"name": "Tytti Solonen"
}
]
},
@@ -45,23 +42,15 @@
"name_en": "",
"representatives": [
{
"name": "Aleksandr Lemin"
},
{
"name": "Roope Jaskari"
},
{
"name": "Sauli Hakala"
},
{
"name": "Ville Lairila"
"name": "Aapo Saranpää"
},
{
"name": "Aapo Nyyssönen"
},
{
"name": "Mikko Sandström"
"name": "Kehrä Halme"
}
]
},
{
@@ -69,12 +58,37 @@
"name_en": "",
"representatives": [
{
"name": "Veera Melvasalo"
"name": "Apollo Ailus"
},
{
"name": "Julius Männistö"
}
]
},
{
"name_fi": "Valokuvaaja",
"name_en": "",
"representatives": [
{
"name": "Aaro Rasilainen"
},
{
"name": "Apollo Ailus"
},
{
"name": "Arvi Virkkunen"
},
{
"name": "Julius Männistö"
},
{
"name": "Lotta Kähkönen"
},
{
"name": "Veikko Räty"
}
]
}
]
}
src/views/CommitteePage/ytmk.json
+16 -46
View File
@@ -7,6 +7,15 @@
{
"name_fi": "Yrityssuhdemestari",
"name_en": "Head of Corporate Relations",
"representatives": [
{
"name": "Into Saarinen"
}
]
},
{
"name_fi": "Yrityssuhdeguru",
"name_en": "Guru of yritysuhde",
"representatives": [
{
"name": "Tuomas Hintikka"
@@ -18,67 +27,28 @@
"name_en": "Head of Excursions",
"representatives": [
{
"name": "Aino Tasapuro"
"name": "Roope Palo"
}
]
},
{
"name_fi": "Yrityssuhdevastaava",
"name_fi": "Yrityssuhde- ja excursiovastaava",
"name_en": "Apprentice of Corporate Relations",
"representatives": [
{
"name": "Axel Aurola"
},
{
"name": "Mikael Sundell"
},
{
"name": "Henrik Ervasti"
"name": "Kaisa Lehtimäki"
},
{
"name": "Samuel Södervall"
},
{
"name": "Markus Määttänen"
},
{
"name": "Aura Friman"
},
{
"name": "Anton Niemi"
},
{
"name": "Iida Toivanen"
},
{
"name": "Joona Kivioja"
},
{
"name": "Jussi Seppälä"
},
{
"name": "Roope Palo"
"name": "Timo Kaleva"
},
{
"name": "Väinö Saarinen"
},
{
"name": "Junias Vasama"
},
{
"name": "Anton Saari"
},
{
"name": "Väinö Silvenius"
}
]
},
{
"name_fi": "Excursiovastaava",
"name_en": "",
"representatives": [
{
"name": "Into Saarinen"
},
{
"name": "Otto Rinne"
}
]
}