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

apikey

@@ -1 +1 @@
-AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig
+'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg'

dev.js

@@ -0,0 +1,87 @@
+process.env['NODE_ENV'] = 'production';
+const express = require('express');
+const compression = require('compression')
+const bodyParser = require('body-parser');
+const low = require('lowdb');
+const lodashId = require('lodash-id');
+const FileAsync = require('lowdb/adapters/FileAsync');
+const app = express(); // app is an instance of express
+
+app.use(compression()); // enables gzip compression
+app.use(bodyParser.urlencoded({ extended: false })) // parse application/x-www-form-urlencoded
+app.use(bodyParser.json()) // parse application/json
+
+
+// Create database instance and start server
+// const adapter = new FileAsync(__dirname + '/db.json');
+low(new FileAsync(__dirname + '/db.json')) // production
+	.then(db => {
+		db._.mixin(lodashId);
+		// DATABASE ROUTES 
+
+		// ==============
+
+		app.post('/test', (req, res) => {
+			// "reason": {
+			// 	"fitali": req.body.reason.toString() === "fvitali" ? 1:0,
+			// 	"": req.body.reason.toString() === "" ? 1:0,
+			// 	"": req.body.reason.toString() === "" ? 1:0,
+			// }
+			// try {
+			// 	let test = table.updateById(req.body.id, { })
+			// }
+			// catch(e) {
+			// }
+			res.send(req.body);
+		});
+
+		// ==============
+
+		// GET /globpop 
+		app.get('/globpop', (req, res) => {
+			req.query.id ? res.send(req.query.id) : res.status(400).send('Bad Request');
+		});
+
+		// OPTIONS /videotrack
+		app.options('/videotrack', (req, res) => {
+			res.set({
+				'Access-Control-Allow-Origin': '*',
+				'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
+				'Access-Control-Allow-Headers': 'Content-Type',
+				'Access-Control-Max-Age': 600
+			})
+			res.status(200).end();
+		})
+
+		// GET /videotrack 
+		app.get('/videotrack', (req, res) => {
+			const videos = db.get('videos');
+			req.query.id ? res.send(videos.getById(req.query.id).value()) : res.send(videos.value())
+		});
+
+		// POST /videotrack
+		app.post('/videotrack', (req, res) => {
+			const videos = db.get('videos');
+			const row = videos.getById(req.body.id);
+			if (row.value()) {
+				row
+					.update('timesWatched', (n) => ++n)
+					.update('lastWatched', () => new Date().toISOString())
+					.write()
+					.then(output => res.send(output))
+			} else {
+				let newRow = {
+					"id": req.body.id.toString(),
+					"timesWatched": 1,
+					"lastWatched": new Date().toISOString(),
+				}
+				videos.push(newRow).last().write().then(output => res.send(output))
+			}
+		});
+
+		// Set db default values
+		return db.defaults({ videos: [] }).write();
+	})
+	.then(() => {
+		app.listen(8000, () => console.log('listen on 8000')); // bind to port 8000 as required from specs
+	});

node-entry.js

@@ -1,5 +1,5 @@
 process.env['NODE_ENV'] = 'production';
-process.env.APIKEY = 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig';
+//'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' = 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg';
 const express = require('express');
 const compression = require('compression')
 const bodyParser = require('body-parser');
@@ -14,7 +14,7 @@ app.use(bodyParser.json()) // parse application/json
 
 
 app.get('/a', (req, res) => {
-res.send(process.env);
+	res.send(process.env);
 
 });
 
@@ -26,9 +26,9 @@ low(new FileAsync(__dirname + '/db.json')) // production
 		db._.mixin(lodashId);
 		// DATABASE ROUTES 
 
-// ==============
+		// ==============
 
