Skip to content

Commit 45b7d91

Browse files
corwintinescorwintines
authored
Merge branch 'dev' into staging
2 parents 53da381 + 1c12129 commit 45b7d91

File tree

119 files changed

+2718
-372
lines changed

Some content is hidden

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

119 files changed

+2718
-372
lines changed

‎.all-contributorsrc‎

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13296,7 +13296,8 @@
1329613296
"avatar_url": "https://avatars.githubusercontent.com/u/185210158?v=4",
1329713297
"profile": "https://zksec.io",
1329813298
"contributions": [
13299-
"maintenance"
13299+
"maintenance",
13300+
"bug"
1330013301
]
1330113302
},
1330213303
{
@@ -13388,6 +13389,96 @@
1338813389
"contributions": [
1338913390
"tool"
1339013391
]
13392+
},
13393+
{
13394+
"login": "hackertron",
13395+
"name": "jayssj11",
13396+
"avatar_url": "https://avatars.githubusercontent.com/u/7667514?v=4",
13397+
"profile": "https://hackertron.github.io/",
13398+
"contributions": [
13399+
"tool"
13400+
]
13401+
},
13402+
{
13403+
"login": "CodeLeom",
13404+
"name": "Ayodele Aransiola",
13405+
"avatar_url": "https://avatars.githubusercontent.com/u/36636824?v=4",
13406+
"profile": "http://leomofthings.com",
13407+
"contributions": [
13408+
"content"
13409+
]
13410+
},
13411+
{
13412+
"login": "indmind",
13413+
"name": "indmind",
13414+
"avatar_url": "https://avatars.githubusercontent.com/u/197907501?v=4",
13415+
"profile": "https://github.com/indmind",
13416+
"contributions": [
13417+
"maintenance"
13418+
]
13419+
},
13420+
{
13421+
"login": "kvbik",
13422+
"name": "Jakub Vysoký",
13423+
"avatar_url": "https://avatars.githubusercontent.com/u/45091?v=4",
13424+
"profile": "https://twitter.com/kvbik",
13425+
"contributions": [
13426+
"tool"
13427+
]
13428+
},
13429+
{
13430+
"login": "0xsenty",
13431+
"name": "0xsenty",
13432+
"avatar_url": "https://avatars.githubusercontent.com/u/201055698?v=4",
13433+
"profile": "https://github.com/0xsenty",
13434+
"contributions": [
13435+
"bug"
13436+
]
13437+
},
13438+
{
13439+
"login": "dRPCMarketing",
13440+
"name": "dRPC Marketing",
13441+
"avatar_url": "https://avatars.githubusercontent.com/u/156195424?v=4",
13442+
"profile": "https://drpc.org",
13443+
"contributions": [
13444+
"maintenance"
13445+
]
13446+
},
13447+
{
13448+
"login": "caveman-eth",
13449+
"name": "caveman.eth",
13450+
"avatar_url": "https://avatars.githubusercontent.com/u/24273561?v=4",
13451+
"profile": "http://efp.app/caveman.eth",
13452+
"contributions": [
13453+
"maintenance"
13454+
]
13455+
},
13456+
{
13457+
"login": "pete-vielhaber",
13458+
"name": "Pete",
13459+
"avatar_url": "https://avatars.githubusercontent.com/u/178667149?v=4",
13460+
"profile": "https://github.com/pete-vielhaber",
13461+
"contributions": [
13462+
"maintenance"
13463+
]
13464+
},
13465+
{
13466+
"login": "unhappyben",
13467+
"name": "Ben",
13468+
"avatar_url": "https://avatars.githubusercontent.com/u/66370595?v=4",
13469+
"profile": "https://github.com/unhappyben",
13470+
"contributions": [
13471+
"tool"
13472+
]
13473+
},
13474+
{
13475+
"login": "sethforprivacy",
13476+
"name": "Seth For Privacy",
13477+
"avatar_url": "https://avatars.githubusercontent.com/u/40500387?v=4",
13478+
"profile": "http://sethforprivacy.com",
13479+
"contributions": [
13480+
"tool"
13481+
]
1339113482
}
1339213483
],
1339313484
"contributorsPerLine": 7,

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This is the official Ethereum.org website - a Next.js application that serves as
1919
- **next-mdx-remote 5.0+** - MDX content processing
2020
- **Framer Motion 10.13+** - Animations and transitions
2121
- **Radix UI** - Accessible component primitives
22-
- **ShadCN/UI** - Component library built on Radix UI
22+
- **shadcn/ui** - Component library built on Radix UI
2323
- **Recharts** - Data visualization
2424
- **Viem/Wagmi** - Ethereum blockchain integration
2525

