Skip to content

Commit 36d8c36

Browse files
wackerowwackerow
committed
Merge branch 'dev' into pr/14938
2 parents 7ce91f5 + 448789c commit 36d8c36

File tree

1,826 files changed

+60896
-17368
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,826 files changed

+60896
-17368
lines changed

‎.all-contributorsrc

Lines changed: 67 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6239,10 +6239,10 @@
62396239
]
62406240
},
62416241
{
6242-
"login": "mradziwon",
6243-
"name": "mradziwon",
6242+
"login": "maciejrrr",
6243+
"name": "maciejrrr",
62446244
"avatar_url": "https://avatars.githubusercontent.com/u/6785984?v=4",
6245-
"profile": "http://www.linkedin.com/in/mradziwon",
6245+
"profile": "http://www.linkedin.com/in/maciejrrr",
62466246
"contributions": [
62476247
"code",
62486248
"bug"
@@ -12697,6 +12697,70 @@
1269712697
"contributions": [
1269812698
"content"
1269912699
]
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+
]
12718+
},
12719+
{
12720+
"login": "JJOptimist",
12721+
"name": "JJOptimist",
12722+
"avatar_url": "https://avatars.githubusercontent.com/u/86833563?v=4",
12723+
"profile": "https://github.com/JJOptimist",
12724+
"contributions": [
12725+
"bug"
12726+
]
12727+
},
12728+
{
12729+
"login": "hotequil",
12730+
"name": "João Paulo Hotequil",
12731+
"avatar_url": "https://avatars.githubusercontent.com/u/46814712?v=4",
12732+
"profile": "https://github.com/hotequil",
12733+
"contributions": [
12734+
"code",
12735+
"translation"
12736+
]
12737+
},
12738+
{
12739+
"login": "microHoffman",
12740+
"name": "microHoffman",
12741+
"avatar_url": "https://avatars.githubusercontent.com/u/61500778?v=4",
12742+
"profile": "http://pwn.xyz",
12743+
"contributions": [
12744+
"bug"
12745+
]
12746+
},
12747+
{
12748+
"login": "smithrashell",
12749+
"name": "Rashell Smith",
12750+
"avatar_url": "https://avatars.githubusercontent.com/u/36465023?v=4",
12751+
"profile": "https://github.com/smithrashell",
12752+
"contributions": [
12753+
"bug"
12754+
]
12755+
},
12756+
{
12757+
"login": "aolson078",
12758+
"name": "Alex Olson",
12759+
"avatar_url": "https://avatars.githubusercontent.com/u/69769089?v=4",
12760+
"profile": "https://github.com/aolson078",
12761+
"contributions": [
12762+
"bug"
12763+
]
1270012764
}
1270112765
],
1270212766
"contributorsPerLine": 7,

‎.env.example

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
# be careful not to expose sensitive data (e.g. your Algolia admin key)
55

66
# Algolia environment (app ID, search key and base search index name required for search)
7+
# You can use the following test keys provided by DocSearch for local development/testing:
8+
# NEXT_PUBLIC_ALGOLIA_APP_ID=R2IYF7ETH7
9+
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=599cec31baffa4868cae4e79f180729b
10+
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=docsearch
11+
# Replace insertValue with your actual keys for production builds.
712
# NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
813
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
914
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue
15+
16+
# Github token for read-only use with api functions
1017
# NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
1118

1219
# Etherscan API key (required for Etherscan API fetches)
@@ -29,7 +36,7 @@ IS_PREVIEW_DEPLOY=false
2936
# Build pages only for the specified langs. Leave it empty to build all the langs
3037
# e.g. `en,fr` will only build English and French pages
3138
# Note: always include `en` as it is the default lang of the site
32-
BUILD_LOCALES=
39+
NEXT_PUBLIC_BUILD_LOCALES=
3340

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

‎.eslintrc.json

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
["^@/data"],
3434
// From the `constants` directory.
3535
["^@/lib/constants"],
36-
// From the `.storybook/utils` file
37-
["^@/storybook-utils"],
36+
// `.storybook` directory and utils files`
37+
["^@/storybook","^@/storybook-utils"],
3838
// Parent imports. Put `..` last.
3939
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
4040
// Other relative imports. Put same-folder imports and `.` last.
@@ -63,17 +63,6 @@
6363
"varsIgnorePattern": "^_$"
6464
}
6565
],
66-
"unused-imports/no-unused-imports-ts": "warn",
67-
"no-restricted-imports": [
68-
"warn",
69-
{
70-
"paths": [
71-
{
72-
"name": "react-i18next",
73-
"message": "Please use next-i18next instead of react-i18next."
74-
}
75-
]
76-
}
77-
]
66+
"unused-imports/no-unused-imports-ts": "warn"
7867
}
7968
}

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +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
1212
/src/data/wallets/new-to-crypto.ts @konopkja @minimalsm

‎.github/ISSUE_TEMPLATE/suggest_resource.yaml

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

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ src/data/crowdin/bucketsAwaitingReviewReport.csv
6060
# Storybook
6161
build-storybook.log
6262
storybook-static
63+

‎.storybook/main.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import path from "path"
2+
13
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin"
24
import type { StorybookConfig } from "@storybook/nextjs"
35

@@ -28,9 +30,9 @@ const config: StorybookConfig = {
2830
},
2931
},
3032
"@storybook/addon-interactions",
31-
"storybook-react-i18next",
3233
"@storybook/addon-themes",
3334
"@chromatic-com/storybook",
35+
"storybook-next-intl",
3436
],
3537
staticDirs: ["../public"],
3638
framework: {
@@ -51,6 +53,11 @@ const config: StorybookConfig = {
5153
extensions: config.resolve.extensions,
5254
}),
5355
]
56+
57+
config.resolve.alias = {
58+
...config.resolve.alias,
59+
"@/storybook/*": path.resolve(__dirname, "./.storybook/"),
60+
}
5461
}
5562

5663
// This modifies the existing image rule to exclude .svg files

‎.storybook/manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { addons } from "@storybook/manager-api"
22

3-
import favicon from "../public/images/favicon.png"
3+
import favicon from "../public/images/eth-home-icon.png"
44

55
import theme from "./theme"
66

‎.storybook/modes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pickBy from "lodash/pickBy"
22

3-
import { baseLocales } from "./i18next"
3+
import { baseLocales } from "./next-intl"
44
import { breakpointSet } from "./preview"
55

66
export const viewportModes = breakpointSet.reduce<{

0 commit comments

Comments
 (0)