Skip to content

Commit 995cbaf

Browse files
committed
Merge branch 'dev' into pr/14162
2 parents f2a91a1 + 1a54816 commit 995cbaf

File tree

2,594 files changed

+194272
-99332
lines changed

Some content is hidden

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

2,594 files changed

+194272
-99332
lines changed

.all-contributorsrc

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12571,6 +12571,150 @@
1257112571
"contributions": [
1257212572
"content"
1257312573
]
12574+
},
12575+
{
12576+
"login": "Xcertik-Realist",
12577+
"name": "NilFoundation",
12578+
"avatar_url": "https://avatars.githubusercontent.com/u/63165931?v=4",
12579+
"profile": "https://github.com/Xcertik-Realist",
12580+
"contributions": [
12581+
"content"
12582+
]
12583+
},
12584+
{
12585+
"login": "gconnect",
12586+
"name": "Glory Agatevure",
12587+
"avatar_url": "https://avatars.githubusercontent.com/u/23031920?v=4",
12588+
"profile": "https://github.com/gconnect",
12589+
"contributions": [
12590+
"content"
12591+
]
12592+
},
12593+
{
12594+
"login": "emmanuellar",
12595+
"name": "Amarachi Johnson-Ubah",
12596+
"avatar_url": "https://avatars.githubusercontent.com/u/41474439?v=4",
12597+
"profile": "http://amarachijohnson.com",
12598+
"contributions": [
12599+
"ideas"
12600+
]
12601+
},
12602+
{
12603+
"login": "sumitvekariya",
12604+
"name": "Sumit Vekariya",
12605+
"avatar_url": "https://avatars.githubusercontent.com/u/20764957?v=4",
12606+
"profile": "http://sumitvekariya.surge.sh",
12607+
"contributions": [
12608+
"maintenance"
12609+
]
12610+
},
12611+
{
12612+
"login": "rafagomes",
12613+
"name": "Rafa Gomes",
12614+
"avatar_url": "https://avatars.githubusercontent.com/u/565337?v=4",
12615+
"profile": "https://github.com/rafagomes",
12616+
"contributions": [
12617+
"code"
12618+
]
12619+
},
12620+
{
12621+
"login": "ddannehh",
12622+
"name": "ddannehh",
12623+
"avatar_url": "https://avatars.githubusercontent.com/u/109203827?v=4",
12624+
"profile": "https://github.com/ddannehh",
12625+
"contributions": [
12626+
"design"
12627+
]
12628+
},
12629+
{
12630+
"login": "jkylling",
12631+
"name": "Jonas Irgens Kylling",
12632+
"avatar_url": "https://avatars.githubusercontent.com/u/6781076?v=4",
12633+
"profile": "https://github.com/jkylling",
12634+
"contributions": [
12635+
"content"
12636+
]
12637+
},
12638+
{
12639+
"login": "CremaFR",
12640+
"name": "Thomas Brillard",
12641+
"avatar_url": "https://avatars.githubusercontent.com/u/5360522?v=4",
12642+
"profile": "https://github.com/CremaFR",
12643+
"contributions": [
12644+
"doc"
12645+
]
12646+
},
12647+
{
12648+
"login": "YakshitAgarwal",
12649+
"name": "Yakshit Agarwal",
12650+
"avatar_url": "https://avatars.githubusercontent.com/u/153830716?v=4",
12651+
"profile": "https://github.com/YakshitAgarwal",
12652+
"contributions": [
12653+
"content"
12654+
]
12655+
},
12656+
{
12657+
"login": "mseidlx",
12658+
"name": "Matthias Seidl",
12659+
"avatar_url": "https://avatars.githubusercontent.com/u/32496674?v=4",
12660+
"profile": "https://growthepie.xyz",
12661+
"contributions": [
12662+
"code"
12663+
]
12664+
},
12665+
{
12666+
"login": "JoeChenJ",
12667+
"name": "JoeChenJ",
12668+
"avatar_url": "https://avatars.githubusercontent.com/u/171761102?v=4",
12669+
"profile": "https://github.com/JoeChenJ",
12670+
"contributions": [
12671+
"content"
12672+
]
12673+
},
12674+
{
12675+
"login": "itzVarsha",
12676+
"name": "Varshitha",
12677+
"avatar_url": "https://avatars.githubusercontent.com/u/138134029?v=4",
12678+
"profile": "https://github.com/itzVarsha",
12679+
"contributions": [
12680+
"maintenance"
12681+
]
12682+
},
12683+
{
12684+
"login": "alexandriaroberts",
12685+
"name": "Alexandria Roberts",
12686+
"avatar_url": "https://avatars.githubusercontent.com/u/31341867?v=4",
12687+
"profile": "https://alexandriaroberts.dev/",
12688+
"contributions": [
12689+
"code"
12690+
]
12691+
},
12692+
{
12693+
"login": "colinlyguo",
12694+
"name": "colin",
12695+
"avatar_url": "https://avatars.githubusercontent.com/u/102356659?v=4",
12696+
"profile": "https://github.com/colinlyguo",
12697+
"contributions": [
12698+
"content"
12699+
]
12700+
},
12701+
{
12702+
"login": "jenish-thapa",
12703+
"name": "Jenish Thapa",
12704+
"avatar_url": "https://avatars.githubusercontent.com/u/141203631?v=4",
12705+
"profile": "https://github.com/jenish-thapa",
12706+
"contributions": [
12707+
"ideas"
12708+
]
12709+
},
12710+
{
12711+
"login": "iusx",
12712+
"name": "iusx",
12713+
"avatar_url": "https://avatars.githubusercontent.com/u/57232813?v=4",
12714+
"profile": "https://jiangxue.org/~ritsu",
12715+
"contributions": [
12716+
"code"
12717+
]
1257412718
}
1257512719
],
1257612720
"contributorsPerLine": 7,

