Deploy v4.7.0

.all-contributorsrc

@@ -937,7 +937,8 @@
       "profile": "https://github.com/EmanHerawy",
       "contributions": [
         "translation",
-        "code"
+        "code",
+        "ideas"
       ]
     },
     {
@@ -4639,7 +4640,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/55439064?v=4",
       "profile": "https://github.com/raj-shekhar1",
       "contributions": [
-        "doc"
+        "doc",
+        "ideas"
       ]
     },
     {
@@ -8058,6 +8060,79 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "gingerheart86",
+      "name": "gingerheart86",
+      "avatar_url": "https://avatars.githubusercontent.com/u/100948227?v=4",
+      "profile": "https://github.com/gingerheart86",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "naveen106",
+      "name": "Naveen Kumar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61573478?v=4",
+      "profile": "https://github.com/naveen106",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "treethought",
+      "name": "Cam Sweeney",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15894818?v=4",
+      "profile": "https://github.com/treethought",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "moyedx3",
+      "name": "moyed",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108647630?v=4",
+      "profile": "https://github.com/moyedx3",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "shelleyolivia",
+      "name": "shelleyolivia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108895606?v=4",
+      "profile": "https://github.com/shelleyolivia",
+      "contributions": [
+        "doc",
+        "ideas"
+      ]
+    },
+    {
+      "login": "zyjblockchain",
+      "name": "Sandy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40423181?v=4",
+      "profile": "http://[email protected]",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "NachoRoizman",
+      "name": "NachoRoizman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/107893772?v=4",
+      "profile": "https://github.com/NachoRoizman",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "M-Ivan",
+      "name": "Iván Miragaya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72365253?v=4",
+      "profile": "https://linkedin.com/in/miragaya-ivan",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.gitignore

@@ -77,4 +77,7 @@ src/data/contributors.json
 # These files are generated by `yarn merge-translations` command
 src/intl/*.json
 # Auto generated code when gatsby build the site
-src/gatsby-types.d.ts
+src/gatsby-types.d.ts
+
+# Exported Crowdin files
+.crowdin

README.md

@@ -3,6 +3,7 @@
 [![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=ethereum.org%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/CetY6Y4)
 [![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://twitter.com/ethdotorg)
 [![Crowdin](https://badges.crowdin.net/ethereum-org/localized.svg)](https://crowdin.com/project/ethereum-org)
+[![gitpoap badge](https://public-api.gitpoap.io/v1/repo/ethereum/ethereum-org-website/badge)](https://www.gitpoap.io/gh/ethereum/ethereum-org-website)
 
 <div align="center" style="margin-top: 1em; margin-bottom: 3em;">
   <a href="https://ethereum.org"><img alt="ethereum logo" src="./eth-transparent.png" alt="ethereum.org" width="125"></a>
@@ -310,7 +311,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/DjangoM"><img src="https://avatars2.githubusercontent.com/u/35060411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jaroslav Macej</b></sub></a><br /><a href="#translation-DjangoM" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/EmanHerawy"><img src="https://avatars3.githubusercontent.com/u/10674070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eman Herawy</b></sub></a><br /><a href="#translation-EmanHerawy" title="Translation">🌍</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=EmanHerawy" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/EmanHerawy"><img src="https://avatars3.githubusercontent.com/u/10674070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eman Herawy</b></sub></a><br /><a href="#translation-EmanHerawy" title="Translation">🌍</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=EmanHerawy" title="Code">💻</a> <a href="#ideas-EmanHerawy" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/Bellinas"><img src="https://avatars0.githubusercontent.com/u/45827044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bellinas</b></sub></a><br /><a href="#translation-Bellinas" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/amchercashin"><img src="https://avatars3.githubusercontent.com/u/8727497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexander Cherkashin</b></sub></a><br /><a href="#translation-amchercashin" title="Translation">🌍</a></td>
     <td align="center"><a href="http://www.soarontech.com.ng"><img src="https://avatars0.githubusercontent.com/u/29120867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Enoch Mbaebie</b></sub></a><br /><a href="#translation-EnochMbaebie" title="Translation">🌍</a></td>
@@ -822,7 +823,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://notmanyideasdev.github.io"><img src="https://avatars.githubusercontent.com/u/45824238?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gianni Alessandroni</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=NotManyIdeasDev" title="Documentation">📖</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/raj-shekhar1"><img src="https://avatars.githubusercontent.com/u/55439064?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raj Shekhar Bhardwaj</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=raj-shekhar1" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/raj-shekhar1"><img src="https://avatars.githubusercontent.com/u/55439064?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raj Shekhar Bhardwaj</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=raj-shekhar1" title="Documentation">📖</a> <a href="#ideas-raj-shekhar1" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/joakimengerstam"><img src="https://avatars.githubusercontent.com/u/12713452?v=4?s=100" width="100px;" alt=""/><br /><sub><b>joakimengerstam</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joakimengerstam" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/ndrozd"><img src="https://avatars.githubusercontent.com/u/6696080?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Drozd</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Androzd" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=ndrozd" title="Documentation">📖</a></td>
     <td align="center"><a href="http://scottcameron.uk"><img src="https://avatars.githubusercontent.com/u/83584447?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott</b></sub></a><br /><a href="#design-Scott1UP" title="Design">🎨</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AScott1UP" title="Bug reports">🐛</a></td>
@@ -1293,6 +1294,16 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://www.koogawa.com"><img src="https://avatars.githubusercontent.com/u/893643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kosuke Ogawa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=koogawa" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akoogawa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Feerol"><img src="https://avatars.githubusercontent.com/u/47645405?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fatih Eren Erol</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Feerol" title="Documentation">📖</a></td>
     <td align="center"><a href="https://syskall.com"><img src="https://avatars.githubusercontent.com/u/416585?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oli Lalonde</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=olalonde" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gingerheart86"><img src="https://avatars.githubusercontent.com/u/100948227?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gingerheart86</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gingerheart86" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/naveen106"><img src="https://avatars.githubusercontent.com/u/61573478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Naveen Kumar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=naveen106" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/treethought"><img src="https://avatars.githubusercontent.com/u/15894818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cam Sweeney</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=treethought" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/moyedx3"><img src="https://avatars.githubusercontent.com/u/108647630?v=4?s=100" width="100px;" alt=""/><br /><sub><b>moyed</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=moyedx3" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/shelleyolivia"><img src="https://avatars.githubusercontent.com/u/108895606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shelleyolivia</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=shelleyolivia" title="Documentation">📖</a> <a href="#ideas-shelleyolivia" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://[email protected]"><img src="https://avatars.githubusercontent.com/u/40423181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sandy</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=zyjblockchain" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/NachoRoizman"><img src="https://avatars.githubusercontent.com/u/107893772?v=4?s=100" width="100px;" alt=""/><br /><sub><b>NachoRoizman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=NachoRoizman" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://linkedin.com/in/miragaya-ivan"><img src="https://avatars.githubusercontent.com/u/72365253?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Iván Miragaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=M-Ivan" title="Code">💻</a></td>
   </tr>
 </table>
 

overrides.d.ts

@@ -3,15 +3,7 @@
 declare module "gatsby-plugin-image"
 
 declare module "*developer-docs-links.yaml" {
-  import { TranslationKey } from "./src/utils/translations"
-
-  export interface DeveloperDocsLink {
-    id: TranslationKey
-    to: string
-    path: string
-    description: TranslationKey
-    items: Array<DeveloperDocsLink>
-  }
+  import { DeveloperDocsLink } from "./src/types"
   const content: Array<DeveloperDocsLink>
   export default content
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",
@@ -81,6 +81,7 @@
     "github-slugger": "^1.3.0",
     "husky": "^4.2.5",
     "identity-obj-proxy": "^3.0.0",
+    "minimist": "^1.2.6",
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.0",
     "react-test-renderer": "^17.0.1",
@@ -91,10 +92,10 @@
     "build:lambda": "netlify-lambda build src/lambda",
     "build:10gb": "NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
     "clean": "gatsby clean",
-    "copy-contributors": "node src/scripts/copy-contributors.js",
+    "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
+    "crowdin-import": "ts-node src/scripts/crowdin-import.ts",
     "format": "prettier --write \"**/*.{js,jsx,json,md}\"",
     "generate-heading-ids": "node src/scripts/generate-heading-ids.js",
-    "merge-translations": "node src/scripts/merge-translations.js",
     "start": "gatsby develop",
     "start:lambda": "netlify-lambda serve src/lambda",
     "start:static": "gatsby build && gatsby serve",

src/components/BugBountyCards.js → src/components/BugBountyCards.tsx

@@ -1,8 +1,9 @@
 import React from "react"
 import styled from "styled-components"
+import { TranslationKey } from "../utils/translations"
 import ButtonLink from "./ButtonLink"
 
-import Translation from "../components/Translation"
+import Translation from "./Translation"
 
 const CardRow = styled.div`
   display: flex;
@@ -108,7 +109,22 @@ const Text = styled.div`
   margin-top: 0.5rem;
 `
 
-const bugBountyCardsInfo = [
+export interface BugBountyCardInfo {
+  lowLabelTranslationId?: TranslationKey
+  mediumLabelTranslationId?: TranslationKey
+  highLabelTranslationId?: TranslationKey
+  criticalLabelTranslationId?: TranslationKey
+  h2TranslationId: TranslationKey
+  descriptionTranslationId: TranslationKey
+  subDescriptionTranslationId: TranslationKey
+  subHeader1TranslationId: TranslationKey
+  severityList: Array<TranslationKey>
+  subHeader2TranslationId: TranslationKey
+  textTranslationId: TranslationKey
+  styledButtonTranslationId: TranslationKey
+}
+
+const bugBountyCardsInfo: Array<BugBountyCardInfo> = [
   {
     lowLabelTranslationId: "page-upgrades-bug-bounty-card-label-2",
     h2TranslationId: "page-upgrades-bug-bounty-card-low",
@@ -165,7 +181,9 @@ const bugBountyCardsInfo = [
   },
 ]
 
-const BugBountyCards = () => (
+export interface IProps {}
+
+const BugBountyCards: React.FC<IProps> = () => (
   <CardRow>
     {bugBountyCardsInfo.map((card, idx) => (
       <Card key={`bug-bounty-card-${idx}`}>

src/components/BugBountyPoints.js → src/components/BugBountyPoints.tsx

@@ -84,18 +84,31 @@ export const TokenLogo = graphql`
 
 const USD_PER_POINT = 2
 
-const BugBountyPoints = () => {
-  const [state, setState] = useState({
-    currentETHPriceUSD: "",
-    currentDAIPriceUSD: "",
+interface State {
+  currentETHPriceUSD: number
+  currentDAIPriceUSD: number
+  hasError: boolean
+}
+
+type GetPriceResponse = {
+  ethereum: { usd: number }
+  dai: { usd: number }
+}
+
+export interface IProps {}
+
+const BugBountyPoints: React.FC<IProps> = () => {
+  const [state, setState] = useState<State>({
+    currentETHPriceUSD: 1,
+    currentDAIPriceUSD: 1,
     hasError: false,
   })
   const themeContext = useContext(ThemeContext)
   const isDarkTheme = themeContext.isDark
 
   useEffect(() => {
     axios
-      .get(
+      .get<GetPriceResponse>(
         "https://api.coingecko.com/api/v3/simple/price?ids=ethereum%2Cdai&vs_currencies=usd"
       )
       .then((response) => {
@@ -112,15 +125,20 @@ const BugBountyPoints = () => {
       .catch((error) => {
         console.error(error)
         setState({
+          ...state,
           hasError: true,
         })
       })
   }, [])
 
   const isLoading = !state.currentETHPriceUSD
 
-  const pointsInETH = (USD_PER_POINT / state.currentETHPriceUSD).toFixed(5)
-  const pointsInDAI = (USD_PER_POINT / state.currentDAIPriceUSD).toFixed(5)
+  const pointsInETH = !state.hasError
+    ? (USD_PER_POINT / state.currentETHPriceUSD!).toFixed(5)
+    : 0
+  const pointsInDAI = !state.hasError
+    ? (USD_PER_POINT / state.currentDAIPriceUSD!).toFixed(5)
+    : 0
 
   const tooltipContent = (
     <div>

src/components/ButtonDropdown.js → src/components/ButtonDropdown.tsx

@@ -12,7 +12,7 @@ import { ButtonSecondary } from "./SharedStyledComponents"
 
 // Utils
 import { useOnClickOutside } from "../hooks/useOnClickOutside"
-import { translateMessageId } from "../utils/translations"
+import { translateMessageId, TranslationKey } from "../utils/translations"
 import { trackCustomEvent } from "../utils/matomo"
 
 const Container = styled.div`
@@ -113,16 +113,38 @@ const NakedNavLink = styled.div`
   }
 `
 
-const ButtonDropdown = ({ list, className }) => {
-  const [isOpen, setIsOpen] = useState(false)
+export interface ListItem {
+  text: TranslationKey
+  to?: string
+  matomo?: {
+    eventCategory: string
+    eventAction: string
+    eventName: string
+  }
+  callback?: (idx: number) => void
+}
+
+export interface List {
+  text: TranslationKey
+  ariaLabel: string
+  items: Array<ListItem>
+}
+
+export interface IProps {
+  list: List
+  className?: string
+}
+
+const ButtonDropdown: React.FC<IProps> = ({ list, className }) => {
+  const [isOpen, setIsOpen] = useState<boolean>(false)
   const intl = useIntl()
-  const ref = createRef()
+  const ref = createRef<HTMLInputElement>()
 
   useOnClickOutside(ref, () => setIsOpen(false))
 
   // Toggle on `enter` key
-  const onKeyDownHandler = (e) => {
-    if (e.keyCode === 13) {
+  const onKeyDownHandler = (e: React.KeyboardEvent<HTMLElement>): void => {
+    if (e.key === "13") {
       setIsOpen(!isOpen)
     }
   }
@@ -136,7 +158,7 @@ const ButtonDropdown = ({ list, className }) => {
       <Button
         onClick={() => setIsOpen(!isOpen)}
         onKeyDown={onKeyDownHandler}
-        tabIndex="0"
+        tabIndex={0}
       >
         <StyledIcon name="menu" />
         <Translation id={list.text} />
@@ -155,13 +177,12 @@ const ButtonDropdown = ({ list, className }) => {
                   trackCustomEvent(matomo)
                 }}
                 to={to}
-                tabIndex="-1"
               >
                 <Translation id={text} />
               </NavLink>
             )}
             {!!to && !matomo && (
-              <NavLink isPartiallyActive={false} to={to} tabIndex="-1">
+              <NavLink isPartiallyActive={false} to={to}>
                 <Translation id={text} />
               </NavLink>
             )}