Skip to content

Commit 8d4518d

Browse files
authored
Merge branch 'dev' into quiz-staking
2 parents 63bf6dc + 96d1371 commit 8d4518d

File tree

646 files changed

+62877
-3322
lines changed

Some content is hidden

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

646 files changed

+62877
-3322
lines changed

.all-contributorsrc

Lines changed: 130 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8756,7 +8756,8 @@
87568756
"profile": "https://github.com/MahendraBishnoi29",
87578757
"contributions": [
87588758
"ideas",
8759-
"code"
8759+
"code",
8760+
"bug"
87608761
]
87618762
},
87628763
{
@@ -10210,6 +10211,134 @@
1021010211
"content",
1021110212
"code"
1021210213
]
10214+
},
10215+
{
10216+
"login": "maxime216-pro",
10217+
"name": "Maxime Dessez",
10218+
"avatar_url": "https://avatars.githubusercontent.com/u/66296351?v=4",
10219+
"profile": "http://maximedessez.fr",
10220+
"contributions": [
10221+
"bug",
10222+
"translation"
10223+
]
10224+
},
10225+
{
10226+
"login": "Tyler-233",
10227+
"name": "Tyler-233",
10228+
"avatar_url": "https://avatars.githubusercontent.com/u/44740396?v=4",
10229+
"profile": "https://github.com/Tyler-233",
10230+
"contributions": [
10231+
"translation",
10232+
"content"
10233+
]
10234+
},
10235+
{
10236+
"login": "neodaoist",
10237+
"name": "neodaoist",
10238+
"avatar_url": "https://avatars.githubusercontent.com/u/3170590?v=4",
10239+
"profile": "http://neodaoist.xyz",
10240+
"contributions": [
10241+
"content"
10242+
]
10243+
},
10244+
{
10245+
"login": "atharvadeosthale",
10246+
"name": "Atharva Deosthale",
10247+
"avatar_url": "https://avatars.githubusercontent.com/u/11805367?v=4",
10248+
"profile": "https://links.atharva.codes",
10249+
"contributions": [
10250+
"content"
10251+
]
10252+
},
10253+
{
10254+
"login": "ckartik",
10255+
"name": "Kartik Chopra",
10256+
"avatar_url": "https://avatars.githubusercontent.com/u/13803371?v=4",
10257+
"profile": "https://github.com/ckartik",
10258+
"contributions": [
10259+
"content"
10260+
]
10261+
},
10262+
{
10263+
"login": "BBashh",
10264+
"name": "Bibash Tandon",
10265+
"avatar_url": "https://avatars.githubusercontent.com/u/125178349?v=4",
10266+
"profile": "https://github.com/BBashh",
10267+
"contributions": [
10268+
"content"
10269+
]
10270+
},
10271+
{
10272+
"login": "vaibhavtevatia",
10273+
"name": "Vaibhav Tevatia",
10274+
"avatar_url": "https://avatars.githubusercontent.com/u/86671961?v=4",
10275+
"profile": "https://github.com/vaibhavtevatia",
10276+
"contributions": [
10277+
"code"
10278+
]
10279+
},
10280+
{
10281+
"login": "cnn-rnn",
10282+
"name": "cnn-rnn",
10283+
"avatar_url": "https://avatars.githubusercontent.com/u/44789658?v=4",
10284+
"profile": "https://github.com/cnn-rnn",
10285+
"contributions": [
10286+
"ideas"
10287+
]
10288+
},
10289+
{
10290+
"login": "SahityaRoy",
10291+
"name": "Sahitya Roy",
10292+
"avatar_url": "https://avatars.githubusercontent.com/u/72821604?v=4",
10293+
"profile": "https://www.linkedin.com/in/sahitya-roy-244b941a2/",
10294+
"contributions": [
10295+
"ideas"
10296+
]
10297+
},
10298+
{
10299+
"login": "Keecointoken",
10300+
"name": "KeeCoin",
10301+
"avatar_url": "https://avatars.githubusercontent.com/u/99338330?v=4",
10302+
"profile": "https://www.keecoin.io",
10303+
"contributions": [
10304+
"ideas"
10305+
]
10306+
},
10307+
{
10308+
"login": "tomatowax",
10309+
"name": "Seungwook Chi",
10310+
"avatar_url": "https://avatars.githubusercontent.com/u/799503?v=4",
10311+
"profile": "http://www.tomatowax.com/",
10312+
"contributions": [
10313+
"content"
10314+
]
10315+
},
10316+
{
10317+
"login": "0xx92",
10318+
"name": "0xx92",
10319+
"avatar_url": "https://avatars.githubusercontent.com/u/133748557?v=4",
10320+
"profile": "https://github.com/0xx92",
10321+
"contributions": [
10322+
"content"
10323+
]
10324+
},
10325+
{
10326+
"login": "altinocoelho",
10327+
"name": "altinocoelho",
10328+
"avatar_url": "https://avatars.githubusercontent.com/u/92543849?v=4",
10329+
"profile": "https://github.com/altinocoelho",
10330+
"contributions": [
10331+
"content"
10332+
]
10333+
},
10334+
{
10335+
"login": "viac92",
10336+
"name": "viac92",
10337+
"avatar_url": "https://avatars.githubusercontent.com/u/64146594?v=4",
10338+
"profile": "https://github.com/viac92",
10339+
"contributions": [
10340+
"content"
10341+
]
1021310342
}
1021410343
],
1021510344
"contributorsPerLine": 7,
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Update Crowdin Contributors
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * SUN" # Runs every Sunday at midnight
6+
workflow_dispatch:
7+
8+
jobs:
9+
create_pr:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v3
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: 18
19+
20+
- name: Install dependencies
21+
run: yarn install
22+
23+
- name: Install ts-node
24+
run: yarn global add ts-node
25+
26+
- name: Set up git
27+
run: |
28+
git config --global user.email "[email protected]"
29+
git config --global user.name "GitHub Action"
30+
31+
- name: Generate timestamp and readable date
32+
id: date
33+
run: |
34+
echo "TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
35+
echo "READABLE_DATE=$(date +'%B %-d')" >> $GITHUB_ENV
36+
37+
- name: Fetch latest dev and create new branch
38+
run: |
39+
git fetch origin dev
40+
git checkout -b "automated-update-${{ env.TIMESTAMP }}" origin/dev
41+
42+
- name: Run script
43+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/getCrowdinContributors.ts
44+
env:
45+
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
46+
47+
- name: Commit and push
48+
run: |
49+
git add -A
50+
git commit -m "Update Crowdin contributors"
51+
git push origin "automated-update-${{ env.TIMESTAMP }}"
52+
53+
- name: Create PR body
54+
run: |
55+
echo "This PR was automatically created to update Crowdin contributors." > pr_body.txt
56+
echo "This workflows runs every Sunday at 00:00 (UTC)." >> pr_body.txt
57+
echo "" >> pr_body.txt
58+
echo "Thank you to everyone contributing to translate ethereum.org ❤️" >> pr_body.txt
59+
60+
- name: Create Pull Request
61+
run: |
62+
gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }}
63+
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
13921392
<td align="center" valign="top" width="14.28%"><a href="https://carllippert.com"><img src="https://avatars.githubusercontent.com/u/16457876?v=4?s=100" width="100px;" alt="Carl Lippert"/><br /><sub><b>Carl Lippert</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=carllippert" title="Documentation">📖</a></td>
13931393
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tymtam2"><img src="https://avatars.githubusercontent.com/u/1097613?v=4?s=100" width="100px;" alt="Tymek Majewski"/><br /><sub><b>Tymek Majewski</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=tymtam2" title="Documentation">📖</a></td>
13941394
<td align="center" valign="top" width="14.28%"><a href="http://cryptolibertarian.id"><img src="https://avatars.githubusercontent.com/u/108990005?v=4?s=100" width="100px;" alt="Cryptolibertarian.id"/><br /><sub><b>Cryptolibertarian.id</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Cryptolibertarian-id" title="Documentation">📖</a></td>
1395-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MahendraBishnoi29"><img src="https://avatars.githubusercontent.com/u/74294202?v=4?s=100" width="100px;" alt="browny"/><br /><sub><b>browny</b></sub></a><br /><a href="#ideas-MahendraBishnoi29" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MahendraBishnoi29" title="Code">💻</a></td>
1395+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MahendraBishnoi29"><img src="https://avatars.githubusercontent.com/u/74294202?v=4?s=100" width="100px;" alt="browny"/><br /><sub><b>browny</b></sub></a><br /><a href="#ideas-MahendraBishnoi29" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MahendraBishnoi29" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMahendraBishnoi29" title="Bug reports">🐛</a></td>
13961396
</tr>
13971397
<tr>
13981398
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sandakersmann"><img src="https://avatars.githubusercontent.com/u/6118832?v=4?s=100" width="100px;" alt="Marius Kjærstad"/><br /><sub><b>Marius Kjærstad</b></sub></a><br /><a href="#ideas-sandakersmann" title="Ideas, Planning, & Feedback">🤔</a></td>
@@ -1599,6 +1599,24 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15991599
<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>
16001600
<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>
16011601
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rpalakkal"><img src="https://avatars.githubusercontent.com/u/19766713?v=4?s=100" width="100px;" alt="Roshan"/><br /><sub><b>Roshan</b></sub></a><br /><a href="#content-rpalakkal" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=rpalakkal" title="Code">💻</a></td>
1602+
<td align="center" valign="top" width="14.28%"><a href="http://maximedessez.fr"><img src="https://avatars.githubusercontent.com/u/66296351?v=4?s=100" width="100px;" alt="Maxime Dessez"/><br /><sub><b>Maxime Dessez</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amaxime216-pro" title="Bug reports">🐛</a> <a href="#translation-maxime216-pro" title="Translation">🌍</a></td>
1603+
</tr>
1604+
<tr>
1605+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Tyler-233"><img src="https://avatars.githubusercontent.com/u/44740396?v=4?s=100" width="100px;" alt="Tyler-233"/><br /><sub><b>Tyler-233</b></sub></a><br /><a href="#translation-Tyler-233" title="Translation">🌍</a> <a href="#content-Tyler-233" title="Content">🖋</a></td>
1606+
<td align="center" valign="top" width="14.28%"><a href="http://neodaoist.xyz"><img src="https://avatars.githubusercontent.com/u/3170590?v=4?s=100" width="100px;" alt="neodaoist"/><br /><sub><b>neodaoist</b></sub></a><br /><a href="#content-neodaoist" title="Content">🖋</a></td>
1607+
<td align="center" valign="top" width="14.28%"><a href="https://links.atharva.codes"><img src="https://avatars.githubusercontent.com/u/11805367?v=4?s=100" width="100px;" alt="Atharva Deosthale"/><br /><sub><b>Atharva Deosthale</b></sub></a><br /><a href="#content-atharvadeosthale" title="Content">🖋</a></td>
1608+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ckartik"><img src="https://avatars.githubusercontent.com/u/13803371?v=4?s=100" width="100px;" alt="Kartik Chopra"/><br /><sub><b>Kartik Chopra</b></sub></a><br /><a href="#content-ckartik" title="Content">🖋</a></td>
1609+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/BBashh"><img src="https://avatars.githubusercontent.com/u/125178349?v=4?s=100" width="100px;" alt="Bibash Tandon"/><br /><sub><b>Bibash Tandon</b></sub></a><br /><a href="#content-BBashh" title="Content">🖋</a></td>
1610+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vaibhavtevatia"><img src="https://avatars.githubusercontent.com/u/86671961?v=4?s=100" width="100px;" alt="Vaibhav Tevatia"/><br /><sub><b>Vaibhav Tevatia</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vaibhavtevatia" title="Code">💻</a></td>
1611+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cnn-rnn"><img src="https://avatars.githubusercontent.com/u/44789658?v=4?s=100" width="100px;" alt="cnn-rnn"/><br /><sub><b>cnn-rnn</b></sub></a><br /><a href="#ideas-cnn-rnn" title="Ideas, Planning, & Feedback">🤔</a></td>
1612+
</tr>
1613+
<tr>
1614+
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/sahitya-roy-244b941a2/"><img src="https://avatars.githubusercontent.com/u/72821604?v=4?s=100" width="100px;" alt="Sahitya Roy"/><br /><sub><b>Sahitya Roy</b></sub></a><br /><a href="#ideas-SahityaRoy" title="Ideas, Planning, & Feedback">🤔</a></td>
1615+
<td align="center" valign="top" width="14.28%"><a href="https://www.keecoin.io"><img src="https://avatars.githubusercontent.com/u/99338330?v=4?s=100" width="100px;" alt="KeeCoin"/><br /><sub><b>KeeCoin</b></sub></a><br /><a href="#ideas-Keecointoken" title="Ideas, Planning, & Feedback">🤔</a></td>
1616+
<td align="center" valign="top" width="14.28%"><a href="http://www.tomatowax.com/"><img src="https://avatars.githubusercontent.com/u/799503?v=4?s=100" width="100px;" alt="Seungwook Chi"/><br /><sub><b>Seungwook Chi</b></sub></a><br /><a href="#content-tomatowax" title="Content">🖋</a></td>
1617+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xx92"><img src="https://avatars.githubusercontent.com/u/133748557?v=4?s=100" width="100px;" alt="0xx92"/><br /><sub><b>0xx92</b></sub></a><br /><a href="#content-0xx92" title="Content">🖋</a></td>
1618+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/altinocoelho"><img src="https://avatars.githubusercontent.com/u/92543849?v=4?s=100" width="100px;" alt="altinocoelho"/><br /><sub><b>altinocoelho</b></sub></a><br /><a href="#content-altinocoelho" title="Content">🖋</a></td>
1619+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/viac92"><img src="https://avatars.githubusercontent.com/u/64146594?v=4?s=100" width="100px;" alt="viac92"/><br /><sub><b>viac92</b></sub></a><br /><a href="#content-viac92" title="Content">🖋</a></td>
16021620
</tr>
16031621
</tbody>
16041622
</table>

