From d6031d313b88529adde15f72e000705cfad99c79 Mon Sep 17 00:00:00 2001
From: Giampiero Galeazzi <simone.ferrari1@outlook.com>
Date: Fri, 1 Mar 2019 15:41:34 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into layout1

# Conflicts:
#	src/AboutUs.js
#	src/VideoPlayer.js
#	src/reccomenders/Recent.js
#	src/reccomenders/fvitali.js
---
 src/Suggestion.js                   | 2 +-
 src/VideoInfo.js                    | 1 +
 src/index.js                        | 6 ++----
 src/reccomenders/genreSimilarity.js | 6 +-----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Suggestion.js b/src/Suggestion.js
index a8854af..438b117 100644
--- a/src/Suggestion.js
+++ b/src/Suggestion.js
@@ -9,6 +9,7 @@ import popGlobaleAssoluta from './reccomenders/popGlobaleAssoluta';
 import Recent from './reccomenders/Recent';
 import similarityArtist from './reccomenders/similarityArtist';
 import popLocaleAss from './reccomenders/popLocaleAss';
+import genreSimilarity from "./reccomenders/genreSimilarity";
 
 // and so on..
 
@@ -45,7 +46,6 @@ class Suggestion extends Component {
               <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>
diff --git a/src/VideoInfo.js b/src/VideoInfo.js
index fcb9159..cddbd61 100644
--- a/src/VideoInfo.js
+++ b/src/VideoInfo.js
@@ -50,6 +50,7 @@ class VideoInfo extends React.Component {
                     comments: commentThreadResponse.data.items,
                     isLoaded: true
                 });
+                //localStorage.setItem('lastTopic',videosResponse.data.items[0])
             }), error => {
                 console.error(error);
                 this.setState({
diff --git a/src/index.js b/src/index.js
index 4c72e38..fb68207 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,13 +1,11 @@
+import 'bootstrap/dist/css/bootstrap.css';
 import 'react-app-polyfill/ie9';
-//import 'bootstrap/dist/css/bootstrap.css';
-// import './css/bootswatch/darkly/bootstrap.min.css'
-import './css/bootswatch/superhero/bootstrap.min.css'
 //import '@babel/polyfill';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 import registerServiceWorker from './registerServiceWorker';
-import { HashRouter, BrowserRouter } from 'react-router-dom'; // eslint-disable-line 
+import { HashRouter, BrowserRouter } from 'react-router-dom'; // eslint-disable-line
 
 localStorage['lastWatched'] ? function (){}() : localStorage.setItem('lastWatched', JSON.stringify([]))
 localStorage['lastId'] ? function (){}() : localStorage.setItem('lastId','0J2QdDbelmY')
diff --git a/src/reccomenders/genreSimilarity.js b/src/reccomenders/genreSimilarity.js
index b9b5e4e..2f24ea6 100644
--- a/src/reccomenders/genreSimilarity.js
+++ b/src/reccomenders/genreSimilarity.js
@@ -4,7 +4,7 @@ import axios from 'axios';
 class genreSimilarity extends Component {
     state={
         videoId : localStorage['lastId'],
-        videoTopic : localStorage['lastTopic'],
+        //videoTopic : localStorage['lastTopic'],
         items : []
     }
 
@@ -36,8 +36,4 @@ class genreSimilarity extends Component {
     }
 }
 
-Related.propTypes = {
-
-};
-
 export default genreSimilarity;
\ No newline at end of file