+
+
{this.props.movie.title || this.props.movie.name}
Rating: {this.props.movie.vote_average * 10}%
Release date: {this.props.movie.release_date || this.props.movie.first_air_date} Runtime: {this.props.movie.runtime || this.props.movie.episode_run_time}m
-
+
{this.props.movie.number_of_episodes ? " Episodes: " + this.props.movie.number_of_episodes : ""}
{this.props.movie.number_of_seasons ? " Seasons: " + this.props.movie.number_of_seasons : ""}
{this.props.movie.overview}
@@ -26,10 +23,7 @@ class MovieSummary extends Component {
staring: mdf gglo bool emmy djf
Genres: mdf gglo bool emmy djf
-
-
-
-
+
)
}
}
diff --git a/src/components/UI/Modal/Modal.js b/src/components/UI/Modal/Modal.js
index 44c4520..c640f10 100644
--- a/src/components/UI/Modal/Modal.js
+++ b/src/components/UI/Modal/Modal.js
@@ -2,21 +2,15 @@ import React, {Component} from 'react';
import Aux from '../../../hoc/Aux/Aux';
import Backdrop from '../Backdrop/Backdrop'
+
+
+
class Modal extends Component {
-
render() {
-// `background: linear-gradient(90deg, #000000, #ffffff00),
-
const backgroundStyle = {
- // overflow: 'hidden',
-
- // backgroundRepeat: "no-repeat",
- // // backgroundPosition: 'center center'
- // background: "red",
backgroundSize: "cover",
- // backgroundImage: 'linear-gradient(to right, #1c1b1b, rgb(237, 232, 232)'
backgroundImage: `url(https://image.tmdb.org/t/p/original/${this.props.movie.backdrop_path || this.props.movie.poster_path})`,
}
return (
@@ -25,10 +19,8 @@ class Modal extends Component {
- {this.props.children}
+ {this.props.children}
-
-
);
}
diff --git a/src/containers/App.js b/src/containers/App.js
index c508124..c451789 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -5,6 +5,7 @@ import axios from 'axios';
import MovieRow from '../components/MovieRow/MovieRow'
import Modal from '../components/UI/Modal/Modal';
import MovieSummary from '../components/MovieRow/MovieSummary/MovieSummary';
+import CancelIcon from '../static/images/cancel-music.svg'
@@ -77,9 +78,9 @@ makeAipCall = (searchItem) => {
}
axios.get(url)
.then(res => {
-
+ console.log(res);
const movieData = res.data;
- console.log(movieData);
+ // console.log(movieData);
this.setState({movieDetails: movieData});
}).catch(error => {
@@ -97,7 +98,7 @@ makeAipCall = (searchItem) => {
return (
- {this.state.toggleMovieList ?
:
:
{this.state.rows}
}
diff --git a/src/containers/Layout/Layout.js b/src/containers/Layout/Layout.js
index 0f6c974..9b817d0 100644
--- a/src/containers/Layout/Layout.js
+++ b/src/containers/Layout/Layout.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-
+import axios from 'axios';
import Header from '../../components/Header/Header';
import MovieShowcase from '../MovieShowcase/MovieShowcase';
import MovieOriginals from '../MovieOriginals/MovieOriginals';
@@ -9,6 +9,28 @@ import { BrowserRouter } from "react-router-dom";
class Layout extends Component {
+ state = {
+ selectedMovie: {}
+ }
+
+ componentDidMount = () => {
+ this.getMovie();
+ }
+
+ 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 => {
+ const movieData = res.data;
+ this.setState({ selectedMovie: movieData })
+
+ }).catch(error => {
+ console.log(error);
+ })
+
+ }
render() {
@@ -17,7 +39,7 @@ class Layout extends Component {
return (
-
+
diff --git a/src/containers/Navigation/Navigation.js b/src/containers/Navigation/Navigation.js
index 7da0516..60193aa 100644
--- a/src/containers/Navigation/Navigation.js
+++ b/src/containers/Navigation/Navigation.js
@@ -46,7 +46,6 @@ class navigation extends Component {
diff --git a/src/static/images/cancel-music.svg b/src/static/images/cancel-music.svg
new file mode 100644
index 0000000..fa7ebb9
--- /dev/null
+++ b/src/static/images/cancel-music.svg
@@ -0,0 +1,41 @@
+
+
+
diff --git a/src/static/sass/base/_base.scss b/src/static/sass/base/_base.scss
index 8d1e4cc..533ffc3 100644
--- a/src/static/sass/base/_base.scss
+++ b/src/static/sass/base/_base.scss
@@ -45,7 +45,7 @@
body {
box-sizing: border-box;
- background-color: fff;
+ background-color: $color-background;
}
html {
@@ -55,21 +55,8 @@ html {
// GRID AREA
.container {
+
display: grid;
grid-template-rows: 47vw min-content min-content min-content;
grid-template-columns: 4% repeat(10, 1fr) 4%;
}
-
-.searchContent {
- height: 100vh;
- background-color: $color-background;
-}
-
-.search-container {
- background-color: $color-background;
- height: 150%;
- padding-bottom: 10rem;
- padding-left: 4rem;
-
-
-}
diff --git a/src/static/sass/components/_modal.scss b/src/static/sass/components/_modal.scss
index 6849031..c8f1e4b 100644
--- a/src/static/sass/components/_modal.scss
+++ b/src/static/sass/components/_modal.scss
@@ -26,6 +26,15 @@
font-size: 2rem;
}
+ &__cancel {
+ cursor: pointer;
+ width: 1.8rem;
+ fill: #fff;
+ float: right;
+ padding-right: 2rem;
+ padding-top: 2rem;
+ }
+
&__overview {
color: $color-modal-grey;
padding-top: 2rem;
@@ -35,27 +44,19 @@
}
}
-// .hide {
-// transition: all 1s;
-// // transform: translateY(-100vh);
-// display: none;
-// }
+.show {
+ opacity: 1;
+}
- .show {
- opacity: 1;
- // transform: scale(1);
- }
+.hide {
+ transition: all 1s;
+ display: none;
+}
- .hide {
- transition: all 1s;
- // transform: translateY(-100vh);
- display: none;
- }
-
- .shit {
- background: linear-gradient(90deg, #000 50%, transparent);
- width: 70%;
- padding-top: 3rem;
- height: 100%;
- padding-left: 3.5rem;
- }
\ No newline at end of file
+.modal__container {
+ background: linear-gradient(90deg, #000 50%, transparent);
+ width: 70%;
+ padding-top: 3rem;
+ height: 100%;
+ padding-left: 3.5rem;
+}
\ No newline at end of file
diff --git a/src/static/sass/components/_movie.scss b/src/static/sass/components/_movie.scss
index a6e98f7..57f8ce4 100644
--- a/src/static/sass/components/_movie.scss
+++ b/src/static/sass/components/_movie.scss
@@ -1,5 +1,4 @@
.movie {
- // z-index: -1;
flex: 1 1 auto;
padding-top: 6rem;
display: inline-block;
@@ -12,7 +11,8 @@
&:hover {
z-index: -1;
- transform: scale(1.4);
+ transform: scale(1.25);
+
}
}
diff --git a/src/static/sass/components/_search.scss b/src/static/sass/components/_search.scss
index e69de29..e014f62 100644
--- a/src/static/sass/components/_search.scss
+++ b/src/static/sass/components/_search.scss
@@ -0,0 +1,11 @@
+.searchContent {
+ height: 100vh;
+ background-color: $color-background;
+}
+
+.search-container {
+ background-color: $color-background;
+ height: 150%;
+ padding-bottom: 10rem;
+ padding-left: 4rem;
+}
\ No newline at end of file
diff --git a/src/static/sass/layout/_header.scss b/src/static/sass/layout/_header.scss
index a1319c7..5a0b4ca 100644
--- a/src/static/sass/layout/_header.scss
+++ b/src/static/sass/layout/_header.scss
@@ -1,5 +1,9 @@
.header {
- padding-top: 4rem;
background-color: rebeccapurple;
grid-column: 1 / 13;
+
+
+ &__background {
+
+ }
}
\ No newline at end of file