Skip to content

Commit b282531

Browse files
committed
Merge branch 'dev' into fix-morpher-fade
2 parents 01e7915 + 1c3004a commit b282531

File tree

157 files changed

+3798
-2132
lines changed

Some content is hidden

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

157 files changed

+3798
-2132
lines changed

.all-contributorsrc

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10181,7 +10181,8 @@
1018110181
"avatar_url": "https://avatars.githubusercontent.com/u/84749041?v=4",
1018210182
"profile": "http://uniyj.eth",
1018310183
"contributions": [
10184-
"content"
10184+
"content",
10185+
"maintenance"
1018510186
]
1018610187
},
1018710188
{
@@ -12801,6 +12802,42 @@
1280112802
"contributions": [
1280212803
"maintenance"
1280312804
]
12805+
},
12806+
{
12807+
"login": "kks-code",
12808+
"name": "Kendra Karol Sevilla",
12809+
"avatar_url": "https://avatars.githubusercontent.com/u/214244795?v=4",
12810+
"profile": "https://github.com/kks-code",
12811+
"contributions": [
12812+
"maintenance"
12813+
]
12814+
},
12815+
{
12816+
"login": "otc-png",
12817+
"name": "otc group",
12818+
"avatar_url": "https://avatars.githubusercontent.com/u/214395681?v=4",
12819+
"profile": "https://github.com/otc-png",
12820+
"contributions": [
12821+
"maintenance"
12822+
]
12823+
},
12824+
{
12825+
"login": "Savio-Sou",
12826+
"name": "Savio",
12827+
"avatar_url": "https://avatars.githubusercontent.com/u/72797635?v=4",
12828+
"profile": "https://github.com/Savio-Sou",
12829+
"contributions": [
12830+
"maintenance"
12831+
]
12832+
},
12833+
{
12834+
"login": "vtjl10",
12835+
"name": "fuder.eth",
12836+
"avatar_url": "https://avatars.githubusercontent.com/u/139509124?v=4",
12837+
"profile": "https://github.com/vtjl10",
12838+
"contributions": [
12839+
"maintenance"
12840+
]
1280412841
}
1280512842
],
1280612843
"contributorsPerLine": 7,

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"coverage/",
9191
"storybook-static/",
9292
"**/*.d.ts",
93-
"src/intl/"
93+
"src/intl/",
94+
"public/code-examples/"
9495
]
9596
}

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16251625
</tr>
16261626
<tr>
16271627
<td align="center" valign="top" width="14.28%"><a href="https://changwu.me/"><img src="https://avatars.githubusercontent.com/u/1557364?v=4?s=100" width="100px;" alt="changwu"/><br /><sub><b>changwu</b></sub></a><br /><a href="#content-changwu-tw" title="Content">🖋</a></td>
1628-
<td align="center" valign="top" width="14.28%"><a href="http://uniyj.eth"><img src="https://avatars.githubusercontent.com/u/84749041?v=4?s=100" width="100px;" alt="yj"/><br /><sub><b>yj</b></sub></a><br /><a href="#content-uniyj" title="Content">🖋</a></td>
1628+
<td align="center" valign="top" width="14.28%"><a href="http://uniyj.eth"><img src="https://avatars.githubusercontent.com/u/84749041?v=4?s=100" width="100px;" alt="yj"/><br /><sub><b>yj</b></sub></a><br /><a href="#content-uniyj" title="Content">🖋</a> <a href="#maintenance-uniyj" title="Maintenance">🚧</a></td>
16291629
<td align="center" valign="top" width="14.28%"><a href="https://megatheikal.com"><img src="https://avatars.githubusercontent.com/u/64621442?v=4?s=100" width="100px;" alt="megatheikal"/><br /><sub><b>megatheikal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amegatheikal" title="Bug reports">🐛</a></td>
16301630
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stephenfire"><img src="https://avatars.githubusercontent.com/u/17247036?v=4?s=100" width="100px;" alt="Stephen Guo"/><br /><sub><b>Stephen Guo</b></sub></a><br /><a href="#translation-stephenfire" title="Translation">🌍</a></td>
16311631
<td align="center" valign="top" width="14.28%"><a href="http://aumson.org/gene"><img src="https://avatars.githubusercontent.com/u/7883777?v=4?s=100" width="100px;" alt="F. Eugene Aumson"/><br /><sub><b>F. Eugene Aumson</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AfeuGeneA" title="Bug reports">🐛</a> <a href="#content-feuGeneA" title="Content">🖋</a></td>
@@ -1995,6 +1995,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19951995
<tr>
19961996
<td align="center" valign="top" width="14.28%"><a href="https://github.com/brossetti1"><img src="https://avatars.githubusercontent.com/u/5998100?v=4?s=100" width="100px;" alt="Brian Rossetti"/><br /><sub><b>Brian Rossetti</b></sub></a><br /><a href="#maintenance-brossetti1" title="Maintenance">🚧</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=brossetti1" title="Code">💻</a></td>
19971997
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Antoine-Sparenberg"><img src="https://avatars.githubusercontent.com/u/128523213?v=4?s=100" width="100px;" alt="Antoine-Sparenberg"/><br /><sub><b>Antoine-Sparenberg</b></sub></a><br /><a href="#maintenance-Antoine-Sparenberg" title="Maintenance">🚧</a></td>
1998+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kks-code"><img src="https://avatars.githubusercontent.com/u/214244795?v=4?s=100" width="100px;" alt="Kendra Karol Sevilla"/><br /><sub><b>Kendra Karol Sevilla</b></sub></a><br /><a href="#maintenance-kks-code" title="Maintenance">🚧</a></td>
1999+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/otc-png"><img src="https://avatars.githubusercontent.com/u/214395681?v=4?s=100" width="100px;" alt="otc group"/><br /><sub><b>otc group</b></sub></a><br /><a href="#maintenance-otc-png" title="Maintenance">🚧</a></td>
2000+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Savio-Sou"><img src="https://avatars.githubusercontent.com/u/72797635?v=4?s=100" width="100px;" alt="Savio"/><br /><sub><b>Savio</b></sub></a><br /><a href="#maintenance-Savio-Sou" title="Maintenance">🚧</a></td>
2001+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vtjl10"><img src="https://avatars.githubusercontent.com/u/139509124?v=4?s=100" width="100px;" alt="fuder.eth"/><br /><sub><b>fuder.eth</b></sub></a><br /><a href="#maintenance-vtjl10" title="Maintenance">🚧</a></td>
19982002
</tr>
19992003
</tbody>
20002004
</table>

