diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index 0ebadb0..98847f6 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -18,8 +18,11 @@ class Header extends Component { return (
-
- {/*

{this.props.movie.name}

*/} +
+

{this.props.movie.name}

+ + +

{this.props.movie.overview}

diff --git a/src/containers/App.js b/src/containers/App.js index c451789..10c0408 100644 --- a/src/containers/App.js +++ b/src/containers/App.js @@ -34,7 +34,7 @@ makeAipCall = (searchItem) => { movieImageUrl = "https://image.tmdb.org/t/p/w500" + movie.poster_path; // pass in the movie object to our MovieRow component and keep it in a variable called // movieComponent - const movieComponent = this.selectMovieHandler(movie)} key={movie.id} movieImage={movieImageUrl} @@ -110,5 +110,3 @@ makeAipCall = (searchItem) => { } export default App; - - diff --git a/src/containers/Layout/Layout.js b/src/containers/Layout/Layout.js index 9b817d0..34ec2f3 100644 --- a/src/containers/Layout/Layout.js +++ b/src/containers/Layout/Layout.js @@ -17,9 +17,9 @@ class Layout extends Component { this.getMovie(); } - 71411 + // 71411 getMovie = () => { - // 1) make api call to retrieve movie + const url = "https://api.themoviedb.org/3/tv/71411?api_key=224ce27b38a3805ecf6f6c36eb3ba9d0"; axios.get(url) .then(res => { diff --git a/src/containers/MovieShowcase/MovieShowcase.js b/src/containers/MovieShowcase/MovieShowcase.js index b2a7449..31c3231 100644 --- a/src/containers/MovieShowcase/MovieShowcase.js +++ b/src/containers/MovieShowcase/MovieShowcase.js @@ -1,20 +1,65 @@ import React, { Component } from "react"; +import axios from 'axios'; +import MovieShowCaseRow from '../MovieShowcase/MovieShowcaseRow/MovieShowcaseRow'; class MovieShowcase extends Component { + + state = { + trendingMovieRows: [], + movies: [] + } + + componentWillMount() { + this.getTrending(); + } + + getTrending = () => { + const url = 'https://api.themoviedb.org/3/movie/popular?api_key=224ce27b38a3805ecf6f6c36eb3ba9d0&language=en-US&page=1'; + + axios.get(url) + .then(res => { + console.log(res.data.results); + const results = res.data.results; + let movieRows = []; + + results.forEach((movie) => { + const movieImageUrl = "url(https://image.tmdb.org/t/p/original/" + movie.poster_path; + const movieComponent = + movieRows.push(movieComponent); + }) + // update state + this.setState({trendingMovieRows: movieRows}) + + }).catch(error => { + console.log(error); + }) + } + + + + render() { + + + return (

New Releases

-
movie 1
+ {/* {this.state.trendingMovieRows} */} + {/* {this.state.movies[0].title} */} + {/*
movie 1
movie 2
movie 3
movie 4
movie 5
-
movie 6
-
+
movie 6
*/} + {/*
*/} -

Trending Now

+ {/*

Trending Now

movie 1
movie 2
@@ -22,6 +67,7 @@ class MovieShowcase extends Component {
movie 4
movie 5
movie 6
+
*/} ) diff --git a/src/containers/MovieShowcase/MovieShowcaseRow/MovieShowcaseRow.js b/src/containers/MovieShowcase/MovieShowcaseRow/MovieShowcaseRow.js new file mode 100644 index 0000000..f4015ed --- /dev/null +++ b/src/containers/MovieShowcase/MovieShowcaseRow/MovieShowcaseRow.js @@ -0,0 +1,14 @@ +import React, { Component } from 'react'; + +// `url(https://image.tmdb.org/t/p/original/${this.props.movie.backdrop_path})`; + +const movieShowcaseRow = (props) => ( + +
+
+ +
+
+); + +export default movieShowcaseRow; \ No newline at end of file diff --git a/src/static/sass/base/_base.scss b/src/static/sass/base/_base.scss index 533ffc3..51ecc1d 100644 --- a/src/static/sass/base/_base.scss +++ b/src/static/sass/base/_base.scss @@ -57,6 +57,6 @@ html { .container { display: grid; - grid-template-rows: 47vw min-content min-content min-content; + grid-template-rows: 50vw min-content min-content min-content; grid-template-columns: 4% repeat(10, 1fr) 4%; } diff --git a/src/static/sass/components/_modal.scss b/src/static/sass/components/_modal.scss index c8f1e4b..6adcd2c 100644 --- a/src/static/sass/components/_modal.scss +++ b/src/static/sass/components/_modal.scss @@ -6,7 +6,8 @@ left: 0; color: #fff; height: 50rem; - + box-shadow: 0 1.5rem 4rem rgba($color-dark, .15); + &__title { font-size: 4rem; } diff --git a/src/static/sass/components/_movieShowcase.scss b/src/static/sass/components/_movieShowcase.scss index 479b6b7..20f5933 100644 --- a/src/static/sass/components/_movieShowcase.scss +++ b/src/static/sass/components/_movieShowcase.scss @@ -1,6 +1,7 @@ .movieShowcase { - background-color: blue; + background-color: $color-background; grid-column: 2 / 13; + color: #fff; &__container { display: grid; @@ -11,4 +12,9 @@ padding: 3rem; } } +} + +.shit { + width: 20rem; + height: 10rem; } \ No newline at end of file diff --git a/src/static/sass/layout/_header.scss b/src/static/sass/layout/_header.scss index 5a0b4ca..7518012 100644 --- a/src/static/sass/layout/_header.scss +++ b/src/static/sass/layout/_header.scss @@ -1,9 +1,47 @@ .header { background-color: rebeccapurple; grid-column: 1 / 13; + display: flex; + + &__container { + padding-top: 25rem; + padding-left: 4.5rem; + color: #fff; - &__background { - - } + &-heading { + font-size: 6rem; + padding-bottom: 1rem; + } + + &-btnPlay, + &-btnMyList { + cursor: pointer; + font-size: 1.5rem; + color: #fff; + border-radius: 5px; + padding-left: 4rem; + margin-right: 1rem; + padding-right: 4rem; + border: 1px solid rgba(255, 255, 255, .4); + padding-top: 1rem; + background-color: rgba(51, 51, 51, .4); + padding-bottom: 1rem; + + + + &:hover { + color: $color-dark; + background-color: #fff; + transition: all .3s; + } + } + + &-overview { + width: 45rem; + line-height: 1.3; + padding-top: 1.5rem; + font-size: 1.8rem; + } + } } \ No newline at end of file