Merge branch 'dev' into ds-toc

Author: wackerow

.all-contributorsrc

@@ -4810,7 +4810,8 @@
       "profile": "http://www.technobunnies.com",
       "contributions": [
         "doc",
-        "maintenance"
+        "maintenance",
+        "content"
       ]
     },
     {
@@ -7193,7 +7194,8 @@
       "contributions": [
         "doc",
         "ideas",
-        "bug"
+        "bug",
+        "tool"
       ]
     },
     {
@@ -11318,7 +11320,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/71248977?v=4",
       "profile": "https://github.com/UNOFFICIALbgd",
       "contributions": [
-        "bug"
+        "bug",
+        "doc"
       ]
     },
     {
@@ -12168,6 +12171,151 @@
       "contributions": [
         "tool"
       ]
+    },
+    {
+      "login": "SnehalSrivastava27",
+      "name": "SnehalSrivastava27",
+      "avatar_url": "https://avatars.githubusercontent.com/u/118104081?v=4",
+      "profile": "https://github.com/SnehalSrivastava27",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "wrexgem",
+      "name": "wrexgem",
+      "avatar_url": "https://avatars.githubusercontent.com/u/134736543?v=4",
+      "profile": "https://github.com/wrexgem",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "cd-sigma",
+      "name": "ciphernova",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119534349?v=4",
+      "profile": "https://github.com/cd-sigma",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "CodeMongerrr",
+      "name": "Aditya Joshi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/99281767?v=4",
+      "profile": "https://github.com/CodeMongerrr",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Khemmie-Ray",
+      "name": "Atoyebi Oluwakemi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89976006?v=4",
+      "profile": "https://github.com/Khemmie-Ray",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "pglekshmi",
+      "name": "pglekshmi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/107828565?v=4",
+      "profile": "https://github.com/pglekshmi",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "abonnaudet-ledger",
+      "name": "abonnaudet-ledger",
+      "avatar_url": "https://avatars.githubusercontent.com/u/71646516?v=4",
+      "profile": "https://github.com/abonnaudet-ledger",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "JacobSharples",
+      "name": "Jacob Sharples",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45126111?v=4",
+      "profile": "https://github.com/JacobSharples",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "omahs",
+      "name": "omahs",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73983677?v=4",
+      "profile": "https://github.com/omahs",
+      "contributions": [
+        "translation",
+        "maintenance"
+      ]
+    },
+    {
+      "login": "Shiva-Sai-ssb",
+      "name": "Shiva Sai",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112751524?v=4",
+      "profile": "https://github.com/Shiva-Sai-ssb",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "saurabhburade",
+      "name": "Saurabh Burade",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39492927?v=4",
+      "profile": "https://bsaurabh.xyz/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yorkerhodes3",
+      "name": "Yorke E. Rhodes III",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17415717?v=4",
+      "profile": "https://github.com/yorkerhodes3",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "sandeepV2",
+      "name": "Sandeep Belagavi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52043035?v=4",
+      "profile": "https://github.com/sandeepV2",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "codingmickey",
+      "name": "Kartik Jolapara",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42518907?v=4",
+      "profile": "https://github.com/codingmickey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Ekam-Bitt",
+      "name": "Ekam Bitt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74407205?v=4",
+      "profile": "https://ekam-bitt.github.io",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "iankressin",
+      "name": "Ian K. Guimarães",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29215044?v=4",
+      "profile": "http://iankguimaraes.com",
+      "contributions": [
+        "maintenance"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -16,6 +16,9 @@
 # GOOGLE_API_KEY=
 # GOOGLE_CALENDAR_ID=
 
+# Dune Analytics API key (required for total eth staked)
+# DUNE_API_KEY=
+
 # Matomo environment (URL and site ID required for analytics)
 NEXT_PUBLIC_MATOMO_URL=
 NEXT_PUBLIC_MATOMO_SITE_ID=

.eslintignore

@@ -1,3 +1,5 @@
 .next
 dist
 node_modules/
+
+!.storybook

.eslintrc.json

@@ -1,11 +1,20 @@
 {
   "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
     "next/core-web-vitals",
     "prettier",
     "plugin:storybook/recommended"
   ],
-  "env": { "es6": true },
-  "plugins": ["simple-import-sort"],
+  "env": {
+    "es6": true
+  },
+  "plugins": [
+    "simple-import-sort",
+    "@typescript-eslint",
+    "unused-imports"
+  ],
+  "parser": "@typescript-eslint/parser",
   "rules": {
     "simple-import-sort/imports": [
       "error",
@@ -17,32 +26,76 @@
           ],
           // Packages. `react` related packages come first.
           // Also, put `react-icons` in sorting order not with `react`
-          ["^react(?!-.)$", "^\\w", "^@\\w"],
+          [
+            "^react(?!-.)$",
+            "^\\w",
+            "^@\\w"
+          ],
           // The Chakra theme directory if imported to story file or other places
-          ["^@/@chakra-ui"],
+          [
+            "^@/@chakra-ui"
+          ],
           // From the `types` directory.
-          ["^@/lib/types", "^@/lib/interfaces"],
+          [
+            "^@/lib/types",
+            "^@/lib/interfaces"
+          ],
           // From the `components` directory.
-          ["^@/components"],
+          [
+            "^@/components"
+          ],
           // From the `utils` directory.
-          ["^@/lib/utils"],
+          [
+            "^@/lib/utils"
+          ],
           // From the `data` directory.
-          ["^@/data"],
+          [
+            "^@/data"
+          ],
           // From the `constants` directory.
           ["^@/lib/constants"],
           // From the `.storybook/utils` file
           ["^@/storybook-utils"],
           // Parent imports. Put `..` last.
-          ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
+          [
+            "^\\.\\.(?!/?$)",
+            "^\\.\\./?$"
+          ],
           // Other relative imports. Put same-folder imports and `.` last.
-          ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
+          [
+            "^\\./(?=.*/)(?!/?$)",
+            "^\\.(?!/?$)",
+            "^\\./?$"
+          ],
           // Style imports.
-          ["^.+\\.s?css$"],
+          [
+            "^.+\\.s?css$"
+          ],
           // Side effect imports.
-          ["^\\u0000"]
+          [
+            "^\\u0000"
+          ]
         ]
       }
     ],
