diff --git a/package-lock.json b/package-lock.json index 5328283..d1ede67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2550,6 +2550,14 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==" }, + "axios": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "requires": { + "follow-redirects": "^1.10.0" + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -12170,6 +12178,16 @@ "react-is": "^16.6.3" } }, + "react-youtube": { + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-7.13.1.tgz", + "integrity": "sha512-b++TLHmHDpd0ZBS1wcbYabbuchU+W4jtx5A2MUQX0BINNKKsaIQX29sn/aLvZ9v5luwAoceia3VGtyz9blaB9w==", + "requires": { + "fast-deep-equal": "3.1.3", + "prop-types": "15.7.2", + "youtube-player": "5.5.2" + } + }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -13146,6 +13164,11 @@ } } }, + "sister": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/sister/-/sister-3.0.2.tgz", + "integrity": "sha512-p19rtTs+NksBRKW9qn0UhZ8/TUI9BPw9lmtHny+Y3TinWlOa9jWh9xB0AtPSdmOy49NJJJSSe0Ey4C7h0TrcYA==" + }, "sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -15709,6 +15732,31 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" } } + }, + "youtube-player": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/youtube-player/-/youtube-player-5.5.2.tgz", + "integrity": "sha512-ZGtsemSpXnDky2AUYWgxjaopgB+shFHgXVpiJFeNB5nWEugpW1KWYDaHKuLqh2b67r24GtP6HoSW5swvf0fFIQ==", + "requires": { + "debug": "^2.6.6", + "load-script": "^1.0.0", + "sister": "^3.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } } } } diff --git a/server/app.py b/server/app.py index 834dcca..15ecd58 100644 --- a/server/app.py +++ b/server/app.py @@ -12,8 +12,10 @@ # app.config['CORS_HEADERS'] = 'Content-Type' DUMMY_DICT = { - 'car': [[5, 10], [30, 35]], - 'bicycle': [[15, 35]] + 'boat': [[5, 10], [30, 45]], + 'fish': [[15, 500]], + 'kite': [[15, 20], [50, 80]], + 'chair': [[60, 200]] } diff --git a/src/App.js b/src/App.js index d4eb41d..db134ae 100644 --- a/src/App.js +++ b/src/App.js @@ -9,11 +9,12 @@ import {youtubeLibraryLoaded} from './store/actions/api'; import Trending from './containers/Trending/Trending'; import Search from './containers/Search/Search'; -import API_KEY_YOUTUBE from './keys.js' +import API_KEY_YOUTUBE from './keys.js'; const API_KEY = process.env.REACT_APP_YT_API_KEY || API_KEY_YOUTUBE; -// const API_KEY = API_KEY_YOUTUBE; -console.log('API key: ' + JSON.stringify(API_KEY)) +//const API_KEY = API_KEY_YOUTUBE; + +console.log('API key: ' + JSON.stringify(API_KEY)); class App extends Component { render() { diff --git a/src/components/RelatedVideos/RelatedVideos.js b/src/components/RelatedVideos/RelatedVideos.js index 273364e..2bb7ed2 100644 --- a/src/components/RelatedVideos/RelatedVideos.js +++ b/src/components/RelatedVideos/RelatedVideos.js @@ -4,6 +4,7 @@ import './RelatedVideos.scss'; import {NextUpVideo} from './NextUpVideo/NextUpVideo'; export function RelatedVideos(props) { + /* if (!props.videos || !props.videos.length) { return
; } @@ -19,11 +20,19 @@ export function RelatedVideos(props) { search={`?v=${relatedVideo.id}`} horizontal={true}/> )); - +*/ return ( + + +
+ +
+ + /*
{relatedVideosPreviews}
+ */ ); } \ No newline at end of file diff --git a/src/components/Video/Video.js b/src/components/Video/Video.js index 89d8273..f49d695 100644 --- a/src/components/Video/Video.js +++ b/src/components/Video/Video.js @@ -26,8 +26,8 @@ export function Video(props) { // console.log('video.js this: ' + player) const opts = { - height: '390', - width: '640', + height: '400', + width: '700', playerVars: { // https://developers.google.com/youtube/player_parameters autoplay: 1, @@ -96,10 +96,10 @@ export function Video(props) { */}
+ {/*
{descriptionParagraphs}
*/} -

Summary

-

0:00 - Item 1 Display...

-

1:02 - Item 2 Appears...

+ + + + + {/* */}
diff --git a/src/components/VideoMetadata/VideoMetadata.js b/src/components/VideoMetadata/VideoMetadata.js index 9e9ecc2..ab66112 100644 --- a/src/components/VideoMetadata/VideoMetadata.js +++ b/src/components/VideoMetadata/VideoMetadata.js @@ -11,6 +11,7 @@ export function VideoMetadata(props) { return (
+

{props.video.snippet.title}

{/*
{viewCount} views diff --git a/src/components/VideoMetadata/VideoMetadata.scss b/src/components/VideoMetadata/VideoMetadata.scss index 167558a..054adf8 100644 --- a/src/components/VideoMetadata/VideoMetadata.scss +++ b/src/components/VideoMetadata/VideoMetadata.scss @@ -7,6 +7,7 @@ h3 { font-weight: 400; color: $text-color-dark; + align-items: center; } .video-stats {