Skip to content

Commit f84e1d1

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into add-lychee-ci
2 parents 1c41909 + a37827a commit f84e1d1

File tree

106 files changed

+2712
-44
lines changed

Some content is hidden

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

106 files changed

+2712
-44
lines changed
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

next.config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ module.exports = (phase, { defaultConfig }) => {
5959
// Modify the file loader rule to ignore *.svg, since we have it handled now.
6060
fileLoaderRule.exclude = /\.svg$/i
6161

62+
config.module.rules.push({
63+
test: /\.(mp3)$/,
64+
type: "asset/resource",
65+
generator: {
66+
filename: "static/media/[name][ext]",
67+
},
68+
})
69+
6270
return config
6371
},
6472
trailingSlash: true,

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "9.6.0",
3+
"version": "9.7.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {
@@ -57,6 +57,7 @@
5757
"ethereum-blockies-base64": "^1.0.2",
5858
"framer-motion": "^10.13.0",
5959
"gray-matter": "^4.0.3",
60+
"howler": "^2.2.4",
6061
"htmr": "^1.0.2",
6162
"lodash.merge": "^4.6.2",
6263
"lodash.shuffle": "^4.2.0",

public/_redirects

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,7 @@
177177
/*/deprecated-software /:splat/dapps/ 301!
178178

179179
/*/enterprise/private-ethereum/ /:splat/enterprise/ 301!
180+
181+
/dashboards /en/resources 301!
182+
183+
/*/dashboards /:splat/resources 301!
Lines changed: 53 additions & 0 deletions

public/content/developers/tutorials/erc20-with-safety-rails/index.md

Lines changed: 1 addition & 1 deletion

public/content/developers/tutorials/hello-world-smart-contract-fullstack/index.md

Lines changed: 1 addition & 1 deletion

public/content/developers/tutorials/how-to-use-slither-to-find-smart-contract-bugs/index.md

Lines changed: 1 addition & 1 deletion

public/content/developers/tutorials/ipfs-decentralized-ui/index.md

Lines changed: 1 addition & 1 deletion

public/content/developers/tutorials/kickstart-your-dapp-frontend-development-with-create-eth-app/index.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)