Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Layout update #45

Merged
merged 6 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.hugo_build.lock
public
resources/_gen
to_be_added
Binary file added assets/images/brands/bpi.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 assets/images/brands/centrale_lyon.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 assets/images/brands/cnes.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 assets/images/brands/france2030.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 assets/images/brands/gfz.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 assets/images/brands/pam_building.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 removed assets/images/brands/quantstack.png
Binary file not shown.
Binary file added assets/images/brands/safran.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 assets/images/brands/spacedreams.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 removed assets/images/brands/ssg-aero.png
Binary file not shown.
Binary file added assets/images/brands/vectura.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 assets/images/portfolio/pyturbo_aircraft.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 assets/images/portfolio/pyturbo_icon.gif
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 assets/images/portfolio/pyturbo_user.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion config/_default/menus.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ name = "Videos"
url = "videos/"
weight = 7

[[main]]
name = "Portfolio"
url = "portfolio/"
weight = 8

[[main]]
name = "Blog"
url = "blog/"
Expand All @@ -48,4 +53,4 @@ weight = 9
#[[footer]]
#name = "Terms & Conditions"
#url = "terms-and-conditions/"
#weight = 4
#weight = 4
File renamed without changes.
5 changes: 5 additions & 0 deletions content/advisors/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
subtitle: "Our Advisors"
title: "External Partnerships"
headless: true
---
File renamed without changes.
4 changes: 4 additions & 0 deletions content/partners/centrale_lyon.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/centrale_lyon.png"
external_url: "https://www.ec-lyon.fr/"
---
4 changes: 4 additions & 0 deletions content/partners/cnes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/cnes.png"
external_url: "https://www.cnes.fr/"
---
4 changes: 4 additions & 0 deletions content/partners/gfz.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/gfz.png"
external_url: "https://www.gfz-potsdam.de/en/"
---
2 changes: 1 addition & 1 deletion content/partners/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subtitle: "Our Partners"
title: "The people we work with"
title: "The organisations we work with"
headless: true
---
4 changes: 4 additions & 0 deletions content/partners/pam_building.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/pam_building.png"
external_url: "https://www.pambuilding.fr/"
---
4 changes: 0 additions & 4 deletions content/partners/quantstack.md

This file was deleted.

4 changes: 4 additions & 0 deletions content/partners/safran.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/safran.png"
external_url: "https://www.safran-group.com/"
---
4 changes: 4 additions & 0 deletions content/partners/spacedreams.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/spacedreams.png"
external_url: "https://www.spacedreams.com/"
---
4 changes: 0 additions & 4 deletions content/partners/ssg-aero.md

This file was deleted.

4 changes: 4 additions & 0 deletions content/partners/vectura.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/vectura.png"
external_url: "https://www.vectura-system.com/"
---
6 changes: 6 additions & 0 deletions content/portfolio/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: "Portfolio"
description: "meta description"
image: ""
draft: false
---
40 changes: 40 additions & 0 deletions content/portfolio/pyturbo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
title: "pyturbo library"
subtitle: "Efficient turbine design made open-source"
draft: false
image: "images/portfolio/pyturbo_icon.gif"
weight: 1
article_url: "pyturbo"
---

<div class='row'>
<div class='col-7 '>

### Objectives

- Demonstrate modelling and design capabilities based on CoSApp.

- Provide a turbofan Open-Source library for training and as a base block of advanced simulations workflows.


### Outlook

- Add alternative modelings, architectures.
- Improve the learning experience with beginner to advanced tutorials.

### Current status

- A turbofan (2 shafts) architecture is covered from single physics/components to the full product, using modular intermediate assemblies.

- Multiple off-design and design strategies are available as numerical workflows.

