use head instead of helmet

morganstanley · Aug 1, 2024 · 389528b · 389528b
1 parent b2f6bc8
commit 389528b
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 115 deletions.
diff --git a/site/content/exercises/makecode/intro/E1/index.md b/site/content/exercises/makecode/intro/E1/index.md
@@ -25,4 +25,4 @@ Download code of selected project & just have fun with running the example.
 
 Objective: Just copy and paste existing examples and have fun, fun, fun...
 
-Homework: [Read thru all Adafruit features](https://learn.adafruit.com/adafruit-circuit-playground-express)
+Homework: [Read through all Adafruit features](https://learn.adafruit.com/adafruit-circuit-playground-express)
diff --git a/site/content/teach.mdx b/site/content/teach.mdx
@@ -2,6 +2,7 @@
 order: 5
 title: Teach
 subtitle:
+description: Training tips for instructors
 ---
 
 ## Mission &amp; Philosophy

diff --git a/site/gatsby-node.js b/site/gatsby-node.js
@@ -4,32 +4,36 @@ const { createFilePath } = require(`gatsby-source-filesystem`);
 exports.createPages = async ({ graphql, actions }) => {
   const { createPage } = actions;
 
-  const result = await graphql(
-    `
-      {
-        allMdx {
-          nodes {
-            id
-            tableOfContents
-            frontmatter {
-              template
-              title
-              tags
-              level
-              exercise
-              category
-            }
-            internal {
-              contentFilePath
-            }
-            fields {
-              slug
-            }
+  const result = await graphql(`
+    {
+      site {
+        siteMetadata {
+          title
+        }
+      }
+      allMdx {
+        nodes {
+          id
+          tableOfContents
+          frontmatter {
+            template
+            title
+            tags
+            level
+            exercise
+            category
+            description
+          }
+          internal {
+            contentFilePath
+          }
+          fields {
+            slug
           }
         }
       }
-    `
-  );
+    }
+  `);
 
   if (result.errors) {
     throw result.errors;

diff --git a/site/src/components/seo.jsx b/site/src/components/seo.jsx
diff --git a/site/src/pages/404.js b/site/src/pages/404.js
@@ -2,12 +2,10 @@ import React from 'react';
 import { graphql } from 'gatsby';
 
 import Layout from '../components/layout';
-import Seo from '../components/seo';
 
 const NotFoundPage = ({ location }) => {
   return (
     <Layout location={location}>
-      <Seo title="404: Not Found" />
       <h1>Not Found</h1>
       <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
     </Layout>
@@ -16,6 +14,8 @@ const NotFoundPage = ({ location }) => {
 
 export default NotFoundPage;
 
+export const Head = () => <title>404: Not Found</title>;
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/exercises/circuitpython/level-1/index.js b/site/src/pages/exercises/circuitpython/level-1/index.js
@@ -4,7 +4,6 @@ import { graphql } from 'gatsby';
 import ExerciseList from '../../../../components/exercises';
 import Hero from '../../../../components/hero';
 import Layout from '../../../../components/layout';
-import Seo from '../../../../components/seo';
 
 import SetUp from '../../../../../content/exercises/circuitpython/start-here.mdx';
 
@@ -21,7 +20,6 @@ const CPXLevel1Index = ({ data, location }) => {
           title="CPX Training Workshop"
           subtitle="CircuitPython - Level 1"
         />
-        <Seo title="CircuitPython | Level 1" />
         <article className="content">
           <SetUp />
         </article>
@@ -33,6 +31,16 @@ const CPXLevel1Index = ({ data, location }) => {
 
 export default CPXLevel1Index;
 
+export const Head = () => (
+  <>
+    <title>CircuitPython | Level 1</title>
+    <meta
+      name="description"
+      content="Level 1 CircuitPython curriculum for beginners"
+    />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/exercises/circuitpython/level-2/index.js b/site/src/pages/exercises/circuitpython/level-2/index.js
@@ -4,7 +4,6 @@ import { graphql } from 'gatsby';
 import ExerciseList from '../../../../components/exercises';
 import Hero from '../../../../components/hero';
 import Layout from '../../../../components/layout';
-import Seo from '../../../../components/seo';
 
 import SetUp from '../../../../../content/exercises/circuitpython/start-here.mdx';
 
@@ -21,7 +20,6 @@ const CPXLevel2Index = ({ data, location }) => {
           title="CPX Training Workshop"
           subtitle="CircuitPython - Level 2"
         />
-        <Seo title="CircuitPython | Level 2" />
         <article className="content">
           <SetUp />
         </article>
@@ -33,6 +31,16 @@ const CPXLevel2Index = ({ data, location }) => {
 
 export default CPXLevel2Index;
 
+export const Head = () => (
+  <>
+    <title>CircuitPython | Level 2</title>
+    <meta
+      name="description"
+      content="Level 2 CircuitPython curriculum for intermediate users"
+    />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/exercises/circuitpython/robotics/index.js b/site/src/pages/exercises/circuitpython/robotics/index.js
@@ -4,7 +4,6 @@ import { graphql } from 'gatsby';
 import ExerciseList from '../../../../components/exercises';
 import Hero from '../../../../components/hero';
 import Layout from '../../../../components/layout';
-import Seo from '../../../../components/seo';
 
 import '../../../../styles/global.css';
 import '../../../../styles/style.css';
@@ -22,7 +21,6 @@ const MakeCodeIndex = ({ data, location }) => {
           subtitle=""
           image="../../images/desk.jpg"
         />
-        <Seo title="MakeCode" />
         <article className="content">
           <Summary />
         </article>
@@ -34,6 +32,13 @@ const MakeCodeIndex = ({ data, location }) => {
 
 export default MakeCodeIndex;
 
+export const Head = () => (
+  <>
+    <title>CircuitPython | Robotics</title>
+    <meta name="description" content="CircuitPython Robotics Curriculum" />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/exercises/index.js b/site/src/pages/exercises/index.js
@@ -3,7 +3,6 @@ import { graphql, Link } from 'gatsby';
 
 import Hero from '../../components/hero';
 import Layout from '../../components/layout';
-import Seo from '../../components/seo';
 
 const CurriculumPage = ({ location }) => {
   return (
@@ -14,7 +13,6 @@ const CurriculumPage = ({ location }) => {
           subtitle="An interactive introduction to coding. Learn the basics through
           simple exercises designed to inspire."
         />
-        <Seo title="Learn" />
         <article className="content">
           <h2>Single Day Programs</h2>
           <div>
@@ -107,6 +105,13 @@ const CurriculumPage = ({ location }) => {
 
 export default CurriculumPage;
 
+export const Head = () => (
+  <>
+    <title>CircuitPlayground Express Curriculum</title>
+    <meta name="description" content="CircuitPlayground Express Curriculum" />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/exercises/makecode/intro/index.js b/site/src/pages/exercises/makecode/intro/index.js
@@ -4,7 +4,6 @@ import { graphql } from 'gatsby';
 import ExerciseList from '../../../../components/exercises';
 import Hero from '../../../../components/hero';
 import Layout from '../../../../components/layout';
-import Seo from '../../../../components/seo';
 
 import '../../../../styles/global.css';
 import '../../../../styles/style.css';
@@ -17,7 +16,6 @@ const MakeCodeIndex = ({ data, location }) => {
   return (
     <Layout location={location}>
       <div className="exercises-main">
-        <Seo title="MakeCode" />
         <Hero
           title="Circuit Playground Express with MakeCode"
           subtitle=""
@@ -34,6 +32,13 @@ const MakeCodeIndex = ({ data, location }) => {
 
 export default MakeCodeIndex;
 
+export const Head = ({ pageContext }) => (
+  <>
+    <title>{pageContext.frontmatter.title}</title>
+    <meta name="description" content={pageContext.description} />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/exercises/makecode/robotics/index.js b/site/src/pages/exercises/makecode/robotics/index.js
@@ -4,7 +4,6 @@ import { graphql } from 'gatsby';
 import ExerciseList from '../../../../components/exercises';
 import Hero from '../../../../components/hero';
 import Layout from '../../../../components/layout';
-import Seo from '../../../../components/seo';
 
 import '../../../../styles/global.css';
 import '../../../../styles/style.css';
@@ -22,7 +21,6 @@ const MakeCodeIndex = ({ data, location }) => {
           subtitle=""
           image="../../images/desk.jpg"
         />
-        <Seo title="MakeCode" />
         <article className="content">
           <Summary />
         </article>
@@ -34,6 +32,13 @@ const MakeCodeIndex = ({ data, location }) => {
 
 export default MakeCodeIndex;
 
+export const Head = () => (
+  <>
+    <title>MakeCode | Robotics</title>
+    <meta name="description" content="MakeCode Robotics Curriculum" />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {

diff --git a/site/src/pages/index.js b/site/src/pages/index.js
@@ -3,7 +3,6 @@ import { Link, graphql } from 'gatsby';
 
 import Hero from '../components/hero';
 import Layout from '../components/layout';
-import Seo from '../components/seo';
 
 const SiteIndex = ({ location }) => {
   return (
@@ -14,7 +13,6 @@ const SiteIndex = ({ location }) => {
           subtitle="Introduction to programming with Adafruit's Circuit Playground
                 Express"
         />
-        <Seo title="Makerspace by Morgan Stanley" />
         <article className="hero hero-learn">
           <img
             src="images/student-computer.jpg"
@@ -89,6 +87,17 @@ const SiteIndex = ({ location }) => {
 
 export default SiteIndex;
 
+export const Head = () => (
+  <>
+    <title>Makerspace by Morgan Stanley</title>
+    <meta
+      name="description"
+      content="Introduction to programming with Adafruit's Circuit Playground
+                Express"
+    />
+  </>
+);
+
 export const pageQuery = graphql`
   query {
     site {