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 
Updated board info

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!117
This commit is contained in:
Ilari Ojakorpi
2023-01-02 01:16:53 +00:00
parent ea333b7c69 faf12816bb
commit 8a6b2e0846
4 changed files with 91 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ContactCard.tsx
+10 -4
View File
@@ -18,8 +18,8 @@ const Row = styled.div`
const ImageContainer = styled.div` const ImageContainer = styled.div`
position: relative; position: relative;
height: 125px; height: 8rem;
width: 125px; width: 8rem;
flex-shrink: 0; flex-shrink: 0;
img { img {
@@ -35,13 +35,19 @@ const Info = styled.div`
margin-left: -20px; margin-left: -20px;
min-width: 150px; min-width: 150px;
padding: 2rem; padding: 2rem;
padding-top: 10px;
color: ${colors.darkBlue}; color: ${colors.darkBlue};
& > p { & > p {
font-size: 1.0rem; font-size: 1rem;
margin: 0; margin: 0;
} }
& > a {
font-weight: 400;
font-size: 0.9rem;
}
& > h3 { & > h3 {
font-size: 1.2rem; font-size: 1.2rem;
font-weight: 500; font-weight: 500;
@@ -76,7 +82,7 @@ const ContactCard: React.FC<ContactCardProps> = ({
<h3>{name}</h3> <h3>{name}</h3>
<p>{role_fi || role_en}</p> <p>{role_fi || role_en}</p>
{phone ? <p>{phone}</p> : null} {phone ? <p>{phone}</p> : null}
{email ? <p>{email}</p> : null} {email ? <a href={`mailto:${email}`}>{email}</a> : null}
</Info> </Info>
</Row> </Row>
</Card> </Card>
src/views/ContactsPage/ContactsPageView.tsx
+26 -29
View File
@@ -5,35 +5,35 @@ 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 NtmkJson from "./ntmk.json"; // import NtmkJson from "./ntmk.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 ShntmkJson from "./shntmk.json"; // import ShntmkJson from "./shntmk.json";
import ShtmkJson from "./shtmk.json"; // import ShtmkJson from "./shtmk.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,
NtmkJson, // NtmkJson,
OptmkJson, // OptmkJson,
OtmkJson, // OtmkJson,
EPtmkJson, // EPtmkJson,
SstmkJson, // SstmkJson,
ShntmkJson, // ShntmkJson,
ShtmkJson, // ShtmkJson,
TtmkJson, // TtmkJson,
UtmkJson, // UtmkJson,
YtmkJson, // YtmkJson,
Others, // Others,
]; ];
const blankProfile = "/img/blank_profile.png"; const blankProfile = "/img/blank_profile.png";
@@ -91,7 +91,6 @@ const Container = styled.div`
`; `;
const ContactContainer = styled.div` const ContactContainer = styled.div`
margin-top: -13rem;
overflow-x: hidden; overflow-x: hidden;
@media (max-width: 950px) { @media (max-width: 950px) {
margin-top: 0; margin-top: 0;
@@ -172,7 +171,6 @@ const ContactsPageView: React.FC = () => (
</aside> </aside>
</TextSection> </TextSection>
<ContactContainer> <ContactContainer>
{orderedCommittees.map((json) => ( {orderedCommittees.map((json) => (
<React.Fragment key={json.slug}> <React.Fragment key={json.slug}>
{(json.slug !== "board") && ( {(json.slug !== "board") && (
@@ -197,7 +195,6 @@ const ContactsPageView: React.FC = () => (
{", lomakkeen vastauksia käydään läpi hallituksen kokouksissa."} {", lomakkeen vastauksia käydään läpi hallituksen kokouksissa."}
</p> </p>
</div> </div>
)} )}
</CommitteeContainer> </CommitteeContainer>
</TextSection> </TextSection>
src/views/ContactsPage/board.json
+49 -49
View File
@@ -8,10 +8,10 @@
"name_en": "Chairman of the Board", "name_en": "Chairman of the Board",
"representatives": [ "representatives": [
{ {
"name": "Mikko Suhonen", "name": "Otto Julkunen",
"phone_number": null, "phone_number": null,
"email": null, "email": "otto.julkunen@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/mikko.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -20,10 +20,10 @@
"name_en": "Secretary", "name_en": "Secretary",
"representatives": [ "representatives": [
{ {
"name": "Emilia Kortelainen", "name": "Karoliina Talvikangas",
"phone_number": null, "phone_number": null,
"email": null, "email": "karoliina.talvikangas@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/emilia.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -32,10 +32,10 @@
"name_en": "Treasurer", "name_en": "Treasurer",
"representatives": [ "representatives": [
{ {
"name": "Esko Väänänen", "name": "Ville Lairila",
"phone_number": null, "phone_number": null,
"email": null, "email": "ville.lairila@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/esko.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -44,10 +44,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Melisa Dönmez", "name": "Aaron Löfgren",
"phone_number": null, "phone_number": null,
"email": null, "email": "aaron.lofgren@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/melisa.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -56,10 +56,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Eveliina Ahonen", "name": "Sakke Kangas",
"phone_number": null, "phone_number": null,
"email": null, "email": "sakke.kangas@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/eveliina.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -68,10 +68,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Sakke Kangas", "name": "Roni Vallius",
"phone_number": null, "phone_number": null,
"email": null, "email": "roni.vallius@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/sakke.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -80,22 +80,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Eero Ketonen", "name": "Elina Huttunen",
"phone_number": null, "phone_number": null,
"email": null, "email": "elina.huttunen@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/eero.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.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"
} }
] ]
}, },
@@ -104,10 +92,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Sofia Öhman", "name": "Julia Pykälä-aho",
"phone_number": null, "phone_number": null,
"email": null, "email": "julia.pykalaaho@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/sofia.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -116,22 +104,22 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Iikka Huttu", "name": "Juulia Härkönen",
"phone_number": null, "phone_number": null,
"email": null, "email": "juulia.harkonen@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/iikka.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
{ {
"name_fi": "Teknologiamestari", "name_fi": "Pajamestari",
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Ilari Ojakorpi", "name": "Tommi Sytelä",
"phone_number": null, "phone_number": null,
"email": null, "email": "tommi.sytela@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/ilari.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -140,10 +128,10 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Heidi Mäkitalo", "name": "Pyry Vaara",
"phone_number": null, "phone_number": null,
"email": null, "email": "pyry.vaara@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/heidi.jpg" "image": "https://static.sahkoinsinoorikilta.fi/img/board/placeholder.jpg"
} }
] ]
}, },
@@ -152,10 +140,22 @@
"name_en": "", "name_en": "",
"representatives": [ "representatives": [
{ {
"name": "Tommi Oinonen", "name": "Nette Levijoki",
"phone_number": null, "phone_number": null,
"email": null, "email": "nette.levijoki@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/tommmi.jpg" "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"
} }
] ]
} }
src/views/CorporatePage/CorporatePageView.tsx
+6 -4
View File
@@ -6,8 +6,10 @@ import JobAd from "@models/JobAd";
import CorporatePageHero from "./CorporatePageHero"; import CorporatePageHero from "./CorporatePageHero";
import JobAdList from "./JobAdList"; import JobAdList from "./JobAdList";
import BoardJson from "../ContactsPage/board.json";
const EXCURSION_RULES = "https://static.sahkoinsinoorikilta.fi/saannot/excursiosaannot.pdf"; 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 { interface CorporatePageViewProps {
jobAds: JobAd[]; jobAds: JobAd[];
@@ -92,9 +94,9 @@ const CorporatePageView: React.FC<CorporatePageViewProps> = ({ jobAds }) => (
<TextSection> <TextSection>
<h3>Olethan yhteydessä!</h3> <h3>Olethan yhteydessä!</h3>
<div> <div>
<p>Yllämainituista mahdollisuuksista, sekä muista ideoista kiinnostuneena, voit olla yhteydessä Yrityssuhdemestariimme Tommiin.</p> <p>Yllämainituista mahdollisuuksista, sekä muista ideoista kiinnostuneena, voit olla yhteydessä Yrityssuhdemestariimme.</p>
<h6>Yrityssuhdemestari</h6> <h6>Yrityssuhdemestari</h6>
<p>Tommi Oinonen <br />044 299 3439<br /> <a href={`mailto:${CORPORATE_MASTER_MAIL}`}>{CORPORATE_MASTER_MAIL}</a></p> <p>{CORPORATE_MASTER_INFO.name} <br /> <a href={`mailto:${CORPORATE_MASTER_INFO.email}`}>{CORPORATE_MASTER_INFO.email}</a></p>
</div> </div>
</TextSection> </TextSection>
@@ -110,7 +112,7 @@ const CorporatePageView: React.FC<CorporatePageViewProps> = ({ jobAds }) => (
<h3 id="tyopaikat">Työpaikkailmoitukset</h3> <h3 id="tyopaikat">Työpaikkailmoitukset</h3>
<div> <div>
<JobAdList jobAds={jobAds} /> <JobAdList jobAds={jobAds} />
<p>Voit saada yrityksesi työpaikkailmoituksen listalle lähettämällä sen osoitteeseen <a href={`mailto:${CORPORATE_MASTER_MAIL}`}>{CORPORATE_MASTER_MAIL}</a></p> <p>Voit saada yrityksesi työpaikkailmoituksen listalle lähettämällä sen osoitteeseen <a href={`mailto:${CORPORATE_MASTER_INFO.email}`}>{CORPORATE_MASTER_INFO.email}</a></p>
</div> </div>
</TextSection> </TextSection>