</div>
<div class='col-5' text-align='center'>
<div class='row'>
{{<figure src=/images/portfolio/pyturbo_icon.gif width="500">}}
</div>
<div class='row'>
{{<figure src=/images/portfolio/pyturbo_aircraft.png width="500">}}
</div>
</div>
</div>
4 changes: 4 additions & 0 deletions content/support/bpi.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/bpi.png"
external_url: "https://www.bpifrance.fr/"
---
4 changes: 4 additions & 0 deletions content/support/france2030.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
image: "images/brands/france2030.png"
external_url: "https://www.economie.gouv.fr/france-2030"
---
5 changes: 5 additions & 0 deletions content/support/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
subtitle: "Our Sponsors"
title: "They support us"
headless: true
---
File renamed without changes.
2 changes: 1 addition & 1 deletion content/we_worked_together/alexandre.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "Alexandre Perrin"
designation: "Intern - Avionic Engineering student"
designation: "Intern - Avionic Engineering"
image: "images/team/alexandre.jpg"
weight: 999
---
2 changes: 1 addition & 1 deletion content/we_worked_together/anthony.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "Anthony Pacini"
image: "images/team/anthony.jpg"
designation: "Intern - Datascience and Artificial Intelligence student"
designation: "Intern - Datascience and AI"
weight: 998
---
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
name: "Hugo Chesneau"
designation: "Scientific Software Engineer"
image: "images/team/hugo.jpg"
weight: 2
weight: 990
---
2 changes: 1 addition & 1 deletion content/we_worked_together/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subtitle: "Past collaborations"
subtitle: "Past collaborators"
title: "We Were Pleased To Work Together"
headless: true
---
2 changes: 1 addition & 1 deletion content/we_worked_together/nam.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "Nam Vu"
designation: "Intern - CS Engineering student"
designation: "Intern - CS Engineering"
image: "images/team/nam.jpg"
weight: 1000
---
2 changes: 1 addition & 1 deletion content/we_worked_together/simon.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "Simon Garrigues"
designation: "Intern - Propulsion Engineering Student"
designation: "Intern - Propulsion Engineering"
image: "images/team/simon.jpg"
weight: 995
---
108 changes: 99 additions & 9 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ <h3>{{.Params.name | markdownify}}</h3>
</section>
{{end}}

{{with .Site.GetPage "we_worked_together"}}
{{with .Site.GetPage "advisors"}}
<section class="section" id="team">
<div class="container">
<div class="row">
Expand Down Expand Up @@ -219,29 +219,34 @@ <h2 class="title">{{.Params.title | markdownify}}</h2>
</div>
</div>
<div class="row">
<div class="col-md-12" data-aos="fade-left">
<div class="col-md-12 text-center" data-aos="fade-in">
<div class="brand-carousel swiper-container">
<div class="swiper-wrapper">
<div class="swiper-wrapper align-items-center">
{{range .Resources}}
{{if fileExists (add `assets/` .Params.image)}}
<div class="swiper-slide">
<div class="swiper-slide" disableOnInteraction="false">
<div class="brand-item">
{{$img:= resources.Get .Params.image}}
{{$img_width := $img.Width }}

{{$box_width := "400"}}
{{$box_height := "200"}}
{{$box_aspect := add (add (string $box_width) "x") (string $box_height)}}

{{$img_orginal := add (add (string $img_width) "x") " " }}
{{$img_src := ($img.Resize $img_orginal).RelPermalink }}
{{$img_src := ($img.Fit $box_aspect).RelPermalink }}

{{$imgWebp := add (add (string $img_width) "x") " webp" }}
{{$imgWebp_src := ($img.Resize $imgWebp).RelPermalink }}
{{$imgWebp_src := ($img.Fit $box_aspect).RelPermalink }}

<a href="{{.Params.external_url}}" target="_blank">
<img loading="lazy" decoding="async" class="img-fluid" width="{{$img_width}}" height="{{$img.Height}}"
<img loading="lazy" decoding="async" class="img-fluid" height="{{$box_height}}"
src="{{$imgWebp_src}}" alt="Brand Image" onerror="this.onerror=null;this.src='{{$img_src}}'">
</a>
</div>
</div>
{{end}}
{{end}}


</div>
</div>
</div>
Expand All @@ -250,6 +255,91 @@ <h2 class="title">{{.Params.title | markdownify}}</h2>
</section>
{{end}}

