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

Merge branch 'refactor/contacts-page' into 'master'

Browse Source 
Refactor/contacts page

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!63
This commit is contained in:
Aarni Halinen
2021-06-15 19:26:34 +00:00
parent 26b8a9500f 00129980c2
commit 0b9d58faa2
13 changed files with 940 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/ContactsPage/ContactsPageView.tsx
+63 -67
View File
@@ -9,11 +9,26 @@ import HvtmkJson from "./hvtmk.json";
import MtmkJson from "./mtmk.json";
import OptmkJson from "./optmk.json";
import OtmkJson from "./otmk.json";
import PtmkJson from "./ptmk.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,
HvtmkJson,
MtmkJson,
OptmkJson,
OtmkJson,
EPtmkJson,
SstmkJson,
TtmkJson,
UtmkJson,
YtmkJson,
Others,
];
const blank_profile = "/img/blank_profile.png";
@@ -25,6 +40,28 @@ const BlueLink = styled(Link)`
}
`;
const IndexUL = styled.ul`
padding: 0;
list-style: none;
li:before {
content: attr(data-icon);
margin-right: 4px;
}
`;
const Index: React.FC<{ committees: typeof orderedCommittees }> = ({ committees }) => (
<IndexUL>
{committees.map(({ slug, name_fi }) => (
<BlueLink to={`#${slug}`} key={slug}>
<li data-icon="»">
{name_fi}
</li>
</BlueLink>
))}
</IndexUL>
);
const Container = styled.div`
color: ${colors.darkBlue};
@@ -92,74 +129,33 @@ const ContactsPageView: React.FC = () => (
Asiaa olisi, mutta kehen ottaa yhteyttä?<br />
Tämä sivu yrittää valottaa sen oikean ihmisen puhelinnumeroa ja sähköpostiosoitetta.
</p>
<aside>
<div>
<h6>Toimikuntaluettelo</h6>
<Index committees={orderedCommittees} />
</div>
</aside>
</TextSection>
<TextSection>
<CommitteeContainer committee={BoardJson}>
<p>
{"Hallitukseen saa yhteyden lähettämällä sähköpostia "}
<BlueLink to="mailto:hallitus@sahkoinsinoorikilta.fi">
hallitus@sahkoinsinoorikilta.fi
</BlueLink>
</p>
</CommitteeContainer>
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={HvtmkJson} />
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={MtmkJson} />
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={OptmkJson} />
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={OtmkJson} />
</TextSection>
<Divider />
<TextSection id="eptmk">
<CommitteeContainer committee={PtmkJson} />
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={SstmkJson} />
</TextSection>
<Divider />
<TextSection id="ttmk">
<CommitteeContainer committee={TtmkJson} />
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={UtmkJson} />
</TextSection>
<Divider />
<TextSection>
<CommitteeContainer committee={YtmkJson} />
</TextSection>
<Divider />
{orderedCommittees.map((json) => (
<React.Fragment key={json.slug}>
{(json.slug !== "board") && (
<Divider />
)}
<TextSection id={json.slug}>
<CommitteeContainer committee={json}>
{(json.slug === "board") && (
<p>
{"Hallitukseen saa yhteyden lähettämällä sähköpostia "}
<BlueLink to="mailto:hallitus@sahkoinsinoorikilta.fi">
hallitus@sahkoinsinoorikilta.fi
</BlueLink>
</p>
)}
</CommitteeContainer>
</TextSection>
</React.Fragment>
))}
</>
);
src/views/ContactsPage/board.json
+160 -159
View File
@@ -1,160 +1,161 @@
{
"name_fi": "Hallitus",
"name_en": "Board",
"roles": [
{
"name_fi": "Puheenjohtaja",
"name_en": "Chairman of the Board",
"representatives": [
{
"name": "Johannes Ora",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/chairman.jpg"
}
]
},
{
"name_fi": "Sihteeri",
"name_en": "Secretary",
"representatives": [
{
"name": "Salla Lyytikäinen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/secretary.jpg"
}
]
},
{
"name_fi": "Rahastonhoitaja",
"name_en": "Treasurer",
"representatives": [
{
"name": "Santeri Huhtala",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/treasurer.jpg"
}
]
},
{
"name_fi": "Fuksitoimikunnan Puheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Toni Ojala",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg"
}
]
},
{
"name_fi": "Fuksitoimikunnan puheenjohtajan adjutantti",
"name_en": "",
"representatives": [
{
"name": "Toni Lyttinen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg"
}
]
},
{
"name_fi": "Hovimestari",
"name_en": "",
"representatives": [
{
"name": "Eveliina Ahonen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/ceremonies.jpg"
}
]
},
{
"name_fi": "Hovineuvos",
"name_en": "",
"representatives": [
{
"name": "Melisa Dönmez",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/court_cancelor.jpg"
}
]
},
{
"name_fi": "ISOvastaava",
"name_en": "",
"representatives": [
{
"name": "Heidi Mäkitalo",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg"
}
]
},
{
"name_fi": "Hyvinvointimestari",
"name_en": "",
"representatives": [
{
"name": "Sauli Norja",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/wellbeing.jpg"
}
]
},
{
"name_fi": "Opintomestari",
"name_en": "",
"representatives": [
{
"name": "Simo Hakanummi",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/studies.jpg"
}
]
},
{
"name_fi": "Teknologiamestari",
"name_en": "",
"representatives": [
{
"name": "Oskari Ponkala",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/technology.jpg"
}
]
},
{
"name_fi": "Ulkomestari",
"name_en": "",
"representatives": [
{
"name": "Oliver Hiekkamies",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg"
}
]
},
{
"name_fi": "Yrityssuhdemestari",
"name_en": "",
"representatives": [
{
"name": "Otto Julkunen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/corporate.jpg"
}
]
}
]
}
"slug": "board",
"name_fi": "Hallitus",
"name_en": "Board",
"roles": [
{
"name_fi": "Puheenjohtaja",
"name_en": "Chairman of the Board",
"representatives": [
{
"name": "Johannes Ora",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/chairman.jpg"
}
]
},
{
"name_fi": "Sihteeri",
"name_en": "Secretary",
"representatives": [
{
"name": "Salla Lyytikäinen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/secretary.jpg"
}
]
},
{
"name_fi": "Rahastonhoitaja",
"name_en": "Treasurer",
"representatives": [
{
"name": "Santeri Huhtala",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/treasurer.jpg"
}
]
},
{
"name_fi": "Fuksitoimikunnan Puheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Toni Ojala",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg"
}
]
},
{
"name_fi": "Fuksitoimikunnan puheenjohtajan adjutantti",
"name_en": "",
"representatives": [
{
"name": "Toni Lyttinen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg"
}
]
},
{
"name_fi": "Hovimestari",
"name_en": "",
"representatives": [
{
"name": "Eveliina Ahonen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/ceremonies.jpg"
}
]
},
{
"name_fi": "Hovineuvos",
"name_en": "",
"representatives": [
{
"name": "Melisa Dönmez",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/court_cancelor.jpg"
}
]
},
{
"name_fi": "ISOvastaava",
"name_en": "",
"representatives": [
{
"name": "Heidi Mäkitalo",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg"
}
]
},
{
"name_fi": "Hyvinvointimestari",
"name_en": "",
"representatives": [
{
"name": "Sauli Norja",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/wellbeing.jpg"
}
]
},
{
"name_fi": "Opintomestari",
"name_en": "",
"representatives": [
{
"name": "Simo Hakanummi",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/studies.jpg"
}
]
},
{
"name_fi": "Teknologiamestari",
"name_en": "",
"representatives": [
{
"name": "Oskari Ponkala",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/technology.jpg"
}
]
},
{
"name_fi": "Ulkomestari",
"name_en": "",
"representatives": [
{
"name": "Oliver Hiekkamies",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg"
}
]
},
{
"name_fi": "Yrityssuhdemestari",
"name_en": "",
"representatives": [
{
"name": "Otto Julkunen",
"phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/corporate.jpg"
}
]
}
]
}
src/views/ContactsPage/eptmk.json
+52
View File
@@ -0,0 +1,52 @@
{
"slug": "eptmk",
"name_fi": "Elepajatoimikunta",
"name_en": "",
"roles": [
{
"name_fi": "Pajavastaava",
"name_en": "",
"representatives": [
{
"name": "Karl Lipping"
}
]
},
{
"name_fi": "Pajakisälli",
"name_en": "",
"representatives": [
{
"name": "Tommi Sytelä"
},
{
"name": "Eerikki Eskola"
},
{
"name": "Arkadii Kolchin"
},
{
"name": "Samu Nyman"
},
{
"name": "Konsta Langi"
},
{
"name": "Johannes Viirimäki"
},
{
"name": "Justus Ojala"
},
{
"name": "Ville Tujunen"
},
{
"name": "Antti Tarkka"
},
{
"name": "Pyry Vaara"
}
]
}
]
}
src/views/ContactsPage/hvtmk.json
+78 -51
View File
@@ -1,55 +1,82 @@
{
"name_fi": "Hyvinvointitoimikunta",
"name_en": "Committee of Wellbeing",
"roles": [
"slug": "hvtmk",
"name_fi": "Hyvinvointitoimikunta",
"name_en": "Committee of Wellbeing",
"roles": [
{
"name_fi": "Hyvinvointimestari",
"name_en": "Master of Wellbeing",
"representatives": [
{
"name_fi": "Hyvinvointimestari",
"name_en": "Master of Wellbeing",
"representatives": [
{ "name": "Sauli Norja" }
]
},
{
"name_fi": "Kulttuurivastaava",
"name_en": "Culture Representative",
"representatives": [
{ "name": "Juha Anttila" },
{ "name": "Aino Suomi" },
{ "name": "Nestori Yrjönkoski" }
]
},
{
"name_fi": "Liikuntavastaava",
"name_en": "Sports Representative",
"representatives": [
{ "name": "Elmeri Pälikkö" },
{ "name": "Joel Wickström" }
]
},
{
"name_fi": "Kiltahuonevastaava",
"name_en": "Guild Room Representative",
"representatives": [
{ "name": "Ilari Ojakorpi" }
]
},
{
"name_fi": "Kiltapäiväkerhovastaava",
"name_en": "",
"representatives": [
{ "name": "Samuel Laine" },
{ "name": "Aleksanteri Vesala" }
]
},
{
"name_fi": "Retkivastaava",
"name_en": "",
"representatives": [
{ "name": "Jarno Mustonen" },
{ "name": "Suvi Karanta" },
{ "name": "Jesse Räisänen" },
{ "name": "Mikko Suhonen" }
]
"name": "Sauli Norja"
}
]
]
},
{
"name_fi": "Kulttuurivastaava",
"name_en": "Culture Representative",
"representatives": [
{
"name": "Juha Anttila"
},
{
"name": "Aino Suomi"
},
{
"name": "Nestori Yrjönkoski"
}
]
},
{
"name_fi": "Liikuntavastaava",
"name_en": "Sports Representative",
"representatives": [
{
"name": "Elmeri Pälikkö"
},
{
"name": "Joel Wickström"
}
]
},
{
"name_fi": "Kiltahuonevastaava",
"name_en": "Guild Room Representative",
"representatives": [
{
"name": "Ilari Ojakorpi"
}
]
},
{
"name_fi": "Kiltapäiväkerhovastaava",
"name_en": "",
"representatives": [
{
"name": "Samuel Laine"
},
{
"name": "Aleksanteri Vesala"
}
]
},
{
"name_fi": "Retkivastaava",
"name_en": "",
"representatives": [
{
"name": "Jarno Mustonen"
},
{
"name": "Suvi Karanta"
},
{
"name": "Jesse Räisänen"
},
{
"name": "Mikko Suhonen"
}
]
}
]
}
src/views/ContactsPage/mtmk.json
+132 -85
View File
@@ -1,89 +1,136 @@
{
"name_fi": "Mediatoimikunta",
"name_en": "Media Committee",
"roles": [
"slug": "mtmk",
"name_fi": "Mediatoimikunta",
"name_en": "Media Committee",
"roles": [
{
"name_fi": "Puheenjohtaja, Päätoimittaja",
"name_en": "Chair, Editor in Chief",
"representatives": [
{
"name_fi": "Puheenjohtaja, Päätoimittaja",
"name_en": "Chair, Editor in Chief",
"representatives": [
{
"name": "Sasu Saalasti",
"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": "Elias Hirvonen" },
{ "name": "Miika Koskela" },
{ "name": "Taneli Myllykangas" },
{ "name": "Emmaleena Ahonen" },
{ "name": "Ville-Pekka Laakkonen" },
{ "name": "Sofia Öhman" },
{ "name": "Nestori Yrjönkoski" },
{ "name": "Jami Hyytiäinen" },
{ "name": "Aleksanteri Vesala" }
]
},
{
"name_fi": "Toimittaja & Valokuvaaja",
"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_fi": "Taittaja & Valokuvaaja",
"name_en": "Layout Artist & Photographer",
"representatives": [
{ "name": "Jonna Tammikivi" }
]
},
{
"name_fi": "Valokuvaaja",
"name_en": "Photographer",
"representatives": [
{ "name": "Suvi Karanta" },
{ "name": "Mikko Haaparanta" },
{ "name": "Johannes Viirimäki" }
]
},
{
"name_fi": "Valokuvaaja & Graafikko",
"name_en": "Photographer & Graphic Artist",
"representatives": [
{ "name": "Kalle Petäjäaho" },
{ "name": "Maria Pöllä" }
]
},
{
"name_fi": "Videokuvaaja",
"name_en": "Videographer",
"representatives": [
{ "name": "Aaro Rasilainen" }
]
"name": "Sasu Saalasti",
"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": "Elias Hirvonen"
},
{
"name": "Miika Koskela"
},
{
"name": "Taneli Myllykangas"
},
{
"name": "Emmaleena Ahonen"
},
{
"name": "Ville-Pekka Laakkonen"
},
{
"name": "Sofia Öhman"
},
{
"name": "Nestori Yrjönkoski"
},
{
"name": "Jami Hyytiäinen"
},
{
"name": "Aleksanteri Vesala"
}
]
},
{
"name_fi": "Toimittaja & Valokuvaaja",
"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_fi": "Taittaja & Valokuvaaja",
"name_en": "Layout Artist & Photographer",
"representatives": [
{
"name": "Jonna Tammikivi"
}
]
},
{
"name_fi": "Valokuvaaja",
"name_en": "Photographer",
"representatives": [
{
"name": "Suvi Karanta"
},
{
"name": "Mikko Haaparanta"
},
{
"name": "Johannes Viirimäki"
}
]
},
{
"name_fi": "Valokuvaaja & Graafikko",
"name_en": "Photographer & Graphic Artist",
"representatives": [
{
"name": "Kalle Petäjäaho"
},
{
"name": "Maria Pöllä"
}
]
},
{
"name_fi": "Videokuvaaja",
"name_en": "Videographer",
"representatives": [
{
"name": "Aaro Rasilainen"
}
]
}
]
}
src/views/ContactsPage/optmk.json
+42 -27
View File
@@ -1,31 +1,46 @@
{
"name_fi": "Opintotoimikunta",
"name_en": "Study Committee",
"roles": [
"slug": "optmk",
"name_fi": "Opintotoimikunta",
"name_en": "Study Committee",
"roles": [
{
"name_fi": "Opintomestari",
"name_en": "Master of Studies",
"representatives": [
{
"name_fi": "Opintomestari",
"name_en": "Master of Studies",
"representatives": [
{ "name": "Simo Hakanummi" }
]
},
{
"name_fi": "Opintovastaava",
"name_en": "Study Coordinator",
"representatives": [
{ "name": "Miina-Maija Simonen" },
{ "name": "Tomi Valkonen" },
{ "name": "Leo Lahti" },
{ "name": "Ville-Pekka Laakkonen" },
{ "name": "Samu Nyman" }
]
},
{
"name_fi": "Abimarkkinointi Vastaava",
"name_en": "",
"representatives": [
{ "name": "Iikka Huttu" }
]
"name": "Simo Hakanummi"
}
]
]
},
{
"name_fi": "Opintovastaava",
"name_en": "Study Coordinator",
"representatives": [
{
"name": "Miina-Maija Simonen"
},
{
"name": "Tomi Valkonen"
},
{
"name": "Leo Lahti"
},
{
"name": "Ville-Pekka Laakkonen"
},
{
"name": "Samu Nyman"
}
]
},
{
"name_fi": "Abimarkkinointi Vastaava",
"name_en": "",
"representatives": [
{
"name": "Iikka Huttu"
}
]
}
]
}
src/views/ContactsPage/others.json
+61
View File
@@ -0,0 +1,61 @@
{
"slug": "others",
"name_fi": "Muut",
"name_en": "Other officials",
"roles": [
{
"name_fi": "Kiltapatruuna",
"name_en": "Guild elder",
"representatives": [
{
"name": "Erna Virtanen",
"phone_number": null,
"email": null
},
{
"name": "Emmaleena Ahonen",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "TEK-yhdyshenkilö",
"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",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "Arkistonhoitaja",
"name_en": "Archivist",
"representatives": [
{
"name": "Antti Mäki",
"phone_number": null,
"email": null
},
{
"name": "Jonna Tammikivi",
"phone_number": null,
"email": null
}
]
}
]
}
src/views/ContactsPage/otmk.json
+111 -62
View File
@@ -1,66 +1,115 @@
{
"name_fi": "Ohjelmatoimikunta",
"name_en": "Entertainment Committee",
"roles": [
"slug": "otmk",
"name_fi": "Ohjelmatoimikunta",
"name_en": "Entertainment Committee",
"roles": [
{
"name_fi": "Hovimestari",
"name_en": "Master of Ceremonies",
"representatives": [
{
"name_fi": "Hovimestari",
"name_en": "Master of Ceremonies",
"representatives": [
{ "name": "Eveliina Ahonen" }
]
},
{
"name_fi": "Hovineuvos",
"name_en": "Court Counsellor",
"representatives": [
{ "name": "Melisa Dönmez" }
]
},
{
"name_fi": "Emäntä",
"name_en": "",
"representatives": [
{ "name": "Oona Karjalainen" },
{ "name": "Emilia Kortelainen" },
{ "name": "Venla Vastamäki" }
]
},
{
"name_fi": "Isäntä",
"name_en": "",
"representatives": [
{ "name": "Henry Jaakkola" },
{ "name": "Sakke Kangas" },
{ "name": "Otto Torkkeli" },
{ "name": "Tommi Oinonen" },
{ "name": "Eero Ketonen" }
]
},
{
"name_fi": "Lukkari",
"name_en": "",
"representatives": [
{ "name": "Tuomo Leino" },
{ "name": "Jami Hyytiäinen" },
{ "name": "Tuomas Pajunpää" },
{ "name": "Samuel Laine" },
{ "name": "Toni Miilunpalo" },
{ "name": "Ville Kaakinen"},
{ "name": "Eero Torpo"},
{ "name": "Sauli Norja"}
]
},
{
"name_fi": "Lukkarikisällit",
"name_en": "",
"representatives": [
{ "name": "Jesse Räisänen" },
{ "name": "Eino Laakso" },
{ "name": "Sakari Harjunpää" },
{ "name": "Niilo Ojala" },
{ "name": "Iikka Huttu" },
{ "name": "Akseli Järvinen" }
]
"name": "Eveliina Ahonen"
}
]
]
},
{
"name_fi": "Hovineuvos",
"name_en": "Court Counsellor",
"representatives": [
{
"name": "Melisa Dönmez"
}
]
},
{
"name_fi": "Emäntä",
"name_en": "",
"representatives": [
{
"name": "Oona Karjalainen"
},
{
"name": "Emilia Kortelainen"
},
{
"name": "Venla Vastamäki"
}
]
},
{
"name_fi": "Isäntä",
"name_en": "",
"representatives": [
{
"name": "Henry Jaakkola"
},
{
"name": "Sakke Kangas"
},
{
"name": "Otto Torkkeli"
},
{
"name": "Tommi Oinonen"
},
{
"name": "Eero Ketonen"
}
]
},
{
"name_fi": "Lukkari",
"name_en": "",
"representatives": [
{
"name": "Tuomo Leino"
},
{
"name": "Jami Hyytiäinen"
},
{
"name": "Tuomas Pajunpää"
},
{
"name": "Samuel Laine"
},
{
"name": "Toni Miilunpalo"
},
{
"name": "Ville Kaakinen"
},
{
"name": "Eero Torpo"
},
{
"name": "Sauli Norja"
}
]
},
{
"name_fi": "Lukkarikisällit",
"name_en": "",
"representatives": [
{
"name": "Jesse Räisänen"
},
{
"name": "Eino Laakso"
},
{
"name": "Sakari Harjunpää"
},
{
"name": "Niilo Ojala"
},
{
"name": "Iikka Huttu"
},
{
"name": "Akseli Järvinen"
}
]
}
]
}
src/views/ContactsPage/ptmk.json
-29
View File
@@ -1,29 +0,0 @@
{
"name_fi": "Elepajatoimikunta",
"name_en": "",
"roles": [
{
"name_fi": "Pajavastaava",
"name_en": "",
"representatives": [
{ "name": "Karl Lipping" }
]
},
{
"name_fi": "Pajakisälli",
"name_en": "",
"representatives": [
{ "name": "Tommi Sytelä" },
{ "name": "Eerikki Eskola" },
{ "name": "Arkadii Kolchin" },
{ "name": "Samu Nyman" },
{ "name": "Konsta Langi" },
{ "name": "Johannes Viirimäki" },
{ "name": "Justus Ojala" },
{ "name": "Ville Tujunen" },
{ "name": "Antti Tarkka" },
{ "name": "Pyry Vaara" }
]
}
]
}
src/views/ContactsPage/sstmk.json
+88 -67
View File
@@ -1,70 +1,91 @@
{
"name_fi": "SIK100-toimikunta",
"name_en": "",
"roles": [
"slug": "sstmk",
"name_fi": "SIK100-toimikunta",
"name_en": "",
"roles": [
{
"name_fi": "Puheenjohtaja",
"name_en": "",
"representatives": [
{
"name_fi": "Puheenjohtaja",
"name_en": "",
"representatives": [
{ "name": "Erna Virtanen" }
]
},
{
"name_fi": "Webivastaava",
"name_en": "",
"representatives": [
{ "name": "Jaakko Koskela" }
]
},
{
"name_fi": "Markkinointivastaava",
"name_en": "",
"representatives": [
{ "name": "Sasu Saalasti" }
]
},
{
"name_fi": "Yritysvastaava",
"name_en": "",
"representatives": [
{ "name": "Juuli Leppänen" }
]
},
{
"name_fi": "Seminaarivastaava",
"name_en": "",
"representatives": [
{ "name": "Sini Huhtinen" }
]
},
{
"name_fi": "Kevätkarnevaalimajuri",
"name_en": "",
"representatives": [
{ "name": "Olli Komulainen" }
]
},
{
"name_fi": "PoTa100-pääjuhlatirehtööri",
"name_en": "",
"representatives": [
{ "name": "Emmaleena Ahonen" },
{ "name": "Jonna Tammikivi" }
]
},
{
"name_fi": "PoTa100-jatkokuvernööri",
"name_en": "",
"representatives": [
{ "name": "Mikael Liimatainen" }
]
},
{
"name_fi": "PoTa100-sillistirehtööri",
"name_en": "",
"representatives": [
{ "name": "Tuomo Leino" }
]
"name": "Erna Virtanen"
}
]
}
]
},
{
"name_fi": "Webivastaava",
"name_en": "",
"representatives": [
{
"name": "Jaakko Koskela"
}
]
},
{
"name_fi": "Markkinointivastaava",
"name_en": "",
"representatives": [
{
"name": "Sasu Saalasti"
}
]
},
{
"name_fi": "Yritysvastaava",
"name_en": "",
"representatives": [
{
"name": "Juuli Leppänen"
}
]
},
{
"name_fi": "Seminaarivastaava",
"name_en": "",
"representatives": [
{
"name": "Sini Huhtinen"
}
]
},
{
"name_fi": "Kevätkarnevaalimajuri",
"name_en": "",
"representatives": [
{
"name": "Olli Komulainen"
}
]
},
{
"name_fi": "PoTa100-pääjuhlatirehtööri",
"name_en": "",
"representatives": [
{
"name": "Emmaleena Ahonen"
},
{
"name": "Jonna Tammikivi"
}
]
},
{
"name_fi": "PoTa100-jatkokuvernööri",
"name_en": "",
"representatives": [
{
"name": "Mikael Liimatainen"
}
]
},
{
"name_fi": "PoTa100-sillistirehtööri",
"name_en": "",
"representatives": [
{
"name": "Tuomo Leino"
}
]
}
]
}
src/views/ContactsPage/ttmk.json
+51 -31
View File
@@ -1,35 +1,55 @@
{
"name_fi": "Teknologiatoimikunta",
"name_en": "",
"roles": [
"slug": "ttmk",
"name_fi": "Teknologiatoimikunta",
"name_en": "",
"roles": [
{
"name_fi": "Teknologiamestari",
"name_en": "",
"representatives": [
{
"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": "",
"representatives": [
{ "name": "Ilari Ojakorpi" },
{ "name": "Leo Lahti" },
{ "name": "Jyri Korhonen" },
{ "name": "Tuukka Syrjänen" },
{ "name": "Emmaleena Ahonen" },
{ "name": "Mikko Suhonen" },
{ "name": "Jaakko Koskela" },
{ "name": "Justus Ojala" }
]
"name": "Oskari Ponkala"
}
]
]
},
{
"name_fi": "Tekniikkavastaava",
"name_en": "",
"representatives": [
{
"name": "Antti Mäki"
}
]
},
{
"name_fi": "Web-Kisälli",
"name_en": "",
"representatives": [
{
"name": "Ilari Ojakorpi"
},
{
"name": "Leo Lahti"
},
{
"name": "Jyri Korhonen"
},
{
"name": "Tuukka Syrjänen"
},
{
"name": "Emmaleena Ahonen"
},
{
"name": "Mikko Suhonen"
},
{
"name": "Jaakko Koskela"
},
{
"name": "Justus Ojala"
}
]
}
]
}
src/views/ContactsPage/utmk.json
+54 -39
View File
@@ -1,43 +1,58 @@
{
"name_fi": "Ulkotoimikunta",
"name_en": "External Affairs Committeee",
"roles": [
"slug": "utmk",
"name_fi": "Ulkotoimikunta",
"name_en": "External Affairs Committeee",
"roles": [
{
"name_fi": "Ulkomestari",
"name_en": "Master of External Affairs",
"representatives": [
{
"name_fi": "Ulkomestari",
"name_en": "Master of External Affairs",
"representatives": [
{ "name": "Oliver Hiekkamies" }
]
},
{
"name_fi": "Kv-ISOvastaava",
"name_en": "International Tutor Coordinator",
"representatives": [
{ "name": "Elias Hirvonen" }
]
},
{
"name_fi": "International Helper",
"name_en": "International Helper",
"representatives": [
{ "name": "Ville-Pekka Laakkonen" }
]
},
{
"name_fi": "Ulkosuhdevastaava",
"name_en": "Apprentice of External Affairs",
"representatives": [
{ "name": "Leo Müller" },
{ "name": "Eino Tyrvänen" },
{ "name": "Pekka Aho" }
]
},
{
"name_fi": "Ulkowanhus",
"name_en": "",
"representatives": [
{ "name": "Jyri Korhonen" }
]
"name": "Oliver Hiekkamies"
}
]
]
},
{
"name_fi": "Kv-ISOvastaava",
"name_en": "International Tutor Coordinator",
"representatives": [
{
"name": "Elias Hirvonen"
}
]
},
{
"name_fi": "International Helper",
"name_en": "International Helper",
"representatives": [
{
"name": "Ville-Pekka Laakkonen"
}
]
},
{
"name_fi": "Ulkosuhdevastaava",
"name_en": "Apprentice of External Affairs",
"representatives": [
{
"name": "Leo Müller"
},
{
"name": "Eino Tyrvänen"
},
{
"name": "Pekka Aho"
}
]
},
{
"name_fi": "Ulkowanhus",
"name_en": "",
"representatives": [
{
"name": "Jyri Korhonen"
}
]
}
]
}
src/views/ContactsPage/ytmk.json
+48 -29
View File
@@ -1,33 +1,52 @@
{
"name_fi": "Yrityssuhdetoimikunta",
"name_en": "Corporate Relations Committee",
"roles": [
"slug": "ytmk",
"name_fi": "Yrityssuhdetoimikunta",
"name_en": "Corporate Relations Committee",
"roles": [
{
"name_fi": "Yrityssuhdemestari",
"name_en": "Master of Corporate Relations",
"representatives": [
{
"name_fi": "Yrityssuhdemestari",
"name_en": "Master of Corporate Relations",
"representatives": [
{ "name": "Otto Julkunen" }
]
},
{
"name_fi": "Excursiopäävastaava",
"name_en": "Head of Excursions",
"representatives": [
{ "name": "Henry Gustafsson" }
]
},
{
"name_fi": "Yrityssuhdevastaava",
"name_en": "Apprentice of Corporate Relations",
"representatives": [
{ "name": "Iikka Huttu" },
{ "name": "Arkadii Kolchin" },
{ "name": "Oskari Luukkonen" },
{ "name": "Niilo Ojala" },
{ "name": "Emma Reinikainen" },
{ "name": "Melina Sundell" },
{ "name": "Elma Tuohimetsä" }
]
"name": "Otto Julkunen"
}
]
]
},
{
"name_fi": "Excursiopäävastaava",
"name_en": "Head of Excursions",
"representatives": [
{
"name": "Henry Gustafsson"
}
]
},
{
"name_fi": "Yrityssuhdevastaava",
"name_en": "Apprentice of Corporate Relations",
"representatives": [
{
"name": "Iikka Huttu"
},
{
"name": "Arkadii Kolchin"
},
{
"name": "Oskari Luukkonen"
},
{
"name": "Niilo Ojala"
},
{
"name": "Emma Reinikainen"
},
{
"name": "Melina Sundell"
},
{
"name": "Elma Tuohimetsä"
}
]
}
]
}