Archived
merged1
This commit is contained in:
@@ -5,10 +5,6 @@ import ReactDOM from 'react-dom';
|
|||||||
import App from './App';
|
import App from './App';
|
||||||
import registerServiceWorker from './registerServiceWorker';
|
import registerServiceWorker from './registerServiceWorker';
|
||||||
import { HashRouter, BrowserRouter } from 'react-router-dom'; // eslint-disable-line
|
import { HashRouter, BrowserRouter } from 'react-router-dom'; // eslint-disable-line
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 4e906261be5bde911e46316a11ba0ec25de00fe8
|
|
||||||
localStorage['lastWatched'] ? function (){}() : localStorage.setItem('lastWatched', JSON.stringify([]))
|
localStorage['lastWatched'] ? function (){}() : localStorage.setItem('lastWatched', JSON.stringify([]))
|
||||||
localStorage['lastId'] ? function (){}() : localStorage.setItem('lastId','0J2QdDbelmY')
|
localStorage['lastId'] ? function (){}() : localStorage.setItem('lastId','0J2QdDbelmY')
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ class popGlobaleAssoluta extends React.Component {
|
|||||||
|
|
||||||
|
|
||||||
// let listSiti = ['1828', '1829', '1838', '1839', '1846', '1822', '1847', '1831', '1827', '1848', '1824', '1830', '1836', '1850', '1849', '1851', '1861', '1823', '1863', '1834', '1904', '1906', '1901', '1862', '1859'];
|
// let listSiti = ['1828', '1829', '1838', '1839', '1846', '1822', '1847', '1831', '1827', '1848', '1824', '1830', '1836', '1850', '1849', '1851', '1861', '1823', '1863', '1834', '1904', '1906', '1901', '1862', '1859'];
|
||||||
<<<<<<< HEAD
|
|
||||||
let listSiti = ['1828', '1838', '1839', '1846', '1847', '1831', '1827', '1849', '1823', '1863', '1834', '1901', '1859'];
|
let listSiti = ['1828', '1838', '1839', '1846', '1847', '1831', '1827', '1849', '1823', '1863', '1834', '1901', '1859'];
|
||||||
let axiosReq = [];
|
let axiosReq = [];
|
||||||
for(let i=0; i<listSiti.length; i++){
|
for(let i=0; i<listSiti.length; i++){
|
||||||
@@ -41,21 +40,6 @@ class popGlobaleAssoluta extends React.Component {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
let listSiti = ['1828', '1838', '1839', '1846', '1847', '1831', '1827', '1849', '1823', '1863', '1834', '1901', '1859'];
|
|
||||||
axios.all(listSiti.map(sito => {
|
|
||||||
axios.get(`http://site${sito}.tw.cs.unibo.it/globpop`, {
|
|
||||||
'params': {
|
|
||||||
'id': this.props.match.params.id
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})).then( res=>{console.log(listSiti)
|
|
||||||
console.log(res.data)}
|
|
||||||
|
|
||||||
|
|
||||||
)
|
|
||||||
}
|
|
||||||
>>>>>>> 4e906261be5bde911e46316a11ba0ec25de00fe8
|
|
||||||
|
|
||||||
// METODI
|
// METODI
|
||||||
getThumbnailsNames(reccomended) {
|
getThumbnailsNames(reccomended) {
|
||||||
|
|||||||
Reference in New Issue
Block a user