Merge pull request #48 from rustnl/workshop-updates

Workshop updates

src/pages/people/trainers/alice.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Alice Ivy Cecile"
-image: "alice_cecile.jpg"
+image: "alice_cecile.jpg" # images go in public/images/people
 title: "Bevy community leader & mad scientist"
 linkedin: ""
 twitter: ""

src/pages/people/trainers/andre.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Andre Bogus"
-image: "andre.jpg"
+image: "andre.jpg" # images go in public/images/people
 title: "Distinguished Engineer"
 linkedin: ""
 twitter: "https://twitter.com/llogiq"

src/pages/people/trainers/francois.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "François Mockers"
-image: "francois.png"
+image: "francois.png" # images go in public/images/people
 title: "Maintainer @ Bevy"
 linkedin: ""
 twitter: ""

src/pages/people/trainers/georg.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Georg Semmler"
-image: "georg.jpeg"
+image: "georg.jpeg" # images go in public/images/people
 title: "Diesel Maintainer"
 linkedin: ""
 twitter: ""

src/pages/people/trainers/marc.md

@@ -0,0 +1,14 @@
+---
+layout: "../../../layouts/MarkdownLayout.astro"
+name: "Marc Schoolderman"
+image: "marc.jpeg" # images go in public/images/people
+title: "Software engineer @ Tweede golf"
+linkedin: "https://www.linkedin.com/in/marc-schoolderman/"
+twitter: ""
+mastodon: ""
+github: "https://github.com/squell"
+workshop: "python"
+slug: "marc"
+---
+
+Marc is a software engineer at Tweede golf, interested in reliable software engineering. He led the project team formed by Tweede golf and Ferrous Systems to re-implement the ubiquitous “sudo” and “su” commands in Rust. Before working at Tweede golf, he worked at the Digital Security department at Radboud University Nijmegen, researching the practical application of formal methods.

src/pages/people/trainers/matthias.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Matthias Endler"
-image: "matthias.jpg"
+image: "matthias.jpg" # images go in public/images/people
 title: "Rust Consultant & 'Rust in Production' podcast host"
 linkedin: "https://www.linkedin.com/in/endlermatthias/"
 twitter: "https://twitter.com/matthiasendler"
@@ -11,6 +11,6 @@ workshop: "cli"
 slug: "matthias"
 ---
 
-Hi, I’m Matthias Endler, a Rust developer and open-source maintainer with 20 years of experience in software development. I'm also the host of 'Rust in Production' podcast.
+Hi, I’m Matthias Endler, a Rust developer and open-source maintainer with 20 years of experience in software development. I'm also the host of the 'Rust in Production' podcast.
 
 I help clients worldwide get the most out of Rust through training, consulting, and writing no-frills, easy-to-follow, idiomatic Rust code.

src/pages/people/trainers/michael.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Michael Winkelmann"
-image: "michaelw.jpg"
+image: "michaelw.jpg" # images go in public/images/people
 title: "Independent Software Consultant"
 linkedin: ""
 twitter: ""

src/pages/people/trainers/rik.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Rik Arends"
-image: "rik.jpeg"
+image: "rik.jpeg" # images go in public/images/people
 title: "Founder Makepad"
 linkedin: "https://www.linkedin.com/in/arendsrik/"
 twitter: "https://twitter.com/rikarends"

src/pages/people/trainers/tamme.md

@@ -1,7 +1,7 @@
 ---
 layout: "../../../layouts/MarkdownLayout.astro"
 name: "Tamme Dittrich"
-image: "tamme.jpg"
+image: "tamme.jpg" # images go in public/images/people
 title: "Embedded Rust engineer @ Tweede golf"
 linkedin: "https://www.linkedin.com/in/tamme-dittrich-81b225227/"
 twitter: ""

src/pages/workshops.astro

@@ -36,13 +36,13 @@ const trainers = await Astro.glob('./people/trainers/*.md');
                 <Workshop>
                     <WorkshopDetail {...workshop.frontmatter} description={workshop.compiledContent()} />
                         <div class="space-y-3">
-                            <h4>Workshop by</h4>
+                            <strong>Workshop by</strong>
+                            {trainers
+                                .filter((trainer) => trainer.frontmatter.workshop == workshop.frontmatter.slug)
+                                .map((workshopTrainer) =>
+                                <div class="trainer">{workshopTrainer.frontmatter.name}</div>
+                            )}
                         </div>
-                        {trainers
-                            .filter((trainer) => trainer.frontmatter.workshop == workshop.frontmatter.slug)
-                            .map((workshopTrainer) =>
-                            <SpeakerFull {...workshopTrainer.frontmatter} />
-                        )}
 
                 </Workshop>
                 <div class="space-y-3">
@@ -60,8 +60,12 @@ const trainers = await Astro.glob('./people/trainers/*.md');
 </CommonLayout>
 
 <style lang="scss">
-@use "../styles/variables.scss";
-h4 {
-    font-size: variables.$font-size-lg;
+    @use "../styles/variables.scss";
+    .trainer {
+        font-size: variables.$font-size-md;
+            // note: writing this as text-decoration shorthand does not work on safari
+        text-decoration-line: underline;
+        text-decoration-color: variables.$color-red-400;
+        text-decoration-thickness: 0.3rem;
     }
 </style>

src/pages/workshops/clippy.md

@@ -1,14 +1,15 @@
 ---
 layout: "../../layouts/WorkshopLayout.astro"
 title: "Clippy Lint Implementer's Workshop"
-abstract: "Let's pair up to pick a clippy issue to work on and then code up a PR for it with the help of llogiq."
+abstract: "Let's pair up to pick a clippy issue to work on and then code up a PR for it."
 time: "9:00 - 13:00"
 slug: "clippy"
 level: "intermediate"
 beginnerFriendly: true
 ---
 
-Let's pair up to pick a clippy issue to work on and then code up a PR for it with the help of llogiq.
+Let's pair up to pick a clippy issue to work on and then code up a PR for it with the help of Andre.
+
 What participants will learn:
 
 - How contributing to rust-clippy works