diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
index ac6083f..bdd45fd 100644
--- a/src/components/Header/Header.js
+++ b/src/components/Header/Header.js
@@ -1,8 +1,9 @@
import React from 'react';
+import SearchMovie from "../../containers/SearchMovie/SearchMovie";
const header = () => (
);
diff --git a/src/components/MovieRow/MovieRow.js b/src/components/MovieRow/MovieRow.js
index bb18f54..b91d44b 100644
--- a/src/components/MovieRow/MovieRow.js
+++ b/src/components/MovieRow/MovieRow.js
@@ -3,17 +3,17 @@ import React from 'react';
const movieRow = (props) => (
-
);
diff --git a/src/components/NavigationItems/NavigationItems.js b/src/components/NavigationItems/NavigationItems.js
index 626ef8d..d940b34 100644
--- a/src/components/NavigationItems/NavigationItems.js
+++ b/src/components/NavigationItems/NavigationItems.js
@@ -1,24 +1,58 @@
-import React from 'react';
+import React, { Component } from 'react';
+
import NavigationItem from './NavigationItem/NavigationItem';
+import SearchLogo from '../../static/images/search-icon.svg';
+import SearchMovie from '../../containers/SearchMovie/SearchMovie';
-const navigationItems = props => (
-
- Netflix
- Home
- TV Shows
- Movies
- Recently Added
- My List
+// const navigationItems = (props) => (
+//
+// Netflix
+// Home
+// TV Shows
+// Movies
+// Recently Added
+// My List
-
-
- {/*
hello
-
hello
*/}
-
-
-);
+//
+//
+//
+// {/*
*/}
+// {/*
hello
+//
hello
*/}
+//
+//
+// );
-export default navigationItems;
+// export default navigationItems;
+
+class NavigationItems extends Component {
+
+
+ render() {
+ return (
+
+ Netflix
+ Home
+ TV Shows
+ Movies
+ Recently Added
+ My List
+
+
+
+ {/*
*/}
+ {/* */}
+ {/* hello
+ hello
*/}
+
+
+ );
+ }
+}
+
+export default NavigationItems;
diff --git a/src/components/Search/Search.js b/src/components/Search/Search.js
index 70eaee0..e095ef5 100644
--- a/src/components/Search/Search.js
+++ b/src/components/Search/Search.js
@@ -1,16 +1,12 @@
import React from 'react';
const search = (props) => (
-
-
-
-
-
-);
+
+)
-export default search;
\ No newline at end of file
+export default search;
\ No newline at end of file
diff --git a/src/containers/App.js b/src/containers/App.js
index 880d10c..2a70b0f 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -1,17 +1,28 @@
import React, { Component } from 'react';
-import axios from 'axios';
-
+import Navigation from "./Navigation/Navigation"
import Layout from './Layout/Layout';
-import MovieRow from '../components/MovieRow/MovieRow';
+import axios from 'axios';
+import MovieRow from '../components/MovieRow/MovieRow'
+// import SearchMovie from './SearchMovie/SearchMovie';
class App extends Component {
- state = {
- // an array that will hold all of our movies component
- rows: []
- }
+ state = {
+ myVal: true,
+ //an array that will hold all of our movies component
+ rows: []
+ }
- makeAipCall = (searchItem) => {
+ myB = () => {
+ this.setState({
+ myVal: true
+ })
+ }
+
+
+
+
+makeAipCall = (searchItem) => {
const url = "https://api.themoviedb.org/3/search/movie?api_key=224ce27b38a3805ecf6f6c36eb3ba9d0&page=1&query=" + searchItem;
axios.get(url)
.then(res => {
@@ -42,17 +53,33 @@ class App extends Component {
}
// get the user input and pass it to the makeAPICall function
- searchHandler = (event) => {
- const searchItem = event.target.value;
- this.makeAipCall(searchItem);
- }
+ // searchHandler = (event) => {
+ // // const searchItem = event.target.value;
+ // // this.makeAipCall(searchItem);
+ // alert("Hello");
+ // }
+
+
+ myF = (event) => {
+ this.setState({
+ myVal: false
+ });
+ const userInput = event.target.value;
+ this.makeAipCall(userInput);
+ console.log(userInput);
+ }
+
+
+
render() {
+
+
return (
-
-
- {/*
- {this.state.rows} */}
+
+
+ {this.state.myVal ?
:
{this.state.rows}
}
+
);
diff --git a/src/containers/Layout/Layout.js b/src/containers/Layout/Layout.js
index d7ad783..29a5eda 100644
--- a/src/containers/Layout/Layout.js
+++ b/src/containers/Layout/Layout.js
@@ -1,32 +1,27 @@
import React, { Component } from 'react';
-import Navigation from '../Navigation/Navigation';
import Header from '../../components/Header/Header';
import MovieShowcase from '../MovieShowcase/MovieShowcase';
import MovieOriginals from '../MovieOriginals/MovieOriginals';
import Footer from '../../components/Footer/Footer';
import { BrowserRouter } from "react-router-dom";
+import SearchMovie from '../../containers/SearchMovie/SearchMovie';
- // < Navigation />
- //
- //
- //
- //
class Layout extends Component {
+
render() {
return (
-
-
+
)
}
diff --git a/src/containers/Navigation/Navigation.js b/src/containers/Navigation/Navigation.js
index 0cbf4df..4349dbf 100644
--- a/src/containers/Navigation/Navigation.js
+++ b/src/containers/Navigation/Navigation.js
@@ -25,11 +25,22 @@ class navigation extends Component {
}
}
+
+
+
render () {
return (
)
}
diff --git a/src/containers/SearchMovie/SearchMovie.js b/src/containers/SearchMovie/SearchMovie.js
new file mode 100644
index 0000000..b803674
--- /dev/null
+++ b/src/containers/SearchMovie/SearchMovie.js
@@ -0,0 +1,75 @@
+// import React, { Component } from 'react';
+// import axios from "axios";
+// // import Search from '../../components/Search/Search';
+// import MovieRow from '../../components/MovieRow/MovieRow';
+// import Layout from '../Layout/Layout';
+
+
+// class SearchMovie extends Component {
+
+// state = {
+// // an array that will hold all of our movies component
+// rows: [],
+// myVal: false
+// }
+
+// makeAipCall = (searchItem) => {
+// const url = "https://api.themoviedb.org/3/search/movie?api_key=224ce27b38a3805ecf6f6c36eb3ba9d0&page=1&query=" + searchItem;
+// axios.get(url)
+// .then(res => {
+// // extract the data from json object
+// const movies = res.data.results;
+// // Holds our movieComponent.
+// let movieRows = [];
+// let total = 0;
+// movies.forEach((movie) => {
+// // manually build our image url and set it on the movie object
+// movie.posterSrc = "https://image.tmdb.org/t/p/w185" + movie.poster_path;
+// total+= 1;
+// // pass in the movie object to our MovieRow component and keep it in a variable called
+// // movieComponent
+// const movieComponent =
+// // push our movieComponent to our movieRows array;
+// movieRows.push(movieComponent);
+// })
+// // update state
+// this.setState({ rows: movieRows });
+// }).catch(error => {
+// console.log(error);
+// });
+// }
+
+
+
+// // get the user input and pass it to the makeAPICall function
+// searchHandler = (event) => {
+// // const searchItem = event.target.value;
+// // this.makeAipCall(searchItem);
+// alert("Hello");
+// }
+
+
+// render() {
+
+
+
+// return (
+//
+//
+// {/* */}
+// {event.key}
+//
+
+// );
+// }
+// }
+
+// export default SearchMovie;
\ No newline at end of file
diff --git a/src/static/sass/base/_base.scss b/src/static/sass/base/_base.scss
index d14f979..8c1c09e 100644
--- a/src/static/sass/base/_base.scss
+++ b/src/static/sass/base/_base.scss
@@ -58,4 +58,23 @@ html {
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;
+}
+
+.no {
+ background-color: $color-background;
+ height: 150%;
+ padding-bottom: 10rem;
+ display: flex;
+
+
+}
+
+.yes {
+ background-color: purple;
+ height: 100vh;
}
\ No newline at end of file
diff --git a/src/static/sass/components/_movie.scss b/src/static/sass/components/_movie.scss
index e69de29..2d76ebf 100644
--- a/src/static/sass/components/_movie.scss
+++ b/src/static/sass/components/_movie.scss
@@ -0,0 +1,83 @@
+.movie {
+ // margin-top: 5rem;
+ // padding-left: 16rem;
+ // padding-right: 6rem;
+ // padding-bottom: 6rem;
+ margin-top: 15rem;
+ height: 1rem;
+ display: inline-block;
+
+ display: flex;
+ justify-content: center;
+
+ * > img {
+ width: 25rem;
+ padding-right: 2rem;
+
+ }
+
+ &__column-poster {
+ height: 25rem;
+
+ }
+
+ &__column-overview {
+ padding-left: 3.5rem;
+ text-align: left;
+ width: 60%;
+ padding-top: .5rem;
+
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+
+ &-heading {
+ font-size: 3rem;
+ font-family: 'Fjalla One', sans-serif;
+ color: $color-white;
+ }
+
+ &-text {
+ color: $color-white;
+ font-family: 'Nanum Gothic', sans-serif;
+ text-align: left;
+ font-size: 1.6rem;
+ line-height: 1.5;
+
+ }
+
+ &-btn {
+ margin-bottom: 1rem;
+ color: $color-green;
+ cursor: pointer;
+ border-radius: 5rem;
+ // padding: .5rem;
+ padding: .8rem 2rem .8rem 2rem;
+ font-family: 'Nanum Gothic', sans-serif;
+ font-size: 1.5rem;
+ border: solid 1.7px $color-green;
+ transition: all .2s;
+
+ &:hover {
+ background-color: $color-green;
+ color: #fff;
+ }
+
+ }
+
+ }
+
+ &__poster {
+ height: 100%;
+ }
+}
+
+.even {
+ background-color: $color-purple;
+}
+
+.odd {
+ background-color: $color-light-blue-2;
+
+}
\ No newline at end of file
diff --git a/src/static/sass/layout/_navigation.scss b/src/static/sass/layout/_navigation.scss
index 846ba67..06c169c 100644
--- a/src/static/sass/layout/_navigation.scss
+++ b/src/static/sass/layout/_navigation.scss
@@ -39,17 +39,22 @@
padding-right: 4.6rem;
display: flex;
justify-content: flex-end;
-
}
}
}
+ ::placeholder {
+ color: rgb(167, 166, 166);
+ opacity: 1;
+ /* Firefox */
+ }
+
input[type="text"] {
- // display: none;
- // color: #fff;
+ font-size: 1.4rem;
border: none;
outline: none;
+ background-color: red;
width: 0px;
padding: 10px;
padding-right: 2rem;
@@ -59,12 +64,14 @@ input[type="text"] {
}
input[type="text"]:focus:hover {
+ z-index: 2;
border-bottom: 1px solid #BBB;
color: #fff;
}
input[type="text"]:focus {
width: 22rem;
+ color: #fff;
z-index: 1;
background-color: #000;
border: 1px solid #fff;
@@ -75,7 +82,6 @@ input[type="submit"] {
height: 67px;
width: 63px;
- color: red;
text-indent: -10000px;
border: none;
position: absolute;
@@ -84,4 +90,12 @@ input[type="submit"] {
opacity: 0.4;
cursor: pointer;
transition: opacity .4s ease;
+}
+
+.logo {
+ z-index: -1;
+ width: 2rem;
+ height: 2rem;
+ transform: translateX(2.4rem) translateY(.5rem);
+ cursor: pointer;
}
\ No newline at end of file