-    "simple-import-sort/exports": "error"
+    "simple-import-sort/exports": "error",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "@typescript-eslint/no-explicit-any": [
+      "error",
+      {
+        "fixToUnknown": true
+      }
+    ],
+    "unused-imports/no-unused-vars": [
+      "error",
+        {
+        "args": "all",
+        "argsIgnorePattern": "^_$",
+        "varsIgnorePattern": "^_$"
+      }
+    ],
+    "unused-imports/no-unused-imports-ts": "warn"
   }
 }
+

.gitignore

@@ -56,3 +56,7 @@ robots.txt
 
 # Crowdin report output
 src/data/crowdin/bucketsAwaitingReviewReport.csv
+
+# Storybook
+build-storybook.log
+storybook-static

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.lintstagedrc.js

@@ -0,0 +1,12 @@
+const path = require("path")
+
+const buildEslintCommand = (filenames) =>
+  `next lint --fix --file ${filenames
+    .map((f) => path.relative(process.cwd(), f))
+    .join(" --file ")}`
+
+const formatCommand = "prettier --write"
+
+module.exports = {
+  "*.{js,jsx,ts,tsx}": [buildEslintCommand, formatCommand],
+}

.prettierrc

@@ -3,5 +3,8 @@
   "semi": false,
   "singleQuote": false,
   "tabWidth": 2,
-  "trailingComma": "es5"
-}
+  "trailingComma": "es5",
+  "plugins": [
+    "prettier-plugin-tailwindcss"
+  ]
+}

.storybook/ChakraDecorator.tsx

@@ -1,3 +1,4 @@
+import { useEffect, useMemo, useState } from "react"
 import {
   ChakraBaseProvider,
   extendBaseTheme,
@@ -6,7 +7,7 @@ import {
 import type { Decorator } from "@storybook/react"
 
 import theme from "../src/@chakra-ui/theme"
-import { useEffect, useMemo, useState } from "react"
+
 import i18n from "./i18next"
 
 type DecoratorProps = Parameters<Decorator>

.storybook/i18next.ts

@@ -13,12 +13,14 @@ export const baseLocales = {
 export const ns = [
   "common",
   "glossary",
+  "glossary-tooltip",
   "learn-quizzes",
   "page-about",
   "page-index",
   "page-learn",
   "page-upgrades",
   "page-developers-index",
+  "page-what-is-ethereum",
 ] as const
 const supportedLngs = Object.keys(baseLocales)