Merge branch 'dev' into quiz-roadmap-scaling

Author: wackerow

.all-contributorsrc

@@ -8756,7 +8756,8 @@
       "profile": "https://github.com/MahendraBishnoi29",
       "contributions": [
         "ideas",
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -10210,6 +10211,134 @@
         "content",
         "code"
       ]
+    },
+    {
+      "login": "maxime216-pro",
+      "name": "Maxime Dessez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66296351?v=4",
+      "profile": "http://maximedessez.fr",
+      "contributions": [
+        "bug",
+        "translation"
+      ]
+    },
+    {
+      "login": "Tyler-233",
+      "name": "Tyler-233",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44740396?v=4",
+      "profile": "https://github.com/Tyler-233",
+      "contributions": [
+        "translation",
+        "content"
+      ]
+    },
+    {
+      "login": "neodaoist",
+      "name": "neodaoist",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3170590?v=4",
+      "profile": "http://neodaoist.xyz",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "atharvadeosthale",
+      "name": "Atharva Deosthale",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11805367?v=4",
+      "profile": "https://links.atharva.codes",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ckartik",
+      "name": "Kartik Chopra",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13803371?v=4",
+      "profile": "https://github.com/ckartik",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "BBashh",
+      "name": "Bibash Tandon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/125178349?v=4",
+      "profile": "https://github.com/BBashh",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "vaibhavtevatia",
+      "name": "Vaibhav Tevatia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86671961?v=4",
+      "profile": "https://github.com/vaibhavtevatia",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cnn-rnn",
+      "name": "cnn-rnn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44789658?v=4",
+      "profile": "https://github.com/cnn-rnn",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "SahityaRoy",
+      "name": "Sahitya Roy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72821604?v=4",
+      "profile": "https://www.linkedin.com/in/sahitya-roy-244b941a2/",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Keecointoken",
+      "name": "KeeCoin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/99338330?v=4",
+      "profile": "https://www.keecoin.io",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "tomatowax",
+      "name": "Seungwook Chi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/799503?v=4",
+      "profile": "http://www.tomatowax.com/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "0xx92",
+      "name": "0xx92",
+      "avatar_url": "https://avatars.githubusercontent.com/u/133748557?v=4",
+      "profile": "https://github.com/0xx92",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "altinocoelho",
+      "name": "altinocoelho",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92543849?v=4",
+      "profile": "https://github.com/altinocoelho",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "viac92",
+      "name": "viac92",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64146594?v=4",
+      "profile": "https://github.com/viac92",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/get-crowdin-contributors.yml

@@ -0,0 +1,63 @@
+name: Update Crowdin Contributors
+
+on:
+  schedule:
+    - cron: "0 0 * * SUN" # Runs every Sunday at midnight
+  workflow_dispatch:
+
+jobs:
+  create_pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Install ts-node
+        run: yarn global add ts-node
+
+      - name: Set up git
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Action"
+
+      - name: Generate timestamp and readable date
+        id: date
+        run: |
+          echo "TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
+          echo "READABLE_DATE=$(date +'%B %-d')" >> $GITHUB_ENV
+
+      - name: Fetch latest dev and create new branch
+        run: |
+          git fetch origin dev
+          git checkout -b "automated-update-${{ env.TIMESTAMP }}" origin/dev
+
+      - name: Run script
+        run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/getCrowdinContributors.ts
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+
+      - name: Commit and push
+        run: |
+          git add -A
+          git commit -m "Update Crowdin contributors"
+          git push origin "automated-update-${{ env.TIMESTAMP }}"
+
+      - name: Create PR body
+        run: |
+          echo "This PR was automatically created to update Crowdin contributors." > pr_body.txt
+          echo "This workflows runs every Sunday at 00:00 (UTC)." >> pr_body.txt
+          echo "" >> pr_body.txt
+          echo "Thank you to everyone contributing to translate ethereum.org ❤️" >> pr_body.txt
+
+      - name: Create Pull Request
+        run: |
+          gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }}
+          gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

README.md

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -11,11 +11,13 @@
     "@apollo/client": "^3.3.13",
     "@chakra-ui/gatsby-plugin": "^3.1.3",
     "@chakra-ui/react": "2.6.1",
+    "@crowdin/crowdin-api-client": "^1.23.2",
     "@docsearch/react": "^3.3.3",
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
     "@formatjs/intl-locale": "^2.4.14",
     "@formatjs/intl-numberformat": "^6.1.4",
+    "@googleapis/calendar": "^6.0.0",
     "@mdx-js/mdx": "^1.6.5",
     "@mdx-js/react": "^1.6.5",
     "algoliasearch": "^4.3.0",
@@ -54,6 +56,7 @@
     "gatsby-transformer-json": "^5.4.0",
     "gatsby-transformer-remark": "^6.4.0",
     "gatsby-transformer-sharp": "^5.4.0",
+    "googleapis": "^118.0.0",
     "htmr": "^1.0.2",
     "i18next": "^21.9.2",
     "is-relative-url": "^3.0.0",
@@ -104,6 +107,7 @@
     "babel-loader": "^8.3.0",
     "babel-preset-gatsby": "^2.23.0",
     "chromatic": "^6.19.9",
+    "cross-env": "^7.0.3",
     "github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3",
     "husky": "^4.2.5",
@@ -121,8 +125,8 @@
   "scripts": {
     "postinstall": "yarn theme",
     "build": "gatsby build",
-    "build:lambda": "NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
-    "build:10gb": "NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
+    "build:lambda": "cross-env NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
+    "build:10gb": "cross-env NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
     "clean": "gatsby clean",
     "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
     "crowdin-import": "ts-node src/scripts/crowdin-import.ts",
@@ -131,6 +135,8 @@
     "generate-heading-ids": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/generateHeadingIds.ts",
     "unused-translations": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/unusedTranslations.ts",
     "reorg-intl": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/reorgIntlFiles.ts",
+    "optimize-images": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/optimizeImages.ts",
+    "crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
     "start": "gatsby develop",
     "start:lambda": "netlify-lambda serve src/lambda",
     "start:static": "gatsby build && gatsby serve",

package.json

@@ -0,0 +1,17 @@
+import type { GatsbyFunctionRequest, GatsbyFunctionResponse } from "gatsby"
+import { lambda } from "../lambda/calendarEvents"
+
+async function handler(
+  __req: GatsbyFunctionRequest,
+  res: GatsbyFunctionResponse
+): Promise<void> {
+  // passing env vars as arguments due to a bug on GC functions where env vars
+  // can not be accessed by imported functions
+  const { statusCode, body } = await lambda(
+    process.env.GOOGLE_API_KEY!,
+    process.env.GOOGLE_CALENDAR_ID!
+  )
+  res.status(statusCode).send(body)
+}
+
+export default handler