Skip to content

Commit 6caf852

Browse files
authored
Merge pull request #12 from reactjs/master
Обновление репозитория.
2 parents 4cf142c + 0884ae1 commit 6caf852

Some content is hidden

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

46 files changed

+257
-93
lines changed

content/community/conferences.md

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### React Summit 2019 {#reactsummit2019}
16-
November 30, 2019 in Lagos, Nigeria
17-
18-
[Website](https://reactsummit2019.splashthat.com) -[Twitter](https://twitter.com/react_summit)
19-
20-
### React Day Berlin 2019 {#react-day-berlin-2019}
21-
December 6, 2019 in Berlin, Germany
22-
23-
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
24-
2515
### React Barcamp Cologne 2020 {#react-barcamp-cologne-2020}
2616
February 1-2, 2020 in Cologne, Germany
2717

@@ -32,6 +22,16 @@ February 27 & 28, 2020 in Sydney, Australia
3222

3323
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
3424

25+
### ReactConf Japan 2020 {#reactconfjp-2020}
26+
March 21, 2020 in Tokyo, Japan
27+
28+
[Website](https://reactconf.jp/) - [Twitter](https://twitter.com/reactjapanconf)
29+
30+
### Reactathon 2020 {#reactathon-2020}
31+
March 30 - 31, 2020 in San Francisco, CA
32+
33+
[Website](https://www.reactathon.com) - [Twitter](https://twitter.com/reactathon) - [Facebook](https://www.facebook.com/events/575942819854160/)
34+
3535
### React Summit Amsterdam 2020 {#react-summit-2020}
3636
April 15-17, 2020 in Amsterdam, The Netherlands
3737

@@ -45,12 +45,12 @@ April 23 - 24, 2020 in Kraków, Poland
4545
### React Day Bangalore 2020 {#react-day-bangalore-2020}
4646
April 25, 2020 in Bangalore, India
4747

48-
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn)
48+
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn) - [LinkedIn](https://www.linkedin.com/company/react-day/)
4949

5050
### render(ATL) 2020 {#render-atlanta-2020}
5151
May 4-6, 2020. Atlanta, GA, USA.
5252

53-
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
53+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
5454

5555
### ReactEurope 2020 {#reacteurope-2020}
5656
May 14-15, 2020 in Paris, France
@@ -65,7 +65,7 @@ May 26-29 in Helsinki, Finland
6565
### React Next 2020 {#react-next-2020}
6666
June 15, 2020. Tel Aviv, Israel.
6767

68-
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
68+
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
6969

7070
### React Loop 2020 {#react-loop-2020}
7171
June 19, 2020. Chicago, Illinois, USA.
@@ -75,8 +75,22 @@ June 19, 2020. Chicago, Illinois, USA.
7575
### React Week NY 2020 {#react-week-ny-2020}
7676
July 17, 2020. New York City, USA.
7777

78-
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
78+
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
79+
80+
### React La Conferencia 2020 {#react-la-conferencia-2020}
81+
July 18, 2020. Medellín, Colombia.
7982

83+
[Website](https://reactlaconf.co/) - [Twitter](https://twitter.com/reactlaconf)
84+
85+
### ComponentsConf 2020 {#components20}
86+
September 1, 2020 in Melbourne, Australia
87+
88+
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/ComponentsConf) - [Facebook](https://www.facebook.com/ComponentsConf/) - [LinkedIn](https://www.linkedin.com/company/componentsconf/) - [YouTube](https://www.youtube.com/ComponentsConf)
89+
90+
### React India 2020 {#react-india-2020}
91+
November 6, 2020 in Mumbai, India
92+
93+
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos)
8094

8195
## Past Conferences {#past-conferences}
8296

@@ -417,8 +431,8 @@ August 22-23, 2019. Salt Lake City, USA.
417431

418432
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
419433

420-
### React Conf Iran 2019 {#react-conf-iran-2019}
421-
August 29, 2019. Tehran, Iran.
434+
### React Conf Iran 2019 {#react-conf-iran-2019}
435+
August 29, 2019. Tehran, Iran.
422436

423437
[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights)
424438

@@ -472,3 +486,13 @@ October 19, 2019 in São Paulo, BR
472486

473487
[Website](https://reactconf.com.br/) - [Twitter](https://twitter.com/reactconfbr) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Slack](https://react.now.sh/)
474488

489+
### React Summit 2019 {#reactsummit2019}
490+
November 30, 2019 in Lagos, Nigeria
491+
492+
[Website](https://reactsummit2019.splashthat.com) -[Twitter](https://twitter.com/react_summit)
493+
494+
### React Day Berlin 2019 {#react-day-berlin-2019}
495+
December 6, 2019 in Berlin, Germany
496+
497+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
498+

content/community/examples.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ permalink: community/examples.html
99
There are many example projects created by the React community. Feel free to add your own project. If you add a project, please commit to keeping it up to date with the latest versions of React.
1010

1111

12+
* **[Zeldog](https://yannsainty.github.io/Zeldog/)** A Zelda like game with a dog fighting ducks and more to eat pizza !
1213
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
1314
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
1415
* **[GitHub Battle App](https://tm.dev/react-course-project/)** Battle two GitHub users and see the most popular Github projects for any language.

content/community/external-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ There are many wonderful curated resources the React community has put together.
1818

1919
- [Awesome React Talks](https://github.com/tiaanduplessis/awesome-react-talks) - A curated list of React talks.
2020

21-
- [Hero35 React Hub](https://hero35.com/stack/react) - A website with _all_ React conferences and talks, categorized & curated.
21+
- [Hero35 React Hub](https://hero35.com/topic/react) - A website with _all_ React conferences and talks, categorized & curated.

content/community/meetups.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ permalink: community/meetups.html
88

99
Do you have a local React.js meetup? Add it here! (Please keep the list alphabetical)
1010

11+
## Argentina {#argentina}
12+
* [Rosario](https://www.meetup.com/es/reactrosario)
13+
1114
## Australia {#australia}
1215
* [Brisbane](https://www.meetup.com/reactbris/)
1316
* [Melbourne](https://www.meetup.com/React-Melbourne/)
@@ -92,6 +95,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
9295
* [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
9396

9497
## Malaysia {#malaysia}
98+
* [Kuala Lumpur](https://www.kl-react.com/)
9599
* [Penang](https://www.facebook.com/groups/reactpenang/)
96100

97101
## Netherlands {#netherlands}
@@ -134,6 +138,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
134138
## Sweden {#sweden}
135139
* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
136140

141+
## Switzerland {#switzerland}
142+
* [Zurich](https://www.meetup.com/Zurich-ReactJS-Meetup/)
143+
137144
## Ukraine {#ukraine}
138145
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
139146

@@ -145,6 +152,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
145152
* [Charlotte, NC - ReactJS](https://www.meetup.com/ReactJS-Charlotte/)
146153
* [Charlotte, NC - React Native](https://www.meetup.com/cltreactnative/)
147154
* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
155+
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
148156
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
149157
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
150158
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
@@ -167,6 +175,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
167175
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
168176
* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
169177
* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
178+
* [San Diego, CA - San Diego JS](https://www.meetup.com/sandiegojs/)
170179
* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
171180
* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
172181
* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)

content/community/nav.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
items:
33
- id: support
44
title: Support
5+
- id: team
6+
title: Team
57
- id: courses
68
title: Courses
79
- id: examples

content/community/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ React имеет сообщество из миллионов разработч
1717
* [react_js](https://telegram.me/react_js) - самое крупное русскоговорящее сообщество по React
1818
* [react_ru](http://t.me/react_ru) - независимое сообщество React-разработчиков на русском языке
1919

20-
Before participating in React's communities, [please read our Code of Conduct](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md). We have adopted the [Contributor Covenant](https://www.contributor-covenant.org/) and we expect that all community members adhere to the guidelines within.
20+
Прежде чем вступить в React сообщество, пожалуйста, [прочтите правила поведения](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md). Также мы приняли [соглашение участника](https://www.contributor-covenant.org/) и ожидаем, что все участники сообщества будут его придерживаться.
2121

2222
## Stack Overflow {#stack-overflow}
2323

content/community/team.md

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
---
2+
id: team
3+
title: Team
4+
layout: community
5+
sectionid: community
6+
permalink: community/team.html
7+
---
8+
9+
React development is led by a small dedicated team working full time at Facebook. It also receives contributions from people all over the world.
10+
11+
## Meet the React Team {#meet-the-react-team}
12+
13+
The React team members work full time on the core component APIs, the engine that powers React DOM and React Native, React DevTools, and the React documentation website.
14+
15+
Current members of the React team are listed in alphabetical order below.
16+
17+
### Andrew Clark {#andrew-clark}
18+
19+
![Andrew Clark](../images/team/acdlite.jpg)
20+
21+
[@acdlite on GitHub](https://github.com/acdlite) · [@acdlite on Twitter](https://twitter.com/acdlite)
22+
23+
Andrew got started with web development by making sites with WordPress, and eventually tricked himself into doing JavaScript. His favorite pastime is karaoke. Andrew is either a Disney villain or a Disney princess, depending on the day.
24+
25+
### Brian Vaughn {#brian-vaughn}
26+
27+
![Brian Vaughn](../images/team/bvaughn.jpg)
28+
29+
[@bvaughn on GitHub](https://github.com/bvaughn) · [@brian\_d\_vaughn on Twitter](https://twitter.com/brian_d_vaughn)
30+
31+
Brian studied art in college and did programming on the side to pay for his education. Eventually, he realized that he enjoys working on open source. Brian has one [one-person band](https://soundcloud.com/brianvaughn/) and two [two-person](https://soundcloud.com/pilotlessdrone) [bands](https://soundcloud.com/pinwurm). He also takes care of the cutest cat in the world.
32+
33+
### Dan Abramov {#dan-abramov}
34+
35+
![Dan Abramov](../images/team/gaearon.jpg)
36+
37+
[@gaearon on GitHub](https://github.com/gaearon) · [@dan_abramov on Twitter](https://twitter.com/dan_abramov)
38+
39+
Dan got into programming after he accidentally discovered Visual Basic inside Microsoft PowerPoint. He has found his true calling in turning [Sebastian](#sebastian-markbage)'s tweets into long-form blog posts. Dan occasionally wins at Fortnite by hiding in a bush until the game ends.
40+
41+
### Dominic Gannaway {#dominic-gannaway}
42+
43+
![Dominic](../images/team/trueadm.jpg)
44+
45+
[@trueadm on GitHub](https://github.com/trueadm) · [@trueadm on Twitter](https://twitter.com/trueadm)
46+
47+
Dominic is interested in travelling, drum and bass, stand-up comedy and spending time with the family. He most enjoys hacking on new unexplored ideas around UIs and accessibility and has a passion for tweaking and optimizing code to get the most performance out of things.
48+
49+
### Luna Ruan {#luna-ruan}
50+
51+
![Luna](../images/team/lunaruan.jpg)
52+
53+
[@lunaruan on GitHub](https://github.com/lunaruan) · [@lunaruan on Twitter](https://twitter.com/lunaruan)
54+
55+
Luna learned programming because she thought it meant creating video games. Instead, she ended up working on the Pinterest web app, and now on React itself. Luna doesn't want to make video games anymore, but she plans to do creative writing if she ever gets bored.
56+
57+
### Nicolas Gallagher {#nicolas-gallagher}
58+
59+
![Nicolas](../images/team/necolas.jpg)
60+
61+
[@necolas on GitHub](https://github.com/necolas) · [@necolas on Twitter](https://twitter.com/necolas)
62+
63+
Nicolas has majored in anthropology. He started in web development by building a website for a friend, and eventually found himself rebuilding the Twitter website with React. Nicolas describes himself as boring on paper, not much better in real life.
64+
65+
### Rachel Nabors {#rachel-nabors}
66+
67+
![Rachel](../images/team/rnabors.jpg)
68+
69+
[@rachelnabors on GitHub](https://github.com/rachelnabors) · [@rachelnabors on Twitter](https://twitter.com/rachelnabors)
70+
71+
Rachel wrote a [book about UI animation](https://abookapart.com/products/animation-at-work) once and worked with MDN and the W3C on the web animations API. Now she is busy with education materials and community engineering on the React team. Secretly, she is an award-winning cartoonist for teenage girls. Catch her making fancy tea with lukewarm water in the microkitchen.
72+
73+
### Sebastian Markbåge {#sebastian-markbage}
74+
75+
![Sebastian](../images/team/sebmarkbage.jpg)
76+
77+
[@sebmarkbage on GitHub](https://github.com/sebmarkbage) · [@sebmarkbage on Twitter](https://twitter.com/sebmarkbage)
78+
79+
Sebastian majored in psychology. He's usually quiet. Even when he says something, it often doesn't make sense to the rest of us until a few months later. The correct way to pronounce his surname is "mark-boa-geh" but he settled for "mark-beige" out of pragmatism -- and that's how he approaches React.
80+
81+
### Sunil Pai {#sunil-pai}
82+
83+
![Sunil](../images/team/threepointone.jpg)
84+
85+
[@threepointone on GitHub](https://github.com/threepointone) · [@threepointone on Twitter](https://twitter.com/threepointone)
86+
87+
Sunil started writing JavaScript for IE6 and still has some regrets about it. He worked in consulting, design, and product firms, before joining the React team to help others do the same. Sunil plays a blue Les Paul guitar, loves London, and would appreciate a response to his last ping, please and thank you!
88+
89+
### Yuzhi Zheng {#yuzhi-zheng}
90+
91+
![Yuzhi](../images/team/yuzhi.jpg)
92+
93+
[@yuzhi on GitHub](https://github.com/yuzhi) · [@yuzhiz on Twitter](https://twitter.com/yuzhiz)
94+
95+
Yuzhi studied Computer Science in school. She liked the instant gratification of seeing code come to life without having to physically be in a laboratory. Now she manages the React team. Before management, she used to work on the Relay data fetching framework. In her spare time, Yuzhi enjoys optimizing her life via gardening and home improvement projects.
96+
97+
## Acknowledgements {#acknowledgements}
98+
99+
React was originally created by [Jordan Walke](https://github.com/jordwalke). Today, React has over a thousand open source contributors. We'd like to recognize a few people who have made significant contributions to React and its documentation in the past and have helped maintain them over the years:
100+
101+
* [Almero Steyn](https://github.com/AlmeroSteyn)
102+
* [Andreas Svensson](https://github.com/syranide)
103+
* [Alex Krolick](https://github.com/alexkrolick)
104+
* [Alexey Pyltsyn](https://github.com/lex111)
105+
* [Brandon Dail](https://github.com/aweary)
106+
* [Caleb Meredith](https://github.com/calebmer)
107+
* [Chang Yan](https://github.com/cyan33)
108+
* [Cheng Lou](https://github.com/chenglou)
109+
* [Christoph Nakazawa](https://github.com/cpojer)
110+
* [Christopher Chedeau](https://github.com/vjeux)
111+
* [Clement Hoang](https://github.com/clemmy)
112+
* [Flarnie Marchan](https://github.com/flarnie)
113+
* [Jason Quense](https://github.com/jquense)
114+
* [Jesse Beach](https://github.com/jessebeach)
115+
* [Jessica Franco](https://github.com/Jessidhia)
116+
* [Jim Sproch](https://github.com/jimfb)
117+
* [Josh Duck](https://github.com/joshduck)
118+
* [Joe Critchley](https://github.com/joecritch)
119+
* [Jeff Morrison](https://github.com/jeffmo)
120+
* [Keyan Zhang](https://github.com/keyz)
121+
* [Nat Alison](https://github.com/tesseralis)
122+
* [Nathan Hunzaker](https://github.com/nhunzaker)
123+
* [Paul O'Shannessy](https://github.com/zpao)
124+
* [Pete Hunt](https://github.com/petehunt)
125+
* [Philipp Spiess](https://github.com/philipp-spiess)
126+
* [Sander Spies](https://github.com/sanderspies)
127+
* [Sophia Shoemaker](https://github.com/mrscobbler)
128+
* [Sophie Alpert](https://github.com/sophiebits)
129+
* [Sasha Aickin](https://github.com/aickin)
130+
* [Tim Yung](https://github.com/yungsters)
131+
132+
This list is not exhaustive.
133+
134+
We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We'd also like to thank all the volunteers who [translated React into other languages](https://isreacttranslatedyet.com/).

content/docs/addons-shallow-compare.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var shallowCompare = require('react-addons-shallow-compare'); // ES5 with npm
1919

2020
## Обзор {#overview}
2121

22-
Перед появленияем [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) `shallowCompare` использовался для того же, что и [`PureRenderMixin`](pure-render-mixin.html) при использовании ES6-классов с React.
22+
Перед появлением [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) `shallowCompare` использовался для того же, что и [`PureRenderMixin`](pure-render-mixin.html) при использовании ES6-классов с React.
2323

2424
Если функция рендера React-компонента является «чистой» (возвращается тот же результат при таких же пропсах и состоянии), вы можете в некоторых случаях использовать эту функцию для повышения производительности.
2525

content/docs/code-splitting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ import("./math").then(math => {
102102

103103
> Примечание:
104104
>
105-
> Возможности `React.lazy` и задержки (suspense) пока недоступны для рендеринга на стороне сервера. Если вам нужно разделение кода в серверном приложении, мы рекомендуем [Loadable Components](https://github.com/smooth-code/loadable-components). У них есть хорошее [руководство по разделению бандла](https://www.smooth-code.com/open-source/loadable-components/docs/server-side-rendering/) с серверным рендерингом.
105+
> Возможности `React.lazy` и задержки (suspense) пока недоступны для рендеринга на стороне сервера. Если вам нужно разделение кода в серверном приложении, мы рекомендуем [Loadable Components](https://github.com/gregberge/loadable-components). У них есть хорошее [руководство по разделению бандла](https://loadable-components.com/docs/server-side-rendering/) с серверным рендерингом.
106106
107107
Функция `React.lazy` позволяет рендерить динамический импорт как обычный компонент.
108108

0 commit comments

Comments
 (0)