Merge branch 'dev' into brokenLinkRemoval

Author: minimalsm

.all-contributorsrc

@@ -9599,6 +9599,42 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "dgcoffman",
+      "name": "Daniel Coffman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1711204?v=4",
+      "profile": "http://dancoffman.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Amit0617",
+      "name": "AMIT KUMAR MISHRA",
+      "avatar_url": "https://avatars.githubusercontent.com/u/71893015?v=4",
+      "profile": "https://github.com/Amit0617",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Saksham010",
+      "name": "Saksham Thapa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56692835?v=4",
+      "profile": "https://github.com/Saksham010",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "vjgaur",
+      "name": "Vijayendra Gaur",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1871257?v=4",
+      "profile": "https://github.com/vjgaur",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1510,6 +1510,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center"><a href="https://github.com/owenHwang"><img src="https://avatars.githubusercontent.com/u/112543777?v=4?s=100" width="100px;" alt="Owen Hwang"/><br /><sub><b>Owen Hwang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=owenHwang" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/florath"><img src="https://avatars.githubusercontent.com/u/11856543?v=4?s=100" width="100px;" alt="Andreas Florath"/><br /><sub><b>Andreas Florath</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=florath" title="Documentation">📖</a></td>
+      <td align="center"><a href="http://dancoffman.com"><img src="https://avatars.githubusercontent.com/u/1711204?v=4?s=100" width="100px;" alt="Daniel Coffman"/><br /><sub><b>Daniel Coffman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=dgcoffman" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/Amit0617"><img src="https://avatars.githubusercontent.com/u/71893015?v=4?s=100" width="100px;" alt="AMIT KUMAR MISHRA"/><br /><sub><b>AMIT KUMAR MISHRA</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Amit0617" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/Saksham010"><img src="https://avatars.githubusercontent.com/u/56692835?v=4?s=100" width="100px;" alt="Saksham Thapa"/><br /><sub><b>Saksham Thapa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ASaksham010" title="Bug reports">🐛</a></td>
+      <td align="center"><a href="https://github.com/vjgaur"><img src="https://avatars.githubusercontent.com/u/1871257?v=4?s=100" width="100px;" alt="Vijayendra Gaur"/><br /><sub><b>Vijayendra Gaur</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vjgaur" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

docs/stack.md

@@ -9,6 +9,7 @@
   - [Gatsby Docs](https://www.gatsbyjs.org/docs/)
 - [React](https://reactjs.org/) - A JavaScript library for building component-based user interfaces
 - [Typescript](https://www.typescriptlang.org/) - TypeScript is a strongly typed programming language that builds on JavaScript
+- [Chakra UI](https://chakra-ui.com/) - A UI library (Migration in progress)
 - [GraphQL](https://graphql.org/) - A query language for APIs
 - [Algolia](https://www.algolia.com/) - Site indexing, rapid intra-site search results, and search analytics. [Learn more on how we implement Algolia for site search](./docs/ALGOLIA_DOCSEARCH.md).
   - Primary implementation: `/src/components/Search/index.ts`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "6.9.2",
+  "version": "6.9.4",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",

src/@chakra-ui/gatsby-plugin/components/Button.ts

@@ -90,5 +90,17 @@ export const Button: ComponentStyleConfig = {
       color: "primary",
       borderColor: "primary",
     },
+    icon: {
+      appearance: "none",
+      background: "inherit",
+      padding: "initial",
+      border: 0,
+      color: "inherit",
+      boxShadow: "none",
+      _hover: {
+        color: "primary",
+        boxShadow: "none",
+      },
+    },
   },
 }

src/@chakra-ui/gatsby-plugin/styles.ts

@@ -19,6 +19,10 @@ const styles = {
       bg: mode("white", "gray.700")(props),
       lineHeight: "1.6rem",
     },
+    a: {
+      color: "primary",
+      textDecoration: "underline",
+    },
     // should be replace with https://chakra-ui.com/docs/components/text
     p: {
       margin: "0px 0px 1.45rem",

src/assets/exchanges/ftx.png

@@ -7,6 +7,7 @@ import {
   LinkBox,
   LinkOverlay,
   StackProps,
+  useColorModeValue,
 } from "@chakra-ui/react"
 
 import { ImageProp } from "../types"
@@ -50,6 +51,8 @@ const Card = (props: CardListItem & Omit<StackProps, "title" | "id">) => {
   const isLink = !!link
   const isExternal = url.isExternal(link || "")
 
+  const descriptionColor = useColorModeValue("gray.500", "gray.400")
+
   return (
     <CardContainer {...rest}>
       {image && <Box as={GatsbyImage} image={image} alt={alt} minW="20px" />}
@@ -69,7 +72,7 @@ const Card = (props: CardListItem & Omit<StackProps, "title" | "id">) => {
           <Box>{title}</Box>
         )}
 
-        <Box fontSize="sm" mb={0} opacity={0.6}>
+        <Box fontSize="sm" mb={0} color={descriptionColor}>
           {description}
         </Box>
       </Flex>

src/assets/feedback-glyph.svg

@@ -154,8 +154,6 @@ type ExchangeName =
   | "coinspot"
   | "cryptocom"
   | "easycrypto"
-  | "ftx"
-  | "ftxus"
   | "gateio"
   | "gemini"
   | "huobiglobal"
@@ -241,8 +239,6 @@ const EthExchanges = () => {
           country
           cryptocom
           easycrypto
-          ftx
-          ftxus
           gateio
           gemini
           huobiglobal
@@ -317,12 +313,6 @@ const EthExchanges = () => {
       easycrypto: file(relativePath: { eq: "exchanges/easycrypto.png" }) {
         ...cardListImage
       }
-      ftx: file(relativePath: { eq: "exchanges/ftx.png" }) {
-        ...cardListImage
-      }
-      ftxus: file(relativePath: { eq: "exchanges/ftx.png" }) {
-        ...cardListImage
-      }
       gateio: file(relativePath: { eq: "exchanges/gateio.png" }) {
         ...cardListImage
       }
@@ -462,18 +452,6 @@ const EthExchanges = () => {
       image: data.easycrypto,
       usaExceptions: [],
     },
-    ftx: {
-      name: "FTX",
-      url: "https://ftx.com/",
-      image: data.ftx,
-      usaExceptions: [],
-    },
-    ftxus: {
-      name: "FTX US",
-      url: "https://ftx.us/",
-      image: data.ftx,
-      usaExceptions: ["NY"],
-    },
     gateio: {
       name: "Gate.io",
       url: "https://www.gate.io/",