Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

syting for movie details #13

Merged
merged 2 commits into from
Jun 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ nav {
top: 0;
width: 100%;
height: 70px;
z-index: 3;
}

li {
Expand All @@ -102,6 +103,19 @@ li {
color: white;
}

.site-name{
display: block;
padding: 20px;
color: white;
font-size: 20px;
text-decoration: none;
}

.site-name:hover {
text-decoration: none;
color: white;
}

.nav-option {
display: inline-block;
border: none;
Expand Down Expand Up @@ -158,9 +172,16 @@ li {
}

.selected-movie-details {
width: 250px;
height: 300px;
top: 300px;
grid-area: side;
background-color: white;
margin-top: 50px;
grid-column-start: 2;
grid-row-start: 2;
box-sizing: border-box;
position: fixed;
}


Expand Down
13 changes: 6 additions & 7 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class App extends Component {
behaviorMessage: '',
messageStatus: false,
siteAreaStatus: 'free',
welcomeMessage: 'Welcome to our Movie store',
welcomeMessage: 'ME-tFlix movie rental ',
displaySideBar: false,
}
}
Expand Down Expand Up @@ -213,7 +213,7 @@ class App extends Component {
homeBanner = () => {
this.setState({
siteAreaStatus: 'home',
welcomeMessage: 'We have some good movies!',
welcomeMessage: 'Rent and Chill!',
searchResults: undefined,
displaySideBar: false,

Expand Down Expand Up @@ -245,14 +245,13 @@ class App extends Component {
<nav>
<ul>
<li className="home-link">
<Link className="nav-option" to='/' onClick={this.homeBanner}><span>Home</span></Link>
<Link className="site-name" to='/' onClick={this.homeBanner}><span>RentFlix</span></Link>
</li>

<li>
<Link className="nav-option" to='/movielibrary' onClick={this.clearSearchResults &&this.setSiteAreaBusy}><span>Movies</span></Link>
<li>
<Link className="nav-option" to='/customerlist' onClick={this.clearSearchResults &&this.setSiteAreaBusy}><span>Customers</span> </Link>
</li>
<li>
<Link className="nav-option" to='/customerlist' onClick={this.clearSearchResults &&this.setSiteAreaBusy}><span>Customers</span> </Link>
<Link className="nav-option" to='/movielibrary' onClick={this.clearSearchResults &&this.setSiteAreaBusy}><span>Movies</span></Link>
</li>
<li>
<Link className="nav-option" to='/search' onClick={this.clearSearchResults && this.setSiteAreaFree}><span>Search</span></Link>
Expand Down
32 changes: 19 additions & 13 deletions src/components/Home.css
Original file line number Diff line number Diff line change
@@ -1,33 +1,39 @@
.h-text{
width: 600px;
height: 900px;
width: 400px;
height: 600px;
text-align: center;
margin-left: auto;
margin-right: 100px;
font-size: 4em;
margin-top: 1%;
margin-right: 10%;
margin-left: 73%;
padding: 1000px;
font-size: 5em;
padding: 3px;
z-index: 1;
position: absolute;
left:0;
color: white;
text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
}

.h-section {
max-height: 500vh;
max-height: 400vh;
}

#cf {
position: relative;;
margin:0 auto;
}

#cf img {
position:absolute;
position: center;
max-height: 400vh;
width: 100%;
left:0;
-webkit-transition: opacity 1s ease-in-out;
-moz-transition: opacity 1s ease-in-out;
-o-transition: opacity 1s ease-in-out;
transition: opacity 1s ease-in-out;
-webkit-transition: opacity 0.5s ease-in-out;
-moz-transition: opacity 0.5s ease-in-out;
-o-transition: opacity 0.5s ease-in-out;
transition: opacity 0.5s ease-in-out;
}

#cf img.top:hover {
opacity:0;
}
}
4 changes: 2 additions & 2 deletions src/components/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const Home = (props) => {
return(
<div className="h-section">
<div id="cf">
<img class="bottom" src="https://cdn.pixabay.com/photo/2016/07/14/20/39/background-1517622_1280.jpg" />
<img class="top" src="https://cdn.pixabay.com/photo/2016/06/03/12/42/popcorn-1433327_1280.jpg" />
<img src="https://www.blazingcariboustudios.com/wp-content/uploads/2018/01/Arrival_Review_Header.jpg" alt="arrival movie"/>
<img className="top" src="https://drraa3ej68s2c.cloudfront.net/wp-content/uploads/2016/01/07150125/3086769cfa36c94d625e958981bfc6901c2d116dbd80fb864e067e333ba56542-770x443.jpg" alt="ex-machina movie" />
</div>
<div className='h-text top'>
{props.welcomeMessage}
Expand Down