merging all conflicts

Author: react-translations-bot

content/docs/thinking-in-react.md

@@ -39,9 +39,13 @@ React 最棒的部分之一是引导我们思考如何构建一个应用。在
 
 在实践中，因为你经常是在向用户展示 JSON 数据模型，所以如果你的模型设计得恰当，UI（或者说组件结构）便会与数据模型一一对应，这是因为 UI 和数据模型都会倾向于遵守相同的*信息结构*。将 UI 分离为组件，其中每个组件需与数据模型的某部分匹配。
 
-![Component diagram](../images/blog/thinking-in-react-components.png)
+![Diagram showing nesting of components](../images/blog/thinking-in-react-components.png)
 
+<<<<<<< HEAD
 你会看到我们的应用中包含五个组件。我们已经将每个组件展示的数据标注为了斜体。
+=======
+You'll see here that we have five components in our app. We've italicized the data each component represents. The numbers in the image correspond to the numbers below.
+>>>>>>> a11c2534062bd79cc1e6e34db0e149f928df35bb
 
   1. **`FilterableProductTable` (橙色):** 是整个示例应用的整体
   2. **`SearchBar` (蓝色):** 接受所有的*用户输入*

content/images/blog/thinking-in-react-components.png

@@ -11,7 +11,7 @@ import {colors, fonts, media} from 'theme';
 import ExternalLinkSvg from 'templates/components/ExternalLinkSvg';
 
 const linkProps = {
-  href: 'https://www.surveymonkey.co.uk/r/673TZ7T',
+  href: 'https://surveys.savanta.com/survey/selfserve/21e3/210643?list=2',
   target: '_blank',
   rel: 'noopener',
 };
@@ -135,7 +135,11 @@ export default function Banner() {
             target="_blank"
             rel="noopener">
             <span css={{color: colors.brand}}>
+<<<<<<< HEAD
               参与 2020 社区问卷调查！
+=======
+              Take our 2021 Community Survey!
+>>>>>>> a11c2534062bd79cc1e6e34db0e149f928df35bb
             </span>
             <ExternalLinkSvg
               cssProps={{

src/components/Banner/Banner.js

@@ -62,11 +62,11 @@ export default class HTML extends React.Component<Props> {
                   }
 
                   activeBanner = {
-                    storageId: 'reactjs_banner_2020survey',
+                    storageId: 'reactjs_banner_2021survey',
                     normalHeight: 50,
                     smallHeight: 75,
-                    campaignStartDate: '2020-10-05T00:00:00Z', // the Z is for UTC
-                    campaignEndDate: '2020-10-19T00:00:00Z', // the Z is for UTC
+                    campaignStartDate: '2021-08-16T00:00:00Z', // the Z is for UTC
+                    campaignEndDate: '2021-08-31T00:00:00Z', // the Z is for UTC
                     snoozeForDays: 7,
                   };
 

src/html.js

@@ -14633,9 +14633,9 @@ tar-stream@^2.0.0:
     readable-stream "^3.1.1"
 
 tar@^6.0.2:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
-  integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"