Merge branch 'CodingTrain:main' into update-homepage-6-11-24

Author: kfahn22

CONTRIBUTING.md

@@ -23,7 +23,7 @@ Here are the types of contributions we are looking for:
 
 1. Share your creative work inspired by a coding challenge or tutorial in the showcase!
 
-   - You can submit your showcase with the [Passenger Showcase Form](http://thecodingtrain.com/submit)
+   - You can submit your showcase with the [Passenger Showcase Form](https://thecodingtrain.com/submit)
 
 2. Add a new track to the site! (https://github.com/CodingTrain/thecodingtrain.com/issues/279)
 

HACKTOBERFEST.md

@@ -4,7 +4,7 @@ This Hacktoberfest, here are the ways you can contribute to The Coding Train:
 
 1. **Share your creative work on the Passenger Showcase!**
 
-   - For your submission to count towards Hacktoberfest, you must manually create a Pull Request to the website repository. You can follow along with the [Passenger Showcase Guide](http://thecodingtrain.com/guides/passenger-showcase-guide) (scroll down below the form) to create your Pull Request.
+   - For your submission to count towards Hacktoberfest, you must manually create a Pull Request to the website repository. You can follow along with the [Passenger Showcase Guide](https://thecodingtrain.com/guides/passenger-showcase-guide) (scroll down below the form) to create your Pull Request.
 
 2. **Curate content for the website**
 
@@ -21,6 +21,7 @@ This Hacktoberfest, here are the ways you can contribute to The Coding Train:
    - You can contribute to other [Coding Train repositories](https://github.com/CodingTrain/) as well. You will need to ask for the Pull Request to be accepted for Hacktoberfest to count it towards your progress.
 
 ## Guide For Newer Contributors
+
 If you are new to open source contributions, here are some useful resources that can help you get started:
 
 - [Git and GitHub for Poets](https://www.youtube.com/playlist?list=PLRqwX-V7Uu6ZF9C0YMKuns9sLDzK6zoiV): A Coding Train video series for Git and GitHub beginners.

README.md

@@ -1,13 +1,15 @@
 # Coding Train Website
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+
 [![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 This repo holds the website for [thecodingtrain.com](https://thecodingtrain.com/). The website is built with:
 
 - [Gatsby](https://www.gatsbyjs.com/) to perform the static site rendering
-- [React](https://reactjs.org/) as the general JavaScript framework
+- [React](https://react.dev/) as the general JavaScript framework
 
 ## Table of Contents
 

content-testing/schemas.js

@@ -289,7 +289,7 @@ const socialGroup = strictObject({
   title: string().required(),
   links: array(
     strictObject({
-      url: string().url().required(),
+      url: urlOrRelativeLinkValidator.required(),
       site: string()
         .oneOf(['twitter', 'discord', 'instagram', 'youtube', 'github'])
         .required()

content-testing/validators.js

@@ -87,7 +87,7 @@ const dateRangeValidator = string().test(
   (value, context) => {
     if (!value) return true;
 
-    // yup is too leniant with `.date()` and allows broken string date formats
+    // yup is too lenient with `.date()` and allows broken string date formats
     // we only want to allow `yyyy-mm-dd` or a full ISO 8601 date in UTC
     // see https://github.com/jquense/yup/blob/master/src/util/isodate.js
 
@@ -319,7 +319,8 @@ const relativeLinks = {
   '/guides': slugs.guides,
   '/showcase': new Set(),
   '/faq': new Set(),
-  '/about': new Set()
+  '/about': new Set(),
+  '/discord': new Set()
 };
 
 const urlOrRelativeLinkValidator = string().test(

content/pages/about/index.json

@@ -36,7 +36,7 @@
           "url": "https://www.youtube.com/c/TheCodingTrain/",
           "site": "youtube"
         },
-        { "url": "https://thecodingtrain.com/discord", "site": "discord" },
+        { "url": "/discord", "site": "discord" },
         { "url": "https://github.com/CodingTrain", "site": "github" }
       ]
     }

content/pages/faqs/cafe-car.json

@@ -1,6 +1,6 @@
 {
   "question": "Cafe Car",
   "answer": {
-    "text": "The Cafe Car is the place to meet and chat with the Coding Train community! Your first stop is the [Discord](https://thecodingtrain.com/discord), but we’d also love for you to say hi on [Twitter](https://twitter.com/thecodingtrain) and [Instagram](https://www.instagram.com/the.coding.train)!"
+    "text": "The Cafe Car is the place to meet and chat with the Coding Train community! Your first stop is the [Discord](/discord), but we’d also love for you to say hi on [Twitter](https://twitter.com/thecodingtrain) and [Instagram](https://www.instagram.com/the.coding.train)!"
   }
 }

content/pages/faqs/find-help.json

@@ -1,10 +1,7 @@
 {
   "question": "Where can I find help with my code?",
   "answer": {
-    "text": "We have a friendly and helpful community in the [Coding Train Discord](https://thecodingtrain.com/discord), which has a number of help channels. You can also visit [The Processing Foundation's forum](https://discourse.processing.org/), a great place to ask specific questions related to Processing and p5.js.",
-    "list": [
-      "[The Coding Train's Discord](https://thecodingtrain.com/discord)",
-      "[The Processing Foundation's Forum](https://discourse.processing.org/)"
-    ]
+    "text": "We have a friendly and helpful community in the [Coding Train Discord](/discord), which has a number of help channels. You can also visit [The Processing Foundation's forum](https://discourse.processing.org/), a great place to ask specific questions related to Processing and p5.js.",
+    "list": ["[The Coding Train's Discord](/discord)", "[The Processing Foundation's Forum](https://discourse.processing.org/)"]
   }
 }

content/pages/faqs/livestream-notification.json

@@ -1,6 +1,6 @@
 {
   "question": "Where and when do you live stream? Can I get a notification?",
   "answer": {
-    "text": "The best way to stay up to date on my schedule is to [join the Coding Train discord](https://thecodingtrain.com/discord) and subscribe to the “notifications” role.\n Live streams occur on both [Twitch](https://www.twitch.tv/codingtrainchoochoo) and [YouTube](https://www.youtube.com/c/TheCodingTrain/featured). Each platform has various options for receiving notifications. On YouTube, for example you can [subscribe to The Coding Train](https://www.youtube.com/c/TheCodingTrain) and click the bell for all notifications. For streams scheduled in advance, they’ll be listed on the [homepage of this website](/)."
+    "text": "The best way to stay up to date on my schedule is to [join the Coding Train discord](/discord) and subscribe to the “notifications” role.\n Live streams occur on both [Twitch](https://www.twitch.tv/codingtrainchoochoo) and [YouTube](https://www.youtube.com/c/TheCodingTrain/featured). Each platform has various options for receiving notifications. On YouTube, for example you can [subscribe to The Coding Train](https://www.youtube.com/c/TheCodingTrain) and click the bell for all notifications. For streams scheduled in advance, they’ll be listed on the [homepage of this website](/)."
   }
 }

content/pages/faqs/suggest-topic.json

@@ -1,6 +1,6 @@
 {
   "question": "How do I suggest a topic for a Coding Challenge or Track?",
   "answer": {
-    "text": "You can share ideas by [opening an issue in the Coding Train Suggestion Box](https://github.com/CodingTrain/Suggestion-Box) or by [joining the Coding Train discord](https://thecodingtrain.com/discord)."
+    "text": "You can share ideas by [opening an issue in the Coding Train Suggestion Box](https://github.com/CodingTrain/Suggestion-Box) or by [joining the Coding Train discord](/discord)."
   }
 }