Skip to content

Commit 954636c

Browse files
pettinarippettinarip
committed
Merge branch 'dev' into fix-cs-common
2 parents 6c38bbd + 70dd7c6 commit 954636c

File tree

417 files changed

+10800
-4112
lines changed

Some content is hidden

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

417 files changed

+10800
-4112
lines changed

‎.all-contributorsrc

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10750,7 +10750,8 @@
1075010750
"avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
1075110751
"profile": "https://www.darigovresearch.com/",
1075210752
"contributions": [
10753-
"content"
10753+
"content",
10754+
"bug"
1075410755
]
1075510756
},
1075610757
{
@@ -10984,7 +10985,8 @@
1098410985
"avatar_url": "https://avatars.githubusercontent.com/u/9151261?v=4",
1098510986
"profile": "https://github.com/aslikaya",
1098610987
"contributions": [
10987-
"doc"
10988+
"doc",
10989+
"maintenance"
1098810990
]
1098910991
},
1099010992
{
@@ -11662,6 +11664,87 @@
1166211664
"contributions": [
1166311665
"content"
1166411666
]
11667+
},
11668+
{
11669+
"login": "WuRuiLei2023",
11670+
"name": "WuRuiLei2023",
11671+
"avatar_url": "https://avatars.githubusercontent.com/u/149141323?v=4",
11672+
"profile": "https://github.com/WuRuiLei2023",
11673+
"contributions": [
11674+
"bug"
11675+
]
11676+
},
11677+
{
11678+
"login": "radeksvarz",
11679+
"name": "Radek",
11680+
"avatar_url": "https://avatars.githubusercontent.com/u/6020891?v=4",
11681+
"profile": "http://www.edukids.cz",
11682+
"contributions": [
11683+
"eventOrganizing"
11684+
]
11685+
},
11686+
{
11687+
"login": "bhargavkakadiya",
11688+
"name": "Bhargav kakadiya",
11689+
"avatar_url": "https://avatars.githubusercontent.com/u/26486494?v=4",
11690+
"profile": "https://github.com/bhargavkakadiya",
11691+
"contributions": [
11692+
"bug"
11693+
]
11694+
},
11695+
{
11696+
"login": "ArtificialPB",
11697+
"name": "ArtificialPB",
11698+
"avatar_url": "https://avatars.githubusercontent.com/u/4672155?v=4",
11699+
"profile": "https://github.com/ArtificialPB",
11700+
"contributions": [
11701+
"tool"
11702+
]
11703+
},
11704+
{
11705+
"login": "Pedrojok01",
11706+
"name": "Pedrojok01",
11707+
"avatar_url": "https://avatars.githubusercontent.com/u/77141890?v=4",
11708+
"profile": "https://github.com/Pedrojok01",
11709+
"contributions": [
11710+
"maintenance"
11711+
]
11712+
},
11713+
{
11714+
"login": "Vid201",
11715+
"name": "Vid Kersic",
11716+
"avatar_url": "https://avatars.githubusercontent.com/u/38610409?v=4",
11717+
"profile": "https://github.com/Vid201",
11718+
"contributions": [
11719+
"tool"
11720+
]
11721+
},
11722+
{
11723+
"login": "futantan",
11724+
"name": "Tantan Fu",
11725+
"avatar_url": "https://avatars.githubusercontent.com/u/6268441?v=4",
11726+
"profile": "http://www.futantan.com",
11727+
"contributions": [
11728+
"maintenance"
11729+
]
11730+
},
11731+
{
11732+
"login": "Dharmik79",
11733+
"name": "Dharmik Dholariya",
11734+
"avatar_url": "https://avatars.githubusercontent.com/u/61613931?v=4",
11735+
"profile": "https://dharmik79.github.io/portfolio.github.io/",
11736+
"contributions": [
11737+
"bug"
11738+
]
11739+
},
11740+
{
11741+
"login": "Destiner",
11742+
"name": "Timur Badretdinov",
11743+
"avatar_url": "https://avatars.githubusercontent.com/u/4247901?v=4",
11744+
"profile": "https://destiner.io",
11745+
"contributions": [
11746+
"tool"
11747+
]
1166511748
}
1166611749
],
1166711750
"contributorsPerLine": 7,