app/[locale]/10years/_components/AdoptionSwiper.tsx

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
"use client"
2+
3+
import { Image } from "@/components/Image"
4+
import Translation from "@/components/Translation"
5+
import { ButtonLink } from "@/components/ui/buttons/Button"
6+
import {
7+
Swiper,
8+
SwiperContainer,
9+
SwiperNavigation,
10+
SwiperSlide,
11+
} from "@/components/ui/swiper"
12+
13+
import { cn } from "@/lib/utils/cn"
14+
15+
import { AdoptionCard } from "../types"
16+
17+
type AdoptionCardProps = {
18+
adoptionCards: AdoptionCard[]
19+
adoptionStyles: string[]
20+
}
21+
22+
const AdoptionSwiper = ({
23+
adoptionCards,
24+
adoptionStyles,
25+
}: AdoptionCardProps) => (
26+
<div className="flex flex-1 flex-col gap-6 md:hidden">
27+
<SwiperContainer className="mx-auto w-full max-w-[550px]">
28+
<Swiper spaceBetween={32}>
29+
{adoptionCards.map(({ image, linkText, href, title }, index) => {
30+
return (
31+
<SwiperSlide key={title}>
32+
<div
33+
className={cn("h-full rounded-2xl p-8", adoptionStyles[index])}
34+
>
35+
<Image
36+
src={image}
37+
alt={title}
38+
className="mx-auto mb-4 h-36 object-contain"
39+
/>
40+
<h3 className="mb-4 text-2xl font-bold">{title}</h3>
41+
<p className="mb-8">
42+
<Translation
43+
id={`page-10-year-adoption-card-${index + 1}-description`}
44+
ns="page-10-year-anniversary"
45+
/>
46+
</p>
47+
<ButtonLink href={href} hideArrow variant="outline">
48+
{linkText}
49+
</ButtonLink>
50+
</div>
51+
</SwiperSlide>
52+
)
53+
})}
54+
<SwiperNavigation />
55+
</Swiper>
56+
</SwiperContainer>
57+
</div>
58+
)
59+
60+
export default AdoptionSwiper
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import dynamic from "next/dynamic"
2+
3+
import Loading from "./loading"
4+
5+
export default dynamic(() => import("."), { ssr: false, loading: Loading })
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { Skeleton } from "@/components/ui/skeleton"
2+
3+
const Loading = () => (
4+
<div className="flex w-full flex-col items-center gap-6 md:hidden">
5+
<div className="flex w-full max-w-[550px] flex-col gap-6 rounded-2xl bg-card-gradient-secondary p-4 sm:p-6 xl:max-w-[700px]">
6+
<Skeleton className="mx-auto size-36 rounded-4xl" />
7+
<Skeleton className="h-8 w-1/2" />
8+
<div className="space-y-1">
9+
<Skeleton className="h-5 w-[95%]" />
10+
<Skeleton className="h-5 w-full" />
11+
<Skeleton className="h-5 w-1/2" />
12+
</div>
13+
<div className="w-2/5 rounded border px-4 py-3">
14+
<Skeleton className="h-5" />
15+
</div>
16+
</div>
17+
<Skeleton className="h-6 w-40 rounded-full" />
18+
</div>
19+
)
20+
21+
export default Loading
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import dynamic from "next/dynamic"
2+
3+
import Loading from "./loading"
4+
5+
export default dynamic(() => import("."), { ssr: false, loading: Loading })
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Skeleton } from "@/components/ui/skeleton"
2+
3+
const Loading = () => (
4+
<div className="flex items-center justify-center gap-10">
5+
{Array.from({ length: 4 }).map((_, idx) => (
6+
<div
7+
key={idx}
8+
className="flex size-20 flex-col items-center justify-center gap-1 rounded-2xl border p-2 text-center shadow-md last:max-lg:hidden"
9+
>
10+
<Skeleton className="size-full" />
11+
<Skeleton className="h-5 w-8" />
12+
</div>
13+
))}
14+
</div>
15+
)
16+
17+
export default Loading

0 commit comments

Comments
 (0)