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 
Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!144
This commit is contained in:
Simeon Pursiainen
2025-02-26 20:39:35 +00:00
parent e6457d7487 3c791f4b3b
commit 970cceef7f
4 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ContactCard.tsx
+1 -1
View File
@@ -74,7 +74,7 @@ const ContactCard: React.FC<ContactCardProps> = ({
src={image}
alt={name}
layout="fill"
objectFit="scale-down"
objectFit="cover"
/>
</ImageContainer>
) : null}
src/views/BoardPage/board.json
+12 -12
View File
@@ -11,7 +11,7 @@
"name": "Emma Uusküla",
"phone_number": null,
"email": "emma.uuskula@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/2024-board/emma.jpg"
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Emma.jpg"
}
]
},
@@ -23,7 +23,7 @@
"name": "Johannes Viirimäki",
"phone_number": null,
"email": "johannes.viirimaki@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/2024-board/johannes.jpg"
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Johannes.jpg"
}
]
},
@@ -35,7 +35,7 @@
"name": "Nelli Liljasto",
"phone_number": null,
"email": "nelli.liljasto@sahkoinsinoorikilta.fi",
"image": "https://static.sahkoinsinoorikilta.fi/img/board/2024-board/nelli.jpg"
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Nelli.jpg"
}
]
},
@@ -47,7 +47,7 @@
"name": "Teemu Heikkinen",
"phone_number": null,
"email": "teemu.heikkinen@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Teemu.jpg"
}
]
},
@@ -59,7 +59,7 @@
"name": "Henri Aito",
"phone_number": null,
"email": "henri.aito@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Henri.jpg"
}
]
},
@@ -71,7 +71,7 @@
"name": "Tuomas Rantamäki",
"phone_number": null,
"email": "tuomas.rantamaki@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/TuomasR.jpg"
}
]
},
@@ -83,7 +83,7 @@
"name": "Matilda Ahonen",
"phone_number": null,
"email": "matilda.ahonen@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Matilda.jpg"
}
]
},
@@ -107,7 +107,7 @@
"name": "Mikael Vatiainen",
"phone_number": null,
"email": "mikael.vatiainen@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Mikael.jpg"
}
]
},
@@ -119,7 +119,7 @@
"name": "Simeon Pursiainen",
"phone_number": null,
"email": "simeon.pursiainen@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Simeon.jpg"
}
]
},
@@ -131,7 +131,7 @@
"name": "Markus Aaltio",
"phone_number": null,
"email": "markus.aaltio@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Markus.jpg"
}
]
},
@@ -143,7 +143,7 @@
"name": "Tuomas Hintikka",
"phone_number": null,
"email": "tuomas.hintikka@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/TuomasH.jpg"
}
]
},
@@ -155,7 +155,7 @@
"name": "Yassine Ramid",
"phone_number": null,
"email": "yassine.ramid@sahkoinsinoorikilta.fi",
"image": ""
"image": "https://static.sahkoinsinoorikilta.fi/img/board/Yassine.jpg"
}
]
}
src/views/CommitteePage/ltmk.json
+1 -1
View File
@@ -48,7 +48,7 @@
"name": "Antti Salpakari"
},
{
"name": "iiris Kuulusa"
"name": "Iiris Kuulusa"
},
{
"name": "Roman Shalamov"
src/views/CorporatePage/JobAdList_en.tsx
+42
View File
@@ -0,0 +1,42 @@
import React from "react";
import styled from "styled-components";
import JobAd from "@models/JobAd";
import { Accordion } from "@components/index";
import ReactMarkdown from "react-markdown";
import rehypeRaw from "rehype-raw";
import rehypeSanitize from "rehype-sanitize";
interface JobAdListProps {
jobAds: JobAd[];
}
const List = styled.ul`
padding: 0;
li {
margin: 1rem 0;
list-style: none;
}
`;
const JobAdList: React.FC<JobAdListProps> = ({ jobAds }) => (
<List>
{jobAds.map((ad) => (
<li key={ad.id}>
<Accordion title={ad.title_en}>
<div>
<p>
{ad.description_en}
</p>
<ReactMarkdown rehypePlugins={[rehypeRaw, rehypeSanitize]}>
{ad.content_en}
</ReactMarkdown>
</div>
</Accordion>
</li>
))}
</List>
);
export default JobAdList;