Merge branch 'main' into fix/update-code-blocks

Author: davepagurek

src/components/EducationResource/index.astro

@@ -8,6 +8,7 @@ interface Props {
 }
 
 const { name, featuredImage, featuredImageAlt } = Astro.props;
+const authorHTML = (await Astro.slots.render("author")).replace(/\<p[^\>]*\>/gm, "");
 
 ---
 <li class="col-span-3">
@@ -21,6 +22,7 @@ const { name, featuredImage, featuredImageAlt } = Astro.props;
   </div>
   <div class="rendered-markdown">
     <div class="text-sm">
+      <h4 set:html={authorHTML} />
       <slot name="description" />
     </div>
     <div class="text-sm leading-8 [&_a]:whitespace-nowrap [&_a]:rounded-full [&_a]:mr-1 [&_a]:py-1 [&_a]:px-2 [&_a]:outline [&_a]:outline-1 [&_a]:outline-[var(--type-magenta-dark)]">

src/content/pages/en/education-resources.mdx

@@ -34,7 +34,7 @@ Every teaching has its own unique goals, messages, conditions, and environments.
   </EducationResource>
 
   <EducationResource
-    name="Xin Xin’s p5.js Tutorials"
+    name="p5.js Tutorials by Xin Xin"
     featuredImage={await import("../images/education-resources/xin-xin.jpg")}
     featuredImageAlt="Xin Xin’s tutorial cover titled “Experimental Typography textToPoints() Javascript splice()"
   >
@@ -50,7 +50,7 @@ Every teaching has its own unique goals, messages, conditions, and environments.
   </EducationResource>
 
   <EducationResource
-    name="Patt Vira’s p5.js Tutorials"
+    name="p5.js Tutorials by Patt Vira"
     featuredImage={await import("../images/education-resources/patt-vira.jpg")}
     featuredImageAlt="Patt Vira’s youtube channel banner, showing “MAKE ART WITH CODE New video Monday, Wednesday, and Friday”"
   >
@@ -83,18 +83,34 @@ Every teaching has its own unique goals, messages, conditions, and environments.
   </EducationResource>
 
   <EducationResource
-    name="Creative Coding Class with p5.js"
-    featuredImage={await import("../images/education-resources/cc2021lowres.jpg")}
-    featuredImageAlt="Cover photo with text 'Creative Coding'"
+    name="p5.js Tutorials by Computational Mama"
+    featuredImage={await import("../images/education-resources/ComputationalMama.png")}
+    featuredImageAlt="A screenshot of p5.js tutorial by Computational Mama"
   >
     <Fragment slot="author">
-      Carrie Sijia Wang
+      Computational Mama
     </Fragment>
     <Fragment slot="description">
-      Fundamental coding class using p5.js
+      Experiments with creative coding and live coding with p5js.
     </Fragment>
     <Fragment slot="materials">
-      [GitHub](https://github.com/ellennickles/creative-coding-summer-21/blob/main/homework-carrie.md)
+      [YouTube](https://www.youtube.com/@ComputationalMama)
+    </Fragment>
+  </EducationResource>
+
+  <EducationResource
+    name="Critical Code Cookbook"
+    featuredImage={await import("../images/education-resources/critical-code-cookbook.png")}
+    featuredImageAlt="A header image showing “Critical Coding Cookbook: Intersectional Feminist Approaches to Teaching and Learning"
+  >
+    <Fragment slot="author">
+      Critical Code Cookbook
+    </Fragment>
+    <Fragment slot="description">
+      Intersectional Feminist Approaches to Teaching and Learning Material.
+    </Fragment>
+    <Fragment slot="materials">
+      [Website](https://criticalcode.recipes/)
     </Fragment>
   </EducationResource>
 
@@ -132,18 +148,18 @@ Every teaching has its own unique goals, messages, conditions, and environments.
   </EducationResource>
 
   <EducationResource
-    name="Critical Code Cookbook"
-    featuredImage={await import("../images/education-resources/critical-code-cookbook.png")}
-    featuredImageAlt="A header image showing “Critical Coding Cookbook: Intersectional Feminist Approaches to Teaching and Learning"
+    name="Creative Coding Class with p5.js"
+    featuredImage={await import("../images/education-resources/cc2021lowres.jpg")}
+    featuredImageAlt="Cover photo with text 'Creative Coding'"
   >
     <Fragment slot="author">
-      Critical Code Cookbook
+      Carrie Sijia Wang
     </Fragment>
     <Fragment slot="description">
-      Intersectional Feminist Approaches to Teaching and Learning Material.
+      Fundamental coding class using p5.js
     </Fragment>
     <Fragment slot="materials">
-      [Website](https://criticalcode.recipes/)
+      [GitHub](https://github.com/ellennickles/creative-coding-summer-21/blob/main/homework-carrie.md)
     </Fragment>
   </EducationResource>
 
@@ -165,7 +181,7 @@ Every teaching has its own unique goals, messages, conditions, and environments.
 
   <EducationResource
     name="Machine Learning for the Web"
-    featuredImage={await import("../images/education-resources/ml5js.jpg")}
+    featuredImage={await import("../images/education-resources/ml5js.png")}
     featuredImageAlt="pix2pix demo image with cat image generated from edges."
   >
     <Fragment slot="author">