package.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "7.16.0",
3+
"version": "7.17.0",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "[email protected]:ethereum/ethereum-org-website.git",
@@ -11,11 +11,13 @@
1111
"@apollo/client": "^3.3.13",
1212
"@chakra-ui/gatsby-plugin": "^3.1.3",
1313
"@chakra-ui/react": "2.6.1",
14+
"@crowdin/crowdin-api-client": "^1.23.2",
1415
"@docsearch/react": "^3.3.3",
1516
"@emotion/react": "^11.9.3",
1617
"@emotion/styled": "^11.9.3",
1718
"@formatjs/intl-locale": "^2.4.14",
1819
"@formatjs/intl-numberformat": "^6.1.4",
20+
"@googleapis/calendar": "^6.0.0",
1921
"@mdx-js/mdx": "^1.6.5",
2022
"@mdx-js/react": "^1.6.5",
2123
"algoliasearch": "^4.3.0",
@@ -54,6 +56,7 @@
5456
"gatsby-transformer-json": "^5.4.0",
5557
"gatsby-transformer-remark": "^6.4.0",
5658
"gatsby-transformer-sharp": "^5.4.0",
59+
"googleapis": "^118.0.0",
5760
"htmr": "^1.0.2",
5861
"i18next": "^21.9.2",
5962
"is-relative-url": "^3.0.0",
@@ -104,6 +107,7 @@
104107
"babel-loader": "^8.3.0",
105108
"babel-preset-gatsby": "^2.23.0",
106109
"chromatic": "^6.19.9",
110+
"cross-env": "^7.0.3",
107111
"github-slugger": "^1.3.0",
108112
"gray-matter": "^4.0.3",
109113
"husky": "^4.2.5",
@@ -121,8 +125,8 @@
121125
"scripts": {
122126
"postinstall": "yarn theme",
123127
"build": "gatsby build",
124-
"build:lambda": "NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
125-
"build:10gb": "NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
128+
"build:lambda": "cross-env NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
129+
"build:10gb": "cross-env NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
126130
"clean": "gatsby clean",
127131
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
128132
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
@@ -131,6 +135,8 @@
131135
"generate-heading-ids": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/generateHeadingIds.ts",
132136
"unused-translations": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/unusedTranslations.ts",
133137
"reorg-intl": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/reorgIntlFiles.ts",
138+
"optimize-images": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/optimizeImages.ts",
139+
"crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
134140
"start": "gatsby develop",
135141
"start:lambda": "netlify-lambda serve src/lambda",
136142
"start:static": "gatsby build && gatsby serve",
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
import {
2+
createMultiStyleConfigHelpers,
3+
cssVar,
4+
defineStyle,
5+
getToken,
6+
} from "@chakra-ui/react"
7+
import { avatarAnatomy } from "@chakra-ui/anatomy"
8+
import { avatarDefaultTheme, defineMergeStyles } from "./components.utils"
9+
import { pick } from "lodash"
10+
11+
const { defineMultiStyleConfig, definePartsStyle } =
12+
createMultiStyleConfigHelpers(avatarAnatomy.keys)
13+
14+
const { baseStyle: defaultBaseStyle, sizes: defaultSizes } = avatarDefaultTheme
15+
16+
const $border = cssVar("avatar-border-color", "transparent")
17+
const $mlBySize = cssVar("ml-by-size")
18+
19+
const baseStyleContainer = defineStyle((props) => {
20+
const primaryLowContrast = getToken(
21+
"colors",
22+
"primary.lowContrast"
23+
)(props.theme)
24+
25+
return defineMergeStyles(defaultBaseStyle?.(props).container, {
26+
[$border.variable]: "transparent",
27+
borderWidth: "1px",
28+
"&:hover, [data-peer]:hover ~ &": {
29+
boxShadow: `0.15em 0.15em 0 ${primaryLowContrast}`,
30+
},
31+
_focus: {
32+
outline: "4px solid",
33+
outlineColor: "primary.hover",
34+
outlineOffset: "-1px",
35+
},
36+
_active: {
37+
[$border.variable]: "colors.primary.hover",
38+
boxShadow: "none",
39+
"& img": {
40+
opacity: 0.7,
41+
},
42+
},
43+
"[role='group'] &": {
44+
[$border.variable]: "colors.background.base",
45+
_notLast: {
46+
marginLeft: $mlBySize.reference,
47+
},
48+
},
49+
})
50+
})
51+
52+
const baseStyleExessLabel = defineStyle((props) =>
53+
defineMergeStyles(defaultBaseStyle?.(props).excessLabel, {
54+
bg: "body.base",
55+
color: "background.base",
56+
ms: $mlBySize.reference,
57+
})
58+
)
59+
60+
const baseStyle = definePartsStyle((props) => ({
61+
container: baseStyleContainer(props),
62+
excessLabel: baseStyleExessLabel(props),
63+
}))
64+
65+
const USED_SIZES = ["xs", "sm", "md", "lg"] as const
66+
67+
const pickedDefaultSizes: { [k in (typeof USED_SIZES)[number]]?: object } =
68+
pick(defaultSizes, ...USED_SIZES)
69+
70+
const sizes = defineMergeStyles(pickedDefaultSizes, {
71+
xs: {
72+
group: {
73+
[$mlBySize.variable]: "space.-1",
74+
},
75+
excessLabel: {
76+
fontSize: "0.563rem",
77+
},
78+
},
79+
sm: {
80+
group: {
81+
[$mlBySize.variable]: "space.-2",
82+
},
83+
excessLabel: {
84+
fontSize: "sm",
85+
},
86+
},
87+
})
88+
89+
export const Avatar = defineMultiStyleConfig({
90+
baseStyle,
91+
// @ts-expect-error
92+
sizes,
93+
})

0 commit comments

Comments
 (0)