Merge pull request #7973 from ethereum/dev

Deploy v6.5.0
ethereum · Sep 23, 2022 · 82b5306 · 82b5306
2 parents 79ed202 + 4bb150f
commit 82b5306
Show file tree

Hide file tree

Showing 64 changed files with 818 additions and 420 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -8826,6 +8826,141 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "slf188",
+      "name": "菲利",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49417481?v=4",
+      "profile": "huggingface.co/slf188",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "DamitusThyYeetus123",
+      "name": "DamitusThyYeetus123",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108782125?v=4",
+      "profile": "https://github.com/DamitusThyYeetus123",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "matusame",
+      "name": "matusame",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97032288?v=4",
+      "profile": "https://github.com/matusame",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "laurentlucian",
+      "name": "Lohan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33508364?v=4",
+      "profile": "https://github.com/laurentlucian",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "marcellamalune",
+      "name": "Marcella",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63505124?v=4",
+      "profile": "https://github.com/marcellamalune",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "leontodd",
+      "name": "Leon Todd",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8823227?v=4",
+      "profile": "https://londonbustimes.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "ladislasfontaine",
+      "name": "Ladislas Fontaine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42914253?v=4",
+      "profile": "https://ladislasfontaine.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "YasshhYadav",
+      "name": "Yash Yadav",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91071840?v=4",
+      "profile": "https://github.com/YasshhYadav",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "barro32",
+      "name": "barro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1510990?v=4",
+      "profile": "https://github.com/barro32",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Master7130",
+      "name": "Master7130",
+      "avatar_url": "https://avatars.githubusercontent.com/u/85327930?v=4",
+      "profile": "https://github.com/Master7130",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Lude15",
+      "name": "Lude15",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109084476?v=4",
+      "profile": "https://github.com/Lude15",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "badkk",
+      "name": "Luke Fan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10335300?v=4",
+      "profile": "https://crust.network",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "TABASCOatw",
+      "name": "TABASCO",
+      "avatar_url": "https://avatars.githubusercontent.com/u/84655644?v=4",
+      "profile": "https://github.com/TABASCOatw",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "d1onys1us",
+      "name": "d1onys1us",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13951458?v=4",
+      "profile": "https://github.com/d1onys1us",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "thib-web3",
+      "name": "Thibaut",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66329321?v=4",
+      "profile": "https://github.com/thib-web3",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/README.md b/README.md
@@ -1401,6 +1401,25 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center"><a href="jointheleague.org"><img src="https://avatars.githubusercontent.com/u/302478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>June Clarke </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joonspoon" title="Documentation">📖</a></td>
+      <td align="center"><a href="huggingface.co/slf188"><img src="https://avatars.githubusercontent.com/u/49417481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>菲利</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=slf188" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/DamitusThyYeetus123"><img src="https://avatars.githubusercontent.com/u/108782125?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DamitusThyYeetus123</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=DamitusThyYeetus123" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/matusame"><img src="https://avatars.githubusercontent.com/u/97032288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matusame</b></sub></a><br /><a href="#translation-matusame" title="Translation">🌍</a></td>
+      <td align="center"><a href="https://github.com/laurentlucian"><img src="https://avatars.githubusercontent.com/u/33508364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lohan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=laurentlucian" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/marcellamalune"><img src="https://avatars.githubusercontent.com/u/63505124?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcella</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=marcellamalune" title="Code">💻</a></td>
+      <td align="center"><a href="https://londonbustimes.com/"><img src="https://avatars.githubusercontent.com/u/8823227?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leon Todd</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=leontodd" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center"><a href="https://ladislasfontaine.com/"><img src="https://avatars.githubusercontent.com/u/42914253?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ladislas Fontaine</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ladislasfontaine" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/YasshhYadav"><img src="https://avatars.githubusercontent.com/u/91071840?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yash Yadav</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=YasshhYadav" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/barro32"><img src="https://avatars.githubusercontent.com/u/1510990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>barro</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=barro32" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/Master7130"><img src="https://avatars.githubusercontent.com/u/85327930?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Master7130</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Master7130" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/Lude15"><img src="https://avatars.githubusercontent.com/u/109084476?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lude15</b></sub></a><br /><a href="#ideas-Lude15" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center"><a href="https://crust.network"><img src="https://avatars.githubusercontent.com/u/10335300?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luke Fan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=badkk" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/TABASCOatw"><img src="https://avatars.githubusercontent.com/u/84655644?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TABASCO</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=TABASCOatw" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center"><a href="https://github.com/d1onys1us"><img src="https://avatars.githubusercontent.com/u/13951458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1onys1us</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=d1onys1us" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/thib-web3"><img src="https://avatars.githubusercontent.com/u/66329321?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibaut</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=thib-web3" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "6.4.2",
+  "version": "6.5.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",

