Skip to content

Commit cdc2fda

Browse files
authored
Merge branch 'main' into PR/non-challenge-video-thumbnails
2 parents be2ccbe + a8dc2a7 commit cdc2fda

File tree

58 files changed

+236
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+236
-40
lines changed

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Use Node.js ${{ matrix.node-version }}
1818
uses: actions/setup-node@v3
1919
with:
20-
node-version: '18.x'
20+
node-version: '20.x'
2121
cache: 'npm'
2222
- run: npm ci
2323
- run: npm test

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions

HACKTOBERFEST.md

Lines changed: 2 additions & 1 deletion

README.md

Lines changed: 4 additions & 2 deletions

content-testing/schemas.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ const socialGroup = strictObject({
289289
title: string().required(),
290290
links: array(
291291
strictObject({
292-
url: string().url().required(),
292+
url: urlOrRelativeLinkValidator.required(),
293293
site: string()
294294
.oneOf(['twitter', 'discord', 'instagram', 'youtube', 'github'])
295295
.required()

content-testing/validators.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ const relativeLinks = {
319319
'/guides': slugs.guides,
320320
'/showcase': new Set(),
321321
'/faq': new Set(),
322-
'/about': new Set()
322+
'/about': new Set(),
323+
'/discord': new Set()
323324
};
324325

325326
const urlOrRelativeLinkValidator = string().test(

content/pages/about/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"url": "https://www.youtube.com/c/TheCodingTrain/",
3737
"site": "youtube"
3838
},
39-
{ "url": "https://thecodingtrain.com/discord", "site": "discord" },
39+
{ "url": "/discord", "site": "discord" },
4040
{ "url": "https://github.com/CodingTrain", "site": "github" }
4141
]
4242
}

content/pages/challenges/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"title": "Challenges",
33
"description": "Ready to apply what you’ve learned in the Tracks? Try a Challenge! These one-off project videos build off concepts introduced in Tracks and may have prerequisites (listed on the challenge page itself).",
44
"featuredText": "Featured Challenge:",
5-
"featuredChallenge": "183-mathematical-marbling"
5+
"featuredChallenge": "64-kinematics"
66
}

content/pages/faqs/cafe-car.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"question": "Cafe Car",
33
"answer": {
4-
"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)!"
4+
"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)!"
55
}
66
}

content/pages/faqs/find-help.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"question": "Where can I find help with my code?",
33
"answer": {
4-
"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.",
5-
"list": [
6-
"[The Coding Train's Discord](https://thecodingtrain.com/discord)",
7-
"[The Processing Foundation's Forum](https://discourse.processing.org/)"
8-
]
4+
"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.",
5+
"list": ["[The Coding Train's Discord](/discord)", "[The Processing Foundation's Forum](https://discourse.processing.org/)"]
96
}
107
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"question": "Where and when do you live stream? Can I get a notification?",
33
"answer": {
4-
"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](/)."
4+
"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](/)."
55
}
66
}

content/pages/faqs/suggest-topic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"question": "How do I suggest a topic for a Coding Challenge or Track?",
33
"answer": {
4-
"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)."
4+
"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)."
55
}
66
}

content/pages/guides/getting-started.md

Lines changed: 1 addition & 1 deletion

content/pages/guides/maintain-website-guide.md

Lines changed: 2 additions & 2 deletions

content/pages/guides/passenger-showcase-guide.md

Lines changed: 1 addition & 1 deletion

