Merge branch 'wikipedia'

2018-12-15 16:51:21 +01:00
parent 9eca8afd9a c7b4f0c347
commit 1b022cc4b3
6 changed files with 217 additions and 82 deletions
@@ -178,9 +178,19 @@ class VideoInfo extends Component {
                    </ul>
                </Tab>
                <Tab eventKey={4} title="Wikipedia">
-                    <div>
-
-                    </div>
+								<Wikipedia
+									title={
+										this.props.location.state
+											? this.props.location.state.title
+											: this.state.others.title
+									}
+									artist={
+										this.props.location.state
+											? this.props.location.state.artist
+											: this.state.others.artist
+									}
+									videoId={this.props.match.params.id}
+								/>
                </Tab>
            </Tabs>
        </Col>
@@ -197,4 +207,4 @@ VideoInfo.propTypes = {

 };

-export default VideoInfo;
+export default VideoInfo;