Skip to content

Commit 84d59aa

Browse files
authored
Merge pull request #966 from ethereum/dev
Deploy v1.5.0
2 parents 215e051 + 79d3633 commit 84d59aa

File tree

57 files changed

+2164
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2164
-172
lines changed

.all-contributorsrc

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@
321321
"avatar_url": "https://avatars0.githubusercontent.com/u/9390255?v=4",
322322
"profile": "http://www.twitter.com/timbeiko",
323323
"contributions": [
324-
"content"
324+
"content",
325+
"review"
325326
]
326327
},
327328
{
@@ -1479,6 +1480,33 @@
14791480
"contributions": [
14801481
"code"
14811482
]
1483+
},
1484+
{
1485+
"login": "anettrolikova",
1486+
"name": "Anett Rolikova ",
1487+
"avatar_url": "https://avatars1.githubusercontent.com/u/44020788?v=4",
1488+
"profile": "https://twitter.com/AnettRolikova",
1489+
"contributions": [
1490+
"content"
1491+
]
1492+
},
1493+
{
1494+
"login": "poojaranjan",
1495+
"name": "Pooja Ranjan",
1496+
"avatar_url": "https://avatars0.githubusercontent.com/u/29681685?v=4",
1497+
"profile": "https://etherworld.co",
1498+
"contributions": [
1499+
"content"
1500+
]
1501+
},
1502+
{
1503+
"login": "sassal",
1504+
"name": "sassal",
1505+
"avatar_url": "https://avatars0.githubusercontent.com/u/9276959?v=4",
1506+
"profile": "https//twitter.com/sassal0x",
1507+
"contributions": [
1508+
"content"
1509+
]
14821510
}
14831511
],
14841512
"contributorsPerLine": 7,

