Merge pull request #10088 from ethereum/dev

Deploy v7.11.1 and v7.11.2

Author: pettinarip

docs/deploy-and-review-process.md

@@ -4,7 +4,7 @@ This documentation outlines our current processes for how we deploy the latest c
 
 ## Deploy process
 
-Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Monday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
+Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Tuesday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
 
 Occasionally, we’ll also do a patch deploy to fix an urgent or widespread issue.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.11.0",
+  "version": "7.11.2",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",

redirects.json

@@ -287,14 +287,6 @@
     "fromPath": "/*/eth2/deposit-contract/",
     "toPath": "/:splat/staking/deposit-contract/"
   },
-  {
-    "fromPath": "/*/eth2/get-involved/medalla-data-challenge",
-    "toPath": "/:splat/community/grants/medalla-data-challenge/"
-  },
-  {
-    "fromPath": "/*/eth2/get-involved/staking-community-grants",
-    "toPath": "/:splat/community/grants/staking-community-grants/"
-  },
   {
     "fromPath": "/*/eth2",
     "toPath": "/:splat/upgrades/"
@@ -342,5 +334,9 @@
   {
     "fromPath": "/*/staking/withdraws",
     "toPath": "/:splat/staking/withdrawals/"
+  },
+  {
+    "fromPath": "/*/writing-cohort",
+    "toPath": "https://ethereumwriterscohort.carrd.co/"
   }
 ]

src/assets/translation-program/pageviews-dark.png

@@ -0,0 +1,28 @@
+import React from "react"
+import { Text } from "@chakra-ui/react"
+
+import DismissableBanner from "../DismissableBanner"
+import Link from "../../Link"
+
+interface IProps {
+  pathname: string
+}
+
+const WritersCohortBanner = ({ pathname }) => {
+  if (pathname.includes("contributing") || pathname.includes("community")) {
+    return (
+      <DismissableBanner storageKey="writersCohort">
+        <Text m={0}>
+          Join the first-ever ethereum.org Writers Cohort, starting May 11th.{" "}
+          <Link to="https://ethereumwriterscohort.carrd.co/">
+            Sign up here!
+          </Link>
+        </Text>
+      </DismissableBanner>
+    )
+  }
+
+  return null
+}
+
+export default WritersCohortBanner

src/assets/translation-program/pageviews-light.png

@@ -1,12 +1,12 @@
 import React from "react"
 import {
   Checkbox as ChakraCheckbox,
-  CheckboxIconProps,
   CheckboxProps,
   Icon,
+  IconProps,
 } from "@chakra-ui/react"
 