{{with .Site.GetPage "support"}}
<section class="section" id="support">
<div class="container">
<div class="row">
<div class="col-12">
<div class="section-title text-center" data-aos="fade-in">
<p class="text-uppercase">{{.Params.subtitle | markdownify}}</p>
<h2 class="title">{{.Params.title | markdownify}}</h2>
<p>{{.Params.description | markdownify}}</p>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 text-center" data-aos="fade-in">
<div class="brand-carousel swiper-container">
<div class="swiper-wrapper align-items-center">
{{range .Resources}}
{{if fileExists (add `assets/` .Params.image)}}
<div class="swiper-slide" disableOnInteraction="false">
<div class="brand-item">
{{$img:= resources.Get .Params.image}}
{{$img_width := $img.Width }}

{{$box_width := "400"}}
{{$box_height := "200"}}
{{$box_aspect := add (add (string $box_width) "x") (string $box_height)}}

{{$img_src := ($img.Fit $box_aspect).RelPermalink }}

{{$imgWebp_src := ($img.Fit $box_aspect).RelPermalink }}

<a href="{{.Params.external_url}}" target="_blank">
<img loading="lazy" decoding="async" class="img-fluid" height="{{$box_height}}"
src="{{$imgWebp_src}}" alt="Brand Image" onerror="this.onerror=null;this.src='{{$img_src}}'">
</a>
</div>
</div>
{{end}}
{{end}}


</div>
</div>
</div>
</div>
</div>
</section>
{{end}}

{{with .Site.GetPage "we_worked_together"}}
<section class="section" id="team">
<div class="container">
<div class="row">
<div class="col-12">
<div class="section-title text-center" data-aos="fade-in">
<p class="text-uppercase">{{.Params.subtitle | markdownify}}</p>
<h2 class="title">{{.Params.title | markdownify}}</h2>
<p>{{.Params.description | markdownify}}</p>
</div>
</div>
</div>
<div class="row justify-content-around">
{{range sort .Resources "Params.weight"}}
<div class="col-lg-2 col-md-3 col-3">
<div class="team-item text-center">
<div class="team-image">
{{ if fileExists (add `assets/` .Params.image) }}
{{$img:= resources.Get .Params.image }}
{{$img:= $img.Resize "175x "}}
{{$imgWebp:= $img.Resize "175x webp"}}
<img loading="lazy" decoding="async" class="w-100 img-fluid rounded-circle" width="{{$img.Width}}"
height="{{$img.Height}}" src="{{$imgWebp.RelPermalink}}" alt="Team Image"
onerror="this.onerror=null;this.src='{{$img.RelPermalink}}'">
{{end}}
</div>
<h4>{{.Params.name | markdownify}}</h4>
<p>{{.Params.designation | markdownify}}</p>
</div>
</div>
{{end}}
</div>
</div>
</section>
{{end}}

<section class="section" id="contact">
<div class="container">
<div class="row justify-content-center align-items-center">
Expand Down
22 changes: 22 additions & 0 deletions layouts/portfolio/card.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<article class="card blog-card">
<div class="card-body">
<h3 class="card-title"><a title="{{ .Title }}">{{ .Title }}</a>
</h3>
<p>{{ .Params.subtitle }} </p>
</div>
<a title="{{ .Title }}" href="{{ .Params.article_url }}" >
{{ if .Params.image }}
{{ with .Params.image }}
{{ if fileExists (add `assets/` .) }}
{{$imgO:= resources.Get . }}
{{$img:= resources.Get . }}
{{$imgO:= $imgO.Fill "570x310 Center gif"}}
{{$img:= $img.Fill "570x310 Center gif"}}
{{$imgWebp:= $img.Fill "570x300 Center webp"}}
<img loading="lazy" decoding="async" width="570" src="{{$imgO.RelPermalink}}"
alt="portfolio-item" onerror="this.onerror=null;this.src='{{$img.RelPermalink}}'">
{{end}}
{{end}}
{{end}}
</a>
</article>
Loading