diff --git a/src/components/ContactCard.tsx b/src/components/ContactCard.tsx index b1aa8a2..eb922f9 100644 --- a/src/components/ContactCard.tsx +++ b/src/components/ContactCard.tsx @@ -18,8 +18,8 @@ const Row = styled.div` const ImageContainer = styled.div` position: relative; - height: 125px; - width: 125px; + height: 8rem; + width: 8rem; flex-shrink: 0; img { @@ -35,13 +35,19 @@ const Info = styled.div` margin-left: -20px; min-width: 150px; padding: 2rem; + padding-top: 10px; color: ${colors.darkBlue}; & > p { - font-size: 1.0rem; + font-size: 1rem; margin: 0; } + & > a { + font-weight: 400; + font-size: 0.9rem; + } + & > h3 { font-size: 1.2rem; font-weight: 500; @@ -76,7 +82,7 @@ const ContactCard: React.FC = ({

{name}

{role_fi || role_en}

{phone ?

{phone}

: null} - {email ?

{email}

: null} + {email ? {email} : null} diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index b9b5ddb..53db8b6 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -5,35 +5,35 @@ 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 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"; -import Others from "./others.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"; +// import Others from "./others.json"; const orderedCommittees = [ BoardJson, - HvtmkJson, - MtmkJson, - NtmkJson, - OptmkJson, - OtmkJson, - EPtmkJson, - SstmkJson, - ShntmkJson, - ShtmkJson, - TtmkJson, - UtmkJson, - YtmkJson, - Others, + // HvtmkJson, + // MtmkJson, + // NtmkJson, + // OptmkJson, + // OtmkJson, + // EPtmkJson, + // SstmkJson, + // ShntmkJson, + // ShtmkJson, + // TtmkJson, + // UtmkJson, + // YtmkJson, + // Others, ]; const blankProfile = "/img/blank_profile.png"; @@ -91,7 +91,6 @@ const Container = styled.div` `; const ContactContainer = styled.div` - margin-top: -13rem; overflow-x: hidden; @media (max-width: 950px) { margin-top: 0; @@ -172,7 +171,6 @@ const ContactsPageView: React.FC = () => ( - {orderedCommittees.map((json) => ( {(json.slug !== "board") && ( @@ -197,7 +195,6 @@ const ContactsPageView: React.FC = () => ( {", lomakkeen vastauksia käydään läpi hallituksen kokouksissa."}

- )} diff --git a/src/views/ContactsPage/board.json b/src/views/ContactsPage/board.json index bbd332f..7fc5873 100644 --- a/src/views/ContactsPage/board.json +++ b/src/views/ContactsPage/board.json @@ -8,10 +8,10 @@ "name_en": "Chairman of the Board", "representatives": [ { - "name": "Mikko Suhonen", + "name": "Otto Julkunen", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/mikko.jpg" + "email": "otto.julkunen@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -20,10 +20,10 @@ "name_en": "Secretary", "representatives": [ { - "name": "Emilia Kortelainen", + "name": "Karoliina Talvikangas", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/emilia.jpg" + "email": "karoliina.talvikangas@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -32,10 +32,10 @@ "name_en": "Treasurer", "representatives": [ { - "name": "Esko Väänänen", + "name": "Ville Lairila", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/esko.jpg" + "email": "ville.lairila@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -44,10 +44,10 @@ "name_en": "", "representatives": [ { - "name": "Melisa Dönmez", + "name": "Aaron Löfgren", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/melisa.jpg" + "email": "aaron.lofgren@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -56,10 +56,10 @@ "name_en": "", "representatives": [ { - "name": "Eveliina Ahonen", + "name": "Sakke Kangas", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/eveliina.jpg" + "email": "sakke.kangas@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -68,10 +68,10 @@ "name_en": "", "representatives": [ { - "name": "Sakke Kangas", + "name": "Roni Vallius", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/sakke.jpg" + "email": "roni.vallius@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -80,22 +80,10 @@ "name_en": "", "representatives": [ { - "name": "Eero Ketonen", + "name": "Elina Huttunen", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/eero.jpg" - } - ] - }, - { - "name_fi": "ISOvastaava", - "name_en": "", - "representatives": [ - { - "name": "Salla Lyytikäinen", - "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/salla.jpg" + "email": "elina.huttunen@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -104,10 +92,10 @@ "name_en": "", "representatives": [ { - "name": "Sofia Öhman", + "name": "Julia Pykälä-aho", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/sofia.jpg" + "email": "julia.pykalaaho@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -116,22 +104,22 @@ "name_en": "", "representatives": [ { - "name": "Iikka Huttu", + "name": "Juulia Härkönen", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/iikka.jpg" + "email": "juulia.harkonen@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, { - "name_fi": "Teknologiamestari", + "name_fi": "Pajamestari", "name_en": "", "representatives": [ { - "name": "Ilari Ojakorpi", + "name": "Tommi Sytelä", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/ilari.jpg" + "email": "tommi.sytela@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -140,10 +128,10 @@ "name_en": "", "representatives": [ { - "name": "Heidi Mäkitalo", + "name": "Pyry Vaara", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/heidi.jpg" + "email": "pyry.vaara@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -152,10 +140,22 @@ "name_en": "", "representatives": [ { - "name": "Tommi Oinonen", + "name": "Nette Levijoki", "phone_number": null, - "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/tommmi.jpg" + "email": "nette.levijoki@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" + } + ] + }, + { + "name_fi": "Excursiomestari", + "name_en": "", + "representatives": [ + { + "name": "Visa Kurvi", + "phone_number": null, + "email": "visa.kurvi@sahkoinsinoorikilta.fi", + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] } diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index 432786f..1dfa719 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -6,8 +6,10 @@ import JobAd from "@models/JobAd"; import CorporatePageHero from "./CorporatePageHero"; import JobAdList from "./JobAdList"; +import BoardJson from "../ContactsPage/board.json"; + const EXCURSION_RULES = "https://static.sahkoinsinoorikilta.fi/saannot/excursiosaannot.pdf"; -const CORPORATE_MASTER_MAIL = "tommi.oinonen@sahkoinsinoorikilta.fi"; +const CORPORATE_MASTER_INFO = BoardJson.roles.filter(role => { return role.name_fi === "Yrityssuhdemestari"})[0].representatives[0]; interface CorporatePageViewProps { jobAds: JobAd[]; @@ -92,9 +94,9 @@ const CorporatePageView: React.FC = ({ jobAds }) => (

Olethan yhteydessä!

-

Yllämainituista mahdollisuuksista, sekä muista ideoista kiinnostuneena, voit olla yhteydessä Yrityssuhdemestariimme Tommiin.

+

Yllämainituista mahdollisuuksista, sekä muista ideoista kiinnostuneena, voit olla yhteydessä Yrityssuhdemestariimme.

Yrityssuhdemestari
-

Tommi Oinonen
044 299 3439
{CORPORATE_MASTER_MAIL}

+

{CORPORATE_MASTER_INFO.name}
{CORPORATE_MASTER_INFO.email}

@@ -110,7 +112,7 @@ const CorporatePageView: React.FC = ({ jobAds }) => (

Työpaikkailmoitukset

-

Voit saada yrityksesi työpaikkailmoituksen listalle lähettämällä sen osoitteeseen {CORPORATE_MASTER_MAIL}

+

Voit saada yrityksesi työpaikkailmoituksen listalle lähettämällä sen osoitteeseen {CORPORATE_MASTER_INFO.email}