README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
2-
[![All Contributors](https://img.shields.io/badge/all_contributors-160-orange.svg?style=flat-square)](#contributors)
2+
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-163-orange.svg?style=flat-square)](#contributors)
4+
35
<!-- ALL-CONTRIBUTORS-BADGE:END -->
46

57
<h1 align="center" style="margin-top: 1em; margin-bottom: 3em;">
68
<p><a href="https://ethereum.org"><img alt="ethereum logo" src="./eth.png" alt="ethereum.org" width="125"></a></p>
79
<p>👋 Welcome to ethereum.org!</p>
810
</h1>
911

10-
[Ethereum.org](https://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).
12+
[Ethereum.org](https://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://ethereum.org/about/purpose/).
1113

1214
[Ethereum.org](https://ethereum.org) is improved and changed over time through the contributions of community members who submit content, give feedback, or volunteer their time to managing its evolution. If you’re interested in helping to improve [ethereum.org](https://ethereum.org), start here. This contribution guide will help you get started.
1315

@@ -272,7 +274,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
272274
<td align="center"><a href="http://shanejonas.net"><img src="https://avatars2.githubusercontent.com/u/364566?v=4" width="100px;" alt=""/><br /><sub><b>Shane</b></sub></a><br /><a href="#content-shanejonas" title="Content">🖋</a></td>
273275
<td align="center"><a href="https://shazow.net/"><img src="https://avatars3.githubusercontent.com/u/6292?v=4" width="100px;" alt=""/><br /><sub><b>Andrey Petrov</b></sub></a><br /><a href="#content-shazow" title="Content">🖋</a> <a href="#ideas-shazow" title="Ideas, Planning, & Feedback">🤔</a> <a href="#a11y-shazow" title="Accessibility">️️️️♿️</a></td>
274276
<td align="center"><a href="https://twitter.com/smpalladino"><img src="https://avatars2.githubusercontent.com/u/429604?v=4" width="100px;" alt=""/><br /><sub><b>Santiago Palladino</b></sub></a><br /><a href="#content-spalladino" title="Content">🖋</a></td>
275-
<td align="center"><a href="http://www.twitter.com/timbeiko"><img src="https://avatars0.githubusercontent.com/u/9390255?v=4" width="100px;" alt=""/><br /><sub><b>Tim Beiko</b></sub></a><br /><a href="#content-timbeiko" title="Content">🖋</a></td>
277+
<td align="center"><a href="http://www.twitter.com/timbeiko"><img src="https://avatars0.githubusercontent.com/u/9390255?v=4" width="100px;" alt=""/><br /><sub><b>Tim Beiko</b></sub></a><br /><a href="#content-timbeiko" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Atimbeiko" title="Reviewed Pull Requests">👀</a></td>
276278
</tr>
277279
<tr>
278280
<td align="center"><a href="https://wanseob.com"><img src="https://avatars2.githubusercontent.com/u/8542397?v=4" width="100px;" alt=""/><br /><sub><b>Wanseob Lim</b></sub></a><br /><a href="#content-wanseob" title="Content">🖋</a> <a href="#translation-wanseob" title="Translation">🌍</a></td>
@@ -434,11 +436,17 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
434436
<td align="center"><a href="https://github.com/evertonfraga"><img src="https://avatars2.githubusercontent.com/u/47108?v=4" width="100px;" alt=""/><br /><sub><b>Ev</b></sub></a><br /><a href="#ideas-evertonfraga" title="Ideas, Planning, & Feedback">🤔</a></td>
435437
<td align="center"><a href="https://discord.gg/5W5tVb3"><img src="https://avatars2.githubusercontent.com/u/6251510?v=4" width="100px;" alt=""/><br /><sub><b>Ivan Martinez</b></sub></a><br /><a href="#content-0xKiwi" title="Content">🖋</a></td>
436438
<td align="center"><a href="https://github.com/sebastiantf"><img src="https://avatars3.githubusercontent.com/u/36922376?v=4" width="100px;" alt=""/><br /><sub><b>Sebastian T F</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=sebastiantf" title="Code">💻</a></td>
439+
<td align="center"><a href="https://twitter.com/AnettRolikova"><img src="https://avatars1.githubusercontent.com/u/44020788?v=4" width="100px;" alt=""/><br /><sub><b>Anett Rolikova </b></sub></a><br /><a href="#content-anettrolikova" title="Content">🖋</a></td>
440+
</tr>
441+
<tr>
442+
<td align="center"><a href="https://etherworld.co"><img src="https://avatars0.githubusercontent.com/u/29681685?v=4" width="100px;" alt=""/><br /><sub><b>Pooja Ranjan</b></sub></a><br /><a href="#content-poojaranjan" title="Content">🖋</a></td>
443+
<td align="center"><a href="https//twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4" width="100px;" alt=""/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
437444
</tr>
438445
</table>
439446

440447
<!-- markdownlint-enable -->
441448
<!-- prettier-ignore-end -->
449+
442450
<!-- ALL-CONTRIBUTORS-LIST:END -->
443451

444452
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
<template>
2+
<div>
3+
<h2 class="l2">Request a feature</h2>
4+
Do you have an idea for how to improve ethereum.org?
5+
<ul>
6+
<li>
7+
<a
8+
target="_blank"
9+
rel="noopener noreferrer"
10+
href="https://github.com/ethereum/ethereum-org-website/issues/new/choose"
11+
>
12+
Create an issue on Github</a
13+
>
14+
</li>
15+
<li>
16+
<a
17+
target="_blank"
18+
rel="noopener noreferrer"
19+
href="https://twitter.com/ethdotorg"
20+
>
21+
Reach out to us on Twitter</a
22+
>
23+
</li>
24+
</ul>
25+
<h2 class="l2">Ethereum.org Roadmap</h2>
26+
<p>
27+
Ever since the launch of ethereum.org, we strive to be transparent about
28+
how we operate. This is one of our core values, as we believe transparency
29+
is crucial to Ethereum's success. The
30+
<a
31+
target="_blank"
32+
rel="noopener noreferrer"
33+
href="https://github.com/ethereum/ethereum-org-website/blob/master/LICENSE"
34+
>
35+
source code of this repository is licensed under the MIT License</a
36+
>.
37+
</p>
38+
<p>
39+
We use
40+
<a
41+
target="_blank"
42+
rel="noopener noreferrer"
43+
href="https://github.com/ethereum/ethereum-org-website"
44+
>
45+
GitHub</a
46+
>
47+
as our primary project management tool. We organize our tasks in 3
48+
categories; in progress, planned and implemented. We do our best to keep
49+
the community informed what the status is of a specific task.
50+
</p>
51+
52+
<h3 class="l3">Work in progress</h3>
53+
<p>
54+
Tasks that we're implementing.
55+
<a
56+
target="_blank"
57+
rel="noopener noreferrer"
58+
href="https://github.com/ethereum/ethereum-org-website/issues?q=is%3Aissue+is%3Aopen+label%3A%22Status%3A+In+Progress%22"
59+
>
60+
View the full list of tasks in progress on Github </a
61+
>.
62+
</p>
63+
<div class="flex flex-wrap m-0 mt-2 mb-2">
64+
<div
65+
class="issue-item w-100 ma-1 pt-1 pb-1 pr-1 pl-1 border-box-shadow-hover hide-icon"
66+
v-for="issue in inProgress"
67+
:key="issue.number"
68+
>
69+
<div class="l4 mb-2">{{ issue.title }}</div>
70+
71+
<div v-if="issue.errorMsg" class="issue-content">
72+
<div>{{ issue.errorMsg }}</div>
73+
</div>
74+
<div v-else class="issue-content">
75+
<div>Task #{{ issue.number }}</div>
76+
<a :href="issue.html_url" target="_blank" rel="noopener noreferrer">
77+
Discuss
78+
</a>
79+
</div>
80+
</div>
81+
</div>
82+
83+
<h3 class="l3">Planned features</h3>
84+
<p>
85+
Tasks we've queued up to implement next.
86+
<a
87+
target="_blank"
88+
rel="noopener noreferrer"
89+
href="https://github.com/ethereum/ethereum-org-website/issues?q=is%3Aissue+is%3Aopen+label%3A%22Status%3A+Up+Next%22"
90+
>
91+
View the full list of planned tasks on Github </a
92+
>.
93+
</p>
94+
<div class="flex flex-wrap m-0 mt-2 mb-2">
95+
<div
96+
class="issue-item w-100 ma-1 pt-1 pb-1 pr-1 pl-1 border-box-shadow-hover hide-icon"
97+
v-for="issue in planned"
98+
:key="issue.number"
99+
>
100+
<div class="l4 mb-2">{{ issue.title }}</div>
101+
102+
<div v-if="issue.errorMsg" class="issue-content">
103+
<div>{{ issue.errorMsg }}</div>
104+
</div>
105+
<div v-else class="issue-content">
106+
<div>Task #{{ issue.number }}</div>
107+
<a :href="issue.html_url" target="_blank" rel="noopener noreferrer">
108+
Discuss
109+
</a>
110+
</div>
111+
</div>
112+
</div>
113+
<h3 class="l3">Implemented features</h3>
114+
<p>
115+
Recently completed tasks.
116+
<a
117+
target="_blank"
118+
rel="noopener noreferrer"
119+
href="https://github.com/ethereum/ethereum-org-website/issues?q=is%3Aissue+is%3Aclosed"
120+
>
121+
View the full list of implemented tasks on Github </a
122+
>.
123+
</p>
124+
125+
<div class="flex flex-wrap m-0 mt-2 mb-2">
126+
<div
127+
class="issue-item w-100 ma-1 pt-1 pb-1 pr-1 pl-1 border-box-shadow-hover hide-icon"
128+
v-for="issue in implemented"
129+
:key="issue.number"
130+
>
131+
<div class="l4 mb-2">{{ issue.title }}</div>
132+
133+
<div v-if="issue.errorMsg" class="issue-content">
134+
<div>{{ issue.errorMsg }}</div>
135+
</div>
136+
<div v-else class="issue-content">
137+
<div>Task #{{ issue.number }}</div>
138+
<a :href="issue.html_url" target="_blank" rel="noopener noreferrer">
139+
Discuss
140+
</a>
141+
</div>
142+
</div>
143+
</div>
144+
</div>
145+
</template>
146+
147+
<script>
148+
import { translations } from '../theme/utils/translations'
149+
const axios = require('axios')
150+
151+
export default {
152+
data() {
153+
const issue = {
154+
title: 'Loading...'
155+
}
156+
const issues = Array(6).fill(issue)
157+
return {
158+
inProgress: issues,
159+
planned: issues,
160+
implemented: issues
161+
}
162+
},
163+
164+
mounted() {
165+
axios
166+
.get('/.netlify/functions/roadmap')
167+
.then(response => {
168+
let issues = []
169+
if (response.data && response.data.data) {
170+
issues = response.data.data
171+
this.inProgress = issues
172+
.filter(issue => {
173+
// if is an open PR
174+
if (!!issue.pull_request && issue.state === 'open') {
175+
return true
176+
}
177+
178+
// if issue is in progress
179+
for (const label of issue.labels) {
180+
if (label.name === 'Status: In Progress') {
181+
return true
182+
}
183+
}
184+
return false
185+
})
186+
.slice(0, 6)
187+
188+
this.planned = issues
189+
.filter(issue => {
190+
for (const label of issue.labels) {
191+
if (label.name === 'Status: Up Next') {
192+
return true
193+
}
194+
}
195+
})
196+
.slice(0, 6)
197+
198+
this.implemented = issues
199+
.filter(issue => {
200+
return (
201+
issue.state === 'closed' &&
202+
'allcontributors[bot]' !== issue.user.login
203+
)
204+
})
205+
.slice(0, 6)
206+
}
207+
})
208+
.catch(error => {
209+
const errorIssue = {
210+
title: 'Loading error.',
211+
errorMsg: 'Please refresh the page.'
212+
}
213+
const errorIssues = Array(3).fill(errorIssue)
214+
this.inProgress = errorIssues
215+
this.planned = errorIssues
216+
this.implemented = errorIssues
217+
})
218+
}
219+
}
220+
</script>
221+
222+
<style lang="stylus" scoped>
223+
@import '../theme/styles/config.styl';
224+
225+
// TODO use Card component vs. these styles
226+
.issue-item
227+
flex 0 1 260px
228+
list-style none
229+
border-radius .5rem
230+
width 100%
231+
232+
display: flex
233+
flex-direction: column
234+
justify-content: space-between
235+
236+
& > h3:before
237+
display none
238+
239+
.issue-content
240+
display: flex
241+
justify-content: space-between
242+
243+
#wrapper.dark-mode
244+
.issue-item
245+
&:hover
246+
border 1px dotted $colorPrimaryDark500
247+
248+
@media (max-width: $breakXS)
249+
.issue-item
250+
margin 0
251+
margin-top 1rem
252+
flex 1 1 260px
253+
</style>

0 commit comments

Comments
 (0)