diff --git a/.all-contributorsrc b/.all-contributorsrc index 1ed6c640862..0eb99269a34 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -5596,7 +5596,8 @@ "profile": "https://kevinjones.engineer", "contributions": [ "code", - "bug" + "bug", + "content" ] }, { @@ -5839,6 +5840,24 @@ "contributions": [ "code" ] + }, + { + "login": "MiConnell", + "name": "Michael Connell", + "avatar_url": "https://avatars.githubusercontent.com/u/14168559?v=4", + "profile": "https://github.com/MiConnell", + "contributions": [ + "content" + ] + }, + { + "login": "amm98d", + "name": "Ahmed Mustafa Malik", + "avatar_url": "https://avatars.githubusercontent.com/u/39633205?v=4", + "profile": "https://github.com/amm98d", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/.github/ISSUE_TEMPLATE/suggest_wallet.md b/.github/ISSUE_TEMPLATE/suggest_wallet.md index 384f76afbd8..85647b9a4ef 100644 --- a/.github/ISSUE_TEMPLATE/suggest_wallet.md +++ b/.github/ISSUE_TEMPLATE/suggest_wallet.md @@ -40,6 +40,14 @@ If it does complete the following information which we need to accurately list t +**Does the wallet support layer 2 networks?** + + + +**Can the wallet be used with arbitrary Ethereum RPC endpoint?** + + + **Does the wallet have fiat on-ramps?** diff --git a/README.md b/README.md index cec4f34e4ea..e3ea0ec794f 100644 --- a/README.md +++ b/README.md @@ -1258,7 +1258,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Franco Victorio

📖 🐛 -
Kevin Jones

💻 🐛 +
Kevin Jones

💻 🐛 🖋
Shubhankar Kanchan Gupta

🐛 💻
Vishvanathan K

📖
Alexander Gryaznov

🤔 @@ -1291,6 +1291,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Patrick Aljord

📖
decifer

🤔
aghArdeshir

💻 +
Michael Connell

🖋 + + +
Ahmed Mustafa Malik

💻 diff --git a/gatsby-config.js b/gatsby-config.js index 5c1d4fc2251..83d7bb98bc2 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -59,28 +59,6 @@ module.exports = { // dev: true, }, }, - { - resolve: `gatsby-plugin-lodash`, - options: { - disabledFeatures: [ - `shorthands`, - `currying`, - `caching`, - `collections`, - `exotics`, - `guards`, - `metadata`, - `deburring`, - `unicode`, - `chaining`, - `momoizing`, - `coercions`, - `flattening`, - `paths`, - `placeholders`, - ], - }, - }, // Sitemap generator (ethereum.org/sitemap.xml) { resolve: `gatsby-plugin-sitemap`, diff --git a/gatsby-node.js b/gatsby-node.js index a0fe6e79712..f4e7e4194f8 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -179,7 +179,7 @@ exports.onCreateNode = async ({ node, getNode, actions }) => { } const absolutePath = node.fileAbsolutePath - const relativePathStart = absolutePath.indexOf("src/") + const relativePathStart = absolutePath.lastIndexOf("src/") const relativePath = absolutePath.substring(relativePathStart) // Boolean if page is outdated (most translated files are) diff --git a/package.json b/package.json index d9a24d201d7..feca6d0d60a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ethereum-org-website", - "version": "3.1.1", + "version": "3.2.0", "description": "Website of ethereum.org", "main": "index.js", "repository": "git@github.com:ethereum/ethereum-org-website.git", @@ -25,7 +25,6 @@ "gatsby-plugin-gatsby-cloud": "^4.3.0", "gatsby-plugin-image": "^2.0.0", "gatsby-plugin-intl": "^0.3.3", - "gatsby-plugin-lodash": "^5.0.0", "gatsby-plugin-manifest": "^4.0.0", "gatsby-plugin-matomo": "^0.9.0", "gatsby-plugin-mdx": "^2.0.1", diff --git a/src/components/Callout.js b/src/components/Callout.js index 3e07a8c525c..1d0e36c77c0 100644 --- a/src/components/Callout.js +++ b/src/components/Callout.js @@ -1,7 +1,11 @@ +// Libraries import React from "react" import styled from "styled-components" import { GatsbyImage } from "gatsby-plugin-image" +// Components +import Emoji from "../components/Emoji" + const StyledCard = styled.div` display: flex; flex-direction: column; @@ -41,11 +45,20 @@ const Content = styled.div` height: 100%; ` -const Callout = ({ image, alt, title, description, children, className }) => ( +const Callout = ({ + image, + emoji, + alt, + title, + description, + children, + className, +}) => ( - {alt} + {image && {alt}}
+ {emoji && }

{title}

{description}
diff --git a/src/components/DeveloperDocsLinks.js b/src/components/DeveloperDocsLinks.js index 3497e008e3a..874e1b20284 100644 --- a/src/components/DeveloperDocsLinks.js +++ b/src/components/DeveloperDocsLinks.js @@ -7,11 +7,11 @@ import docLinks from "../data/developer-docs-links.yaml" const DeveloperDocsLinks = ({ headerId }) => docLinks .filter(({ id }) => id.includes(headerId)) - .map(({ items }) => ( -