diff --git a/src/components/BeaconChainActions.tsx b/src/components/BeaconChainActions.tsx
@@ -124,7 +124,7 @@ const BeaconChainActions: React.FC = () => {
         intl
       ),
       description: "Ethos.dev",
-      link: "https://ethos.dev/beacon-chain/",
+      link: "https://web.archive.org/web/20220719213551/https://ethos.dev/beacon-chain/",
     },
     {
       title: translateMessageId(

diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx
@@ -1,58 +1,5 @@
 import React from "react"
-import styled from "@emotion/styled"
-
-const CheckboxContainer = styled.div`
-  display: inline-block;
-  vertical-align: middle;
-`
-
-const HiddenCheckbox = styled.input`
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-`
-
-const StyledCheckbox = styled.div<{
-  size: number
-  checked: boolean
-}>`
-  display: inline-block;
-  width: ${(props) => props.size}rem;
-  height: ${(props) => props.size}rem;
-  min-width: ${(props) => props.size}rem;
-  background: ${(props) =>
-    props.checked
-      ? props.theme.colors.primary400
-      : props.theme.colors.background};
-  border: 1px solid ${(props) => props.theme.colors.black50};
-  border-radius: 3px;
-  transition: all 150ms;
-  &:hover {
-    box-shadow: ${(props) => props.theme.colors.tableItemBoxShadow};
-    border: 1px solid ${(props) => props.theme.colors.primary600};
-    transition: transform 0.1s;
-    transform: scale(1.02);
-  }
-`
-
-const Icon = styled.svg<{
-  checked: boolean
-}>`
-  fill: none;
-  stroke: ${(props) => props.theme.colors.white};
-  stroke-width: 2px;
-  visibility: ${(props) => (props.checked ? "visible" : "hidden")};
-`
-
-const Label = styled.span`
-  margin-left: 0.5rem;
-`
+import { Box, VisuallyHiddenInput, Text } from "@chakra-ui/react"
 
 export interface IProps {
   children?: React.ReactNode
@@ -76,20 +23,56 @@ const Checkbox: React.FC<IProps> = ({
     }
   }
   return (
-    <CheckboxContainer className={className} onClick={handleClick}>
-      <HiddenCheckbox type="checkbox" checked={checked} readOnly {...rest} />
-      <StyledCheckbox
-        aria-hidden="true"
+    <Box
+      display="inline-block"
+      verticalAlign="middle"
+      className={className}
+      onClick={handleClick}
+    >
+      <VisuallyHiddenInput
+        type="checkbox"
         checked={checked}
+        readOnly
+        {...rest}
+      />
+      <Box
+        aria-hidden={true}
         className="styled-checkbox"
-        size={size}
+        display="inline-block"
+        w={`${size}rem`}
+        h={`${size}rem`}
+        minW={`${size}rem`}
+        bg={`${checked ? "primary400" : "background"}`}
+        border="1px"
+        borderStyle="solid"
+        borderColor="black50"
+        borderRadius="3px"
+        transition="all 150ms"
+        _hover={{
+          boxShadow: "tableItemBoxShadow",
+          border: "1px",
+          borderStyle: "solid",
+          borderColor: "primary600",
+          transition: "transform 0.1s",
+          transform: "scale(1.02)",
+        }}
       >
-        <Icon checked={checked} viewBox="0 0 24 24">
+        <svg
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="white"
+          strokeWidth="2px"
+          visibility={`${checked ? "visible" : "hidden"}`}
+        >
           <polyline points="20 6 9 17 4 12" />
-        </Icon>
-      </StyledCheckbox>
-      {children && <Label>{children}</Label>}
-    </CheckboxContainer>
+        </svg>
+      </Box>
+      {children && (
+        <Text as="span" ml={2}>
+          {children}
+        </Text>
+      )}
+    </Box>
   )
 }