Merge branch 'staging' into refactor/refine-dashboard-page-design

Author: TylerAPfledderer

app/[locale]/[...slug]/page.tsx

@@ -6,6 +6,7 @@ import I18nProvider from "@/components/I18nProvider"
 import mdComponents from "@/components/MdComponents"
 
 import { dataLoader } from "@/lib/utils/data/dataLoader"
+import { dateToString } from "@/lib/utils/date"
 import { getPostSlugs } from "@/lib/utils/md"
 import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
@@ -18,6 +19,18 @@ import { getMdMetadata } from "@/lib/md/metadata"
 
 const loadData = dataLoader([["gfissues", fetchGFIs]])
 
+function getLayoutFromSlug(slug: string) {
+  if (slug.includes("developers/docs")) {
+    return "docs"
+  }
+
+  if (slug.includes("developers/tutorials")) {
+    return "tutorial"
+  }
+
+  return "static"
+}
+
 export default async function Page({
   params,
 }: {
@@ -49,6 +62,7 @@ export default async function Page({
     tocItems,
     lastEditLocaleTimestamp,
     isTranslated,
+    contributors,
   } = await getPageData({
     locale,
     slug,
@@ -61,9 +75,14 @@ export default async function Page({
   })
 
   // Determine the actual layout after we have the frontmatter
-  const layout = frontmatter.template || "static"
+  const layout = frontmatter.template || getLayoutFromSlug(slug)
   const Layout = layoutMapping[layout]
 
+  // If the page has a published date, format it
+  if ("published" in frontmatter) {
+    frontmatter.published = dateToString(frontmatter.published)
+  }
+
   // Get i18n messages
   const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(slug, layout)
@@ -77,6 +96,9 @@ export default async function Page({
         tocItems={tocItems}
         lastEditLocaleTimestamp={lastEditLocaleTimestamp}
         contentNotTranslated={!isTranslated}
+        contributors={contributors}
+        // TODO: Remove this once we have a real timeToRead value
+        timeToRead={2}
       >
         {content}
       </Layout>
@@ -85,7 +107,7 @@ export default async function Page({
 }
 
 export async function generateStaticParams() {
-  const slugs = await getPostSlugs("/", /\/developers/)
+  const slugs = await getPostSlugs("/")
 
   return LOCALES_CODES.flatMap((locale) =>
     slugs.map((slug) => ({
@@ -95,6 +117,8 @@ export async function generateStaticParams() {
   )
 }
 
+export const dynamicParams = false
+
 export async function generateMetadata({
   params,
 }: {

app/[locale]/developers/docs/[[...doc]]/page.tsx

@@ -229,4 +229,4 @@ parameters: {
 }
 ```
 
-> 🚨 NOTE: This will be notated ahead of time by the team which stories should not receive snapshots.
+> 🚨 NOTE: This will be noted ahead of time by the team which stories should not receive snapshots.

app/[locale]/developers/tutorials/[...tutorial]/page.tsx

@@ -8,7 +8,7 @@ How to prepare your content for translation depends on whether you're working on
 
 **- MDX pages (`public/content/page/`)**
 
-Markdown will be translated as whole pages of content, so no specific action is required. Simply create a new folder within `public/content/` with the name of the page, then place index markdown file (ie. `index.md`) within the new folder.
+Markdown will be translated as whole pages of content, so no specific action is required. Simply create a new folder within `public/content/` with the name of the page, then place an index markdown file (ie. `index.md`) within the new folder.
 
 **- React component page**
 

docs/applying-storybook.md

@@ -36,7 +36,7 @@ See a live example on ethereum.org: [https://ethereum.org/en/developers/docs/blo
 
 ### English content
 
-These should be created for header on every new English markdown document.
+These should be created for header in every new English markdown document.
 
 ### Translated content
 

docs/best-practices.md

@@ -2,6 +2,6 @@
 
 _The Translation Program is an initiative to translate ethereum.org into different languages and make the website accessible to people from all over the world._
 
-If you are looking to get involved as a translator, you can [join our project in Crowdin](https://crowdin.com/project/ethereum-org/) and start translating the website to your language immediately.
+If you are looking to get involved as a translator, you can [join our project in Crowdin](https://crowdin.com/project/ethereum-org/) and start translating the website into your language immediately.
 
 To get more information about the program, learn how to use Crowdin, check on the progress or find some useful tools for translators, please visit the [Translation Program page](https://ethereum.org/en/contributing/translation-program/).

docs/header-ids.md

@@ -81,6 +81,14 @@ module.exports = (phase, { defaultConfig }) => {
           protocol: "https",
           hostname: "crowdin-static.downloads.crowdin.com",
         },
+        {
+          protocol: "https",
+          hostname: "avatars.githubusercontent.com",
+        },
+        {
+          protocol: "https",
+          hostname: "coin-images.coingecko.com",
+        },
       ],
     },
     async headers() {
@@ -116,7 +124,6 @@ module.exports = (phase, { defaultConfig }) => {
             "node_modules/@swc/core-linux-x64-musl",
             "node_modules/@esbuild/linux-x64",
             "src/data",
-            "src/intl",
             "public/**/*.jpg",
             "public/**/*.png",
             "public/**/*.webp",

docs/translation-program.md

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "9.7.0",
+  "version": "10.0.0",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -47,7 +47,9 @@
     "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.1.2",
     "@radix-ui/react-visually-hidden": "^1.1.0",
+    "@rainbow-me/rainbowkit": "^2.2.3",
     "@socialgouv/matomo-next": "^1.8.0",
+    "@tanstack/react-query": "^5.66.7",
     "@tanstack/react-table": "^8.19.3",
     "chart.js": "^4.4.2",
     "chartjs-plugin-datalabels": "^2.2.0",
@@ -62,7 +64,7 @@
     "lodash.merge": "^4.6.2",
     "lodash.shuffle": "^4.2.0",
     "lodash.union": "^4.6.0",
-    "next": "^14.2.21",
+    "next": "^14.2.25",
     "next-intl": "^3.26.3",
     "next-mdx-remote": "^5.0.0",
     "next-sitemap": "^4.2.3",
@@ -86,6 +88,8 @@
     "tailwindcss-animate": "^1.0.7",
     "usehooks-ts": "^3.1.0",
     "vaul": "^1.0.0",
+    "viem": "^2.23.3",
+    "wagmi": "^2.14.11",
     "yaml-loader": "^0.8.0"
   },
   "devDependencies": {