Skip to content

Commit e53d268

Browse files
authored
Merge branch 'main' into fix-broken-link
2 parents 8c857d9 + 3754007 commit e53d268

File tree

129 files changed

+554
-304
lines changed

Some content is hidden

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

129 files changed

+554
-304
lines changed

public/reference/data.json

Lines changed: 189 additions & 136 deletions
Large diffs are not rendered by default.

public/search-indices/en.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

public/search-indices/es.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

public/search-indices/hi.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

public/search-indices/ko.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

public/search-indices/zh-Hans.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/components/CodeEmbed/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const CodeEmbed = (props) => {
4545
const largeSketch = previewWidth && previewWidth > 770 - 60;
4646

4747
// Quick hack to make room for DOM that gets added below the canvas by default
48-
const domMatch = /create(Button|Select|P|Div|Input)/.exec(initialCode);
48+
const domMatch = /create(Button|Select|P|Div|Input|ColorPicker)/.exec(initialCode);
4949
if (domMatch && previewHeight) {
5050
previewHeight += 100;
5151
}

src/components/PageHeader/HomePage.astro

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ interface Props {
77
config: CollectionEntry<"homepage">;
88
}
99
const { config } = Astro.props;
10+
1011
---
1112

1213
<div class="px-lg pt-5xl lg:pt-3xl pb-0 h-full">
@@ -25,22 +26,38 @@ const { config } = Astro.props;
2526
<p
2627
class={`hero-caption text-body-caption pb-sm mt-0 ${i > 0 ? "hidden" : ""}`}
2728
>
28-
{im.caption}
29+
{im.linkTarget ? (
30+
<a href={im.linkTarget}>{im.caption}</a>
31+
) : (
32+
im.caption
33+
)}
2934
</p>
3035
))
3136
}
3237
</div>
3338

3439
{
3540
config.data.heroImages.map((im, i) => (
41+
im.linkTarget ?
42+
<a href={im.linkTarget }>
3643
<Image
37-
containerClass={`relative hero-image-container ${i > 0 ? "hidden" : ""}`}
38-
class={"hero-image"}
39-
aspectRatio="none"
40-
src={im.image}
41-
alt={im.altText}
42-
loading={i > 0 ? "lazy" : "eager"}
43-
/>
44+
containerClass={`relative hero-image-container ${i > 0 ? "hidden" : ""}`}
45+
class={"hero-image"}
46+
aspectRatio="none"
47+
src={im.image}
48+
alt={im.altText}
49+
loading={i > 0 ? "lazy" : "eager"}
50+
/>
51+
</a>
52+
:
53+
<Image
54+
containerClass={`relative hero-image-container ${i > 0 ? "hidden" : ""}`}
55+
class={"hero-image"}
56+
aspectRatio="none"
57+
src={im.image}
58+
alt={im.altText}
59+
loading={i > 0 ? "lazy" : "eager"}
60+
/>
4461
))
4562
}
4663
</div>

src/content/homepage/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export const homepageCollection = defineCollection({
1212
image: image(),
1313
altText: z.string(),
1414
caption: z.string(),
15+
linkTarget: z.string(),
1516
}),
1617
)
1718
.nonempty(),

src/content/homepage/en.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,41 @@
11
title: p5.js
22
heroImages:
33
- image: ./images/hero.webp
4+
linkTarget: "https://archive.org/details/processing-community-catalog-2021"
45
altText: Lauren Lee McCarthy reading the Processing Community Catalog.
56
caption: "Lauren Lee McCarthy reading the Processing Community Catalog. Photo credit: Maximo Xtravaganza."
67
- image: ./images/p5for50plus.webp
8+
linkTarget: ""
79
altText: Inhwa Yeom teaching p5.js to people aged 50+.
810
caption: "Coding Club for people aged 50+ in Korea, led by Inhwa Yeom."
911
- image: ./images/salon-2.webp
12+
linkTarget: ""
1013
altText: Qianqian Ye holding a mic next to a big t.v. screen that has a grid of p5.js contributor photos on it.
1114
caption: "Qianqian Ye introducing 600+ p5.js contributors at p5.js Community Salon. Photo credit: Ziyuan Lin."
1215
- image: ./images/ccfest2018.webp
16+
linkTarget: ""
1317
altText: p5.js workshop participants coding while showing their projects on screen.
1418
caption: "p5.js workshop at CC Fest NYC at ITP-NYU in November 2018."
1519
- image: ./images/tunapanda.webp
20+
linkTarget: ""
1621
altText: Students learning to code while checking a p5.js book.
1722
caption: "p5.js workshop at Tunapanda Institute in Nairobi. Photo credit: Tunapanda Institute."
1823
- image: ./images/contributor-conf-2019_10.webp
24+
linkTarget: ""
1925
altText: Person with a microphone speaking to fellow participants in front of text that reads p5.js will not add any new features except those that increase access.
2026
caption: "p5.js will not add any new features except those that increase access."
2127
- image: ./images/contributor-conf-2015.webp
28+
linkTarget: ""
2229
altText: Participants jump, smile and throw their hands in the air on a green lawn.
2330
caption: "p5.js Contributors Conference 2015."
2431
- image: ./images/contributor-conf-2019-17.webp
32+
linkTarget: ""
2533
altText: Participants sit around a table with their laptops and observe code on a screen.
2634
caption: "p5.js Contributors Conference 2019."
35+
- image: ./images/hello-p5-2024.png
36+
linkTarget: "https://hello.p5js.org"
37+
altText: Eight portrait photos of p5 contributors overlaid by the text "Hello, p5.js"
38+
caption: "Find out how to get started with animation, audio, WebGL, accessibility, and contribution to p5.js in this interactive video:"
2739
heroText: >
2840
p5.js is a friendly tool for learning to code and make art. It is a free and open-source JavaScript library built by an inclusive, nurturing community. p5.js welcomes artists, designers, beginners, educators, and anyone else!
2941
referenceHeaderText: Explore the p5.js library reference

0 commit comments

Comments
 (0)