Merge branch 'dev' into pr/Seek4samurai/10348

Author: pettinarip

.all-contributorsrc

@@ -10172,6 +10172,44 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "megatheikal",
+      "name": "megatheikal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64621442?v=4",
+      "profile": "https://megatheikal.com",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "stephenfire",
+      "name": "Stephen Guo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17247036?v=4",
+      "profile": "https://github.com/stephenfire",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "feuGeneA",
+      "name": "F. Eugene Aumson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7883777?v=4",
+      "profile": "http://aumson.org/gene",
+      "contributions": [
+        "bug",
+        "content"
+      ]
+    },
+    {
+      "login": "rpalakkal",
+      "name": "Roshan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19766713?v=4",
+      "profile": "https://github.com/rpalakkal",
+      "contributions": [
+        "content",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
@@ -10180,5 +10218,6 @@
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": true,
-  "commitConvention": "angular"
+  "commitConvention": "angular",
+  "commitType": "docs"
 }

.github/ISSUE_TEMPLATE/suggest_quiz.yaml

@@ -0,0 +1,34 @@
+name: Suggest quiz
+description: Add, update, delete questions for a quiz on ethereum.osg
+title: Add/Update/Delete quiz question
+labels: ["feature :sparkles", "quiz :books:"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before suggesting additions, updates, or deletions of quiz content, make sure you've read our [contributing guidelines for quizzes](https://ethereum.org/en/contributing/quizzes/).
+  - type: input
+    id: page
+    attributes:
+      label: Page URL
+      description: URL for the page the quiz can be found on, or should be added to
+    validations:
+      required: true
+  - type: textarea
+    id: question_content
+    attributes:
+      label: Question content
+      description: Suggest questions to add, update, or delete based on contribution guideline
+    validations:
+      required: true
+  - type: checkboxes
+    id: work_on
+    attributes:
+      label: Would you like to work on this issue?
+      options:
+        - label: "Yes"
+          required: false
+        - label: "No"
+          required: false
+    validations:
+      required: true

README.md

@@ -1595,6 +1595,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://changwu.me/"><img src="https://avatars.githubusercontent.com/u/1557364?v=4?s=100" width="100px;" alt="changwu"/><br /><sub><b>changwu</b></sub></a><br /><a href="#content-changwu-tw" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://uniyj.eth"><img src="https://avatars.githubusercontent.com/u/84749041?v=4?s=100" width="100px;" alt="yj"/><br /><sub><b>yj</b></sub></a><br /><a href="#content-uniyj" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://megatheikal.com"><img src="https://avatars.githubusercontent.com/u/64621442?v=4?s=100" width="100px;" alt="megatheikal"/><br /><sub><b>megatheikal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amegatheikal" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/stephenfire"><img src="https://avatars.githubusercontent.com/u/17247036?v=4?s=100" width="100px;" alt="Stephen Guo"/><br /><sub><b>Stephen Guo</b></sub></a><br /><a href="#translation-stephenfire" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://aumson.org/gene"><img src="https://avatars.githubusercontent.com/u/7883777?v=4?s=100" width="100px;" alt="F. Eugene Aumson"/><br /><sub><b>F. Eugene Aumson</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AfeuGeneA" title="Bug reports">🐛</a> <a href="#content-feuGeneA" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rpalakkal"><img src="https://avatars.githubusercontent.com/u/19766713?v=4?s=100" width="100px;" alt="Roshan"/><br /><sub><b>Roshan</b></sub></a><br /><a href="#content-rpalakkal" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=rpalakkal" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

docs/chakra-migration-guide.md

@@ -118,9 +118,11 @@ const Text = styled.p`
 `
 
 // now
-<Text color="primary" bg="background" />
+<Text color="primary.base" bg="background.base" />
 ```
 
+> Note the dotted notation. In Chakra, the values are referred to as "semantic tokens" and the new theme applies a nested structure of like tokens for better organization. See [semanticTokens.ts](../src/%40chakra-ui/gatsby-plugin/semanticTokens.ts)
+
 <aside>
 💡 In the **next iteration** we will refactor all the colors with the correct color from the new Design System
 </aside>

gatsby-config.ts

@@ -318,17 +318,11 @@ if (!IS_PREVIEW) {
       resolve: "gatsby-plugin-matomo",
       options: {
         siteId: "4",
-        matomoUrl: "https://matomo.ethereum.org",
+        matomoUrl: "https://ethereumfoundation.matomo.cloud",
         siteUrl,
         matomoPhpScript: "matomo.php",
         matomoJsScript: "matomo.js",
         trackLoad: false,
-        additionalTrackers: [
-          {
-            siteId: "1",
-            trackerUrl: "https://ethereumfoundation.matomo.cloud/matomo.php",
-          },
-        ],
       },
     },
   ]

gatsby-node.ts

@@ -98,12 +98,15 @@ const checkIsPageOutdated = async (
 
   const joinedFilepath = filePath.join("-")
   const srcPath = path.resolve(`src/intl/${lang}/page-${joinedFilepath}.json`)
-  const englishPath = path.resolve(`src/intl/en/page-${joinedFilepath}.json`)
+  const englishPath = path.resolve(
+    `src/intl/${defaultLanguage}/page-${joinedFilepath}.json`
+  )
 
   // If no file exists, default to english
   if (!fs.existsSync(srcPath)) {
     return {
-      isOutdated: true,
+      // Consider always defaultLanguage paths as updated
+      isOutdated: lang !== defaultLanguage,
       isContentEnglish: true,
     }
   } else {
@@ -291,6 +294,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
               isOutdated: false,
               isContentEnglish: true,
               relativePath, // Use English path for template MDX query
+              isDefaultLang: lang === defaultLanguage,
               // gatsby i18n plugin
               i18n: {
                 language: lang,
@@ -366,6 +370,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
             slug,
             isContentEnglish,
             isOutdated,
+            isDefaultLang: lang === defaultLanguage,
             // gatsby i18n plugin
             i18n: {
               language: lang,
@@ -391,6 +396,8 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
   actions,
 }) => {
   const { createPage, deletePage, createRedirect } = actions
+  const rootPath = page.path.slice(3)
+  const is404Page = rootPath.match(/^\/404(\/|.html)$/)
 
   if (!page.context) {
     return
@@ -417,9 +424,11 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
       context: {
         ...page.context,
         languagesToFetch: [language],
-        isOutdated,
-        //display TranslationBanner for translation-component pages that are still in English
+        // hide the outdated content banner for 404 pages
+        isOutdated: is404Page ? false : isOutdated,
+        // display TranslationBanner for translation-component pages that are still in English
         isContentEnglish,
+        isDefaultLang,
       },
     }
 
@@ -445,8 +454,7 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
     if (!IS_DEV && i18n.routed) {
       createPage<Context>(newPage)
 
-      const rootPath = page.path.slice(3)
-      if (isDefaultLang && !rootPath.match(/^\/404(\/|.html)$/)) {
+      if (isDefaultLang && !is404Page) {
         createRedirect({
           ...commonRedirectProps,
           fromPath: rootPath,