Skip to content

Commit 5cbf335

Browse files
authored
Merge branch 'dev' into what-is-ethereum
2 parents 66d1609 + e324262 commit 5cbf335

File tree

713 files changed

+1803
-1867
lines changed

Some content is hidden

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

713 files changed

+1803
-1867
lines changed

.all-contributorsrc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11267,7 +11267,7 @@
1126711267
"login": "konopkja",
1126811268
"name": "Jakub",
1126911269
"avatar_url": "https://avatars.githubusercontent.com/u/100724231?v=4",
11270-
"profile": "http://ethereum.org",
11270+
"profile": "https://ethereum.org",
1127111271
"contributions": [
1127211272
"doc",
1127311273
"content",
@@ -13115,6 +13115,15 @@
1311513115
"contributions": [
1311613116
"maintenance"
1311713117
]
13118+
},
13119+
{
13120+
"login": "haouvw",
13121+
"name": "haouvw",
13122+
"avatar_url": "https://avatars.githubusercontent.com/u/171421479?v=4",
13123+
"profile": "https://github.com/haouvw",
13124+
"contributions": [
13125+
"bug"
13126+
]
1311813127
}
1311913128
],
1312013129
"contributorsPerLine": 7,

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17781778
</tr>
17791779
<tr>
17801780
<td align="center" valign="top" width="14.28%"><a href="https://github.com/enjoyooor"><img src="https://avatars.githubusercontent.com/u/147568088?v=4?s=100" width="100px;" alt="enjoyooor"/><br /><sub><b>enjoyooor</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=enjoyooor" title="Code">💻</a></td>
1781-
<td align="center" valign="top" width="14.28%"><a href="http://ethereum.org"><img src="https://avatars.githubusercontent.com/u/100724231?v=4?s=100" width="100px;" alt="Jakub"/><br /><sub><b>Jakub</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=konopkja" title="Documentation">📖</a> <a href="#content-konopkja" title="Content">🖋</a> <a href="#design-konopkja" title="Design">🎨</a></td>
1781+
<td align="center" valign="top" width="14.28%"><a href="https://ethereum.org"><img src="https://avatars.githubusercontent.com/u/100724231?v=4?s=100" width="100px;" alt="Jakub"/><br /><sub><b>Jakub</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=konopkja" title="Documentation">📖</a> <a href="#content-konopkja" title="Content">🖋</a> <a href="#design-konopkja" title="Design">🎨</a></td>
17821782
<td align="center" valign="top" width="14.28%"><a href="http://www.ymusleh.com"><img src="https://avatars.githubusercontent.com/u/6829768?v=4?s=100" width="100px;" alt="Yusuf Musleh"/><br /><sub><b>Yusuf Musleh</b></sub></a><br /><a href="#content-yusuf-musleh" title="Content">🖋</a></td>
17831783
<td align="center" valign="top" width="14.28%"><a href="https://github.com/acceptacross"><img src="https://avatars.githubusercontent.com/u/150119116?v=4?s=100" width="100px;" alt="acceptacross"/><br /><sub><b>acceptacross</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=acceptacross" title="Documentation">📖</a></td>
17841784
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pdelagrave"><img src="https://avatars.githubusercontent.com/u/17990895?v=4?s=100" width="100px;" alt="Pierre Delagrave"/><br /><sub><b>Pierre Delagrave</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Apdelagrave" title="Bug reports">🐛</a></td>
@@ -2039,6 +2039,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
20392039
</tr>
20402040
<tr>
20412041
<td align="center" valign="top" width="14.28%"><a href="http://abel.fr"><img src="https://avatars.githubusercontent.com/u/5216201?v=4?s=100" width="100px;" alt="Abel Derderian"/><br /><sub><b>Abel Derderian</b></sub></a><br /><a href="#maintenance-abeldotam" title="Maintenance">🚧</a></td>
2042+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/haouvw"><img src="https://avatars.githubusercontent.com/u/171421479?v=4?s=100" width="100px;" alt="haouvw"/><br /><sub><b>haouvw</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Ahaouvw" title="Bug reports">🐛</a></td>
20422043
</tr>
20432044
</tbody>
20442045
</table>