‎.github/labeler.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
"review needed :eyes:":
1+
"needs review 👀":
22
- src/**/*
33
- public/*
44

5-
"documentation :book:":
5+
"documentation 📖":
66
- README.md
77

8-
"tooling :wrench:":
8+
"tooling 🔧":
99
- .github/**/*
1010
- src/scripts/*
1111
- src/lib/*
1212
- src/hooks/*
1313

14-
"dependencies :package:":
14+
"dependencies 📦":
1515
- package.json
1616
- yarn.lock
1717

18-
"internal :house:":
18+
"internal 🏠":
1919
- .all-contributorsrc
2020
- i18n.config.json
2121
- next.config.js
@@ -29,14 +29,14 @@
2929
- .prettierrc
3030
- netlify.toml
3131

32-
"translation :earth_africa:":
32+
"translation 🌍":
3333
- src/content/translations/**/*
3434
- src/intl/**/*
3535
- src/lib/utils/translations.ts
3636

37-
"content :fountain_pen:":
37+
"content 🖋️":
3838
- src/pages/*
3939
- public/content/**/*
4040

41-
"event :date:":
41+
"event 📅":
4242
- src/data/community-events.json

‎.github/workflows/chromatic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- "src/pages/**/*"
1717
- "src/layouts/**/*"
1818
- "src/@chakra-ui/**/*"
19+
- ".storybook/**/*"
1920

2021
# List of jobs
2122
jobs:

‎.github/workflows/get-crowdin-contributors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ jobs:
5959
6060
- name: Create Pull Request
6161
run: |
62-
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
62+
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
6363
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

‎.github/workflows/get-translation-progress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ jobs:
6060
6161
- name: Create Pull Request
6262
run: |
63-
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
63+
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
6464
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation progress from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

‎.github/workflows/import-community-events.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ jobs:
5555
5656
- name: Create Pull Request
5757
run: |
58-
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
58+
echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
5959
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update community events from external spreadsheet - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