-const CustomIcon = (props: CheckboxIconProps) => {
+const CustomIcon = (props: IconProps) => {
   return (
     <Icon
       viewBox="0 0 24 24"

src/components/Banners/Implementations/WritersCohortBanner.tsx

@@ -133,13 +133,15 @@ const Link: React.FC<IProps> = ({
         }}
         {...commonProps}
       >
-        {children}
-        <VisuallyHidden>(opens in a new tab)</VisuallyHidden>
-        {!hideArrow && (
-          <Box as="span" ml={0.5} mr={1.5} aria-hidden>
-            ↗
-          </Box>
-        )}
+        <>
+          {children}
+          <VisuallyHidden>(opens in a new tab)</VisuallyHidden>
+          {!hideArrow && (
+            <Box as="span" ml={0.5} mr={1.5} aria-hidden>
+              ↗
+            </Box>
+          )}
+        </>
       </ChakraLink>
     )
   }
@@ -155,19 +157,21 @@ const Link: React.FC<IProps> = ({
       whiteSpace={isGlossary ? "nowrap" : "normal"}
       {...commonProps}
     >
-      {children}
-      {isGlossary && (
-        <Icon
-          as={BsQuestionSquareFill}
-          aria-label="See definition"
-          fontSize="12px"
-          margin="0 0.25rem 0 0.35rem"
-          _hover={{
-            transition: "transform 0.1s",
-            transform: "scale(1.2)",
-          }}
-        />
-      )}
+      <>
+        {children}
+        {isGlossary && (
+          <Icon
+            as={BsQuestionSquareFill}
+            aria-label="See definition"
+            fontSize="12px"
+            margin="0 0.25rem 0 0.35rem"
+            _hover={{
+              transition: "transform 0.1s",
+              transform: "scale(1.2)",
+            }}
+          />
+        )}
+      </>
     </ChakraLink>
   )
 }

src/components/Checkbox.tsx

@@ -35,6 +35,7 @@ import {
   KilnGlyphIcon,
   LidoGlyphIcon,
   RocketPoolGlyphIcon,
+  SenseiNodeGlyphIcon,
   StafiGlyphIcon,
   StakefishGlyphIcon,
   StakewiseGlyphIcon,
@@ -77,6 +78,7 @@ const getIconFromName = (
     kiln: KilnGlyphIcon,
     lido: LidoGlyphIcon,
     rocketPool: RocketPoolGlyphIcon,
+    senseiNode: SenseiNodeGlyphIcon,
     stafi: StafiGlyphIcon,
     stakewise: StakewiseGlyphIcon,
     stereum: StereumGlyphIcon,

src/components/Link.tsx

@@ -0,0 +1,17 @@
+import React from "react"
+import { createIcon } from "@chakra-ui/react"
+import { commonIconDefaultProps } from "../utils"
+
+export const SenseiNodeGlyphIcon = createIcon({
+  displayName: "SenseiNodeGlyphIcon",
+  viewBox: "0 0 23 32",
+  defaultProps: {
+    width: "32px",
+    height: "32px",
+    ...commonIconDefaultProps,
+  },
+  path: [
+    <path d="M22.7664 21.7955C19.6836 18.1969 14.4691 11.8451 11.3965 8.23824C11.1442 7.94022 10.9343 7.9236 10.633 8.17827C10.034 8.70883 9.43684 9.22368 8.81471 9.74686C8.28873 10.1981 8.28504 10.2866 8.73154 10.8052L17.5417 21.3387C17.9319 21.7917 17.9282 21.8803 17.4891 22.2614C15.7907 23.7193 14.0895 25.1762 12.3856 26.6322C11.9733 26.9885 11.8134 26.9683 11.451 26.54C10.229 25.0969 9.0116 23.651 7.78311 22.2098C6.52225 20.7297 5.2537 19.2534 3.97744 17.7807L2.16935 15.6817C2.13151 15.6381 2.08127 15.6071 2.0253 15.5928C1.96934 15.5785 1.91032 15.5816 1.85616 15.6016C1.80201 15.6217 1.75527 15.6578 1.7222 15.705C1.68913 15.7523 1.67131 15.8086 1.67111 15.8662L1.60548 20.4798C1.60487 20.5475 1.62921 20.6132 1.67388 20.6642L1.75338 20.7566V20.7667C4.86299 24.3651 7.89126 27.9637 11.0092 31.5621C11.4492 32.0613 11.5731 32.0733 12.0778 31.6461C15.6145 28.632 19.1579 25.6234 22.7082 22.6204C23.0215 22.3407 23.0419 22.1174 22.7664 21.7955Z" />,
+    <path d="M11.4197 23.3298C11.684 23.6499 11.9272 23.6472 12.2248 23.3926C12.8247 22.8527 13.4607 22.3305 14.0588 21.7796C14.4867 21.43 14.4961 21.2721 14.1318 20.8468L5.38807 10.6418C5.02943 10.2109 5.03775 10.0309 5.4648 9.66464C7.12869 8.23752 8.79504 6.81101 10.4639 5.38515C10.9584 4.96808 11.0859 4.98101 11.4982 5.46635L17.6139 12.6634C17.908 13.0103 18.2021 13.3567 18.4968 13.7024C18.5073 13.7362 18.5247 13.7676 18.5475 13.7946L20.6404 16.2148C20.678 16.2585 20.7283 16.2897 20.7842 16.3042C20.8402 16.3185 20.8992 16.3155 20.9534 16.2954C21.0075 16.2753 21.0543 16.2391 21.0872 16.1917C21.1202 16.1443 21.1378 16.088 21.1377 16.0303L21.2034 11.4168C21.2035 11.3491 21.1793 11.2836 21.1348 11.2323L20.7651 10.7986C20.7572 10.7899 20.7485 10.7819 20.7393 10.7746C17.7183 7.25269 14.9092 3.87101 11.8578 0.348136C11.4594 -0.113213 11.4446 -0.095683 10.9972 0.280779C7.45253 3.28139 3.90909 6.28323 0.366855 9.28632C-0.0953342 9.684 -0.114746 9.78827 0.274417 10.2431C2.39618 12.7455 4.51915 15.2461 6.64339 17.7447C7.55205 18.8169 10.4944 22.2484 11.4197 23.3298Z" />,
+  ],
+})