Skip to content

Commit

Permalink
initial UI changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rb2001 committed Mar 21, 2021
1 parent 9623ed6 commit dd1f16b
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 14 deletions.
48 changes: 48 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
}


Expand Down
7 changes: 4 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
11 changes: 10 additions & 1 deletion src/components/RelatedVideos/RelatedVideos.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import './RelatedVideos.scss';
import {NextUpVideo} from './NextUpVideo/NextUpVideo';

export function RelatedVideos(props) {
/*
if (!props.videos || !props.videos.length) {
return <div className='related-videos'/>;
}
Expand All @@ -19,11 +20,19 @@ export function RelatedVideos(props) {
search={`?v=${relatedVideo.id}`}
horizontal={true}/>
));

*/
return (


<div>

</div>

/*
<div className='related-videos'>
<NextUpVideo video={nextUpVideo}/>
{relatedVideosPreviews}
</div>
*/
);
}
10 changes: 5 additions & 5 deletions src/components/Video/Video.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -96,10 +96,10 @@ export function Video(props) {
<button disabled={!range.occur} onMouseOver={'pointer'}
style={{
width: Math.floor((opts.width / duration) * (range.end - range.start)),
height: 25,
height: 40,
display: 'inline',
padding: 0,
margin: 0,
padding: 10,
margin: 5,
border: 0,
backgroundColor: range.occur ? color : 'white'
}}
Expand Down
2 changes: 2 additions & 0 deletions src/components/Video/Video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
left: 0;
bottom: 0;
right: 0;
padding: 70px;
margin: 50px;

.video-player {
min-height: 480px;
Expand Down
9 changes: 6 additions & 3 deletions src/components/VideoInfoBox/VideoInfoBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ export class VideoInfoBox extends React.Component {
</div>
<Button className='subscribe' color='youtube'>{buttonText}</Button> */}
<div className="video-description">

{/* <div className={descriptionTextClass}>
{descriptionParagraphs}
</div> */}
<h1>Summary</h1>
<h2>0:00 - Item 1 Display...</h2>
<h2>1:02 - Item 2 Appears...</h2>





{/* <Button compact onClick={this.onToggleCollapseButtonClick}>{buttonTitle}</Button> */}
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/VideoMetadata/VideoMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export function VideoMetadata(props) {

return (
<div className='video-metadata'>

<h3>{props.video.snippet.title}</h3>
{/* <div className='video-stats'>
<span>{viewCount} views</span>
Expand Down
1 change: 1 addition & 0 deletions src/components/VideoMetadata/VideoMetadata.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
h3 {
font-weight: 400;
color: $text-color-dark;
align-items: center;
}

.video-stats {
Expand Down

0 comments on commit dd1f16b

Please sign in to comment.