‎README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16621662
</tr>
16631663
<tr>
16641664
<td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/muhammadaltabba"><img src="https://avatars.githubusercontent.com/u/24407834?v=4?s=100" width="100px;" alt="Muhammad Altabba"/><br /><sub><b>Muhammad Altabba</b></sub></a><br /><a href="#content-Muhammad-Altabba" title="Content">🖋</a></td>
1665-
<td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a></td>
1665+
<td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adarigovresearch" title="Bug reports">🐛</a></td>
16661666
<td align="center" valign="top" width="14.28%"><a href="https://github.com/shubhusion"><img src="https://avatars.githubusercontent.com/u/96301987?v=4?s=100" width="100px;" alt="SHUBHAM SHARMA "/><br /><sub><b>SHUBHAM SHARMA </b></sub></a><br /><a href="#ideas-shubhusion" title="Ideas, Planning, & Feedback">🤔</a></td>
16671667
<td align="center" valign="top" width="14.28%"><a href="https://github.com/paulallensuxs"><img src="https://avatars.githubusercontent.com/u/114240091?v=4?s=100" width="100px;" alt="paulallensuxs"/><br /><sub><b>paulallensuxs</b></sub></a><br /><a href="#content-paulallensuxs" title="Content">🖋</a></td>
16681668
<td align="center" valign="top" width="14.28%"><a href="https://pseudomata.com"><img src="https://avatars.githubusercontent.com/u/132238190?v=4?s=100" width="100px;" alt="Pseudomata"/><br /><sub><b>Pseudomata</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pseudomata" title="Code">💻</a></td>
@@ -1694,7 +1694,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16941694
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Crosstons"><img src="https://avatars.githubusercontent.com/u/110349596?v=4?s=100" width="100px;" alt="Shubh"/><br /><sub><b>Shubh</b></sub></a><br /><a href="#content-Crosstons" title="Content">🖋</a></td>
16951695
<td align="center" valign="top" width="14.28%"><a href="https://github.com/duckdegen"><img src="https://avatars.githubusercontent.com/u/98649644?v=4?s=100" width="100px;" alt="duckdegen"/><br /><sub><b>duckdegen</b></sub></a><br /><a href="#content-duckdegen" title="Content">🖋</a></td>
16961696
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sminempepe"><img src="https://avatars.githubusercontent.com/u/76882704?v=4?s=100" width="100px;" alt="sminempepe"/><br /><sub><b>sminempepe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=sminempepe" title="Documentation">📖</a></td>
1697-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aslikaya"><img src="https://avatars.githubusercontent.com/u/9151261?v=4?s=100" width="100px;" alt="aslikaya"/><br /><sub><b>aslikaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aslikaya" title="Documentation">📖</a></td>
1697+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aslikaya"><img src="https://avatars.githubusercontent.com/u/9151261?v=4?s=100" width="100px;" alt="aslikaya"/><br /><sub><b>aslikaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aslikaya" title="Documentation">📖</a> <a href="#maintenance-aslikaya" title="Maintenance">🚧</a></td>
16981698
</tr>
16991699
<tr>
17001700
<td align="center" valign="top" width="14.28%"><a href="http://lucasamberg.dev"><img src="https://avatars.githubusercontent.com/u/102396588?v=4?s=100" width="100px;" alt="Lucas Amberg"/><br /><sub><b>Lucas Amberg</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lucas-amberg" title="Documentation">📖</a></td>
@@ -1791,6 +1791,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17911791
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bh2smith"><img src="https://avatars.githubusercontent.com/u/11778116?v=4?s=100" width="100px;" alt="Benjamin Smith"/><br /><sub><b>Benjamin Smith</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abh2smith" title="Bug reports">🐛</a></td>
17921792
<td align="center" valign="top" width="14.28%"><a href="http://hector.im"><img src="https://avatars.githubusercontent.com/u/12469549?v=4?s=100" width="100px;" alt="Héctor Chong"/><br /><sub><b>Héctor Chong</b></sub></a><br /><a href="#content-Hector-Chong" title="Content">🖋</a></td>
17931793
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nakmr"><img src="https://avatars.githubusercontent.com/u/145886319?v=4?s=100" width="100px;" alt="nace.kimura"/><br /><sub><b>nace.kimura</b></sub></a><br /><a href="#content-nakmr" title="Content">🖋</a></td>
1794+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/WuRuiLei2023"><img src="https://avatars.githubusercontent.com/u/149141323?v=4?s=100" width="100px;" alt="WuRuiLei2023"/><br /><sub><b>WuRuiLei2023</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AWuRuiLei2023" title="Bug reports">🐛</a></td>
1795+
<td align="center" valign="top" width="14.28%"><a href="http://www.edukids.cz"><img src="https://avatars.githubusercontent.com/u/6020891?v=4?s=100" width="100px;" alt="Radek"/><br /><sub><b>Radek</b></sub></a><br /><a href="#eventOrganizing-radeksvarz" title="Event Organizing">📋</a></td>
1796+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bhargavkakadiya"><img src="https://avatars.githubusercontent.com/u/26486494?v=4?s=100" width="100px;" alt="Bhargav kakadiya"/><br /><sub><b>Bhargav kakadiya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abhargavkakadiya" title="Bug reports">🐛</a></td>
1797+
</tr>
1798+
<tr>
1799+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ArtificialPB"><img src="https://avatars.githubusercontent.com/u/4672155?v=4?s=100" width="100px;" alt="ArtificialPB"/><br /><sub><b>ArtificialPB</b></sub></a><br /><a href="#tool-ArtificialPB" title="Tools">🔧</a></td>
1800+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Pedrojok01"><img src="https://avatars.githubusercontent.com/u/77141890?v=4?s=100" width="100px;" alt="Pedrojok01"/><br /><sub><b>Pedrojok01</b></sub></a><br /><a href="#maintenance-Pedrojok01" title="Maintenance">🚧</a></td>
1801+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Vid201"><img src="https://avatars.githubusercontent.com/u/38610409?v=4?s=100" width="100px;" alt="Vid Kersic"/><br /><sub><b>Vid Kersic</b></sub></a><br /><a href="#tool-Vid201" title="Tools">🔧</a></td>
1802+
<td align="center" valign="top" width="14.28%"><a href="http://www.futantan.com"><img src="https://avatars.githubusercontent.com/u/6268441?v=4?s=100" width="100px;" alt="Tantan Fu"/><br /><sub><b>Tantan Fu</b></sub></a><br /><a href="#maintenance-futantan" title="Maintenance">🚧</a></td>
1803+
<td align="center" valign="top" width="14.28%"><a href="https://dharmik79.github.io/portfolio.github.io/"><img src="https://avatars.githubusercontent.com/u/61613931?v=4?s=100" width="100px;" alt="Dharmik Dholariya"/><br /><sub><b>Dharmik Dholariya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ADharmik79" title="Bug reports">🐛</a></td>
1804+
<td align="center" valign="top" width="14.28%"><a href="https://destiner.io"><img src="https://avatars.githubusercontent.com/u/4247901?v=4?s=100" width="100px;" alt="Timur Badretdinov"/><br /><sub><b>Timur Badretdinov</b></sub></a><br /><a href="#tool-Destiner" title="Tools">🔧</a></td>
17941805
</tr>
17951806
</tbody>
17961807
</table>