content/pages/homepage/index.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
"description": "Watch Dan take on Coding Challenges in p5.js and Processing. The challenge topics include algorithmic art, machine learning, simulation, generative poetry, and more.",
3333
"featured": [
3434
"183-mathematical-marbling",
35-
"41-clappy-bird",
36-
"148-gift-wrapping",
37-
"58-3d-earthquake-data-visualization",
38-
"101-may-the-4th-scrolling-text",
39-
"c1-maurer-rose"
35+
"64-kinematics",
36+
"125-fourier-series",
37+
"28-metaballs",
38+
"116-lissajous-curve-table",
39+
"170-monty-hall-problem"
4040
],
4141
"challengesCta": {
4242
"text": "ready to explore? try a challenge!",
@@ -47,14 +47,14 @@
4747
"passengerShowcase": {
4848
"title": "Passenger showcase highlights",
4949
"featured": [
50-
"challenges/183-mathematical-marbling/showcase/contribution-1714718039.json",
51-
"challenges/183-mathematical-marbling/showcase/contribution-1715194171.json",
52-
"challenges/78-simple-particle-system/showcase/contribution-1714737129.json",
53-
"challenges/30-phyllotaxis/showcase/contribution-1714237829.json",
54-
"physics-libraries/box2d/3-coordinate-and-vectors/showcase/contribution-1714548437.json",
55-
"noc/3-angles/4-polar-coordinates/showcase/contribution-1714998108.json",
56-
"code/1-intro/3-shapes-drawing/showcase/contribution-1713756411.json",
57-
"challenges/181-image-stippling/showcase/contribution-1714302429.json"
50+
"challenges/160-spring-forces/showcase/contribution-1717812105.json",
51+
"noc/4-particles/1-particle-system/showcase/contribution-1716063723.json",
52+
"challenges/183-mathematical-marbling/showcase/contribution-5.json",
53+
"challenges/183-mathematical-marbling/showcase/contribution-1719747682.json",
54+
"challenges/93-double-pendulum/showcase/contribution-1717095241.json",
55+
"code/2-variables/5-map/showcase/contribution-1719881442.json",
56+
"noc/3-angles/7-additive-waves/showcase/contribution-1719068587.json",
57+
"challenges/10-dfs-maze-generator/showcase/contribution-1719932734.json"
5858
],
5959
"showcaseCta": {
6060
"text": "Want to see more?",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Biforkation and depth indication",
3+
"author": {
4+
"name": "Tanner Roberts"
5+
},
6+
"url": "https://editor.p5js.org/tannerbroberts/sketches/WdyY1psa9",
7+
"submittedOn": "2024-07-02T15:05:34.521Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "FNshot",
3+
"author": {
4+
"name": "EclipseMaster0"
5+
},
6+
"url": "https://editor.p5js.org/EclipseMaster0/full/RnPjrLlqK",
7+
"submittedOn": "2024-07-02T17:21:21.423Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "bounce balls",
3+
"author": {
4+
"name": "Bart De Meyere"
5+
},
6+
"url": "https://bartdemeyere.github.io/bounceballs/",
7+
"submittedOn": "2024-06-15T18:57:19.450Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Python Turtle Bezier Curve Maker with MacOs App",
3+
"author": {
4+
"name": "Killercarrot102"
5+
},
6+
"url": "https://github.com/Killeracrrot1021/Python-Turtle-B-zier-Curve-Maker",
7+
"submittedOn": "2024-06-12T16:16:25.623Z",
8+
"socialPermission": true
9+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "Golang implementation of wave function collapse",
3+
"author": {
4+
"name": "Cesare Ghirelli",
5+
"url": "https://github.com/runozo"
6+
},
7+
"url": "https://github.com/runozo/go-wave-function-collapse",
8+
"submittedOn": "2024-06-25T13:22:30.404Z",
9+
"socialPermission": true
10+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"title": "Falling Sand with a bit of control",
3+
"author": {
4+
"name": "abdulrahmanDev1",
5+
"url": "https://github.com/abdulrahmanDev1",
6+
"twitter": "x.com/d7omdev"
7+
},
8+
"url": "https://sand-sim.d7om.dev/",
9+
"submittedOn": "2024-06-05T01:19:33.892Z",
10+
"socialPermission": true
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"title": "Voronoi Game of Life",
3+
"author": {
4+
"name": "Ömer Kaan Gürbüz",
5+
"url": "https://okg21.github.io/",
6+
"instagram": "okg21"
7+
},
8+
"url": "https://github.com/okg21/weighted-voronoi-game-of-life/",
9+
"submittedOn": "2024-06-15T11:52:24.777Z",
10+
"socialPermission": true
11+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Mathematical Marbling",
3+
"author": {
4+
"name": "LinTao"
5+
},
6+
"url": "https://editor.p5js.org/lintao4522/sketches/-YqiEUOHq",
7+
"submittedOn": "2024-06-30T11:41:22.691Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Recursive Islamic Star Quilt",
3+
"author": {
4+
"name": "Kathy McGuiness"
5+
},
6+
"url": "https://editor.p5js.org/kfahn/sketches/R6T0EmC5j",
7+
"submittedOn": "2024-06-28T21:19:32.426Z",
8+
"socialPermission": true
9+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "Minesweeper",
3+
"author": {
4+
"name": "Cooknas",
5+
"url": "http://www.cooknas.com"
6+
},
7+
"url": "http://www.cooknas.com/codingtrain/minesweeper/index.html",
8+
"submittedOn": "2024-06-27T06:23:03.323Z",
9+
"socialPermission": true
10+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Stop the Heat",
3+
"author": {
4+
"name": "The Kid"
5+
},
6+
"url": "https://the-bridge-games.netlify.app/stoptheheat",
7+
"submittedOn": "2024-06-22T10:57:11.648Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Guys help my project is tweaking",
3+
"author": {
4+
"name": "Mohammed Ayath (aka GD Cyber)"
5+
},
6+
"url": "https://editor.p5js.org/gdcyber0303/full/LSprpvbtH",
7+
"submittedOn": "2024-05-11T15:55:57.459Z",
8+
"socialPermission": true
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "random circles",
3+
"author": {
4+
"name": "EclipseMaster0"
5+
},
6+
"url": "https://editor.p5js.org/EclipseMaster0/full/iErdB_7HD",
7+
"submittedOn": "2024-06-27T14:29:25.823Z",
8+
"socialPermission": true
9+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "fill this page",
3+
"author": {
4+
"name": "prisha",
5+
"instagram": "@prishaxjain"
6+
},
7+
"url": "https://editor.p5js.org/prishajain/sketches/yV5XjmsI-",
8+
"submittedOn": "2024-07-02T00:50:42.999Z",
9+
"socialPermission": true
10+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "hover button thing11!!!1!!",
3+
"author": {
4+
"name": "GD Cyber"
5+
},
6+
"url": "https://editor.p5js.org/gdcyber0303/full/VlJpWtSGL",
7+
"submittedOn": "2024-05-18T16:20:46.500Z",
8+
"socialPermission": true
9+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"title": "HelloJSON - JSON Management Tool",
3+
"author": {
4+
"name": "Abbas Majidov",
5+
"url": "https://linkedin.com/in/absmj",
6+
"twitter": "https://x.com/absmjdv",
7+
"instagram": "https://www.instagram.com/absmjdv/"
8+
},
9+
"url": "https://hellojson.in",
10+
"submittedOn": "2024-06-17T18:37:11.300Z",
11+
"socialPermission": true
12+
}

0 commit comments

Comments
 (0)