Merge branch 'dev' into emotion

.all-contributorsrc

@@ -8178,6 +8178,109 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "vorot93",
+      "name": "Artem Vorotnikov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/240364?v=4",
+      "profile": "https://github.com/vorot93",
+      "contributions": [
+        "content",
+        "projectManagement",
+        "question"
+      ]
+    },
+    {
+      "login": "liam0215",
+      "name": "Liam Arzola",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8989334?v=4",
+      "profile": "https://github.com/liam0215",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "srt180",
+      "name": "shao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30768686?v=4",
+      "profile": "https://github.com/srt180",
+      "contributions": [
+        "doc",
+        "translation"
+      ]
+    },
+    {
+      "login": "HiroyukiNaito",
+      "name": "Hiroyuki Naito",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32320988?v=4",
+      "profile": "https://crowdin.com/profile/hiroyukinaito",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AlehNat",
+      "name": "AlehN",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3587775?v=4",
+      "profile": "https://github.com/AlehNat",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "varunshenoy",
+      "name": "Varun Shenoy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10859091?v=4",
+      "profile": "http://varunshenoy.com",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "alebaffa",
+      "name": "Alessandro Baffa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/465513?v=4",
+      "profile": "https://alebaffa.eth.link",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "johngrantuk",
+      "name": "John Grant",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4797222?v=4",
+      "profile": "https://medium.com/@johngrant",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gorondan",
+      "name": "gorondan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97026899?v=4",
+      "profile": "https://github.com/gorondan",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "pruthvirajjadhav1",
+      "name": "Pruthviraj Jadhav",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73253354?v=4",
+      "profile": "https://github.com/pruthvirajjadhav1",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gndx",
+      "name": "Oscar Barajas Tavares",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10554486?v=4",
+      "profile": "https://gndx.io",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintignore

@@ -0,0 +1,2 @@
+# The content is used as a code example in /src/pages/index.js
+src/data/CreateWallet.js

.github/CODEOWNERS

@@ -5,7 +5,7 @@
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
-*       @samajammin @wackerow @corwintines @pettinarip @minimalsm
+*       @samajammin @wackerow @corwintines @pettinarip @minimalsm @jmcook1186
 
 # Owners of specific files
 /src/data/consensus-bounty-hunters.csv @djrtwo @JustinDrake @asanso @fredriksvantes

README.md

@@ -1311,6 +1311,19 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/Tuongg2312"><img src="https://avatars.githubusercontent.com/u/107551539?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tuongg2312</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Tuongg2312" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/ErikSaunier"><img src="https://avatars.githubusercontent.com/u/1122363?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ξrik Saunier</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ErikSaunier" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/vorot93"><img src="https://avatars.githubusercontent.com/u/240364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Artem Vorotnikov</b></sub></a><br /><a href="#content-vorot93" title="Content">🖋</a> <a href="#projectManagement-vorot93" title="Project Management">📆</a> <a href="#question-vorot93" title="Answering Questions">💬</a></td>
+    <td align="center"><a href="https://github.com/liam0215"><img src="https://avatars.githubusercontent.com/u/8989334?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Liam Arzola</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aliam0215" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/srt180"><img src="https://avatars.githubusercontent.com/u/30768686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srt180" title="Documentation">📖</a> <a href="#translation-srt180" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/hiroyukinaito"><img src="https://avatars.githubusercontent.com/u/32320988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hiroyuki Naito</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=HiroyukiNaito" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/AlehNat"><img src="https://avatars.githubusercontent.com/u/3587775?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AlehN</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AlehNat" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://varunshenoy.com"><img src="https://avatars.githubusercontent.com/u/10859091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Varun Shenoy</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Avarunshenoy" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://alebaffa.eth.link"><img src="https://avatars.githubusercontent.com/u/465513?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alessandro Baffa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=alebaffa" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aalebaffa" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://medium.com/@johngrant"><img src="https://avatars.githubusercontent.com/u/4797222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Grant</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=johngrantuk" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gorondan"><img src="https://avatars.githubusercontent.com/u/97026899?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gorondan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gorondan" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/pruthvirajjadhav1"><img src="https://avatars.githubusercontent.com/u/73253354?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pruthviraj Jadhav</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pruthvirajjadhav1" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://gndx.io"><img src="https://avatars.githubusercontent.com/u/10554486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oscar Barajas Tavares</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gndx" title="Documentation">📖</a></td>
   </tr>
 </table>
 

docs/typescript.md

@@ -97,3 +97,6 @@ With the release of Gatsby v4.15.0, [the config option `graphqlTypegen` has been
 - [Official Typescript website](https://www.typescriptlang.org/)
 - [GraphQL Typegen](https://www.gatsbyjs.com/docs/how-to/local-development/graphql-typegen/)
 - [Typescript Challenges](https://github.com/type-challenges/type-challenges)
+- [React TS Cheatsheet](https://react-typescript-cheatsheet.netlify.app/)
+- [Typescript Deep Dive](https://basarat.gitbook.io/typescript/)
+- [Typescript errors](https://typescript.tv/errors/)

gatsby-config.ts

@@ -255,7 +255,7 @@ const config: GatsbyConfig = {
 if (!IS_PREVIEW) {
   config.plugins = [
     ...(config.plugins || []),
-    // Matomo analtyics
+    // Matomo analytics
     {
       resolve: "gatsby-plugin-matomo",
       options: {

i18n/config.json

@@ -183,6 +183,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "kk",
+    "hrefLang": "kk",
+    "name": "Kazakh",
+    "localName": "қазақ",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "ko",
     "hrefLang": "ko",
@@ -239,6 +247,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "ph",
+    "hrefLang": "ph",
+    "name": "Filipino",
+    "localName": "Filipino",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "pl",
     "hrefLang": "pl",

overrides.d.ts

@@ -12,3 +12,8 @@ declare module "*.mp4" {
   const src: string
   export default src
 }
+
+declare module "!!raw-loader!*" {
+  const content: string
+  export default content
+}

src/components/ActionCard.tsx

@@ -1,4 +1,4 @@
-import React from "react"
+import React, { ReactNode } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 
@@ -69,8 +69,8 @@ export interface IProps {
   to: string
   alt?: string
   image: string
-  title: string
-  description?: string
+  title: ReactNode
+  description?: ReactNode
   className?: string
   isRight?: boolean
   isBottom?: boolean

src/components/DataProductCard.tsx

@@ -105,6 +105,7 @@ export interface IProps {
   url: string
   background: string
   image: string
+  alt?: string
   name: string
   description?: string
   data?: Array<DataRow>
@@ -114,13 +115,14 @@ const DataProductCard: React.FC<IProps> = ({
   url,
   background,
   image,
+  alt,
   name,
   description,
   data,
 }) => (
   <Card hideArrow={true} to={url}>
     <ImageWrapper background={background}>
-      <Image image={image} alt={`${name} logo`} />
+      <Image image={image} alt={alt ? alt : `${name} logo`} />
     </ImageWrapper>
     <Content>
       <div>