Skip to content

Commit 514d157

Browse files
authored
Merge pull request #332 from reactjs/sync-bc91fe41
Sync with reactjs.org @ bc91fe4
2 parents f9be699 + 3cd1b3f commit 514d157

File tree

11 files changed

+91
-50
lines changed

11 files changed

+91
-50
lines changed

content/community/conferences.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ March 30 - 31, 2020 in San Francisco, CA
1717

1818
[Website](https://www.reactathon.com) - [Twitter](https://twitter.com/reactathon) - [Facebook](https://www.facebook.com/events/575942819854160/)
1919

20-
### React Summit Amsterdam 2020 {#react-summit-2020}
21-
September 11, 2020 in Amsterdam, The Netherlands
20+
### React Summit - Remote Edition 2020 {#react-summit-remote-2020}
21+
3pm CEST time, April 17, 2020 - remote event
2222

23-
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
23+
[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
2424

2525
### React Day Bangalore 2020 {#react-day-bangalore-2020}
2626
April 25, 2020 in Bangalore, India
@@ -82,11 +82,26 @@ September 5-6, 2020 in Wrocław, Poland
8282

8383
[Website](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/)
8484

85+
### React Summit Amsterdam 2020 {#react-summit-2020}
86+
September 8-11, 2020 in Amsterdam, The Netherlands
87+
88+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
89+
90+
### React Advanced 2020 {#react-advanced-2020}
91+
October 21-23, 2020 in London, UK
92+
93+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
94+
8595
### React India 2020 {#react-india-2020}
8696
November 6, 2020 in Mumbai, India
8797

8898
[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)
8999

100+
### React Day Berlin 2020 {#react-day-berlin-2020}
101+
November 25-27, 2020 in Berlin, Germany
102+
103+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
104+
90105
## Past Conferences {#past-conferences}
91106

92107
### React.js Conf 2015 {#reactjs-conf-2015}

content/community/courses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permalink: community/courses.html
88

99
## Free Courses {#free-courses}
1010

11-
- [Glitch: React Starter Kit](https://glitch.com/culture/react-starter-kit/) - A free, 5-part video course with interactive code examples that will help you learn React.
11+
- [Glitch: React Starter Kit](https://glitch.com/glimmer/post/react-starter-kit/) - A free, 5-part video course with interactive code examples that will help you learn React.
1212

1313
- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codecademy's introductory course for React.
1414

content/community/examples.md

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@ sectionid: community
66
permalink: community/examples.html
77
---
88

9-
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.
9+
There are many example projects created by the React community. We're keeping this page focused on the ones that use React without third-party state management libraries.
1010

11+
If you add a project, please commit to keeping it up to date with the latest versions of React.
12+
13+
## Small Examples
1114

12-
* **[Zeldog](https://yannsainty.github.io/Zeldog/)** A Zelda like game with a dog fighting ducks and more to eat pizza !
1315
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
14-
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
15-
* **[React Powered Hacker News Client](https://github.com/insin/react-hn)** A React & `react-router`-powered implementation of Hacker News using its Firebase API
16-
* **[Pokedex](https://github.com/alik0211/pokedex)** The list of Pokémon with live search
17-
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple e-commerce cart application built using React
18-
* **[Progressive Web Tetris](https://github.com/skidding/flatris)** Besides a beautiful, mobile-friendly implementation of Tetris, this project is a playground for integrating and experimenting with web technologies.
19-
* **[Product Comparison Page](https://github.com/Rhymond/product-compare-react)** Simple Product Compare page built in React
20-
* **[Hacker News Clone React/GraphQL](https://github.com/clintonwoo/hackernews-react-graphql)** Hacker News clone rewritten with universal JavaScript, using React and GraphQL
21-
* **[Bitcoin Price Index](https://github.com/mrkjlchvz/bitcoin-price-index)** Simple Bitcoin price index data from CoinDesk API
22-
* **[Builder Book](https://github.com/builderbook/builderbook)** Open-source web app to write and host documentation or sell books. Built with React, Material-UI, Next, Express, Mongoose, MongoDB.
23-
* **[GFonts Space](https://github.com/pankajladhar/GFontsSpace)** A space which allows user to play with Google fonts. Built with React, Redux and React-Router.
24-
* **[Course Learn Page](https://github.com/ulearnpro/ulearn)** Open Source LMS script in Laravel 5.8 and ReactJS 16.9
25-
* **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features.
26-
* **[Unit Converter](https://github.com/KarthikeyanRanasthala/react-unit-converter)** Minimal Yet Responsive Unit Converter Built With React, Material-UI & Convert-Units.
16+
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** React app for searching emoji
17+
* **[Snap Shot](https://github.com/Yog9/SnapShot)** A photo gallery with search
2718
* **[BMI Calculator](https://github.com/GermaVinsmoke/bmi-calculator)** A React Hooks app for calculating BMI
28-
* **[ReactJS Hangman Game](https://github.com/vetrivelcsamy/reactjs-hangman)** ReactJS Hangman Game Find a Programming Language.
29-
* **[Radix Converter](https://github.com/kumom/radix-converter)** A small tool that converts numbers in radix 2 to 36 with arbitrary precision.
19+
* **[Image Compressor](https://github.com/RaulB-masai/react-image-compressor)** An offline image compressor built with React and browser-image-compression
20+
* **[Counter App](https://github.com/arnab-datta/counter-app)** A small shopping cart example
21+
* **[Tutorial Solutions](https://github.com/harman052/react-tutorial-solutions)** Solutions to challenges mentioned at the end of React tutorial
22+
23+
## Complete Apps
24+
25+
* **[Hacker News Clone React/GraphQL](https://github.com/clintonwoo/hackernews-react-graphql)** Hacker News clone rewritten with universal JavaScript, using React and GraphQL
26+
* **[Builder Book](https://github.com/builderbook/builderbook)** Open-source web app to write and host documentation or sell books. Built with React, Material-UI, Next, Express, Mongoose, MongoDB

content/community/external-resources.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ React community には選定された多くの素晴らしいリソースがあ
1818

1919
- [Awesome React Talks](https://github.com/tiaanduplessis/awesome-react-talks) - React talks についての選定されたリストです。
2020

21+
- [Awesome React Videos](https://www.awesomereact.com) - すばらしい React 関連のビデオを集めたウェブサイトです。
22+
2123
- [Hero35 React Hub](https://hero35.com/topic/react) - React の*すべて*のカンファや講演がカテゴリ別に選定されて収録されているウェブサイトです。

content/community/team.md

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ Dominic is interested in travelling, drum and bass, stand-up comedy and spending
5454

5555
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.
5656

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-
6557
### Rachel Nabors {#rachel-nabors}
6658

6759
![Rachel](../images/team/rnabors.jpg)
@@ -78,14 +70,6 @@ Rachel wrote a [book about UI animation](https://abookapart.com/products/animati
7870

7971
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.
8072

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-
8973
### Yuzhi Zheng {#yuzhi-zheng}
9074

9175
![Yuzhi](../images/team/yuzhi.jpg)
@@ -120,13 +104,15 @@ React was originally created by [Jordan Walke](https://github.com/jordwalke). To
120104
* [Keyan Zhang](https://github.com/keyz)
121105
* [Nat Alison](https://github.com/tesseralis)
122106
* [Nathan Hunzaker](https://github.com/nhunzaker)
107+
* [Nicolas Gallagher](https://github.com/necolas)
123108
* [Paul O'Shannessy](https://github.com/zpao)
124109
* [Pete Hunt](https://github.com/petehunt)
125110
* [Philipp Spiess](https://github.com/philipp-spiess)
126111
* [Sander Spies](https://github.com/sanderspies)
112+
* [Sasha Aickin](https://github.com/aickin)
127113
* [Sophia Shoemaker](https://github.com/mrscobbler)
128114
* [Sophie Alpert](https://github.com/sophiebits)
129-
* [Sasha Aickin](https://github.com/aickin)
115+
* [Sunil Pai](https://github.com/threepointone)
130116
* [Tim Yung](https://github.com/yungsters)
131117

132118
This list is not exhaustive.

content/docs/cdn-links.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ id: cdn-links
33
title: CDN リンク
44
permalink: docs/cdn-links.html
55
prev: create-a-new-react-app.html
6-
next: hello-world.html
6+
next: release-channels.html
77
---
88

99
React および ReactDOM は CDN を介して利用することができます。

content/docs/faq-ajax.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,50 @@ class MyComponent extends React.Component {
8181
}
8282
}
8383
```
84+
85+
Here is the equivalent with [Hooks](https://reactjs.org/docs/hooks-intro.html):
86+
87+
```js
88+
function MyComponent() {
89+
const [error, setError] = useState(null);
90+
const [isLoaded, setIsLoaded] = useState(false);
91+
const [items, setItems] = useState([]);
92+
93+
// Note: the empty deps array [] means
94+
// this useEffect will run once
95+
// similar to componentDidMount()
96+
useEffect(() => {
97+
fetch("https://api.example.com/items")
98+
.then(res => res.json())
99+
.then(
100+
(result) => {
101+
setIsLoaded(true);
102+
setItems(result.items);
103+
},
104+
// Note: it's important to handle errors here
105+
// instead of a catch() block so that we don't swallow
106+
// exceptions from actual bugs in components.
107+
(error) => {
108+
setIsLoaded(true);
109+
setError(error);
110+
}
111+
)
112+
}, [])
113+
114+
if (error) {
115+
return <div>Error: {error.message}</div>;
116+
} else if (!isLoaded) {
117+
return <div>Loading...</div>;
118+
} else {
119+
return (
120+
<ul>
121+
{items.map(item => (
122+
<li key={item.name}>
123+
{item.name} {item.price}
124+
</li>
125+
))}
126+
</ul>
127+
);
128+
}
129+
}
130+
```

content/docs/forms.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,7 @@ class NameForm extends React.Component {
6868

6969
フォーム要素の `value` 属性が設定されているので、表示される値は常に `this.state.value` となり、React の state が信頼できる情報源となります。`handleChange` はキーストロークごとに実行されて React の state を更新するので、表示される値はユーザがタイプするたびに更新されます。
7070

71-
制御されたコンポーネントを使うと、すべての state の変更には紐付けられたハンドラ関数が存在することになります。これによりユーザ入力の改変や検証が簡単になります。例えば、名前が全て大文字で書かれるように強制したいなら、`handleChange` を次のように書くことができます:
72-
73-
```javascript{2}
74-
handleChange(event) {
75-
this.setState({value: event.target.value.toUpperCase()});
76-
}
77-
```
71+
制御されたコンポーネントを使うと、ユーザ入力の値は常に React の state によって制御されるようになります。これによりタイプするコード量は少し増えますが、その値を他の UI 要素に渡したり、他のイベントハンドラからリセットしたりできるようになります。
7872

7973
## textarea タグ {#the-textarea-tag}
8074

content/languages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
- name: Persian
4343
translated_name: فارسی
4444
code: fa
45-
status: 0
45+
status: 1
4646
- name: French
4747
translated_name: Français
4848
code: fr
@@ -66,7 +66,7 @@
6666
- name: Hungarian
6767
translated_name: magyar
6868
code: hu
69-
status: 1
69+
status: 2
7070
- name: Armenian
7171
translated_name: Հայերեն
7272
code: hy

examples/uncontrolled-components/input-type-file.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class FileInput extends React.Component {
66
this.fileInput = React.createRef();
77
}
88
handleSubmit(event) {
9-
// highlight-range{4}
9+
// highlight-range{3}
1010
event.preventDefault();
1111
alert(
1212
`Selected file - ${this.fileInput.current.files[0].name}`

src/components/LayoutFooter/Footer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
122122
},
123123
}}>
124124
<a
125-
href="https://code.facebook.com/projects/"
125+
href="https://opensource.facebook.com/projects/"
126126
target="_blank"
127127
rel="noopener">
128128
<img

0 commit comments

Comments
 (0)