app/[locale]/apps/[application]/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ const Page = async ({
265265
</p>
266266
<LinkOverlay
267267
href={`/apps/${slugify(nextApp.name)}`}
268-
matomoEvent={{
268+
customEventOptions={{
269269
eventCategory: "detail",
270270
eventAction: `app name ${app.name}`,
271271
eventName: "see_next",
@@ -292,7 +292,7 @@ const Page = async ({
292292
</p>
293293
<LinkOverlay
294294
href={`/apps/${slugify(nextApp.name)}`}
295-
matomoEvent={{
295+
customEventOptions={{
296296
eventCategory: "detail",
297297
eventAction: `app name ${app.name}`,
298298
eventName: "see_next",

app/[locale]/apps/_components/AppCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const AppCard = ({
9999
<LinkOverlay
100100
href={`/apps/${slugify(app.name)}`}
101101
className="no-underline"
102-
matomoEvent={{
102+
customEventOptions={{
103103
eventCategory: matomoCategory,
104104
eventAction: `${matomoAction}`,
105105
eventName: `app name ${app.name}`,

app/[locale]/apps/_components/AppsHighlight.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const AppsHighlight = ({ apps, matomoCategory }: AppsHighlightProps) => {
2323
<LinkOverlay
2424
href={`/apps/${slugify(app.name)}`}
2525
className="no-underline"
26-
matomoEvent={{
26+
customEventOptions={{
2727
eventCategory: matomoCategory,
2828
eventAction: "highlights",
2929
eventName: `app name ${app.name}`,

app/[locale]/apps/_components/TopApps.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,11 @@ const TopApps = ({ appsData }: TopAppsProps) => {
9797
<LinkOverlay
9898
href={`/apps/categories/${slugify(category)}`}
9999
className="text-body no-underline"
100-
onClick={() =>
101-
trackCustomEvent({
102-
eventCategory: "apps",
103-
eventAction: "categories",
104-
eventName: `topapps_category_name_${category}`,
105-
})
106-
}
100+
customEventOptions={{
101+
eventCategory: "apps",
102+
eventAction: "categories",
103+
eventName: `topapps_category_name_${category}`,
104+
}}
107105
>
108106
<div className="flex flex-row items-center justify-between gap-2">
109107
<div className="flex items-center gap-2">

app/[locale]/contributing/translation-program/acknowledgements/_components/acknowledgements.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ const TranslatorAcknowledgements = () => {
203203
{t(
204204
"page-contributing-translation-program-acknowledgements-how-to-claim-1"
205205
)}{" "}
206-
<InlineLink href="/discord/">
206+
<InlineLink href="https://discord.gg/ethereum-org">
207207
{t(
208208
"page-contributing-translation-program-acknowledgements-how-to-claim-1-discord"
209209
)}

app/[locale]/developers/page.tsx

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
import { Fragment } from "react"
2+
import { Check } from "lucide-react"
13
import { getTranslations } from "next-intl/server"
24

35
import type { Lang } from "@/lib/types"
46
import { ChildOnlyProp } from "@/lib/types"
57

8+
import ABTestWrapper from "@/components/AB/TestWrapper"
9+
import BigNumber from "@/components/BigNumber"
610
import { CopyButton } from "@/components/CopyToClipboard"
711
import FeedbackCard from "@/components/FeedbackCard"
812
import HubHero from "@/components/Hero/HubHero"
@@ -61,6 +65,56 @@ const Scroller = ({
6165
)
6266
}
6367

68+
const WhyGrid = () => {
69+
const items = [
70+
{
71+
heading: "Money you can program",
72+
description:
73+
"Write code that defines how value moves, when, and to whom. No banks, no intermediaries, just logic you define.",
74+
},
75+
{
76+
heading: "Future-proof skills",
77+
description:
78+
"Learn the building blocks of the next internet. The tech might evolve, but the principles of web3 are here to stay.",
79+
},
80+
{
81+
heading: "Censorship resistance",
82+
description:
83+
"Build projects and commerce that can't be silenced by governments, corporations, or algorithms. If it matters, it stays online.",
84+
},
85+
{
86+
heading: "Digital sovereignty",
87+
description:
88+
"Own your identity, assets, and creations online without relying on platforms that can delete you.",
89+
},
90+
]
91+
92+
return (
93+
<div
94+
className={cn(
95+
"rounded-4xl border border-accent-c/20",
96+
"grid grid-cols-1 gap-6 p-8 md:grid-cols-2 md:p-14",
97+
"bg-gradient-to-b from-accent-c/5 from-[60%] to-accent-c/15"
98+
)}
99+
>
100+
{items.map(({ heading, description }) => (
101+
<div className="flex gap-1.5" key={heading}>
102+
<div className="my-1 grid h-fit place-items-center rounded-full bg-success/20 p-1">
103+
<Check
104+
className="size-3 stroke-[4] text-success"
105+
strokeLinecap="square"
106+
strokeLinejoin="miter"
107+
/>
108+
</div>
109+
<div className="space-y-1">
110+
<h3 className="text-lg">{heading}</h3>
111+
<p className="text-body-medium">{description}</p>
112+
</div>
113+
</div>
114+
))}
115+
</div>
116+
)
117+
}
64118
const DevelopersPage = async ({
65119
params,
66120
}: {
@@ -118,6 +172,68 @@ const DevelopersPage = async ({
118172
</div>
119173
</Section>
120174

175+
<ABTestWrapper
176+
testKey="2025-08-why-dev"
177+
variants={[
178+
<Fragment key="empty" />,
179+
<Section
180+
key="why-without-metrics"
181+
id="why"
182+
className={cn(
183+
"grid grid-cols-1 gap-6 md:gap-10 lg:grid-cols-2",
184+
"-mx-8 w-screen max-w-screen-2xl items-center bg-background-highlight px-8 py-10 md:py-20"
185+
)}
186+
>
187+
<div className="space-y-4">
188+
<h2>Create the internet you want to live in</h2>
189+
<p>
190+
Ethereum is where you turn ideas into un-censorable systems
191+
that run anywhere, forever. Build apps, money, and communities
192+
that answer to no one but their users.
193+
</p>
194+
</div>
195+
<WhyGrid />
196+
</Section>,
197+
<Section
198+
key="why-with-metrics"
199+
id="why"
200+
className={cn(
201+
"grid grid-cols-1 gap-6 md:gap-10 lg:grid-cols-2",
202+
"-mx-8 w-screen max-w-screen-2xl items-center bg-background-highlight px-8 py-10 md:py-20"
203+
)}
204+
>
205+
<div className="space-y-4">
206+
<h2>Get paid well. Stay remote. Build the future.</h2>
207+
<p>
208+
Over half of blockchain careers are remote-first with some
209+
estimates putting the number as high as 70%.
210+
</p>
211+
<div className="flex flex-wrap gap-x-6 md:gap-x-8">
212+
<BigNumber
213+
variant="light"
214+
value="$93 - 169K"
215+
sourceName="Glassdoor"
216+
sourceUrl="https://www.glassdoor.com/Salaries/developer-salary-SRCH_KO0%2C9.htm"
217+
lastUpdated="2025-04-10T12:00:00Z"
218+
>
219+
Avg developer salary
220+
</BigNumber>
221+
<BigNumber
222+
variant="light"
223+
value="$80 - 255K"
224+
sourceName="Web3 Jobs"
225+
sourceUrl="https://web3.career/web3-salaries/united-states"
226+
lastUpdated="2025-08-01T12:00:00Z"
227+
>
228+
Avg salary in blockchain industry
229+
</BigNumber>
230+
</div>
231+
</div>
232+
<WhyGrid />
233+
</Section>,
234+
]}
235+
/>
236+
121237
<Section
122238
id="resources"
123239
className={cn(

app/[locale]/enterprise/page.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,9 @@ const Page = async ({ params }: { params: { locale: Lang } }) => {
505505
strings={{
506506
error: {
507507
domain: t.rich("page-enterprise-team-form-error-domain", {
508-
a: (chunks) => <Link href="/discord/">{chunks}</Link>,
508+
a: (chunks) => (
509+
<Link href="https://discord.gg/ethereum-org">{chunks}</Link>
510+
),
509511
}),
510512
emailInvalid: t(
511513
"page-enterprise-team-form-error-email-invalid"

app/[locale]/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
381381
{
382382
Svg: Discord,
383383
label: "Discord",
384-
href: "/discord/",
384+
href: "https://discord.gg/ethereum-org",
385385
className: "text-primary hover:text-primary-hover",
386386
description: t("page-index-join-action-discord-description"),
387387
eventName: "Discord",
@@ -718,7 +718,7 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
718718
</ButtonLink>
719719
<div className="flex gap-3">
720720
<ButtonLink
721-
href="/discord/"
721+
href="https://discord.gg/ethereum-org"
722722
size="lg"
723723
variant="outline"
724724
isSecondary

0 commit comments

Comments
 (0)