‎README.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
20612061
<td align="center" valign="top" width="14.28%"><a href="http://gists.github.com/ryangoree"><img src="https://avatars.githubusercontent.com/u/3289505?v=4?s=100" width="100px;" alt="Ryan Goree"/><br /><sub><b>Ryan Goree</b></sub></a><br /><a href="#maintenance-ryangoree" title="Maintenance">🚧</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=ryangoree" title="Code">💻</a></td>
20622062
<td align="center" valign="top" width="14.28%"><a href="https://github.com/yansq"><img src="https://avatars.githubusercontent.com/u/26108404?v=4?s=100" width="100px;" alt="Siqi Yan"/><br /><sub><b>Siqi Yan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Ayansq" title="Bug reports">🐛</a></td>
20632063
<td align="center" valign="top" width="14.28%"><a href="https://github.com/famouswizard"><img src="https://avatars.githubusercontent.com/u/112275929?v=4?s=100" width="100px;" alt="wizard"/><br /><sub><b>wizard</b></sub></a><br /><a href="#maintenance-famouswizard" title="Maintenance">🚧</a></td>
2064-
<td align="center" valign="top" width="14.28%"><a href="https://zksec.io"><img src="https://avatars.githubusercontent.com/u/185210158?v=4?s=100" width="100px;" alt="Barajeel"/><br /><sub><b>Barajeel</b></sub></a><br /><a href="#maintenance-barajeel" title="Maintenance">🚧</a></td>
2064+
<td align="center" valign="top" width="14.28%"><a href="https://zksec.io"><img src="https://avatars.githubusercontent.com/u/185210158?v=4?s=100" width="100px;" alt="Barajeel"/><br /><sub><b>Barajeel</b></sub></a><br /><a href="#maintenance-barajeel" title="Maintenance">🚧</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abarajeel" title="Bug reports">🐛</a></td>
20652065
<td align="center" valign="top" width="14.28%"><a href="https://blog.heartade.dev"><img src="https://avatars.githubusercontent.com/u/24813078?v=4?s=100" width="100px;" alt="Daniel Soohan Park"/><br /><sub><b>Daniel Soohan Park</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AHeartade" title="Bug reports">🐛</a></td>
20662066
</tr>
20672067
<tr>
@@ -2076,6 +2076,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
20762076
<tr>
20772077
<td align="center" valign="top" width="14.28%"><a href="https://github.com/fredrik0x"><img src="https://avatars.githubusercontent.com/u/84518844?v=4?s=100" width="100px;" alt="Fredrik"/><br /><sub><b>Fredrik</b></sub></a><br /><a href="#maintenance-fredrik0x" title="Maintenance">🚧</a></td>
20782078
<td align="center" valign="top" width="14.28%"><a href="https://github.com/wdpatti"><img src="https://avatars.githubusercontent.com/u/79338554?v=4?s=100" width="100px;" alt="Will Patti"/><br /><sub><b>Will Patti</b></sub></a><br /><a href="#tool-wdpatti" title="Tools">🔧</a></td>
2079+
<td align="center" valign="top" width="14.28%"><a href="https://hackertron.github.io/"><img src="https://avatars.githubusercontent.com/u/7667514?v=4?s=100" width="100px;" alt="jayssj11"/><br /><sub><b>jayssj11</b></sub></a><br /><a href="#tool-hackertron" title="Tools">🔧</a></td>
2080+
<td align="center" valign="top" width="14.28%"><a href="http://leomofthings.com"><img src="https://avatars.githubusercontent.com/u/36636824?v=4?s=100" width="100px;" alt="Ayodele Aransiola"/><br /><sub><b>Ayodele Aransiola</b></sub></a><br /><a href="#content-CodeLeom" title="Content">🖋</a></td>
2081+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/indmind"><img src="https://avatars.githubusercontent.com/u/197907501?v=4?s=100" width="100px;" alt="indmind"/><br /><sub><b>indmind</b></sub></a><br /><a href="#maintenance-indmind" title="Maintenance">🚧</a></td>
2082+
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/kvbik"><img src="https://avatars.githubusercontent.com/u/45091?v=4?s=100" width="100px;" alt="Jakub Vysoký"/><br /><sub><b>Jakub Vysoký</b></sub></a><br /><a href="#tool-kvbik" title="Tools">🔧</a></td>
2083+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xsenty"><img src="https://avatars.githubusercontent.com/u/201055698?v=4?s=100" width="100px;" alt="0xsenty"/><br /><sub><b>0xsenty</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3A0xsenty" title="Bug reports">🐛</a></td>
2084+
</tr>
2085+
<tr>
2086+
<td align="center" valign="top" width="14.28%"><a href="https://drpc.org"><img src="https://avatars.githubusercontent.com/u/156195424?v=4?s=100" width="100px;" alt="dRPC Marketing"/><br /><sub><b>dRPC Marketing</b></sub></a><br /><a href="#maintenance-dRPCMarketing" title="Maintenance">🚧</a></td>
2087+
<td align="center" valign="top" width="14.28%"><a href="http://efp.app/caveman.eth"><img src="https://avatars.githubusercontent.com/u/24273561?v=4?s=100" width="100px;" alt="caveman.eth"/><br /><sub><b>caveman.eth</b></sub></a><br /><a href="#maintenance-caveman-eth" title="Maintenance">🚧</a></td>
2088+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pete-vielhaber"><img src="https://avatars.githubusercontent.com/u/178667149?v=4?s=100" width="100px;" alt="Pete"/><br /><sub><b>Pete</b></sub></a><br /><a href="#maintenance-pete-vielhaber" title="Maintenance">🚧</a></td>
2089+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/unhappyben"><img src="https://avatars.githubusercontent.com/u/66370595?v=4?s=100" width="100px;" alt="Ben"/><br /><sub><b>Ben</b></sub></a><br /><a href="#tool-unhappyben" title="Tools">🔧</a></td>
2090+
<td align="center" valign="top" width="14.28%"><a href="http://sethforprivacy.com"><img src="https://avatars.githubusercontent.com/u/40500387?v=4?s=100" width="100px;" alt="Seth For Privacy"/><br /><sub><b>Seth For Privacy</b></sub></a><br /><a href="#tool-sethforprivacy" title="Tools">🔧</a></td>
20792091
</tr>
20802092
</tbody>
20812093
</table>