-		app.post('/test',(req,res)=>{
+		app.post('/test', (req, res) => {
 			// "reason": {
 			// 	"fitali": req.body.reason.toString() === "fvitali" ? 1:0,
 			// 	"": req.body.reason.toString() === "" ? 1:0,
@@ -42,27 +42,38 @@ low(new FileAsync(__dirname + '/db.json')) // production
 			res.send(req.body);
 		});
 
-// ==============
+		// ==============
 
-		// GET /videotrack/:id? 
+		// GET /globpop 
 		app.get('/globpop', (req, res) => {
-			req.query.id ? res.send(req.query.id):res.status(400).send('Bad Request');
+			req.query.id ? res.send(req.query.id) : res.status(400).send('Bad Request');
 		});
 
-		// GET /videotrack/:id? 
+		// OPTIONS /videotrack
-		app.get('/videotrack/:id?', (req, res) => {
+		app.options('/videotrack', (req, res) => {
+			res.set({
+				'Access-Control-Allow-Origin': '*',
+				'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
+				'Access-Control-Allow-Headers': 'Content-Type',
+				'Access-Control-Max-Age': 600
+			})
+			res.status(200).end();
+		})
+
+		// GET /videotrack 
+		app.get('/videotrack', (req, res) => {
 			const videos = db.get('videos');
-			req.params.id ?	res.send(videos.getById(req.params.id).value())	:	res.send(videos.value())
+			req.query.id ? res.send(videos.getById(req.query.id).value()) : res.send(videos.value())
 		});
 
 		// POST /videotrack
 		app.post('/videotrack', (req, res) => {
 			const videos = db.get('videos');
 			const row = videos.getById(req.body.id);
-			if(row.value()) {
+			if (row.value()) {
 				row
-				.update('timesWatched',(n) => ++n)
+					.update('timesWatched', (n) => ++n)
-				.update('lastWatched',() => new Date().toISOString())
+					.update('lastWatched', () => new Date().toISOString())
 					.write()
 					.then(output => res.send(output))
 			} else {

src/App.js

@@ -61,8 +61,8 @@ static getDerivedStateFromProps(nextProps, prevState) {
 						xs="12"
 						lg={this.state.isInfoToggled ? { span: 5, order: 1 } : { span: 3, order: 1 }}
 						className="p-0 p-sm-0"
-						style={{ 'overflow': "auto", 'max-height': this.state.playerHeight }} >
+						style={{ 'overflow': "auto", 'maxHeight': this.state.playerHeight }} >
-						<div class="d-flex justify-content-center">
+						<div className="d-flex justify-content-center">
 							<Button
 								variant="outline-light"
 								onClick={() => this.setState({ isInfoToggled: !this.state.isInfoToggled })}
@@ -79,10 +79,11 @@ static getDerivedStateFromProps(nextProps, prevState) {
 						</Collapse>
 					</Col>
 				</ReactHeight>
-				<Row style={{ "max-height": `calc(98vh - ${this.state.blackbgHeight}px - ${this.state.navHeight}px)` }} className='mt-1 downSection'>
+				<Row style={{ "maxHeight": `calc(98vh - ${this.state.blackbgHeight}px - ${this.state.navHeight}px)` }} className='mt-1 downSection'>
 					<Switch>
 						<Route exact path='/' component={VideoList} />
-						<Route path={["/video/:id", "/search/:query"]} component={Suggestion} />
+						<Route path={"/video/:id"} component={Suggestion} />
+						<Route path={"/search/:query"} component={Suggestion} />
 						<Route render={() => <div>URL not found</div>} />
 					</Switch>
 				</Row>

src/VideoInfo.js

@@ -8,8 +8,6 @@ import Card from "react-bootstrap/lib/Card";
 import moment from 'moment';
 import momentDurationFormat from 'moment-duration-format'; //eslint-disable-line no-unused-vars
 import './css/VideoInfo.scss';
-
-
 const ytclear = require('@c0b41/ytclear');
 
 class VideoInfo extends React.Component {
@@ -79,39 +77,35 @@ class VideoInfo extends React.Component {
                         }),
                     ]).then(axios.spread((responseA1,responseA2)=>{
                         console.log(responseA1.data, responseA2.data);
-
                     }))
                 }),
                 error => { }
             );
             }
         
-    
-
     getInfoComments() {
         return axios.all([
             axios.get('https://www.googleapis.com/youtube/v3/videos', { //Richiesta per tutte le info sul video
                 params: {
                     'part': 'snippet,contentDetails,statistics,topicDetails',
                     'id': this.state.videoId,
-                    'key': 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig' // process.env.APIKEY in production
+                    'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' // 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' in production
                 }
             }), axios.get('https://www.googleapis.com/youtube/v3/commentThreads', { //Richiesta per ottenere i commenti del video
                 params: {
                     'part': 'snippet',
                     'videoId': this.state.videoId,
                     'order': 'relevance',
-                    'key': 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig' // process.env.APIKEY in production
+                    'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' // 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' in production
                 }
             })])
             .then(axios.spread((videosResponse, commentThreadResponse) => {
-                this.isArtistOrTitle(ytclear(videosResponse.data.items[0].snippet.title).split('-'));
+              //  this.isArtistOrTitle(ytclear(videosResponse.data.items[0].snippet.title).split('-'));
                 this.setState({
                     VideoDetails: videosResponse.data.items[0],
                     comments: commentThreadResponse.data.items,
                     others: {
-                        artist: null,
+                        title2: ytclear(videosResponse.data.items[0].snippet.title).split('-')[1]
-                        title: videosResponse.data.items[0].snippet.title
                     },
                     isLoaded: true
                 });
@@ -127,6 +121,11 @@ class VideoInfo extends React.Component {
     static getDerivedStateFromProps(nextProps, prevState) {
         if(nextProps.videoId !== prevState.videoId)
             return { videoId: nextProps.videoId };
+        else if(nextProps.location.state)
+            return { others: {
+                artist: nextProps.location.state.artist,
+                title: nextProps.location.state.title
+            }}
         return null;
     }
     componentDidMount() {
@@ -157,7 +156,7 @@ class VideoInfo extends React.Component {
         } else {
             return (
                 <React.Fragment>
-                    <span class="h5 text-white">{VideoDetails.snippet.title}</span>
+                    <span className="h5 text-white">{VideoDetails.snippet.title}</span>
                     <Tabs defaultActiveKey="video" id="tabs">
                         <Tab className="text-white" eventKey="video" title="Video">
                             <p>
@@ -166,7 +165,7 @@ class VideoInfo extends React.Component {
                                 <b>Channel name: </b>{VideoDetails.snippet.channelTitle}<br />
                                 <b>Description: </b><Linkify>{VideoDetails.snippet.description}</Linkify><br />
                                 <b>Tags: </b>{VideoDetails.snippet.tags ?
-                                    VideoDetails.snippet.tags.map(tag => (<Link
+                                    VideoDetails.snippet.tags.map((tag,i) => (<Link key={i}
                                         to={{
                                             pathname: '/search/' + tag,
                                         }}
@@ -208,6 +207,7 @@ class VideoInfo extends React.Component {
                         <Tab className="text-white" eventKey="wikipedia" title="Wikipedia">
                             <Wikipedia 
                             title={this.state.others.title}
+                            title2={this.state.others.title2}
                             artist={this.state.others.artist}
                             videoId={this.state.videoId}
                             />

src/VideoList.js

@@ -6,22 +6,25 @@ import './css/VideoList.css';
 /*eslint no-console: ["error", { allow: ["warn", "error", "info"] }] */
 
 class VideoList extends React.Component {
-	constructor(props) {
+	state = {
-		super(props);
-		this.state = {
 			error: null,
 			isLoaded: false,
 			items: [],
 			headers: null
 		};
-		this.getThumbnails = this.getThumbnails.bind(this);
+
-	}
 
 	componentDidMount() {
+		localStorage['fixedVideoList'] ?
+		this.setState({
+			items: this.shuffleArray(JSON.parse(localStorage.getItem('fixedVideoList'))),
+			isLoaded: true
+		}) :
 		axios.get('http://site1825.tw.cs.unibo.it/video.json').then(
 			response => {
 				this.shuffleArray(response.data);
-				this.getThumbnails(response.data);
+				this.getThumbnails(response.data)
+					.then(videoList => localStorage.setItem('fixedVideoList',JSON.stringify(videoList)));
 			},
 			// Note: it's important to handle errors here
 			// instead of a catch() block so that we don't swallow
@@ -33,21 +36,21 @@ class VideoList extends React.Component {
 					error
 				});
 			}
-		);
+		)
 	}
 
 	// METODI
 	getThumbnails(videoItems) {
 		let idToLookFor = videoItems.map(item => item.videoID);
 		let finalChunk = (videoItems.length % 50) + 100;
-		axios
+	return	axios
 			.all([
 				// chain 3 parallel get
 				axios.get('https://www.googleapis.com/youtube/v3/videos', {
 					params: {
 						part: 'snippet',
 						id: idToLookFor.slice(0, 50).toString(),
-						key: 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig', // process.env.APIKEY in production
+						key: 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg', // 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' in production
 						fields: 'items(id,snippet/thumbnails/medium)'
 					}
 				}),
@@ -56,7 +59,7 @@ class VideoList extends React.Component {
 					params: {
 						part: 'snippet',
 						id: idToLookFor.slice(50, 100).toString(),
-						key: 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig', // process.env.APIKEY in production
+						key: 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg', // 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' in production
 						fields: 'items(id,snippet/thumbnails/medium)'
 					}
 				}),
@@ -65,46 +68,45 @@ class VideoList extends React.Component {
 					params: {
 						part: 'snippet',
 						id: idToLookFor.slice(100, finalChunk).toString(),
-						key: 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig', // process.env.APIKEY in production
+						key: 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg', // 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg' in production
 						fields: 'items(id,snippet/thumbnails/medium)'
 					}
 				})
 			])
 			.then(
 				axios.spread((res1, res2, res3) => {
-					let allres = [].concat(
+					[...res1.data.items,...res2.data.items,...res3.data.items]
-						res1.data.items,
+					.map(resCurrentValue => 
-						res2.data.items,
-						res3.data.items
-					);
-					allres.map(resCurrentValue => {
 						Object.defineProperty(
 							videoItems.find(videoItem => {
 								return videoItem.videoID === resCurrentValue.id;
 							}),
 							'thumbnail',
-							{ value: resCurrentValue.snippet.thumbnails.medium.url }
+							{ value: resCurrentValue.snippet.thumbnails.medium.url,
+								enumerable: true }
+						)
 					);
-					});
 					this.setState({
 						isLoaded: true,
 						items: videoItems
 					});
+				return new Promise((resolve, reject) => resolve(videoItems))
 				})
-			);
+			)
 	}
 
-	shuffleArray(videoarray) {
+	shuffleArray(videoArray) {
-		for (let i = videoarray.length - 1; i > 0; i--) {
+		for (let i = videoArray.length - 1; i > 0; i--) {
 			const j = Math.floor(Math.random() * (i + 1));
-			[videoarray[i], videoarray[j]] = [videoarray[j], videoarray[i]]; // eslint-disable-line no-param-reassign
+			[videoArray[i], videoArray[j]] = [videoArray[j], videoArray[i]]; // eslint-disable-line no-param-reassign
 		}
+		return videoArray
 		// Durstenfeld shuffle.
 		// https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm
 	}
 
 	render() {
-		const { error, isLoaded, items, headers } = this.state;
+		const { error, isLoaded, items } = this.state;
 		if (error) {
 			return (
 				<React.Fragment>

src/VideoPlayer.js

@@ -86,12 +86,12 @@ class VideoPlayer extends React.Component {
 								videoIdWatched => {
 									// post request to local db
 									axios
-										.post('http://localhost:8000/videotrack', {
+										.post('http://site1854.tw.cs.unibo.it/videotrack', {
 											id: videoIdWatched.toString()
 										})
 										.then(
 											response => console.info(response.data),
-											error => console.info(error, videoIdWatched.toString())
+											error => console.error(error, videoIdWatched.toString())
 										);
 									// local storage logic for recent reccomender//tmp è il video che devo inserire sulla lista
 											let tmp = JSON.parse(localStorage.getItem('lastWatched')) 

src/areainfo/Suggestion.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Row, Col, Button, Collapse } from 'react-bootstrap'; 
+import { Row } from 'react-bootstrap'; 
 import { Switch, Route } from 'react-router';
 import Random from '../reccomenders/Random';
 import Related from '../reccomenders/Related';

src/areainfo/Wikipedia.js

@@ -17,7 +17,9 @@ class Wikipedia extends Component {
 		isWikiLoaded: false,
 		isWDataLoaded: false,
 		isMBLoaded: false,
-		isLoaded: false
+		isLoaded: false,
+		wikidatakeys: null,
+		wikipediakeys: null
 	};
 
 	ISO_8601toYYYY(a) {
@@ -64,7 +66,7 @@ class Wikipedia extends Component {
 				if (wikidataP1651Res.data.results.bindings.length) { // got a match
 					this.getWikidataPage(wdk.simplify.sparqlResults(wikidataP1651Res.data))// set in state wikidata
 						.then(() => {
-							if (this.state.wikidata.claims.P435) {
+							if (this.state.wikidata.claims.P435) { // p435 == musicbrainzWorkId
 								axios.get(`${musicbrainzBaseUrl}/work/${this.state.wikidata.claims.P435[0].mainsnak.datavalue.value}`, { // get musicbrainz info
 									params: {
 										'inc': 'artist-rels url-rels',
@@ -105,7 +107,7 @@ class Wikipedia extends Component {
 				else { //oof
 					axios.get(`${musicbrainzBaseUrl}/work`, {
 						params: {
-							'query': this.state.props.title.trim(),
+							'query': 'undefined' === typeof this.state.props.title ? this.state.props.title2 : this.state.props.title,
 							'limit': 1,
 							'offset': 0,
 							'fmt': 'json'
@@ -131,7 +133,7 @@ class Wikipedia extends Component {
 									this.getWikidataPage(wikidataEntityRegEx.exec(a.url.resource)) //.then(() => this.setState({ isWikiLoaded: true }));
 								}
 								else { // oof
-									wikijs().find(this.state.props.title).then(data => console.log('asd', data)) // find by props.title
+									wikijs().find('undefined' === typeof this.state.props.title? this.state.props.title2.trim(): this.state.props.title.trim()).then(data => console.log('asd', data)) // find by props.title
 								}
 							})
 						)
@@ -145,13 +147,13 @@ class Wikipedia extends Component {
 			return {
 				props: {
 					videoId: nextProps.videoId,
-					artist: nextProps.artist,
-					title: nextProps.title
 				},
 				isWikiLoaded: false,
 				isWDataLoaded: false,
 				isMBLoaded: false,
-				isLoaded: false
+				isLoaded: false,
+				wikidatakeys: null,
+				wikipediakeys: null
 			};
 		return null
 	}
@@ -159,7 +161,7 @@ class Wikipedia extends Component {
 
 
 	componentDidMount() {
-		this.wrapper().then(()=>this.setState({isLoaded: true}));
+		this.wrapper().finally(()=>this.setState({isLoaded: true}));
 	}
 
 
@@ -168,8 +170,8 @@ class Wikipedia extends Component {
 	// }
 
 	componentDidUpdate(prevProps, prevState) {
-		if (prevState.props.videoId !== this.state.props.videoId)
+		if (prevProps.videoId !== this.state.props.videoId)
-			this.wrapper().then(()=>this.setState({isLoaded: true}));
+			this.wrapper().finally(()=>this.setState({isLoaded: true}));
 	}
 
 	// componentWillUnmount() {
@@ -189,7 +191,7 @@ class Wikipedia extends Component {
 					<tbody>
 						{ isWikiLoaded &&
 							this.state.wikipediakeys.map(key => (
-								<tr>
+								<tr key={key}>
 									<td>{key}</td>
 									<td>{wikipedia.info[key].toLocaleString()}</td>
 								</tr>
@@ -197,7 +199,7 @@ class Wikipedia extends Component {
 						}
 						{ isWDataLoaded &&
 							this.state.wikidatakeys.map(key => (
-								<tr>
+								<tr key={key}>
 									<td>{`${key} - ${wikidata.claims[key][0].mainsnak.datatype}`}</td>
 									<td>{
 										typeof wikidata.claims[key][0].mainsnak.datavalue.value === "string" ?
@@ -212,14 +214,14 @@ class Wikipedia extends Component {
 							))
 						}
 						{ isMBLoaded &&
-							musicbrainz.relations.map(relation => {
+							musicbrainz.relations.map((relation,i) => {
 								if (relation["target-type"] === "artist")
-									return (<tr>
+									return (<tr key={i}>
 										<td>{relation.type}</td>
 										<td>{relation.artist.name}</td>
 									</tr>);
 								else if (relation["target-type"] === "url")
-									return (<tr>
+									return (<tr key={i}>
 										<td>{relation.type}</td>
 										<td><a href={relation.url.resource}>{relation.type}</a></td>
 									</tr>)

src/reccomenders/Random.js

@@ -31,7 +31,7 @@ class RecommenderRandom extends Component{
                 'type' : 'video',       //che contiene tutti i generi di musica
                 'maxResults': '21',
                 'pageToken' : pageToken,
-                'key': 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig' // process.env.APIKEY in production
+                'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg'
             }
         }).then(
             response => {

src/reccomenders/Related.js

@@ -33,7 +33,7 @@ class Related extends Component {
                 'relatedToVideoId' : this.state.videoId,
                 'type' : 'video',
                 'maxResults' : '21',
-                'key': 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig' // process.env.APIKEY in production
+                'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg'
             }
         }).then(
             response => {

src/reccomenders/Search.js

@@ -1,10 +1,13 @@
 import React from 'react';
 import axios from 'axios';
+import {  Card, Col } from 'react-bootstrap';
 
 class Search extends React.Component {
 
     state = {
         query: '',
+        isLoaded: false,
+        error: null,
         res: null
     }
 
@@ -16,20 +19,12 @@ class Search extends React.Component {
 
     componentDidMount() {
         console.log('called didmo');
-    }
+        if (new RegExp("[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]").test(this.state.query.toString()))
-
+            axios.get('https://www.googleapis.com/youtube/v3/videos', {
-    // shouldComponentUpdate(nextProps, nextState) {
-
-    // }
-
-    componentDidUpdate(prevProps, prevState) {
-        console.log('called didup');
-        if(new RegExp("[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]").test(this.state.query.toString()))
-        axios.get('https://www.googleapis.com/youtube/v3/videos',{
                 params: {
-                'part':'id',
+                    'part': 'id',
                     'id': this.state.query,
-                'key': process.env.APIKEY ? process.env.APIKEY : 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig',
+                    'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg',
                     'field': 'pageInfo/resultsPerPage'
                 }
             }).then(
@@ -46,6 +41,38 @@ class Search extends React.Component {
             this.youtubeSearch();
     }
 
+    // shouldComponentUpdate(nextProps, nextState) {
+
+    // }
+
+    componentDidUpdate(prevProps, prevState) {
+        console.log('called didup');
+        if (prevState.query !== this.props.match.params.query)
+            if (new RegExp("[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]").test(this.state.query.toString()))
+                axios.get('https://www.googleapis.com/youtube/v3/videos', {
+                    params: {
+                        'part': 'id',
+                        'id': this.state.query,
+                        'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg',
+                        'field': 'pageInfo/resultsPerPage'
+                    }
+                }).then(
+                    res => {
+                        res.data.pageInfo.resultsPerPage ?
+                            this.props.history.push('/video/' + this.state.query) :
+                            this.youtubeSearch()
+                    },
+                    error => {
+                        console.error(error)
+                        this.setState({
+                            error
+                        })
+                    }
+                )
+            else
+                this.youtubeSearch();
+    }
+
     // componentWillUnmount() {
 
     // }
@@ -59,13 +86,14 @@ class Search extends React.Component {
                 'type': 'video',
                 'maxResults': 30,
                 'topicId': '/m/04rlf, /m/02jjt',
-                'key': process.env.APIKEY ? process.env.APIKEY : 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig'
+                'key': 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg'
             }
         }).then(
             res => {
                 console.log(res.data);
                 this.setState({
-                    res: res.data
+                    res: res.data,
+                    isLoaded: true
                 })
             },
             error => { console.error(error) }
@@ -73,12 +101,20 @@ class Search extends React.Component {
     }
 
     render() {
+        if (this.state.error) {
+            return <React.Fragment>Error: {this.state.error.message}</React.Fragment>;
+        } else if (!this.state.isLoaded) {
+            return <React.Fragment>Loading...</React.Fragment>;
+        } else {
             return (
-            <div>
+                <Col>
-                <span>{this.state.query}  keyword</span>
+                    {this.state.res.data.items.map(item => (<Card></Card>
-            </div>
+
+                   ))}
+                </Col>
             );
         }
+    }
 }
 
 export default Search;

src/reccomenders/fvitali.js

@@ -57,7 +57,7 @@ class fvitali extends React.Component {
 					params: {
 						part: 'snippet',
 						id: idToLookFor.toString(),
-						key: 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig',
+						key: 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg',
 						fields: 'items(id,snippet/thumbnails/medium,snippet/title)'
 					}
 				})

src/reccomenders/popGlobaleAssoluta.js

@@ -48,7 +48,7 @@ class popGlobaleAssoluta extends React.Component {
             params: {
                 part: 'snippet',
                 id: idToLookFor.toString(),
-                key: 'AIzaSyA21Odw9UdfiOJnxvA_eDfOW0OxuUfHKig',
+                key: 'AIzaSyBYSHhu7AwZqT1JK3x4G8Yzs7iRqoS_QUg',
                 fields: 'items(id,snippet/thumbnails/medium,snippet/title)'
             }
         })