Merge pull request #1108 from ethereum/dev

Deploy v1.5.12
ethereum · Jun 10, 2020 · 526ac7d · 526ac7d
2 parents 5da4848 + 075c0fa
commit 526ac7d
Show file tree

Hide file tree

Showing 20 changed files with 233 additions and 144 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -581,7 +581,8 @@
       "contributions": [
         "content",
         "translation",
-        "ideas"
+        "ideas",
+        "review"
       ]
     },
     {
@@ -1205,7 +1206,8 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/31592931?v=4",
       "profile": "https://github.com/wschwab",
       "contributions": [
-        "code"
+        "code",
+        "content"
       ]
     },
     {
@@ -1677,6 +1679,42 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "johnmonarch",
+      "name": "John Monarch",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/31969812?v=4",
+      "profile": "http://www.johnmonarch.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "shad-k",
+      "name": "Shadab Khan",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/23720732?v=4",
+      "profile": "https://github.com/shad-k",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ryancreatescopy",
+      "name": "ryancreatescopy",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/40891631?v=4",
+      "profile": "https://github.com/ryancreatescopy",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "hammadj",
+      "name": "Hammad Jutt",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7143583?v=4",
+      "profile": "http://jutt.ca",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,18 @@
+name: Close Stale Issues
+
+on:
+  schedule:
+    - cron: '0 8 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/stale@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-label: 'Status: Stale'
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days'
+          days-before-stale: 30
+          days-before-close: 5
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-181-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-185-orange.svg?style=flat-square)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <h1 align="center" style="margin-top: 1em; margin-bottom: 3em;">
@@ -104,9 +104,9 @@ Ethereum is a global project, and we believe it's critical that Ethereum.org is
 
 We're constantly working to add additional language support & to keep our existing translations up to date. You can [view available translations and the progress of all our translations here](https://ethereum.org/languages/).
 
-**Looking to get join our community of translators?**
+**Looking to join our community of translators?**
 
-Great! We'd love to get you involved. [Follow the instructions here](https://ethereum.org/languages/#ethereum-org-translation-program). Thank you in advance for your particpation!
+Great! We'd love to get you involved. [Follow the instructions here](https://ethereum.org/languages/#ethereum-org-translation-program). Thank you in advance for your participation!
 
 ## 🤔 How are decisions about the site made?
 
@@ -308,7 +308,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://zoek1.github.com"><img src="https://avatars1.githubusercontent.com/u/660973?v=4" width="100px;" alt=""/><br /><sub><b>Miguel Angel Gordián</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=zoek1" title="Code">💻</a></td>
     <td align="center"><a href="https://eswarasai.com"><img src="https://avatars2.githubusercontent.com/u/5172086?v=4" width="100px;" alt=""/><br /><sub><b>Eswara Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=eswarasai" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/ethers"><img src="https://avatars1.githubusercontent.com/u/6937903?v=4" width="100px;" alt=""/><br /><sub><b>ethers</b></sub></a><br /><a href="#content-ethers" title="Content">🖋</a> <a href="#ideas-ethers" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://faraggi.org"><img src="https://avatars2.githubusercontent.com/u/264382?v=4" width="100px;" alt=""/><br /><sub><b>Felipe Faraggi</b></sub></a><br /><a href="#content-faraggi" title="Content">🖋</a> <a href="#translation-faraggi" title="Translation">🌍</a> <a href="#ideas-faraggi" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://faraggi.org"><img src="https://avatars2.githubusercontent.com/u/264382?v=4" width="100px;" alt=""/><br /><sub><b>Felipe Faraggi</b></sub></a><br /><a href="#content-faraggi" title="Content">🖋</a> <a href="#translation-faraggi" title="Translation">🌍</a> <a href="#ideas-faraggi" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Afaraggi" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/maurelian"><img src="https://avatars3.githubusercontent.com/u/23033765?v=4" width="100px;" alt=""/><br /><sub><b>Maurelian</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=maurelian" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Amaurelian" title="Reviewed Pull Requests">👀</a> <a href="#content-maurelian" title="Content">🖋</a></td>
