Skip to content

Commit 8fb9be7

Browse files
authored
Merge branch 'main' into fix/alignment-bug-#660
2 parents bd684ab + 5f5eb34 commit 8fb9be7

File tree

129 files changed

+576
-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

+576
-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/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/events/en/contributors-conference-2015.mdx

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ relatedPastEvents:
1111

1212
import YouTubeEmbed from '../../../components/YouTubeEmbed/index.astro'
1313
import Logos from '../../../components/Logos/index.astro'
14+
import VimeoEmbed from '../../../components/VimeoEmbed/index.astro'
1415

1516
A group of approximately 30 participants gathered spent a week at the [Frank-Ratchye STUDIO for Creative Inquiry](http://studioforcreativeinquiry.org/), advancing the code, documentation, and community outreach tools of the p5.js programming environment. Participants came from as far away as Hong Kong, Seattle, Los Angeles, Boston and New York. Most were working professionals in the fields of creative technology, interaction design, and new-media arts, but the group also included a half-dozen undergraduate and graduate students from Carnegie Mellon’s Schools of Art and Architecture.
1617

17-
18-
1918
![A group of participants smile and make a p5 sign with their hands](../images/cc2015/2015_1.jpg)
2019
![Woman presenting the p5.js community statement from her laptop](../images/cc2015/2015_3.jpg)
2120
![Woman expressively speaks into a microphone while two male collaborators look on](../images/cc2015/2015_4.jpg)
@@ -32,13 +31,35 @@ A group of approximately 30 participants gathered spent a week at the [Frank-Rat
3231
![Man in a classroom with a microphone speaking out to a group of participants](../images/cc2015/2015_15.jpg)
3332
![Participants jump, smile and throw their hands in the air on a green lawn](../images/cc2015/2015_2.jpg)
3433

34+
Introduction
35+
<VimeoEmbed id="129140298" />
36+
Casey Reas
37+
<VimeoEmbed id="129151416" />
38+
Johanna Hedva
39+
<VimeoEmbed id="129151418" />
40+
Stephanie Pi
41+
<VimeoEmbed id="129160951" />
42+
Phoenix Perry
43+
<VimeoEmbed id="129163155" />
44+
Taeyoon Choi
45+
<VimeoEmbed id="129173628" />
46+
Sara Hendren
47+
<VimeoEmbed id="129177689" />
48+
Epic Jefferson
49+
<VimeoEmbed id="129183825" />
50+
Chandler McWilliams
51+
<VimeoEmbed id="129187909" />
52+
Q&A
53+
<VimeoEmbed id="129192014" />
54+
3555
## Participants
3656

3757
[Jason Alderman](http://huah.net/jason/), [Sepand Ansari](http://sepans.com/), [Tega Brain](http://tegabrain.com/), [Emily Chen](https://medium.com/@emchenNYC/), [Andres Colubri](http://andrescolubri.net/), [Luca Damasco](https://twitter.com/lucapodular), [Guy de Bree](http://guydebree.com/), [Christine de Carteret](http://www.cjdecarteret.com/), [Xy Feng](http://xystudio.cc/), [Sarah Groff-Palermo](http://www.sarahgp.com/), [Chris Hallberg](http://www.crhallberg.com/), [Val Head](http://valhead.com/), [Johanna Hedva](http://johannahedva.com/), [Kate Hollenbach](http://www.katehollenbach.com/), [Jennifer Jacobs](http://web.media.mit.edu/~jacobsj/), [Epic Jefferson](http://www.epicjefferson.com/), [Michelle Partogi](http://michellepartogi.com/), [Sam Lavigne](http://lav.io/), [Golan Levin](http://flong.com/), [Cici Liu](http://www.liuchangitp.com/), [Maya Man](http://www.mayaman.cc/), [Lauren McCarthy](http://lauren-mccarthy.com/), [David Newbury](http://www.workergnome.com/), [Paolo Pedercini](http://molleindustria.org/), [Luisa Pereira](http://luisaph.com/), [Miles Peyton](http://mileshiroo.info/), [Caroline Record](http://carolinerecord.com/), [Berenger Recoules](http://b2renger.github.io/), [Stephanie Pi](https://pibloginthesky.wordpress.com/), [Jason Sigal](http://jasonsigal.cc/), [Kevin Siwoff](http://studioindefinit.com/), [Charlotte Stiles](http://charlottestiles.com/)
3858

3959
## Diversity
4060

4161
Alongside technical development, one of the main focuses of this conference was outreach, community, and diversity. The conference began with a panel—[Diversity: Seven Voices on Race, Gender, Ability & Class for FLOSS and the Internet](http://studioforcreativeinquiry.org/events/diversity-seven-voices-on-race-gender-ability-class-for-floss-and-the-internet). Organized by [Johanna Hedva](http://johannahedva.com/) and [Lauren McCarthy](http://lauren-mccarthy.com/), the panel took place Tuesday, 25 May 2015 in Kresge Auditorium at Carnegie Mellon University. Speakers included [Maya Man](http://www.mayaman.cc/), [Casey Reas](http://reas.com/), [Johanna Hedva](http://johannahedva.com/), [Stephanie Pi](https://pibloginthesky.wordpress.com/), [Phoenix Perry](http://phoenixperry.com/), [Taeyoon Choi](http://taeyoonchoi.com/), [Sara Hendren](http://ablersite.org/), [Epic Jefferson](http://www.epicjefferson.com/), and [Chandler McWilliams](http://chandlermcwilliams.com/).
62+
4263
![A poster about diversity for FLOSS and the Internet](../images/cc2015/diversity_640.jpg)
4364

4465
## Support

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)