From 44286ab1fd3145710b2eec18cdc022fdcd31c6dc Mon Sep 17 00:00:00 2001 From: Oskari Ponkala Date: Sat, 18 Dec 2021 09:25:14 +0000 Subject: [PATCH 1/4] Update FrontPageView.tsx --- src/views/FrontPage/FrontPageView.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index 6c4ed28..2f28e23 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -28,6 +28,7 @@ const NRCGroup = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/nrcg const Okmetic = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/okmetic.jpg"; const Ramboll = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ramboll.png"; const Helmet = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/helmet.png"; +const Siemens = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/siemens.png"; interface FrontPageViewProps { events: Event[]; @@ -149,8 +150,11 @@ const FrontPageView: React.FC = ({ events, feed }) => ( Caruna + + Siemens + - Eaton + Eaton Ensto From 8b40e336e310529819eeb702f4a3bbb4033efa9f Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 21 Dec 2021 19:11:59 +0000 Subject: [PATCH 2/4] Fix typo --- src/views/FrontPage/FrontPageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index 2f28e23..a0fd36d 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -154,7 +154,7 @@ const FrontPageView: React.FC = ({ events, feed }) => ( Siemens - Eaton + Eaton Ensto From dea2830bdb9cbe8c8be786bcfd329c8c03a84291 Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Sun, 2 Jan 2022 18:19:50 +0200 Subject: [PATCH 3/4] Added new board, hid old committees --- src/views/ContactsPage/ContactsPageView.tsx | 40 +++++++++--------- src/views/ContactsPage/board.json | 46 +++++++++++---------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/views/ContactsPage/ContactsPageView.tsx b/src/views/ContactsPage/ContactsPageView.tsx index e3398ec..d74f923 100644 --- a/src/views/ContactsPage/ContactsPageView.tsx +++ b/src/views/ContactsPage/ContactsPageView.tsx @@ -5,29 +5,29 @@ 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 OptmkJson from "./optmk.json"; -import OtmkJson from "./otmk.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"; +// import HvtmkJson from "./hvtmk.json"; +// import MtmkJson from "./mtmk.json"; +// import OptmkJson from "./optmk.json"; +// import OtmkJson from "./otmk.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, + // HvtmkJson, + // MtmkJson, + // OptmkJson, + // OtmkJson, + // EPtmkJson, + // SstmkJson, + // TtmkJson, + // UtmkJson, + // YtmkJson, + // Others, ]; const blankProfile = "/img/blank_profile.png"; diff --git a/src/views/ContactsPage/board.json b/src/views/ContactsPage/board.json index fb58e92..671a7da 100644 --- a/src/views/ContactsPage/board.json +++ b/src/views/ContactsPage/board.json @@ -8,8 +8,10 @@ "name_en": "Chairman of the Board", "representatives": [ { - "name": "Johannes Ora", - "image": "https://static.sahkoinsinoorikilta.fi/img/board/chairman.jpg" + "name": "Mikko Suhonen", + "phone_number": null, + "email": null, + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -18,10 +20,10 @@ "name_en": "Secretary", "representatives": [ { - "name": "Salla Lyytikäinen", + "name": "Emilia Kortelainen", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/secretary.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -30,10 +32,10 @@ "name_en": "Treasurer", "representatives": [ { - "name": "Santeri Huhtala", + "name": "Esko Väänänen", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/treasurer.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -42,7 +44,7 @@ "name_en": "", "representatives": [ { - "name": "Toni Ojala", + "name": "Eveliina Ahonen", "phone_number": null, "email": null, "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg" @@ -54,7 +56,7 @@ "name_en": "", "representatives": [ { - "name": "Toni Lyttinen", + "name": "Melisa Dönmez", "phone_number": null, "email": null, "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg" @@ -66,10 +68,10 @@ "name_en": "", "representatives": [ { - "name": "Eveliina Ahonen", + "name": "Sakke Kangas", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/ceremonies.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -78,10 +80,10 @@ "name_en": "", "representatives": [ { - "name": "Melisa Dönmez", + "name": "Eero Ketonen", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/court_cancelor.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -90,7 +92,7 @@ "name_en": "", "representatives": [ { - "name": "Heidi Mäkitalo", + "name": "Salla Lyytikäinen", "phone_number": null, "email": null, "image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg" @@ -102,10 +104,10 @@ "name_en": "", "representatives": [ { - "name": "Sauli Norja", + "name": "Sofia Öhman", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/wellbeing.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -114,10 +116,10 @@ "name_en": "", "representatives": [ { - "name": "Simo Hakanummi", + "name": "Iikka Huttu", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/studies.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -126,10 +128,10 @@ "name_en": "", "representatives": [ { - "name": "Oskari Ponkala", + "name": "Ilari Ojakorpi", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/technology.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] }, @@ -138,7 +140,7 @@ "name_en": "", "representatives": [ { - "name": "Oliver Hiekkamies", + "name": "Heidi Mäkitalo", "phone_number": null, "email": null, "image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg" @@ -150,10 +152,10 @@ "name_en": "", "representatives": [ { - "name": "Otto Julkunen", + "name": "Tommi Oinonen", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/corporate.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg" } ] } From 4e72a97f420ff22c9be281e964fe460d274713bb Mon Sep 17 00:00:00 2001 From: Ojakoo Date: Sun, 2 Jan 2022 20:08:58 +0200 Subject: [PATCH 4/4] Fix roles --- src/views/ContactsPage/board.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/ContactsPage/board.json b/src/views/ContactsPage/board.json index 671a7da..67029a3 100644 --- a/src/views/ContactsPage/board.json +++ b/src/views/ContactsPage/board.json @@ -44,10 +44,10 @@ "name_en": "", "representatives": [ { - "name": "Eveliina Ahonen", + "name": "Melisa Dönmez", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg" } ] }, @@ -56,10 +56,10 @@ "name_en": "", "representatives": [ { - "name": "Melisa Dönmez", + "name": "Eveliina Ahonen", "phone_number": null, "email": null, - "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg" + "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg" } ] },