From 0cc0950c72ab4d8b00f842f39a5dadf80b7c3b42 Mon Sep 17 00:00:00 2001 From: ojakoo Date: Sat, 9 Jan 2021 17:18:13 +0200 Subject: [PATCH] Added committee jsons --- src/assets/json/hvtmk.json | 77 ++++++++++++------ src/assets/json/mtmk.json | 89 +++++++++++++++++++++ src/assets/json/optmk.json | 31 +++++++ src/assets/json/otmk.json | 63 +++++++++++++++ src/assets/json/ptmk.json | 29 +++++++ src/assets/json/sstmk.json | 70 ++++++++++++++++ src/assets/json/ttmk.json | 35 ++++++++ src/assets/json/utmk.json | 43 ++++++++++ src/assets/json/ytmk.json | 33 ++++++++ src/components/CommitteeContainer.tsx | 4 +- src/components/ContactCard.tsx | 40 ++++----- src/views/ContactsPage/ContactsPageView.tsx | 73 +++++++++++++++++ 12 files changed, 541 insertions(+), 46 deletions(-) create mode 100644 src/assets/json/mtmk.json create mode 100644 src/assets/json/optmk.json create mode 100644 src/assets/json/otmk.json create mode 100644 src/assets/json/ptmk.json create mode 100644 src/assets/json/sstmk.json create mode 100644 src/assets/json/ttmk.json create mode 100644 src/assets/json/utmk.json create mode 100644 src/assets/json/ytmk.json diff --git a/src/assets/json/hvtmk.json b/src/assets/json/hvtmk.json index fc0302c..421f9bd 100644 --- a/src/assets/json/hvtmk.json +++ b/src/assets/json/hvtmk.json @@ -1,30 +1,55 @@ { "name_fi": "Hyvinvointitoimikunta", - "name_en": "Wellbeing comittee", + "name_en": "", "roles": [ - { - "name_fi": "Puheenjohtaja", - "name_en": "Chairman", - "representatives": [ - { - "name": "Oskari Ponkala", - "phone_number": null, - "email": null, - "image": null - } - ] - }, - { - "name_fi": "Web-kisälli", - "name_en": "Web-journeyman", - "representatives": [ - { - "name": "Ilari Ojakorpi", - "phone_number": null, - "email": null, - "image": null - } - ] - } + { + "name_fi": "Hyvinvointimestari", + "name_en": "", + "representatives": [ + { "name": "Sauli Norja" } + ] + }, + { + "name_fi": "Kulttuurivastaava", + "name_en": "", + "representatives": [ + { "name": "Juha Anttila" }, + { "name": "Aino Suomi" }, + { "name": "Nestori Ylönjoki" } + ] + }, + { + "name_fi": "Liikuntavastaava", + "name_en": "", + "representatives": [ + { "name": "Elmeri Pälikkö" }, + { "name": "Joel Wickström" } + ] + }, + { + "name_fi": "Kiltahuonevastaava", + "name_en": "", + "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" } + ] + } ] - } \ No newline at end of file +} \ No newline at end of file diff --git a/src/assets/json/mtmk.json b/src/assets/json/mtmk.json new file mode 100644 index 0000000..6261ca0 --- /dev/null +++ b/src/assets/json/mtmk.json @@ -0,0 +1,89 @@ +{ + "name_fi": "Mediatoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Puheenjohtaja", + "name_en": "", + "representatives": [ + { + "name": "Salla Lyytikäinen", + "phone_number": null, + "email": null, + "image": null + } + ] + }, + { + "name_fi": "Päätoimittaja", + "name_en": "", + "representatives": [ + { "name": "Sasu Salasti" } + ] + }, + { + "name_fi": "Toimittaja", + "name_en": "", + "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": "", + "representatives": [ + { "name": "Kiia-Einola" } + ] + }, + { + "name_fi": "Taittaja", + "name_en": "", + "representatives": [ + { "name": "Aino Suomi" }, + { "name": "Olli Komulainen" }, + { "name": "Emilia Kortelainen" } + ] + }, + { + "name_fi": "Taittaja & Valokuvaaja", + "name_en": "", + "representatives": [ + { "name": "Jonna Tammikivi" } + ] + }, + { + "name_fi": "Valokuvaaja", + "name_en": "", + "representatives": [ + { "name": "Suvi Karanta" }, + { "name": "Mikko Haaparanta" }, + { "name": "Johannes Viirimäki" } + ] + }, + { + "name_fi": "Valokuvaaja & Graafikko", + "name_en": "", + "representatives": [ + { "name": "Kalle Petäjäaho" }, + { "name": "Maria Pöllä" } + ] + }, + { + "name_fi": "Videokuvaaja", + "name_en": "", + "representatives": [ + { "name": "Aaro Rasilainen" } + ] + } + ] +} \ No newline at end of file diff --git a/src/assets/json/optmk.json b/src/assets/json/optmk.json new file mode 100644 index 0000000..91fdb26 --- /dev/null +++ b/src/assets/json/optmk.json @@ -0,0 +1,31 @@ +{ + "name_fi": "Opintotoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Opintomestari", + "name_en": "", + "representatives": [ + { "name": "Simo Hakanummi" } + ] + }, + { + "name_fi": "Opintovastaava", + "name_en": "", + "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": "Ilkka Huttu" } + ] + } + ] +} \ No newline at end of file diff --git a/src/assets/json/otmk.json b/src/assets/json/otmk.json new file mode 100644 index 0000000..99495f7 --- /dev/null +++ b/src/assets/json/otmk.json @@ -0,0 +1,63 @@ +{ + "name_fi": "Ohjelmatoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Hovimestari", + "name_en": "", + "representatives": [ + { "name": "Eveliina Ahonen" } + ] + }, + { + "name_fi": "Hovineuvos", + "name_en": "", + "representatives": [ + { "name": "Melissa Dönmez" } + ] + }, + { + "name_fi": "Emäntä", + "name_en": "", + "representatives": [ + { "name": "Oona Karjalainen" }, + { "name": "Emilia Kortemäki" }, + { "name": "Venla Vastamäki" } + ] + }, + { + "name_fi": "Isäntä", + "name_en": "", + "representatives": [ + { "name": "Henry Jaakkola" }, + { "name": "Sakke Kangas" }, + { "name": "Otto Torkkeli" }, + { "name": "Tommi Oinen" }, + { "name": "Eero Ketonen" } + ] + }, + { + "name_fi": "Lukkari", + "name_en": "", + "representatives": [ + { "name": "Tuomo Leino" }, + { "name": "Hami Hyytinen" }, + { "name": "Tuomas Pajunpää" }, + { "name": "Samuel Laine" }, + { "name": "Toni Miilunpalo" } + ] + }, + { + "name_fi": "Lukkarikisällit", + "name_en": "", + "representatives": [ + { "name": "Jesse Räisänen" }, + { "name": "Eino Laakso" }, + { "name": "Sakari Harjunpää" }, + { "name": "Niilo Ojala" }, + { "name": "Ilkka Huttu" }, + { "name": "Akseli Järvinen" } + ] + } + ] +} \ No newline at end of file diff --git a/src/assets/json/ptmk.json b/src/assets/json/ptmk.json new file mode 100644 index 0000000..7c531c9 --- /dev/null +++ b/src/assets/json/ptmk.json @@ -0,0 +1,29 @@ +{ + "name_fi": "Pajatoimikunta", + "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" } + ] + } + ] +} \ No newline at end of file diff --git a/src/assets/json/sstmk.json b/src/assets/json/sstmk.json new file mode 100644 index 0000000..51581a1 --- /dev/null +++ b/src/assets/json/sstmk.json @@ -0,0 +1,70 @@ +{ + "name_fi": "SIK100-toimikunta", + "name_en": "", + "roles": [ + { + "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 Salasti" } + ] + }, + { + "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" } + ] + } + ] +} \ No newline at end of file diff --git a/src/assets/json/ttmk.json b/src/assets/json/ttmk.json new file mode 100644 index 0000000..c87b0f0 --- /dev/null +++ b/src/assets/json/ttmk.json @@ -0,0 +1,35 @@ +{ + "name_fi": "Teknologiatoimikunta", + "name_en": "", + "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": "", + "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" } + ] + } + ] +} + \ No newline at end of file diff --git a/src/assets/json/utmk.json b/src/assets/json/utmk.json new file mode 100644 index 0000000..1051174 --- /dev/null +++ b/src/assets/json/utmk.json @@ -0,0 +1,43 @@ +{ + "name_fi": "Ulkotoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Ulkomestari", + "name_en": "", + "representatives": [ + { "name": "Oliver Hiekkamies" } + ] + }, + { + "name_fi": "Kv-ISOvastaava", + "name_en": "", + "representatives": [ + { "name": "Elias Hirvonen" } + ] + }, + { + "name_fi": "International Helper", + "name_en": "", + "representatives": [ + { "name": "Ville-Pekka Laakkonen" } + ] + }, + { + "name_fi": "Ulkosuhdevastaava", + "name_en": "", + "representatives": [ + { "name": "Leo Muller" }, + { "name": "Eino Tyrvänen" }, + { "name": "Pekka Aho" } + ] + }, + { + "name_fi": "Ulkowanhus", + "name_en": "", + "representatives": [ + { "name": "Jyri Korhonen" } + ] + } + ] +} \ No newline at end of file diff --git a/src/assets/json/ytmk.json b/src/assets/json/ytmk.json new file mode 100644 index 0000000..e173861 --- /dev/null +++ b/src/assets/json/ytmk.json @@ -0,0 +1,33 @@ +{ + "name_fi": "Yrityssuhdetoimikunta", + "name_en": "", + "roles": [ + { + "name_fi": "Yrityssuhdemestari", + "name_en": "", + "representatives": [ + { "name": "Otto Julkunen" } + ] + }, + { + "name_fi": "Excursiopäävastaava", + "name_en": "", + "representatives": [ + { "name": "Henry Gustafsson" } + ] + }, + { + "name_fi": "Yrityssuhdevastaava", + "name_en": "", + "representatives": [ + { "name": "Ilkka Huttu" }, + { "name": "Arkadii Kolchin" }, + { "name": "Oskari Luukkonen" }, + { "name": "Niilo Ojala" }, + { "name": "Emma Reinikainen" }, + { "name": "Melina Sundell" }, + { "name": "Elma Tuohimetsä" } + ] + } + ] +} \ No newline at end of file diff --git a/src/components/CommitteeContainer.tsx b/src/components/CommitteeContainer.tsx index 9ff09c2..20c6421 100644 --- a/src/components/CommitteeContainer.tsx +++ b/src/components/CommitteeContainer.tsx @@ -1,6 +1,7 @@ import React from "react"; import styled from "styled-components"; import ContactCard from "./ContactCard"; +import blank_profile from "@assets/img/blank_profile.png"; import { Committee } from "@views/ContactsPage/ContactsPageView" import { colors } from "@theme/colors"; @@ -44,7 +45,8 @@ const CommitteeContainer: React.FC = ({ committee }) => name={representative.name} phone={representative.phone_number} email={representative.email} - image={representative.image} + //conditional image for dev + image={ !(committee.name_en === "Board") ? representative.image : blank_profile} role_fi={role.name_fi} role_en={role.name_en} /> diff --git a/src/components/ContactCard.tsx b/src/components/ContactCard.tsx index 8a86ed8..89b3978 100644 --- a/src/components/ContactCard.tsx +++ b/src/components/ContactCard.tsx @@ -1,6 +1,5 @@ import React from "react"; import styled from "styled-components"; -import blank_profile from "@assets/img/blank_profile.png"; import { colors } from "@theme/colors"; const Card = styled.article` @@ -9,8 +8,7 @@ const Card = styled.article` flex-flow: row nowrap; padding: 0.5rem; color: ${colors.darkBlue}; - width: 15rem; - min-width: 300px; + width: 18rem; `; const ImageContainer = styled.div` @@ -34,14 +32,16 @@ const Info = styled.div` flex-direction: column; align-items: flex-start; padding: 0.25rem; - font-size: 0.9rem; color: ${colors.darkBlue}; -`; -const Name = styled.text` - font-size: 1.2rem; - font-weight: 600; -` + & > p { + font-size: 0.8rem; + } + + & > h4 { + font-size: 0.83rem; + } +`; interface ContactCardProps { name: string; @@ -55,17 +55,19 @@ interface ContactCardProps { const ContactCard: React.FC = ({ name, phone, email, image, role_fi, role_en }) => { return( - - {name} - + {image ? + + {name} + : null + } - {name} - {role_fi || role_en} - {phone ? {phone} : null} - {email ? {email} : null} +

{name}

+

{role_fi || role_en}

+ {phone ?

{phone}

: null} + {email ?

{email}

: null} ) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index fbbb019..8c2f3af 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -4,8 +4,17 @@ import CommitteeContainer from "@components/CommitteeContainer"; import { Divider, TextSection } from "@components/index"; import { colors } from "@theme/colors"; import { Link } from "@components/index"; + import BoardJson from "@assets/json/board.json"; import HvtmkJson from "@assets/json/hvtmk.json"; +import MtmkJson from "@assets/json/mtmk.json"; +import OptmkJson from "@assets/json/optmk.json"; +import OtmkJson from "@assets/json/otmk.json"; +import PtmkJson from "@assets/json/ptmk.json"; +import SstmkJson from "@assets/json/sstmk.json"; +import TtmkJson from "@assets/json/ttmk.json"; +import UtmkJson from "@assets/json/ttmk.json"; +import YtmkJson from "@assets/json/ytmk.json"; const BlueLink = styled(Link)` color: ${colors.blue1}; @@ -62,8 +71,72 @@ const ContactsPageView: React.FC = () => ( + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + )