Skip to content

Commit e076088

Browse files
Merge pull request #1 from ethereum/dev
updating all things
2 parents d970581 + bc70e6b commit e076088

File tree

1,500 files changed

+155470
-50611
lines changed

Some content is hidden

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

1,500 files changed

+155470
-50611
lines changed

.all-contributorsrc

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10442,6 +10442,213 @@
1044210442
"bug",
1044310443
"doc"
1044410444
]
10445+
},
10446+
{
10447+
"login": "avalidurl",
10448+
"name": "gokhan",
10449+
"avatar_url": "https://avatars.githubusercontent.com/u/11991363?v=4",
10450+
"profile": "https://github.com/avalidurl",
10451+
"contributions": [
10452+
"bug"
10453+
]
10454+
},
10455+
{
10456+
"login": "0xadri",
10457+
"name": "Adri",
10458+
"avatar_url": "https://avatars.githubusercontent.com/u/738533?v=4",
10459+
"profile": "https://github.com/0xadri",
10460+
"contributions": [
10461+
"content"
10462+
]
10463+
},
10464+
{
10465+
"login": "DSherryD",
10466+
"name": "Sherry.Du",
10467+
"avatar_url": "https://avatars.githubusercontent.com/u/130898085?v=4",
10468+
"profile": "https://github.com/DSherryD",
10469+
"contributions": [
10470+
"content"
10471+
]
10472+
},
10473+
{
10474+
"login": "FrancescoXX",
10475+
"name": "Francesco Ciulla",
10476+
"avatar_url": "https://avatars.githubusercontent.com/u/18360871?v=4",
10477+
"profile": "http://francescociulla.com",
10478+
"contributions": [
10479+
"content"
10480+
]
10481+
},
10482+
{
10483+
"login": "blazingrome",
10484+
"name": "blazingrome",
10485+
"avatar_url": "https://avatars.githubusercontent.com/u/136898739?v=4",
10486+
"profile": "https://github.com/blazingrome",
10487+
"contributions": [
10488+
"content"
10489+
]
10490+
},
10491+
{
10492+
"login": "etan-status",
10493+
"name": "Etan Kissling",
10494+
"avatar_url": "https://avatars.githubusercontent.com/u/89844309?v=4",
10495+
"profile": "https://github.com/etan-status",
10496+
"contributions": [
10497+
"content"
10498+
]
10499+
},
10500+
{
10501+
"login": "kritik-sah",
10502+
"name": "kritik sah",
10503+
"avatar_url": "https://avatars.githubusercontent.com/u/57076429?v=4",
10504+
"profile": "https://linktr.ee/kritik",
10505+
"contributions": [
10506+
"bug"
10507+
]
10508+
},
10509+
{
10510+
"login": "Fuliggine",
10511+
"name": "Fuliggine",
10512+
"avatar_url": "https://avatars.githubusercontent.com/u/56844974?v=4",
10513+
"profile": "https://github.com/Fuliggine",
10514+
"contributions": [
10515+
"content"
10516+
]
10517+
},
10518+
{
10519+
"login": "Omsify",
10520+
"name": "Omsify",
10521+
"avatar_url": "https://avatars.githubusercontent.com/u/87442202?v=4",
10522+
"profile": "https://github.com/Omsify",
10523+
"contributions": [
10524+
"bug"
10525+
]
10526+
},
10527+
{
10528+
"login": "0xMimir",
10529+
"name": "0xMimir",
10530+
"avatar_url": "https://avatars.githubusercontent.com/u/108837858?v=4",
10531+
"profile": "https://github.com/0xMimir",
10532+
"contributions": [
10533+
"content"
10534+
]
10535+
},
10536+
{
10537+
"login": "bilaljawed",
10538+
"name": "Bilal",
10539+
"avatar_url": "https://avatars.githubusercontent.com/u/17548944?v=4",
10540+
"profile": "https://github.com/bilaljawed",
10541+
"contributions": [
10542+
"content"
10543+
]
10544+
},
10545+
{
10546+
"login": "ilanolkies",
10547+
"name": "Ilan",
10548+
"avatar_url": "https://avatars.githubusercontent.com/u/36084092?v=4",
10549+
"profile": "https://ilanolkies.com",
10550+
"contributions": [
10551+
"content"
10552+
]
10553+
},
10554+
{
10555+
"login": "umededoteth",
10556+
"name": "umede",
10557+
"avatar_url": "https://avatars.githubusercontent.com/u/122288558?v=4",
10558+
"profile": "https://mirror.xyz/umede.eth",
10559+
"contributions": [
10560+
"content"
10561+
]
10562+
},
10563+
{
10564+
"login": "taminobaumann",
10565+
"name": "Tamino",
10566+
"avatar_url": "https://avatars.githubusercontent.com/u/48290617?v=4",
10567+
"profile": "http://taminobaumann.com",
10568+
"contributions": [
10569+
"content"
10570+
]
10571+
},
10572+
{
10573+
"login": "keccers",
10574+
"name": "Katherine Champagne",
10575+
"avatar_url": "https://avatars.githubusercontent.com/u/770277?v=4",
10576+
"profile": "https://github.com/keccers",
10577+
"contributions": [
10578+
"content"
10579+
]
10580+
},
10581+
{
10582+
"login": "Coderoostr",
10583+
"name": "Marcos González",
10584+
"avatar_url": "https://avatars.githubusercontent.com/u/103231131?v=4",
10585+
"profile": "https://coderoostr.com",
10586+
"contributions": [
10587+
"doc"
10588+
]
10589+
},
10590+
{
10591+
"login": "natpicone",
10592+
"name": "Natalino Picone",
10593+
"avatar_url": "https://avatars.githubusercontent.com/u/4753402?v=4",
10594+
"profile": "https://chainlabo.com",
10595+
"contributions": [
10596+
"content"
10597+
]
10598+
},
10599+
{
10600+
"login": "hammadsaedi",
10601+
"name": "Hammad Saaedi",
10602+
"avatar_url": "https://avatars.githubusercontent.com/u/71373419?v=4",
10603+
"profile": "https://github.com/hammadsaedi",
10604+
"contributions": [
10605+
"content"
10606+
]
10607+
},
10608+
{
10609+
"login": "srn08",
10610+
"name": "Shaunak Nagrecha",
10611+
"avatar_url": "https://avatars.githubusercontent.com/u/105499798?v=4",
10612+
"profile": "https://github.com/srn08",
10613+
"contributions": [
10614+
"bug"
10615+
]
10616+
},
10617+
{
10618+
"login": "schwindtkevin",
10619+
"name": "Kevin Schwindt",
10620+
"avatar_url": "https://avatars.githubusercontent.com/u/1700789?v=4",
10621+
"profile": "https://github.com/schwindtkevin",
10622+
"contributions": [
10623+
"content"
10624+
]
10625+
},
10626+
{
10627+
"login": "robertkodra",
10628+
"name": "Robert",
10629+
"avatar_url": "https://avatars.githubusercontent.com/u/36516516?v=4",
10630+
"profile": "https://github.com/robertkodra",
10631+
"contributions": [
10632+
"content"
10633+
]
10634+
},
10635+
{
10636+
"login": "0xObsidian",
10637+
"name": "obsidian",
10638+
"avatar_url": "https://avatars.githubusercontent.com/u/131651958?v=4",
10639+
"profile": "https://github.com/0xObsidian",
10640+
"contributions": [
10641+
"content"
10642+
]
10643+
},
10644+
{
10645+
"login": "MohamedFekryyy",
10646+
"name": "Fekry Aiad",
10647+
"avatar_url": "https://avatars.githubusercontent.com/u/36033065?v=4",
10648+
"profile": "http://www.scienft.com",
10649+
"contributions": [
10650+
"ideas"
10651+
]
1044510652
}
1044610653
],
1044710654
"contributorsPerLine": 7,

