Skip to content

Commit 7945905

Browse files
committed
Merge branch 'PR/non-challenge-video-thumbnails' of github.com:fturmel/thecodingtrain.com into PR/non-challenge-video-thumbnails
2 parents bf9a528 + cdc2fda commit 7945905

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
}

0 commit comments

Comments
 (0)