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.

Sign up for GitHub

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

Carets -- Lauren Cardella & Victoria Sawchuk #18

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
+446 −41
Open

Carets -- Lauren Cardella & Victoria Sawchuk #18

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8791af6
Add files for movie model, collection, and relevant views
vsawchuk Dec 18, 2017
678370f
add ul and movie template to index.html
vsawchuk Dec 18, 2017
ae298db
Add necessary code to render list of movies once it's called from the…
vsawchuk Dec 18, 2017
deb05bc
render rental library when click on rental library button
vsawchuk Dec 18, 2017
a5df649
Rental library renders as a list
vsawchuk Dec 18, 2017
323c516
Display picture in movie template, remove extraneous console.log
vsawchuk Dec 18, 2017
519f4c9
Move event listening onto instance of movie list view instead of init…
vsawchuk Dec 18, 2017
f10233b
Add instace of MovieList for search results. Add method to MovieList …
enigmagnetic Dec 18, 2017
dffd82a
Build custom event to handle an IMDB query
vsawchuk Dec 18, 2017
dc1cf9e
Implement event handling with a form for searching IMDB movies
vsawchuk Dec 19, 2017
a0f9179
Prevent automatic rendering of rental library
vsawchuk Dec 19, 2017
bb91138
Add separate template for library movies and search movies
vsawchuk Dec 19, 2017
88146c6
Add styling. Add events and slide animation for details and add renta…
enigmagnetic Dec 19, 2017
4072930
Remove duration argument from toggle function to make it run at defau…
enigmagnetic Dec 19, 2017
f19d8c9
Remove height property on product cards and replace with min height, …
vsawchuk Dec 19, 2017
23f27db
Styling changes
enigmagnetic Dec 19, 2017
02c4715
Add events for adding a rental to the rental library from the IMDB li…
enigmagnetic Dec 19, 2017
5d8691e
Display details on library movies
vsawchuk Dec 19, 2017
de4c807
Prevent render errors caused by null release dates from API, add addi…
vsawchuk Dec 19, 2017
d246f77
Remove duplicate listing of release date for library movies
vsawchuk Dec 19, 2017
aed70d5
Send post request and add new movie to collection when user adds inve…
vsawchuk Dec 19, 2017
bfd89af
Merge branch 'add-inventory'
vsawchuk Dec 19, 2017
5b67e9d
Add navigation and divs for rentals and customers. Add display-none c…
enigmagnetic Dec 20, 2017
def1f5f
Merge branch 'add-inventory'
enigmagnetic Dec 20, 2017
0d9de1e
Add logic to switch between pages.
enigmagnetic Dec 20, 2017
a4a0fc3
Add customer model, collection, view, and list view. Instantiate cust…
enigmagnetic Dec 20, 2017
fdbe9fe
Adjust html to have $ in front of account credit, show registration y…
enigmagnetic Dec 20, 2017
c6a2e57
Add radio buttons to movie search form
vsawchuk Dec 20, 2017
6e88f15
Create a rental display list, use the rental list as the referencelis…
vsawchuk Dec 20, 2017
6bdb153
Choose between imdb and rental library for searching purposes
vsawchuk Dec 20, 2017
09344f1
Adjust styling for customers and movie lists.
enigmagnetic Dec 21, 2017
3af31ea
Set a min-width to the listing-info div for uniform appearance.
enigmagnetic Dec 21, 2017
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
Prev Previous commit
Next Next commit
Adjust styling for customers and movie lists.
@enigmagnetic
enigmagnetic committed Dec 21, 2017
commit 09344f1f7564245afaf5413de5f2a1db0c4907fa
38 changes: 21 additions & 17 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Backbone Baseline</title>
<title>Hometown Video</title>

<link href="https://fonts.googleapis.com/css?family=Bungee+Inline" rel="stylesheet">

</head>
<body>
<header>
@@ -14,22 +17,23 @@ <h1>Hometown</h1>
<a href="#" id="movies-link">Movies</a> | <a href="#" id="customers-link">Customers</a> | <a href="#" id="rentals-link">Rentals</a>
</nav>
</header>
<div class="actions">
<button id='show-rental-library' class='button'>Rental Library</button>
<form id='search-movies'>
<input type="radio" id="library-radio" name="searchList" value="library" checked="checked"/>
<label for="library-radio">Rental Library</label>

<input type="radio" id="imdb-radio" name="searchList" value="imdb">
<label for="imdb-radio">IMDB</label>

<label>Search Titles</label>
<input type='text' id='searchTerm'/>
<input type='submit' class='button' id='search' value='Search'></input>
</form>
</div>
<main id="main-content">
<div id='movies-container'>
<div class="actions">
<button id='show-rental-library' class='button'>Rental Library</button>
<form id='search-movies'>
<input type="radio" id="library-radio" name="searchList" value="library" checked="checked"/>
<label for="library-radio">Rental Library</label>

<input type="radio" id="imdb-radio" name="searchList" value="imdb">
<label for="imdb-radio">IMDB</label>

<label>Search Titles</label>
<input type='text' id='searchTerm'/>
<input type='submit' class='button' id='search' value='Search'></input>
</form>
</div>
<section id='movies'>
</section>
</div>
@@ -40,7 +44,7 @@ <h1>Hometown</h1>
</div>

<div id="rentals-container" class="display-none">
<p>In rentals container</p>
<p>No rentals yet</p>
</div>

</main>
@@ -64,7 +68,7 @@ <h5>Overview</h5>
<span>
<img src='<%- image_url %>' alt='<%- title %>'/>
</span>
<div class="listing-info">
<div class="listing-info">
<h3><%- title %></h3>
<p><%- release_date.slice(0, 4) %></p>
<button class='button show-details'>Show Details</button>
@@ -78,7 +82,7 @@ <h5>Overview</h5>
<h5>Add Movie to Inventory</h5>
<form id="add-rental">
<label>Quantity</label>
<input type="text" name="inventory"></input>
<input type="text" name="inventory" value="qty"></input>
<input type="submit" class="button" value="Order Movie"></input>
</form>
</div>
45 changes: 31 additions & 14 deletions src/css/styles.css
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,18 @@ header {
padding: 1em;
}

header h1 {
margin-bottom: 0;
line-height: 1em;
font-family: 'Bungee Inline', cursive;
}

header p {
margin-top: 0;
margin-left: 3px;
line-height: 1em;
}

nav {
text-align: right;
}
@@ -38,25 +50,27 @@ header a {
width: 35%;
}

#main-content{
clear: both;
}

#movies {
list-style-type: none;
margin-left: 4em;
width: 85%;
clear: both;
margin: 0 auto;
}

.movie {
.movie, .customer {
background: #2f2f2f;
border: solid 5px #ffcf00;
border-radius: 5px;
min-height: 360px;
margin: 1em;
padding: 1em;
}

.movie {
min-height: 360px;
}

.customer {
color: #ffcf00;
}

.movie img {
border: 4px solid white;
display: inline-block;
@@ -69,12 +83,12 @@ header a {
margin: 1em 1em 1em .5em;
}

.listing-info, .details, .add-rental-form {
.listing-info, .slide {
color: white;
display: inline-block;
}

.listing-info p {
.listing-info p, .customer p, #add-rental label {
color: #afafaf;
}

@@ -86,10 +100,13 @@ header a {

.slide {
display: none;
width: 27em;
/* height: 318px; */
padding: 1em;
}

.details {
overflow: auto;
overflow: scroll;
}

#add-rental input[name="inventory"] {
width: 3em;
}