.env.example

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
# NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
88
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
99
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue
10+
11+
# Github token for read-only use with api functions
1012
# NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
1113

1214
# Etherscan API key (required for Etherscan API fetches)
@@ -29,11 +31,15 @@ IS_PREVIEW_DEPLOY=false
2931
# Build pages only for the specified langs. Leave it empty to build all the langs
3032
# e.g. `en,fr` will only build English and French pages
3133
# Note: always include `en` as it is the default lang of the site
32-
BUILD_LOCALES=
34+
NEXT_PUBLIC_BUILD_LOCALES=
3335

3436
# If resource constraints are being hit during builds, change LIMIT_CPUS to a
3537
# fixed number of CPUs (e.g. 2) to limit the demand during build time
3638
LIMIT_CPUS=
3739

3840
# Enables the bundle analyzer
39-
ANALYZE=false
41+
ANALYZE=false
42+
43+
# Use mock data for development. Set to "false" to use live data but you must have the
44+
# environment variables set to make api requests
45+
USE_MOCK_DATA=true

.eslintrc.json

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
// Packages. `react` related packages come first.
2424
// Also, put `react-icons` in sorting order not with `react`
2525
["^react(?!-.)$", "^\\w", "^@\\w"],
26-
// The Chakra theme directory if imported to story file or other places
27-
["^@/@chakra-ui"],
2826
// From the `types` directory.
2927
["^@/lib/types", "^@/lib/interfaces"],
3028
// From the `components` directory.
@@ -35,8 +33,8 @@
3533
["^@/data"],
3634
// From the `constants` directory.
3735
["^@/lib/constants"],
38-
// From the `.storybook/utils` file
39-
["^@/storybook-utils"],
36+
// `.storybook` directory and utils files`
37+
["^@/storybook","^@/storybook-utils"],
4038
// Parent imports. Put `..` last.
4139
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
4240
// Other relative imports. Put same-folder imports and `.` last.
@@ -65,17 +63,6 @@
6563
"varsIgnorePattern": "^_$"
6664
}
6765
],
68-
"unused-imports/no-unused-imports-ts": "warn",
69-
"no-restricted-imports": [
70-
"warn",
71-
{
72-
"paths": [
73-
{
74-
"name": "react-i18next",
75-
"message": "Please use next-i18next instead of react-i18next."
76-
}
77-
]
78-
}
79-
]
66+
"unused-imports/no-unused-imports-ts": "warn"
8067
}
8168
}

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
* @wackerow @corwintines @pettinarip @minimalsm
99