@@ -395,7 +395,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://greg.jeanmart.me"><img src="https://avatars3.githubusercontent.com/u/506784?v=4" width="100px;" alt=""/><br /><sub><b>Grégoire Jeanmart</b></sub></a><br /><a href="#content-gjeanmart" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/nysxah"><img src="https://avatars2.githubusercontent.com/u/30059030?v=4" width="100px;" alt=""/><br /><sub><b>nysxah</b></sub></a><br /><a href="#content-nysxah" title="Content">🖋</a></td>
     <td align="center"><a href="http://rachblondon.github.io/"><img src="https://avatars0.githubusercontent.com/u/8742251?v=4" width="100px;" alt=""/><br /><sub><b>Rachel</b></sub></a><br /><a href="#content-RachBLondon" title="Content">🖋</a></td>
-    <td align="center"><a href="https://github.com/wschwab"><img src="https://avatars3.githubusercontent.com/u/31592931?v=4" width="100px;" alt=""/><br /><sub><b>wschwab</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=wschwab" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/wschwab"><img src="https://avatars3.githubusercontent.com/u/31592931?v=4" width="100px;" alt=""/><br /><sub><b>wschwab</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=wschwab" title="Code">💻</a> <a href="#content-wschwab" title="Content">🖋</a></td>
     <td align="center"><a href="http://twitter.com/relativeread"><img src="https://avatars2.githubusercontent.com/u/34966228?v=4" width="100px;" alt=""/><br /><sub><b>Edson Ayllon</b></sub></a><br /><a href="#content-edsonayllon" title="Content">🖋</a> <a href="#ideas-edsonayllon" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="http://peteris.xyz"><img src="https://avatars0.githubusercontent.com/u/224585?v=4" width="100px;" alt=""/><br /><sub><b>Peteris Erins</b></sub></a><br /><a href="#content-Pet3ris" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/JimmyShi22"><img src="https://avatars3.githubusercontent.com/u/12178678?v=4" width="100px;" alt=""/><br /><sub><b>jimmyshi</b></sub></a><br /><a href="#content-JimmyShi22" title="Content">🖋</a></td>
@@ -461,6 +461,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/alexmb15"><img src="https://avatars3.githubusercontent.com/u/12184447?v=4" width="100px;" alt=""/><br /><sub><b>Alex</b></sub></a><br /><a href="#ideas-alexmb15" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://twitter.com/PaulRBerg"><img src="https://avatars1.githubusercontent.com/u/8782666?v=4" width="100px;" alt=""/><br /><sub><b>Paul Razvan Berg</b></sub></a><br /><a href="#content-PaulRBerg" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/ph5500"><img src="https://avatars0.githubusercontent.com/u/60459707?v=4" width="100px;" alt=""/><br /><sub><b>ph5500</b></sub></a><br /><a href="#content-ph5500" title="Content">🖋</a></td>
+    <td align="center"><a href="http://www.johnmonarch.com"><img src="https://avatars1.githubusercontent.com/u/31969812?v=4" width="100px;" alt=""/><br /><sub><b>John Monarch</b></sub></a><br /><a href="#content-johnmonarch" title="Content">🖋</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/shad-k"><img src="https://avatars1.githubusercontent.com/u/23720732?v=4" width="100px;" alt=""/><br /><sub><b>Shadab Khan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=shad-k" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ryancreatescopy"><img src="https://avatars2.githubusercontent.com/u/40891631?v=4" width="100px;" alt=""/><br /><sub><b>ryancreatescopy</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ryancreatescopy" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://jutt.ca"><img src="https://avatars3.githubusercontent.com/u/7143583?v=4" width="100px;" alt=""/><br /><sub><b>Hammad Jutt</b></sub></a><br /><a href="#content-hammadj" title="Content">🖋</a></td>
   </tr>
 </table>
 