‎docs/applying-storybook.md

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ It's as easy as running `yarn storybook` to boot up a dedicated localhost to see
1818

1919
## Setting up a component's stories
2020

21-
> 🚨 NOTE: This project uses Storybook v7. The following documentation outlines preferences in setup as it relates to this version. You can refer to the [main docs](https://storybook.js.org/docs/get-started/install) if you need any additional details
21+
> 🚨 NOTE: This project uses Storybook v7, using the Component Story Format v3 and the `satisfies` keyword to define the type of the meta object. The following documentation outlines preferences in setup as it relates to this version. You can refer to the [main docs](https://storybook.js.org/docs/get-started) if you need any additional details
2222
2323
A Storybook "story" is an instance of a component in a certain state or with certain parameters applied to show an alternative version of the component.
2424

@@ -57,9 +57,11 @@ export const Basic: Story = {
5757

5858
**Note**: with the `title` option, we write this based on the groupings set by the Design System. Groupings are declared with forward slashes. (i.e. `Atoms / Form / Input`). See the Storybook docs for details on [Naming conventions](https://storybook.js.org/docs/7.0/react/writing-stories/naming-components-and-hierarchy)
5959

60+
Also, please view the Figma file for the [proposed structure for the Design System](https://www.figma.com/file/Ne3iAassyfAcJ0AlgqioAP/DS-to-storybook-structure?type=design&node-id=42%3A50&mode=design&t=RGkyouvTilzF42y0-1) to provide the correct groupings.
61+
6062
We will maintain this structure for every story file, regardless of simplicity.
6163

62-
Should the component accept props on all or some renders, you can provide an `args` prop for each story and supply the necessary data. And if there is children, use the `render` prop to pass the args and supply children elements.
64+
Should the component accept props on all or some renders, you can provide an `args` prop for each story and supply the necessary data. This can be done in place of the render if only a single instance of the given component is needed with no other components. If the `children` prop is used, it can still be used in the `args` prop.
6365

6466
Let's say for a `Button` component with different style variants...
6567

@@ -77,15 +79,15 @@ export default meta
7779
type Story = StoryObj<typeof meta>;
7880

7981
export const Solid: Story = {
80-
render: (args) => <Button {...args}>A Button</Button>,
8182
args: {
8283
variant: 'solid',
84+
children: 'A Button'
8385
}
8486
}
8587
export const Outline: Story = {
86-
render: (args) => <Button {...args}>A Button</Button>,
8788
args: {
8889
variant: 'outline',
90+
children: 'A Button'
8991
}
9092
}
9193

@@ -94,26 +96,51 @@ export const Outline: Story = {
9496
* they should be shown under one story, so they can be seen side-by-side in the GUI
9597
* for reviewers to easily compare.
9698
* This can also be done for various sizes or other like alterations
99+
*
100+
* 🚨 If prop content is supplied directly to the component and the `args` prop is not used,
101+
* do not use the `StoryObj` type. This is especially important when a story rendering multiple versions
102+
* of the component.
97103
*/
98104

99105
// Assuming `solid` is the default variant in the Chakra theme config
100-
export const Variants = () => (
101-
<VStack>
102-
<Button>A Solid Button</Button>
103-
<Button variant="outline">An Outline Button</Button>
104-
<Button variant="unstyled">An Unstyled Button</Button>
105-
</VStack>
106-
)
106+
export const Variants = {
107+
render: () => (
108+
<VStack>
109+
<Button>A Solid Button</Button>
110+
<Button variant="outline">An Outline Button</Button>
111+
<Button variant="unstyled">An Unstyled Button</Button>
112+
</VStack>
113+
)
114+
}
107115
```
108116

109-
If only one story is provided for a component, the name of the exported object should match the name in the `title` meta option. (If the title is `Atoms / Form / Button` then the object should be named `Button`) This will hoist the display name up to the parent level in the Storybook dashboard's sidebar.
117+
### Story file containing a single story
118+
119+
If only one story is provided for a component, the name of the exported object should match the name in the `title` meta option. (If the title is `Atoms / Form / Button` then the object should be named `Button`) This will hoist the display name up to the parent level in the Storybook dashboard's sidebar. This will also mean you have to rename the import of the component. Call it `ButtonComponent`, say.
120+
121+
```tsx
122+
import ButtonComponent from "."
123+
124+
const meta = {
125+
title: "Atoms / Form / Button",
126+
component: ButtonComponent,
127+
} satisfies Meta<typeof ButtonComponent>
128+
129+
export default meta
130+
131+
export const Button: StoryObj<typeof meta> = {
132+
render: () => <ButtonComponent />,
133+
}
134+
```
110135

111136
As you go and make adjustments to the component itself or it's variant styles, Storybook will hot reload and those changes will appear in the stories that emphasize them.
112137

113138
## Storybook Dashboard
114139

115140
The dashboard where you view each story has a number of different addons available to check the story thoroughly.
116141

142+
![Screenshot of Storybook Dashboard for Ethereum.org](https://github.com/ethereum/ethereum-org-website/assets/65234762/7dea7692-6a6d-4f1c-b7cb-db177bcab44d)
143+
117144
Outlined below are each area going from left to right in the selections.
118145

119146
| Toolbar above the preview | Panel below the preview |

‎i18n.config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,14 @@
423423
"langDir": "ltr",
424424
"dateFormat": "MM/DD/YYYY"
425425
},
426+
{
427+
"code": "te",
428+
"crowdinCode": "te",
429+
"name": "Telugu",
430+
"localName": "తెలుగు",
431+
"langDir": "ltr",
432+
"dateFormat": "MM/DD/YYYY"
433+
},
426434
{
427435
"code": "tk",
428436
"crowdinCode": "tk",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "8.4.0",
3+
"version": "8.5.0",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

0 commit comments

Comments
 (0)