Skip to content

Commit

Permalink
Merge branch 'boisgera:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
boisgera authored Nov 27, 2023
2 parents 6e5a090 + bd7ad52 commit 875429f
Show file tree
Hide file tree
Showing 24 changed files with 53 additions and 24 deletions.
Binary file modified public/portraits/Cédric Prunier.webp
Binary file not shown.
Binary file modified public/portraits/Etienne Decencière Ferrandière.webp
Binary file not shown.
Binary file added public/portraits/Pascal Le Masson.webp
Binary file not shown.
Binary file modified public/portraits/Philippe Blanc.webp
Binary file not shown.
Binary file modified public/portraits/Robin Girard.webp
Binary file not shown.
Binary file modified public/portraits/Sébastien Boisgérault.webp
Binary file not shown.
Binary file modified public/portraits/Thierry Ranchin.webp
Binary file not shown.
Binary file modified public/portraits/Yannick Vimont.webp
Binary file not shown.
Binary file added src/assets/portraits/raw/Cédric Prunier.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/raw/Pascal Le Masson.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/raw/Philippe Blanc.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/raw/Robin Girard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/raw/Thierry Ranchin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/raw/Yannick Vimont.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/square/Cédric Prunier.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/square/Philippe Blanc.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/square/Robin Girard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/square/Thierry Ranchin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/portraits/square/Yannick Vimont.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion src/components/portrait.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import Tag from "@components/named-tag.astro"
import { Icon } from "astro-icon";
const { attrs } = Astro.props;
const { name, role, email, url, linkedin, skills } = attrs;
const { name, role, email, url, linkedin, github, skills } = attrs;
const emailHref = `mailto:${email}[email protected]&subject=[ITN]`;
const image = `${import.meta.env.BASE_URL}portraits/${name}.webp`;
const linkedinHref = linkedin && `https://www.linkedin.com/in/${linkedin}/`;
const githubHref = github && `https://github.com/${github}`;
const map = {
"à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a",
Expand Down Expand Up @@ -68,6 +69,14 @@ const id = noAccent(name).replace(/\W/g, "-")
/>
</span>
</a>}
{ githubHref && <a href={githubHref}>
<span class="hover:text-blue-600 transition-colors">
<Icon
class="w-4 h-4 inline relative"
name="tabler:brand-github"
/>
</span>
</a>}
</div>
<div>
<span
Expand Down
66 changes: 43 additions & 23 deletions src/pages/equipe.astro
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ const data = [
},
{
"name": "Sébastien Boisgérault",
"role": "",
"role": "Enseignant-chercheur",
"email": "",
"linkedin": "",
"github": "boisgera",
"skills": {
"Ingénierie Numérique": [],
"Santé Numérique": [],
Expand All @@ -38,13 +39,18 @@ const data = [
{
"name": "Philippe Blanc",
"role": "",
"email": "",
"role": "Professeur, Responsable d'équipe",
"email": "[email protected]",
"linkedin": "drphilippeblanc",
"skills": {
"Ingénierie Numérique": [],
"Ingénierie Numérique": [
"Géographie numérique",
"Traitement d'images",
"Science des données"
],
"Industries Créatives": [],
"Santé Numérique": [],
"Autres": []
"Autres": ["Energies renouvelables"]
}
},
{
Expand All @@ -60,13 +66,13 @@ const data = [
},
{
"name": "Jérôme Crépin",
"role": "",
"email": "",
"role": "Directeur de centre",
"email": "[email protected]",
"skills": {
"Ingénierie Numérique": [],
"Industries Créatives": [],
"Santé Numérique": [],
"Autres": []
"Autres": ["Mécanique", "Matériaux"]
}
},
{
Expand All @@ -82,11 +88,10 @@ const data = [
},
{
"name": "Etienne Decencière Ferrandière",
"role": "",
"email": "",
"linkedin": "",
"role": "Directeur de recherche, Directeur de centre",
"email": "[email protected]",
"skills": {
"Ingénierie Numérique": [],
"Ingénierie Numérique": ["Analyse d'image", "Apprentissage automatique"],
"Santé Numérique": [],
"Autres": []
}
Expand Down Expand Up @@ -123,13 +128,15 @@ const data = [
},
{
"name": "Robin Girard",
"role": "",
"email": "",
"role": "Enseignant-chercheur",
"email": "[email protected]",
"linkedin": "robin-girard-a88baa4",
"github": "robingirard",
"skills": {
"Ingénierie Numérique": [],
"Ingénierie Numérique": ["Apprentissage automatique", "Modélisation des systèmes énergétiques"],
"Industries Créatives": [],
"Santé Numérique": [],
"Autres": []
"Autres": ["Energies renouvelables"]
}
},
{
Expand All @@ -154,13 +161,25 @@ const data = [
"Autres": ["Géosciences"]
}
},
{
"name": "Pascal Le Masson",
"role": "Professeur",
"email": "[email protected]",
"linkedin": "pascal-le-masson-13583a82",
"skills": {
"Ingénierie Numérique": ["Modéles génératifs"],
"Industries Créatives": ["Processus créatif"],
"Santé Numérique": [],
"Autres": ["Théorie de la conception", "Technologie et innovation"]
}
},
{
"name": "Beatriz Marcotegui",
"role": "",
"email": "",
"linkedin": "",
"role": "Professeure",
"email": "[email protected]",
"linkedin": "beatrizmarcotegui",
"skills": {
"Ingénierie Numérique": [],
"Ingénierie Numérique": ["Analyse d'Image", "Apprentissage automatique"],
"Santé Numérique": [],
"Autres": []
}
Expand Down Expand Up @@ -225,10 +244,11 @@ const data = [
},
{
"name": "Thierry Ranchin",
"role": "",
"email": "",
"role": "Professeur, Directeur de centre",
"email": "[email protected]",
"linkedin": "thierry-ranchin-2b88a932",
"skills": {
"Ingénierie Numérique": [],
"Ingénierie Numérique": ["Traitement d'images", "Fusion de données"],
"Industries Créatives": [],
"Santé Numérique": [],
"Autres": []
Expand Down

0 comments on commit 875429f

Please sign in to comment.