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

Merge branch 'master' into 'production'

Browse Source 
Prod deploy: Siemens logo and new board

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!91
This commit is contained in:
Ilari Ojakorpi
2022-01-03 14:12:32 +00:00
parent 045d48c988 4e72a97f42
commit f91bb57932
3 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/ContactsPage/ContactsPageView.tsx
+20 -20
View File
@@ -5,29 +5,29 @@ import colors from "@theme/colors";
import ContactCard from "@components/ContactCard"; import ContactCard from "@components/ContactCard";
import BoardJson from "./board.json"; import BoardJson from "./board.json";
import HvtmkJson from "./hvtmk.json"; // import HvtmkJson from "./hvtmk.json";
import MtmkJson from "./mtmk.json"; // import MtmkJson from "./mtmk.json";
import OptmkJson from "./optmk.json"; // import OptmkJson from "./optmk.json";
import OtmkJson from "./otmk.json"; // import OtmkJson from "./otmk.json";
import EPtmkJson from "./eptmk.json"; // import EPtmkJson from "./eptmk.json";
import SstmkJson from "./sstmk.json"; // import SstmkJson from "./sstmk.json";
import TtmkJson from "./ttmk.json"; // import TtmkJson from "./ttmk.json";
import UtmkJson from "./utmk.json"; // import UtmkJson from "./utmk.json";
import YtmkJson from "./ytmk.json"; // import YtmkJson from "./ytmk.json";
import Others from "./others.json"; // import Others from "./others.json";
const orderedCommittees = [ const orderedCommittees = [
BoardJson, BoardJson,
HvtmkJson, // HvtmkJson,
MtmkJson, // MtmkJson,
OptmkJson, // OptmkJson,
OtmkJson, // OtmkJson,
EPtmkJson, // EPtmkJson,
SstmkJson, // SstmkJson,
TtmkJson, // TtmkJson,
UtmkJson, // UtmkJson,
YtmkJson, // YtmkJson,
Others, // Others,
]; ];
const blankProfile = "/img/blank_profile.png"; const blankProfile = "/img/blank_profile.png";
src/views/ContactsPage/board.json
+26 -24
View File
@@ -8,8 +8,10 @@
"name_en": "Chairman of the Board", "name_en": "Chairman of the Board",
"representatives": [ "representatives": [
{ {
"name": "Johannes Ora", "name": "Mikko Suhonen",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/chairman.jpg" "phone_number": null,
"email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -18,10 +20,10 @@
"name_en": "Secretary", "name_en": "Secretary",
"representatives": [ "representatives": [
{ {
"name": "Salla Lyytikäinen", "name": "Emilia Kortelainen",
"phone_number": null, "phone_number": null,
"email": 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", "name_en": "Treasurer",
"representatives": [ "representatives": [
{ {
"name": "Santeri Huhtala", "name": "Esko Väänänen",
"phone_number": null, "phone_number": null,
"email": null, "email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/treasurer.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -42,10 +44,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Toni Ojala", "name": "Melisa Dönmez",
"phone_number": null, "phone_number": null,
"email": null, "email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg"
} }
] ]
}, },
@@ -54,10 +56,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Toni Lyttinen", "name": "Eveliina Ahonen",
"phone_number": null, "phone_number": null,
"email": null, "email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/captain2.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/captain1.jpg"
} }
] ]
}, },
@@ -66,10 +68,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Eveliina Ahonen", "name": "Sakke Kangas",
"phone_number": null, "phone_number": null,
"email": 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": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Melisa Dönmez", "name": "Eero Ketonen",
"phone_number": null, "phone_number": null,
"email": 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": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Heidi Mäkitalo", "name": "Salla Lyytikäinen",
"phone_number": null, "phone_number": null,
"email": null, "email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/isocoordinator.jpg"
@@ -102,10 +104,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Sauli Norja", "name": "Sofia Öhman",
"phone_number": null, "phone_number": null,
"email": 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": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Simo Hakanummi", "name": "Iikka Huttu",
"phone_number": null, "phone_number": null,
"email": 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": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Oskari Ponkala", "name": "Ilari Ojakorpi",
"phone_number": null, "phone_number": null,
"email": 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": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Oliver Hiekkamies", "name": "Heidi Mäkitalo",
"phone_number": null, "phone_number": null,
"email": null, "email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/external.jpg"
@@ -150,10 +152,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Otto Julkunen", "name": "Tommi Oinonen",
"phone_number": null, "phone_number": null,
"email": null, "email": null,
"image": "https://static.sahkoinsinoorikilta.fi/img/board/corporate.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
} }
src/views/FrontPage/FrontPageView.tsx
+4
View File
@@ -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 Okmetic = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/okmetic.jpg";
const Ramboll = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ramboll.png"; const Ramboll = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ramboll.png";
const Helmet = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/helmet.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 { interface FrontPageViewProps {
events: Event[]; events: Event[];
@@ -149,6 +150,9 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
<Link to="https://www.caruna.fi/tietoa-meista/tyonhakijalle/tyonantajalupaus"> <Link to="https://www.caruna.fi/tietoa-meista/tyonhakijalle/tyonantajalupaus">
<Image src={Caruna} alt="Caruna" layout="responsive" width={200} height={100} objectFit="contain" /> <Image src={Caruna} alt="Caruna" layout="responsive" width={200} height={100} objectFit="contain" />
</Link> </Link>
<Link to="https://new.siemens.com/fi/fi.html">
<Image src= {Siemens} alt="Siemens" layout="responsive" width={200} height={100} objectFit="contain" />
</Link>
<Link to="https://www.eaton.com/us/en-us.html"> <Link to="https://www.eaton.com/us/en-us.html">
<Image src={Eaton} alt="Eaton" layout="responsive" width={200} height={100} objectFit="contain" /> <Image src={Eaton} alt="Eaton" layout="responsive" width={200} height={100} objectFit="contain" />
</Link> </Link>