‎app/[locale]/community/page.tsx‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
1616
import CommunityPage from "./_components/community"
1717
import CommunityJsonLD from "./page-jsonld"
1818

19-
export default async function Page({
20-
params,
21-
}: {
22-
params: Promise<{ locale: Lang }>
23-
}) {
24-
const { locale } = await params
19+
export default async function Page({ params }: { params: { locale: Lang } }) {
20+
const { locale } = params
2521

2622
setRequestLocale(locale)
2723

@@ -50,9 +46,9 @@ export default async function Page({
5046
export async function generateMetadata({
5147
params,
5248
}: {
53-
params: Promise<{ locale: string }>
49+
params: { locale: string }
5450
}) {
55-
const { locale } = await params
51+
const { locale } = params
5652

5753
const t = await getTranslations({ locale, namespace: "page-community" })
5854

‎app/[locale]/ethereum-vs-bitcoin/_components/DifferencesTable.tsx‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
import { useTranslations } from "next-intl"
2+
3+
import {
4+
Table,
5+
TableBody,
6+
TableCell,
7+
TableHead,
8+
TableHeader,
9+
TableRow,
10+
} from "@/components/ui/table"
11+
12+
const DifferencesTable = () => {
13+
const t = useTranslations("page-ethereum-vs-bitcoin")
14+
return (
15+
<Table variant="highlight-first-column">
16+
<TableHeader>
17+
<TableRow>
18+
<TableHead>
19+
{t("page-ethereum-vs-bitcoin-differences-table-area")}
20+
</TableHead>
21+
<TableHead>
22+
{t("page-ethereum-vs-bitcoin-differences-table-bitcoin")}
23+
</TableHead>
24+
<TableHead>
25+
{t("page-ethereum-vs-bitcoin-differences-table-ethereum")}
26+
</TableHead>
27+
</TableRow>
28+
</TableHeader>
29+
<TableBody>
30+
<TableRow>
31+
<TableCell>
32+
{t("page-ethereum-vs-bitcoin-differences-table-row-1-1")}
33+
</TableCell>
34+
<TableCell>
35+
{t("page-ethereum-vs-bitcoin-differences-table-row-1-2")}
36+
</TableCell>
37+
<TableCell>
38+
{t("page-ethereum-vs-bitcoin-differences-table-row-1-3")}
39+
</TableCell>
40+
</TableRow>
41+
<TableRow>
42+
<TableCell>
43+
{t("page-ethereum-vs-bitcoin-differences-table-row-2-1")}
44+
</TableCell>
45+
<TableCell>
46+
{t("page-ethereum-vs-bitcoin-differences-table-row-2-2")}
47+
</TableCell>
48+
<TableCell>
49+
{t("page-ethereum-vs-bitcoin-differences-table-row-2-3")}
50+
</TableCell>
51+
</TableRow>
52+
<TableRow>
53+
<TableCell>
54+
{t("page-ethereum-vs-bitcoin-differences-table-row-3-1")}
55+
</TableCell>
56+
<TableCell>
57+
{t("page-ethereum-vs-bitcoin-differences-table-row-3-2")}
58+
</TableCell>
59+
<TableCell>
60+
{t("page-ethereum-vs-bitcoin-differences-table-row-3-3")}
61+
</TableCell>
62+
</TableRow>
63+
<TableRow>
64+
<TableCell>
65+
{t("page-ethereum-vs-bitcoin-differences-table-row-4-1")}
66+
</TableCell>
67+
<TableCell>
68+
{t("page-ethereum-vs-bitcoin-differences-table-row-4-2")}
69+
</TableCell>
70+
<TableCell>
71+
{t("page-ethereum-vs-bitcoin-differences-table-row-4-3")}
72+
</TableCell>
73+
</TableRow>
74+
<TableRow>
75+
<TableCell>
76+
{t("page-ethereum-vs-bitcoin-differences-table-row-5-1")}
77+
</TableCell>
78+
<TableCell>
79+
{t("page-ethereum-vs-bitcoin-differences-table-row-5-2")}
80+
</TableCell>
81+
<TableCell>
82+
{t("page-ethereum-vs-bitcoin-differences-table-row-5-3")}
83+
</TableCell>
84+
</TableRow>
85+
<TableRow>
86+
<TableCell>
87+
{t("page-ethereum-vs-bitcoin-differences-table-row-6-1")}
88+
</TableCell>
89+
<TableCell>
90+
{t("page-ethereum-vs-bitcoin-differences-table-row-6-2")}
91+
</TableCell>
92+
<TableCell>
93+
{t("page-ethereum-vs-bitcoin-differences-table-row-6-3")}
94+
</TableCell>
95+
</TableRow>
96+
<TableRow>
97+
<TableCell>
98+
{t("page-ethereum-vs-bitcoin-differences-table-row-7-1")}
99+
</TableCell>
100+
<TableCell>
101+
{t("page-ethereum-vs-bitcoin-differences-table-row-7-2")}
102+
</TableCell>
103+
<TableCell>
104+
{t("page-ethereum-vs-bitcoin-differences-table-row-7-3")}
105+
</TableCell>
106+
</TableRow>
107+
<TableRow>
108+
<TableCell>
109+
{t("page-ethereum-vs-bitcoin-differences-table-row-8-1")}
110+
</TableCell>
111+
<TableCell>
112+
{t("page-ethereum-vs-bitcoin-differences-table-row-8-2")}
113+
</TableCell>
114+
<TableCell>
115+
{t("page-ethereum-vs-bitcoin-differences-table-row-8-3")}
116+
</TableCell>
117+
</TableRow>
118+
<TableRow>
119+
<TableCell>
120+
{t("page-ethereum-vs-bitcoin-differences-table-row-9-1")}
121+
</TableCell>
122+
<TableCell>
123+
{t("page-ethereum-vs-bitcoin-differences-table-row-9-2")}
124+
</TableCell>
125+
<TableCell>
126+
{t("page-ethereum-vs-bitcoin-differences-table-row-9-3")}
127+
</TableCell>
128+
</TableRow>
129+
</TableBody>
130+
</Table>
131+
)
132+
}
133+
134+
export default DifferencesTable

0 commit comments

Comments
 (0)