.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const ns = [
1414
"common",
1515
"glossary",
1616
"page-about",
17+
"page-index",
1718
"page-upgrades",
1819
"page-developers-index",
1920
]

.storybook/preview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { action } from "@storybook/addon-actions"
33

44
import i18n, { baseLocales } from "./i18next"
55
import theme from "../src/@chakra-ui/gatsby-plugin/theme"
6+
import "../static/fonts/inter-font-face.css"
67

78
const chakraBreakpointArray = Object.entries(theme.breakpoints)
89

README.md

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,12 @@ Learn more about how we review pull requests [here](docs/review-process.md).
175175

176176
- To help with verification we request GitHub contributors connect their GitHub account with their Discord account (Discord > Settings > Connections > GitHub). Crowdin contributors will be verified directly through Crowdin by our team.
177177

178-
- If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
178+
### GitPOAP
179+
180+
- If you've made at least one contribution and that gets merged into ethereum.org, GitPOAP will also auto recognize it and let you mint a unique contributor POAP.
181+
[More on GitPOAP](https://www.gitpoap.io).
182+
183+
If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
179184

180185
<hr style="margin-top: 3em; margin-bottom: 3em;">
181186

@@ -1632,6 +1637,35 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16321637
<td align="center" valign="top" width="14.28%"><a href="https://github.com/LadyDhaga"><img src="https://avatars.githubusercontent.com/u/106376368?v=4?s=100" width="100px;" alt="chinaman123"/><br /><sub><b>chinaman123</b></sub></a><br /><a href="#ideas-LadyDhaga" title="Ideas, Planning, & Feedback">🤔</a></td>
16331638
<td align="center" valign="top" width="14.28%"><a href="http://t.me/mevsinternet"><img src="https://avatars.githubusercontent.com/u/32142853?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=z0rats" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Az0rats" title="Bug reports">🐛</a></td>
16341639
<td align="center" valign="top" width="14.28%"><a href="https://mteam88.github.io"><img src="https://avatars.githubusercontent.com/u/84196639?v=4?s=100" width="100px;" alt="Matthew"/><br /><sub><b>Matthew</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amteam88" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=mteam88" title="Documentation">📖</a></td>
1640+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/avalidurl"><img src="https://avatars.githubusercontent.com/u/11991363?v=4?s=100" width="100px;" alt="gokhan"/><br /><sub><b>gokhan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aavalidurl" title="Bug reports">🐛</a></td>
1641+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xadri"><img src="https://avatars.githubusercontent.com/u/738533?v=4?s=100" width="100px;" alt="Adri"/><br /><sub><b>Adri</b></sub></a><br /><a href="#content-0xadri" title="Content">🖋</a></td>
1642+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/DSherryD"><img src="https://avatars.githubusercontent.com/u/130898085?v=4?s=100" width="100px;" alt="Sherry.Du"/><br /><sub><b>Sherry.Du</b></sub></a><br /><a href="#content-DSherryD" title="Content">🖋</a></td>
1643+
<td align="center" valign="top" width="14.28%"><a href="http://francescociulla.com"><img src="https://avatars.githubusercontent.com/u/18360871?v=4?s=100" width="100px;" alt="Francesco Ciulla"/><br /><sub><b>Francesco Ciulla</b></sub></a><br /><a href="#content-FrancescoXX" title="Content">🖋</a></td>
1644+
</tr>
1645+
<tr>
1646+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/blazingrome"><img src="https://avatars.githubusercontent.com/u/136898739?v=4?s=100" width="100px;" alt="blazingrome"/><br /><sub><b>blazingrome</b></sub></a><br /><a href="#content-blazingrome" title="Content">🖋</a></td>
1647+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/etan-status"><img src="https://avatars.githubusercontent.com/u/89844309?v=4?s=100" width="100px;" alt="Etan Kissling"/><br /><sub><b>Etan Kissling</b></sub></a><br /><a href="#content-etan-status" title="Content">🖋</a></td>
1648+
<td align="center" valign="top" width="14.28%"><a href="https://linktr.ee/kritik"><img src="https://avatars.githubusercontent.com/u/57076429?v=4?s=100" width="100px;" alt="kritik sah"/><br /><sub><b>kritik sah</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akritik-sah" title="Bug reports">🐛</a></td>
1649+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuliggine"><img src="https://avatars.githubusercontent.com/u/56844974?v=4?s=100" width="100px;" alt="Fuliggine"/><br /><sub><b>Fuliggine</b></sub></a><br /><a href="#content-Fuliggine" title="Content">🖋</a></td>
1650+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Omsify"><img src="https://avatars.githubusercontent.com/u/87442202?v=4?s=100" width="100px;" alt="Omsify"/><br /><sub><b>Omsify</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AOmsify" title="Bug reports">🐛</a></td>
1651+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xMimir"><img src="https://avatars.githubusercontent.com/u/108837858?v=4?s=100" width="100px;" alt="0xMimir"/><br /><sub><b>0xMimir</b></sub></a><br /><a href="#content-0xMimir" title="Content">🖋</a></td>
1652+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bilaljawed"><img src="https://avatars.githubusercontent.com/u/17548944?v=4?s=100" width="100px;" alt="Bilal"/><br /><sub><b>Bilal</b></sub></a><br /><a href="#content-bilaljawed" title="Content">🖋</a></td>
1653+
</tr>
1654+
<tr>
1655+
<td align="center" valign="top" width="14.28%"><a href="https://ilanolkies.com"><img src="https://avatars.githubusercontent.com/u/36084092?v=4?s=100" width="100px;" alt="Ilan"/><br /><sub><b>Ilan</b></sub></a><br /><a href="#content-ilanolkies" title="Content">🖋</a></td>
1656+
<td align="center" valign="top" width="14.28%"><a href="https://mirror.xyz/umede.eth"><img src="https://avatars.githubusercontent.com/u/122288558?v=4?s=100" width="100px;" alt="umede"/><br /><sub><b>umede</b></sub></a><br /><a href="#content-umededoteth" title="Content">🖋</a></td>
1657+
<td align="center" valign="top" width="14.28%"><a href="http://taminobaumann.com"><img src="https://avatars.githubusercontent.com/u/48290617?v=4?s=100" width="100px;" alt="Tamino"/><br /><sub><b>Tamino</b></sub></a><br /><a href="#content-taminobaumann" title="Content">🖋</a></td>
1658+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/keccers"><img src="https://avatars.githubusercontent.com/u/770277?v=4?s=100" width="100px;" alt="Katherine Champagne"/><br /><sub><b>Katherine Champagne</b></sub></a><br /><a href="#content-keccers" title="Content">🖋</a></td>
1659+
<td align="center" valign="top" width="14.28%"><a href="https://coderoostr.com"><img src="https://avatars.githubusercontent.com/u/103231131?v=4?s=100" width="100px;" alt="Marcos González"/><br /><sub><b>Marcos González</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Coderoostr" title="Documentation">📖</a></td>
1660+
<td align="center" valign="top" width="14.28%"><a href="https://chainlabo.com"><img src="https://avatars.githubusercontent.com/u/4753402?v=4?s=100" width="100px;" alt="Natalino Picone"/><br /><sub><b>Natalino Picone</b></sub></a><br /><a href="#content-natpicone" title="Content">🖋</a></td>
1661+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/hammadsaedi"><img src="https://avatars.githubusercontent.com/u/71373419?v=4?s=100" width="100px;" alt="Hammad Saaedi"/><br /><sub><b>Hammad Saaedi</b></sub></a><br /><a href="#content-hammadsaedi" title="Content">🖋</a></td>
1662+
</tr>
1663+
<tr>
1664+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/srn08"><img src="https://avatars.githubusercontent.com/u/105499798?v=4?s=100" width="100px;" alt="Shaunak Nagrecha"/><br /><sub><b>Shaunak Nagrecha</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asrn08" title="Bug reports">🐛</a></td>
1665+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/schwindtkevin"><img src="https://avatars.githubusercontent.com/u/1700789?v=4?s=100" width="100px;" alt="Kevin Schwindt"/><br /><sub><b>Kevin Schwindt</b></sub></a><br /><a href="#content-schwindtkevin" title="Content">🖋</a></td>
1666+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/robertkodra"><img src="https://avatars.githubusercontent.com/u/36516516?v=4?s=100" width="100px;" alt="Robert"/><br /><sub><b>Robert</b></sub></a><br /><a href="#content-robertkodra" title="Content">🖋</a></td>
1667+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xObsidian"><img src="https://avatars.githubusercontent.com/u/131651958?v=4?s=100" width="100px;" alt="obsidian"/><br /><sub><b>obsidian</b></sub></a><br /><a href="#content-0xObsidian" title="Content">🖋</a></td>
1668+
<td align="center" valign="top" width="14.28%"><a href="http://www.scienft.com"><img src="https://avatars.githubusercontent.com/u/36033065?v=4?s=100" width="100px;" alt="Fekry Aiad"/><br /><sub><b>Fekry Aiad</b></sub></a><br /><a href="#ideas-MohamedFekryyy" title="Ideas, Planning, & Feedback">🤔</a></td>
16351669
</tr>
16361670
</tbody>
16371671
</table>

docs/best-practices.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,3 +229,11 @@ export const query = graphql`
229229
`
230230
// These query results get passed as an object `props.data` to your component
231231
```
232+
233+
### Using custom `GatsbyImage`
234+
235+
[GatsbyImage](https://www.gatsbyjs.com/plugins/gatsby-plugin-image/) is the component of choice to handle responsive images processed through graphql. However, we use a custom version of this component that is properly optimized with Chakra. This way we can use style props from Chakra but still be able to forward common or GatsbyImage-specific props to the Gatsby component for correct usage and rendering.
236+
237+
```tsx
238+
import GatsbyImage from "./components/GatsbyImage"
239+
```

docs/ds-implementation.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# DS implementation guide
2+
3+
This is a reference for implementing the new Design System components and styles defined in a public [Figma file](https://www.figma.com/file/NrNxGjBL0Yl1PrNrOT8G2B/ethereum.org-Design-System).
4+
5+
This is part of our [Design System implementation epic](https://github.com/ethereum/ethereum-org-website/issues/9546). Currently we are implementing the v1, check the remaining tasks [here](https://github.com/ethereum/ethereum-org-website/issues/9548).
6+
7+
## Basics
8+
9+
- Use Chakra tokens for spacing, sizes, and breakpoints. [Chakra theme docs](https://chakra-ui.com/docs/styled-system/theme)
10+
- For colors use the semantic tokens defined in [this file](https://github.com/ethereum/ethereum-org-website/blob/dev/src/@chakra-ui/gatsby-plugin/semanticTokens.ts). These tokens will match the color variables used in the DS Figma file
11+
- Use as many Chakra components and utils as possible
12+
- Read the [Best Practices doc](https://github.com/ethereum/ethereum-org-website/blob/dev/docs/best-practices.md) for more examples and info
13+
14+
**IMPORTANT**
15+
Follow the new component directory structure:
16+
17+
```markdown
18+
src/
19+
└── components/
20+
└── ComponentA/
21+
├── index.tsx
22+
├── ComponentA.stories.tsx
23+
└── // Any other files as applicable (utils, child components, useHook, etc.)
24+
```
25+
26+
## Components creation/modification from the DS
27+
28+
If you are implementing:
29+
30+
- A base component (a component that already exists in the [Chakra components list](https://chakra-ui.com/docs/components/), for example, the button or inputs)
31+
- Try to avoid creating a new component file `/ComponentA/index.tsx` if there is no additional or custom logic we need to add to them
32+
- Create a theme file to override the default Chakra styles with the DS specs. See examples under the [Chakra theme folder](https://github.com/ethereum/ethereum-org-website/blob/dev/src/@chakra-ui/gatsby-plugin/components/)
33+
- Create a `.stories.tsx` file under `src/components/BaseStories`
34+
- A new custom component (e.g. the PageHero)
35+
- Use as many Chakra components as possible
36+
- Avoid implementing previous implementation details or styles if Chakra offers a solution for that
37+
38+
## Stories
39+
40+
As defined in the new directory structure, each created or adapted component must have a story attached to it.
41+
42+
- Follow the [Applying Storybook documentation](https://github.com/ethereum/ethereum-org-website/blob/dev/docs/applying-storybook.md)
43+
- Follow the [proposed Storybook structure](https://www.figma.com/file/Ne3iAassyfAcJ0AlgqioAP/DS-to-storybook-structure)

docs/schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Schema
22

3-
Our schema, used in the Gatsby GraphQL layer, is defined under the `src/schema` folder. These files are then grabbed by the createSchemaCustomization`Gatsby hook in`gatsby-node.ts`.
3+
Our schema, used in the Gatsby GraphQL layer, is defined under the `src/schema` folder. These files are then grabbed by the `createSchemaCustomization` Gatsby hook in `gatsby-node.ts`.
44
There are two ways to define a schema in Gatsby:
55

66
- GraphQL SDL, the traditional way using [template literals](https://graphql.org/learn/schema/)
77
- And a more "programmatic" approach, which has more flexibility, [Gatsby Type Builders](https://www.gatsbyjs.com/docs/reference/graphql-data-layer/schema-customization/#gatsby-type-builders) with `schema.buildObjectType`
88

9-
That is why you see two folders in /schema
9+
That is why you see two folders in `/schema`
1010

1111
- `src/schema/sdls` for GraphQL SDL
1212
- `src/schema/builders` for Gatsby Type Builders

0 commit comments

Comments
 (0)