Skip to content

Commit 3f82cc2

Browse files
authored
Merge branch 'dev' into all-contributors/add-YashIIT0909
2 parents d21b3b2 + d95cc10 commit 3f82cc2

File tree

14 files changed

+217
-8
lines changed

14 files changed

+217
-8
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12965,6 +12965,24 @@
1296512965
"contributions": [
1296612966
"bug"
1296712967
]
12968+
},
12969+
{
12970+
"login": "tomrpl",
12971+
"name": "Reppelin Tom",
12972+
"avatar_url": "https://avatars.githubusercontent.com/u/75627352?v=4",
12973+
"profile": "http://www.linkedin.com/in/tom-reppelin",
12974+
"contributions": [
12975+
"tool"
12976+
]
12977+
},
12978+
{
12979+
"login": "mdqst",
12980+
"name": "Dmitry",
12981+
"avatar_url": "https://avatars.githubusercontent.com/u/98899785?v=4",
12982+
"profile": "https://mdqst.com",
12983+
"contributions": [
12984+
"bug"
12985+
]
1296812986
}
1296912987
],
1297012988
"contributorsPerLine": 7,

.storybook/main.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ const config: StorybookConfig = {
6161
if (imageRule) {
6262
imageRule["exclude"] = /\.svg$/
6363
}
64+
// Configure yaml files to be loaded with yaml-loader
65+
config.module.rules.push({
66+
test: /\.ya?ml$/,
67+
use: "yaml-loader",
68+
})
6469

6570
// Configure .svg files to be loaded with @svgr/webpack
6671
config.module.rules.push({

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,6 +2017,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
20172017
<td align="center" valign="top" width="14.28%"><a href="https://a30a.dev/"><img src="https://avatars.githubusercontent.com/u/1610146?v=4?s=100" width="100px;" alt="Daehyun Paik"/><br /><sub><b>Daehyun Paik</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abaumstern" title="Bug reports">🐛</a></td>
20182018
<td align="center" valign="top" width="14.28%"><a href="https://dbarabashh.com"><img src="https://avatars.githubusercontent.com/u/10253529?v=4?s=100" width="100px;" alt="Dima Barabash"/><br /><sub><b>Dima Barabash</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=dbarabashh" title="Code">💻</a></td>
20192019
<td align="center" valign="top" width="14.28%"><a href="https://github.com/YashIIT0909"><img src="https://avatars.githubusercontent.com/u/182656811?v=4?s=100" width="100px;" alt="Yash Agarwal"/><br /><sub><b>Yash Agarwal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AYashIIT0909" title="Bug reports">🐛</a></td>
2020+
<td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/tom-reppelin"><img src="https://avatars.githubusercontent.com/u/75627352?v=4?s=100" width="100px;" alt="Reppelin Tom"/><br /><sub><b>Reppelin Tom</b></sub></a><br /><a href="#tool-tomrpl" title="Tools">🔧</a></td>
2021+
</tr>
2022+
<tr>
2023+
<td align="center" valign="top" width="14.28%"><a href="https://mdqst.com"><img src="https://avatars.githubusercontent.com/u/98899785?v=4?s=100" width="100px;" alt="Dmitry"/><br /><sub><b>Dmitry</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amdqst" title="Bug reports">🐛</a></td>
20202024
</tr>
20212025
</tbody>
20222026
</table>

app/[locale]/dapps/_components/dapps.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import lido from "@/public/images/dapps/lido.png"
6969
import matcha from "@/public/images/dapps/matcha.png"
7070
import meeds from "@/public/images/dapps/meeds.png"
7171
import mirror from "@/public/images/dapps/mirror.png"
72+
import morpho from "@/public/images/dapps/morpho.png"
7273
import nexus from "@/public/images/dapps/nexus.png"
7374
import nifty from "@/public/images/dapps/nifty.png"
7475
import opensea from "@/public/images/dapps/opensea.png"
@@ -487,6 +488,13 @@ const DappsPage = ({
487488
image: aave,
488489
alt: t("page-dapps-aave-logo-alt"),
489490
},
491+
{
492+
title: "Morpho",
493+
description: t("page-dapps-dapp-description-morpho"),
494+
link: "https://morpho.org/",
495+
image: morpho,
496+
alt: t("page-dapps-morpho-logo-alt"),
497+
},
490498
{
491499
title: "Compound",
492500
description: t("page-dapps-dapp-description-compound"),

docs/deploy-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Ethereum.org follows a [Gitflow](https://www.atlassian.com/git/tutorials/compari
66

77
The current process for deployment involves a 2-day QA cycle to test a release candidate. A release candidate is created on Tuesday, will have 2 days of testing, and then released to production on Thursday assuming no blocking bugs are found.
88

9-
The typical workflow will be as follows:
9+
The typical workflow is as follows:
1010

1111
1. A branch is created off of the `dev` branch, and pull requests for the branch are created into `dev`
1212
2. Pull requests are reviewed, and merged into `dev`

docs/event-tracking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ It's helpful to ask yourself how the results of what we track and measure might
3737

3838
Broadly, events should be grouped by specific topic (e.g. L2 page external links, selected bridge, selected cex).
3939

40-
## Each event comprises of 4 hierarchical values:
40+
## Each event comprises 4 hierarchical values:
4141

4242
1. Category (other events may share the same category if one feature has several actions)
4343
2. Action

public/content/developers/docs/nodes-and-clients/nodes-as-a-service/index.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,19 @@ Here is a list of some of the most popular Ethereum node providers, feel free to
6464
- Integrated testnet faucet access
6565
- Active Discord builder community with 18k users
6666

67+
- [**Allnodes**](https://www.allnodes.com/)
68+
- [Docs](https://docs.allnodes.com/)
69+
- Features
70+
- No rate limits with PublicNode token created on the Allnodes portfolio page.
71+
- Privacy focused free rpc endpoints (100+ blockchains) on [PublicNode](https://www.publicnode.com)
72+
- Dedicated nodes without rate limits for 90+ blockchains
73+
- Dedicated archive nodes for 30+ blockchains
74+
- Available in 3 regions (US, EU, Asia)
75+
- Snapshots for 100+ blockchains on [PublicNode](https://www.publicnode.com/snapshots)
76+
- 24/7 technical support with 99.90%-99.98% uptime SLA (depends on plan).
77+
- Pay-per-hour pricing
78+
- Pay with Credit Card, PayPal or Crypto
79+
6780
- [**All That Node**](https://allthatnode.com/)
6881
- [Docs](https://docs.allthatnode.com/)
6982
- Features

public/images/dapps/morpho.png

9.01 KB
Loading
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
import { Meta, StoryObj } from "@storybook/react"
2+
3+
import ContributorsComponent, { type Contributor } from "."
4+
5+
const meta = {
6+
title: "Molecules / Display Content / Contributors",
7+
component: ContributorsComponent,
8+
parameters: {
9+
layout: "fullscreen",
10+
},
11+
decorators: [
12+
(Story) => (
13+
<article className="max-w-3xl scroll-mt-24">
14+
<Story />
15+
</article>
16+
),
17+
],
18+
} satisfies Meta<typeof ContributorsComponent>
19+
20+
export default meta
21+
22+
type Story = StoryObj<typeof meta>
23+
24+
const mockContributors: Contributor[] = [
25+
{
26+
login: "carlfairclough",
27+
name: "Carl Fairclough",
28+
avatar_url: "https://avatars1.githubusercontent.com/u/4670881?v=4",
29+
profile: "http://carlfairclough.me",
30+
contributions: ["design", "code", "bug"],
31+
},
32+
{
33+
login: "RichardMcSorley",
34+
name: "Richard McSorley",
35+
avatar_url: "https://avatars2.githubusercontent.com/u/6407008?v=4",
36+
profile: "https://github.com/RichardMcSorley",
37+
contributions: ["code"],
38+
},
39+
{
40+
login: "ajsantander",
41+
name: "Alejandro Santander",
42+
avatar_url: "https://avatars2.githubusercontent.com/u/550409?v=4",
43+
profile: "http://ajsantander.github.io/",
44+
contributions: ["content"],
45+
},
46+
{
47+
login: "Lililashka",
48+
name: "Lililashka",
49+
avatar_url: "https://avatars1.githubusercontent.com/u/28689401?v=4",
50+
profile: "http://impermanence.co",
51+
contributions: ["design", "bug"],
52+
},
53+
{
54+
login: "chriseth",
55+
name: "chriseth",
56+
avatar_url: "https://avatars2.githubusercontent.com/u/9073706?v=4",
57+
profile: "https://github.com/chriseth",
58+
contributions: ["content", "review"],
59+
},
60+
{
61+
login: "fzeoli",
62+
name: "Franco Zeoli",
63+
avatar_url: "https://avatars2.githubusercontent.com/u/232174?v=4",
64+
profile: "https://nomiclabs.io",
65+
contributions: ["content", "review"],
66+
},
67+
{
68+
login: "P1X3L0V4",
69+
name: "Anna Karpińska",
70+
avatar_url: "https://avatars2.githubusercontent.com/u/3372341?v=4",
71+
profile: "https://github.com/P1X3L0V4",
72+
contributions: ["translation"],
73+
},
74+
{
75+
login: "vrde",
76+
name: "vrde",
77+
avatar_url: "https://avatars1.githubusercontent.com/u/134680?v=4",
78+
profile: "https://github.com/vrde",
79+
contributions: ["content"],
80+
},
81+
{
82+
login: "AlexandrouR",
83+
name: "Rousos Alexandros",
84+
avatar_url: "https://avatars1.githubusercontent.com/u/21177075?v=4",
85+
profile: "https://github.com/AlexandrouR",
86+
contributions: ["content"],
87+
},
88+
{
89+
login: "eswarasai",
90+
name: "Eswara Sai",
91+
avatar_url: "https://avatars2.githubusercontent.com/u/5172086?v=4",
92+
profile: "https://eswarasai.com",
93+
contributions: ["code"],
94+
},
95+
]
96+
97+
export const Contributors: Story = {
98+
args: {
99+
contributors: mockContributors,
100+
},
101+
}

src/components/Contributors.tsx renamed to src/components/Contributors/index.tsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,20 @@ export interface Contributor {
2020

2121
const allContributors = JSON.parse(data)
2222

23-
const Contributors = () => {
23+
interface ContributorsProps {
24+
contributors?: Contributor[]
25+
}
26+
27+
const Contributors = ({ contributors }: ContributorsProps) => {
2428
const [contributorsList, setContributorsList] = useState<Contributor[]>([])
2529

2630
useEffect(() => {
27-
setContributorsList(shuffle(allContributors.contributors))
28-
}, [])
31+
if (contributors) {
32+
setContributorsList(contributors)
33+
} else {
34+
setContributorsList(shuffle(allContributors.contributors))
35+
}
36+
}, [contributors])
2937

3038
return (
3139
<>
@@ -44,6 +52,9 @@ const Contributors = () => {
4452
className="h-[132px] w-[132px]"
4553
src={contributor.avatar_url}
4654
alt={contributor.name}
55+
width={132}
56+
height={132}
57+
sizes="132px"
4758
/>
4859
<div className="p-4">
4960
<h3 className="mb-4 mt-2 text-md">

0 commit comments

Comments
 (0)