diff --git a/design-principles.md b/design-principles.md
@@ -54,7 +54,7 @@ Writing systems • Use of colour • Visual Direction • Content
 The website should function like a good story. Visitors are on a journey, and the content you contribute is a part of that. Your contributions should fit within a clear narrative: one with a beginning (introduction/entry point), middle (set of learnings and insights), and end (a link(s) to relevant resources, or next steps).
 
 - **Hierarchical**: A clear, hierarchically structured information architecture helps visitors to [Ethereum.org](http://ethereum.org) navigate the site "as a story" as they seek to achieve their goals.
-- **A Stepping Stone:** We're a stepping stone for people come looking for an answer. We don't want to replace or become a substitute for the many resources that already exist. We give an answer & provide reliable next steps.
+- **A Stepping Stone:** We're a stepping stone for anyone looking for answers. We don't want to replace or become a substitute for the many resources that already exist. We give an answer & provide reliable next steps.
 
 User Journeys • Content
 

diff --git a/docs/.vuepress/components/BuildPage.vue b/docs/.vuepress/components/BuildPage.vue
@@ -121,22 +121,19 @@
 </template>
 
 <script>
-import { translate } from '../theme/utils/translations'
+import { translateMixin } from '../theme/utils/translations'
 const { inlineMd } = require('../theme/utils/inline-md')
 
 export default {
+  mixins: [translateMixin],
   methods: {
-    inlineMd: function(str) {
+    inlineMd: function (str) {
       return inlineMd(str)
     },
 
-    translateString: function(str) {
-      return translate(str, this.$lang)
+    langPath: function () {
+      return this.translateString('path')
     },
-
-    langPath: function() {
-      return translate('path', this.$lang)
-    }
   },
   computed: {
     templates() {
@@ -148,9 +145,9 @@ export default {
           ),
           to: {
             url: 'https://studio.ethereum.org/1',
-            text: this.translateString('page-build-hello-world-link-text')
+            text: this.translateString('page-build-hello-world-link-text'),
           },
-          icon: ':wave:'
+          icon: ':wave:',
         },
         {
           title: this.translateString('page-build-coin-contract-title'),
@@ -159,9 +156,9 @@ export default {
           ),
           to: {
             url: 'https://studio.ethereum.org/2',
-            text: this.translateString('page-build-coin-contract-link-text')
+            text: this.translateString('page-build-coin-contract-link-text'),
           },
-          icon: ':key:'
+          icon: ':key:',
         },
         {
           title: this.translateString('page-build-crypto-pizza-title'),
@@ -170,10 +167,10 @@ export default {
           ),
           to: {
             url: 'https://studio.ethereum.org/3',
-            text: this.translateString('page-build-crypto-pizza-link-text')
+            text: this.translateString('page-build-crypto-pizza-link-text'),
           },
-          icon: ':pizza:'
-        }
+          icon: ':pizza:',
+        },
       ]
     },
     learningPlatforms() {
@@ -186,8 +183,8 @@ export default {
           to: 'https://cryptozombies.io/',
           img: {
             src: '/ecosystem/crypto-zombie.png',
-            alt: 'CryptoZombies'
-          }
+            alt: 'CryptoZombies',
+          },
         },
         {
           title: 'Ethernauts',
@@ -197,26 +194,26 @@ export default {
           to: 'https://ethernaut.openzeppelin.com/',
           img: {
             src: '/ecosystem/oz.png',
-            alt: 'Open Zeppelin Ethernaut'
-          }
+            alt: 'Open Zeppelin Ethernaut',
+          },
         },
         {
           title: 'Remix',
           description: this.translateString('page-build-remix-description'),
           to: 'https://remix.ethereum.org',
           img: {
             src: '/ecosystem/remix.png',
-            alt: 'Remix'
-          }
+            alt: 'Remix',
+          },
         },
         {
           title: 'ChainShot',
           description: this.translateString('page-build-chainshot-description'),
           to: 'https://www.chainshot.com',
           img: {
             src: '/ecosystem/chainshot.png',
-            alt: 'ChainShot'
-          }
+            alt: 'ChainShot',
+          },
         },
         {
           title: 'ConsenSys Academy',
@@ -226,12 +223,12 @@ export default {
           to: 'https://consensys.net/academy/bootcamp/',
           img: {
             src: '/ecosystem/consensys.png',
-            alt: 'ConsenSys Academy'
-          }
-        }
+            alt: 'ConsenSys Academy',
+          },
+        },
       ]
