Merge branch 'layout1' of https://bitbucket.org/sco44/tecnologiabanana into layout1

# Conflicts:
#	src/Suggestion.js
This commit is contained in:
Giampiero Galeazzi
2019-03-01 11:32:37 +01:00
+30 -28
View File
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { Row } from 'react-bootstrap';
import { Row, Col } from 'react-bootstrap';
import { Switch, Route } from 'react-router';
import Random from './reccomenders/Random';
import Related from './reccomenders/Related';
@@ -7,49 +7,51 @@ import Search from './reccomenders/Search';
import fvitali from './reccomenders/fvitali';
import popGlobaleAssoluta from './reccomenders/popGlobaleAssoluta';
import Recent from './reccomenders/Recent';
import similarityArtist from './reccomenders/similarityArtist';
import popLocaleAss from './reccomenders/popLocaleAss';
// and so on..
class Suggestion extends Component {
// static getDerivedStateFromProps(nextProps, prevState) {
// static getDerivedStateFromProps(nextProps, prevState) {
// }
// }
// componentDidMount() {
// componentDidMount() {
// }
// }
// shouldComponentUpdate(nextProps, nextState) {
// shouldComponentUpdate(nextProps, nextState) {
// }
// }
// componentDidUpdate(prevProps, prevState) {
// componentDidUpdate(prevProps, prevState) {
// }
// }
// componentWillUnmount() {
// componentWillUnmount() {
// }
// }
render() {
return (
<React.Fragment>
<Row>
<Switch>
<Route path='/video/:id/vitali' component={fvitali} />
<Route path='/search/:query' component={Search} />
<Route path='/video/:id/random' component={Random} />
<Route path='/video/:id/popGlobalAssoluta' component={popGlobaleAssoluta} />
<Route path='/video/:id/recent' component={Recent} />
render() {
return (
<React.Fragment>
<Switch>
<Route path='/video/:id/vitali' component={fvitali} />
<Route path='/search/:query' component={Search} />
<Route path='/video/:id/random' component={Random} />
<Route path='/video/:id/popGlobalAssoluta' component={popGlobaleAssoluta} />
<Route path='/video/:id/popLocaleAss' component={popLocaleAss} />
<Route path='/video/:id/recent' component={Recent} />
<Route path='/video/:id/similarityArtist' component={similarityArtist} />
{/* lasciare questo per ultimo */}
<Route component={Related} />
</Switch>
</Row>
</React.Fragment>
);
}
{/* lasciare questo per ultimo */}
<Route component={Related} />
</Switch>
</React.Fragment>
);
}
}
export default Suggestion;