1010
# Owners of specific files
11-
/src/data/consensus-bounty-hunters.json @djrtwo @asanso @fredriksvantes
11+
/src/data/consensus-bounty-hunters.json @asanso @fredriksvantes
12+
/src/data/wallets/new-to-crypto.ts @konopkja @minimalsm

.github/ISSUE_TEMPLATE/suggest_quiz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Suggest quiz
2-
description: Add, update, delete questions for a quiz on ethereum.osg
2+
description: Add, update, delete questions for a quiz on ethereum.org
33
title: Add/Update/Delete quiz question
44
labels: ["feature ✨", "quiz 📚"]
55
body:
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Suggest a resource
2+
description: Suggest a new resource to list on ethereum.org/resources
3+
title: Suggest a resource
4+
labels: ["resource 📚"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Before suggesting a resource, make sure you've read [our listing policy](https://www.ethereum.org/en/contributing/adding-resources/).
10+
- type: markdown
11+
attributes:
12+
value: Only continue with the issue if your resource meets the criteria listed there.
13+
- type: markdown
14+
attributes:
15+
value: If it does, complete the following information which we need to accurately list the resource.
16+
- type: markdown
17+
id: resource_info
18+
attributes:
19+
value: "## Resource info"
20+
- type: input
21+
id: resource_name
22+
attributes:
23+
label: Name
24+
description: Please provide the official name of the resource
25+
validations:
26+
required: true
27+
- type: input
28+
id: resource_url
29+
attributes:
30+
label: Resource URL
31+
description: Please provide a URL to the resource
32+
validations:
33+
required: true
34+
- type: textarea
35+
id: resource_description
36+
attributes:
37+
label: Description
38+
description: Please provide a short 1-2 sentence description of the resource
39+
validations:
40+
required: true
41+
- type: textarea
42+
id: resource_logo
43+
attributes:
44+
label: Logo
45+
description: |
46+
Please provide an SVG or transparent PNG
47+
Tip: You can attach images by clicking this area to highlight it and then dragging files in.
48+
- type: input
49+
id: resource_category
50+
attributes:
51+
label: Category
52+
description: Please specify a best fit to categorize the resource (e.g., DeFi, NFT, Scaling, etc.)
53+
- type: checkboxes
54+
id: resource_work_on
55+
attributes:
56+
label: Would you like to work on this issue?
57+
options:
58+
- label: "Yes"
59+
required: false
60+
- label: "No"
61+
required: false
62+
validations:
63+
required: true

.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"config ⚙️":
1717
- i18n.config.json
1818
- next.config.js
19-
- next-i18next.config,js
2019
- next-sitemap.config.js
2120
- tsconfig.json
2221
- .nvmrc

.github/workflows/chromatic.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- "src/components/**/*"
1616
- "src/pages/**/*"
1717
- "src/layouts/**/*"
18-
- "src/@chakra-ui/**/*"
1918
- ".storybook/**/*"
2019
- "tailwind.config.ts"
2120
- "src/styles/**/*"

.github/workflows/generate-review-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
2929

3030
- name: Upload output as artifact
31-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: output
3434
path: ./src/data/crowdin/bucketsAwaitingReviewReport.csv

.github/workflows/update-chains.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Update Chains
2+
3+
on:
4+
schedule:
5+
- cron: '20 16 * * FRI' # Runs every Friday at 16:20 UTC
6+
workflow_dispatch: # Can be dispatched manually
7+
8+
jobs:
9+
update-chains:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
15+
16+
- name: Set up Node.js
17+
uses: actions/setup-node@v3
18+
with:
19+
node-version: '20'
20+
21+
- name: Install dependencies
22+
run: yarn install
23+
24+
- name: Install ts-node
25+
run: yarn global add ts-node
26+
27+
- name: Update chains data
28+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/update-chains.ts
29+
30+
- name: Create Pull Request
31+
uses: peter-evans/create-pull-request@v6
32+
with:
33+
token: ${{ secrets.GITHUB_TOKEN }}
34+
branch: update-chains
35+
branch-suffix: timestamp
36+
commit-message: |
37+
Update chains data
38+
base: dev
39+
title: Update chains data
40+
body: Automated update of chains data from https://chainid.network/chains.json
41+
labels: update 🔄

0 commit comments

Comments
 (0)