-    }
-  }
+    },
+  },
 }
 </script>
 

diff --git a/docs/.vuepress/components/HomePage.vue b/docs/.vuepress/components/HomePage.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { translate } from '../theme/utils/translations'
+import { translateMixin } from '../theme/utils/translations'
 
 export default {
   computed: {
@@ -195,17 +195,14 @@ export default {
       ]
     }
   },
+  mixins: [translateMixin],
   methods: {
-    translateString: function(str) {
-      return translate(str, this.$lang)
-    },
-
     langPath: function() {
-      return translate('path', this.$lang)
+      return this.translateString('path')
     },
 
     contentVersion() {
-      return translate('version', this.$lang)
+      return this.translateString('version')
     }
   }
 }

diff --git a/docs/.vuepress/theme/components/AlgoliaSearchBox.vue b/docs/.vuepress/theme/components/AlgoliaSearchBox.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { translate } from '../utils/translations'
+import { translateMixin } from '../utils/translations'
 
 export default {
   name: 'AlgoliaSearchBox',
@@ -83,7 +83,7 @@ export default {
   mounted() {
     this.initialize(this.options, this.$lang)
   },
-
+  mixins: [translateMixin],
   methods: {
     initialize(userOptions, lang) {
       Promise.all([
@@ -124,10 +124,6 @@ export default {
     update(options, lang) {
       this.$el.innerHTML = this.$el.innerHTML // Needed to reset language index
       this.initialize(options, lang)
-    },
-
-    translateString: function(str) {
-      return translate(str, this.$lang)
     }
   }
 }

diff --git a/docs/.vuepress/theme/components/NavLinks.vue b/docs/.vuepress/theme/components/NavLinks.vue
@@ -102,7 +102,7 @@
 
 <script>
 import { isActive, resolveNavLinkItem } from '../utils/util'
-import { translate } from '../utils/translations'
+import { translateMixin } from '../utils/translations'
 import NavLink from './NavLink.vue'
 import NavDropdown from './NavDropdown.vue'
 import SearchBox from './SearchBox.vue'
@@ -142,11 +142,11 @@ export default {
 
     darkOrLightModeText() {
       const key = this.isDarkMode ? 'light-mode' : 'dark-mode'
-      return translate(key, this.$lang)
+      return this.translateString(key)
     },
 
     nav() {
-      const languagePath = translate('path', this.$lang)
+      const languagePath = this.translateString('path')
       return this.$site.locales[languagePath].nav || []
     },
 
@@ -168,16 +168,12 @@ export default {
       return this.algolia && this.algolia.apiKey && this.algolia.indexName
     }
   },
-
+  mixins: [translateMixin],
   methods: {
     isActive,
 
     handleSearchToggle() {
       this.isSearchVisible = !this.isSearchVisible
-    },
-
-    translateString: function(str) {
-      return translate(str, this.$lang)
     }
   },
 

diff --git a/docs/.vuepress/theme/utils/translations.js b/docs/.vuepress/theme/utils/translations.js
@@ -232,7 +232,16 @@ const translate = (lookup, lang = 'en-US') => {
   return translation || ''
 }
 
+const translateMixin = {
+  methods: {
+    translateString(str) {
+      return translate(str, this.$lang)
+    }
+  }
+}
+
 module.exports = {
   translate,
-  translations
+  translations,
+  translateMixin
 }
diff --git a/docs/about/index.md b/docs/about/index.md
@@ -1,4 +1,4 @@
-# About Ethereum.org
+# About Ethereum.org {#about-ethereumorg}
 
 Ethereum.org is a primary online resource for the Ethereum community. The purpose of the site is to **"Be the best portal to Ethereum for our growing global community"** - read more about what this means [here](https://github.com/ethereum/ethereum-org-website/blob/dev/purpose.md).