Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6b6f851
edited html template from pets livecode
tehut Jun 13, 2017
aec14ac
initial commits for movie_list, movie_list_view, code for app to sync…
edeutschie Jun 13, 2017
8a6a1e9
Merge branch 'master' of https://github.com/edeutschie/VideoStoreCons…
edeutschie Jun 13, 2017
50c5700
fixed movie related typos
edeutschie Jun 13, 2017
b11a81b
movie view
eclairedelune Jun 13, 2017
9ba27b3
resolved file path match issue for Movie and MovieList view
tehut Jun 13, 2017
3695b00
completed debug of GET request and display for Movies
tehut Jun 13, 2017
2eae672
html for search box
tehut Jun 14, 2017
aac8e4d
turned off console logging
tehut Jun 14, 2017
622d56f
still trying to display search results--pushing for partner to collab
tehut Jun 14, 2017
d9a7d7c
got view for search working
tehut Jun 14, 2017
1d17d60
fixed missing var on line 79
tehut Jun 14, 2017
ae63d41
start of css for movie db thumbnails, made movies from movieList links
edeutschie Jun 14, 2017
0342ef2
intitial code for showMovieDetails function
edeutschie Jun 14, 2017
c7799aa
showMovieDetails function testing
edeutschie Jun 14, 2017
88358a0
css strip down for movie lists
edeutschie Jun 15, 2017
8fa6fc4
add tagname: li for movie lists
edeutschie Jun 15, 2017
bdd589f
rent button
eclairedelune Jun 16, 2017
cd37d84
added default type attribute to movie model
tehut Jun 17, 2017
590c418
created searchRender function to render searchTemplate
tehut Jun 17, 2017
5d865a8
changed text on rent/order movie buttons
tehut Jun 17, 2017
bd057ef
implemented POST to rails API
tehut Jun 17, 2017
182b7b8
commented out lines
edeutschie Jun 19, 2017
4043e7e
merge conflict
edeutschie Jun 19, 2017
caa9463
re-added searchRender function to movie_list_view
edeutschie Jun 19, 2017
8c40f7d
fixed bug in orderMovie click event in movie_view
edeutschie Jun 19, 2017
b8d8fb9
added button and functionality to reload movie library list
edeutschie Jun 19, 2017
9861f12
initial template and methods for modal that adds movie to inventory
edeutschie Jun 20, 2017
55013d7
got modal to show up and populate with template on open click
edeutschie Jun 20, 2017
1684e19
populated modal with movie info
edeutschie Jun 20, 2017
b0dd119
reconnected orderMovie function
edeutschie Jun 20, 2017
7f5b73c
change text for Movie Info button, first attempt to save inventory wh…
edeutschie Jun 21, 2017
8152970
removed closing tag on image which fixed issue
eclairedelune Jun 21, 2017
5c8e63e
added inventory to movie when ordering movie
edeutschie Jun 21, 2017
82116e8
Merge branch 'master' of https://github.com/edeutschie/VideoStoreCons…
edeutschie Jun 21, 2017
b34ec9d
troubleshooting Order Movie functions
edeutschie Jun 21, 2017
c736cf1
new header
edeutschie Jun 21, 2017
de00cea
added poster background images to display
tehut Jun 21, 2017
8c6d5c3
Merge branch 'master' of https://github.com/edeutschie/VideoStoreCons…
tehut Jun 21, 2017
1990a92
removed background images and inserted images in template
tehut Jun 21, 2017
c1bfe92
removed impotent rent button and relabeled search and search input text
tehut Jun 21, 2017
6376877
css styling - fonts and header color
edeutschie Jun 23, 2017
41cfa7e
troubleshooting image_url's not loading, deleted unnecessary code
edeutschie Jun 23, 2017
c709a6e
deleted unnecessary notes
edeutschie Jun 27, 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
10 changes: 6 additions & 4 deletions build/css/_settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
// 37. Top Bar

@import 'util/util';
@import url(https://fonts.googleapis.com/css?family=Slabo+27px);
/*@import url(http://fonts.googleapis.com/css?family=Open+Sans);*/


// 1. Global
// ---------
Expand All @@ -63,7 +66,7 @@ $black: #0a0a0a;
$white: #fefefe;
$body-background: $white;
$body-font-color: $black;
$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
$body-font-family: 'Slabo 27px', serif;
$body-antialiased: true;
$global-margin: 1rem;
$global-padding: 1rem;
Expand Down Expand Up @@ -104,10 +107,10 @@ $block-grid-max: 8;
// 4. Base Typography
// ------------------

$header-font-family: $body-font-family;
$header-font-family: 'Slabo 27px', serif;
$header-font-weight: $global-weight-normal;
$header-font-style: normal;
$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;
$font-family-monospace: 'Slabo 27px', serif;
$header-color: inherit;
$header-lineheight: 1.4;
$header-margin-bottom: 0.5rem;
Expand Down Expand Up @@ -618,4 +621,3 @@ $topbar-submenu-background: $topbar-background;
$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
$topbar-input-width: 200px;
$topbar-unstack-breakpoint: medium;

44 changes: 39 additions & 5 deletions build/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
@include foundation-everything;
@import url('https://fonts.googleapis.com/css?family=Slabo+27px');

* {
font-family: 'Slabo 27px', serif;
}

main {
background: lightblue;
font-family: 'Slabo 27px', serif;
}

header {
background-color: lightgreen;
background-color: white;
padding: 0.5rem;
font-family: 'Slabo 27px', serif;
}

h1 {
text-align: center;
}

#completed-checkbox {
Expand Down Expand Up @@ -37,8 +48,31 @@ aside label {
div {
display: inline;
}
/*
* {
border-style: solid;


#order-form {
z-index: 10;
width: 50%;
height: 60%;
top: 30%;
left: 30%;
background-color: white;
text-align: center;
margin-left: 20%;
margin-right: 20%;
border: 2px solid black;
font-family: 'Slabo 27px', serif;
}
*/

li{
vertical-align: top;
margin: 5px;
list-style: none;
width:300px;
display: inline-block;
}

p.title{
background-color: rgba(193, 66, 66, 0.8);
vertical-align: bottom;
}
69 changes: 68 additions & 1 deletion build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,78 @@
<link rel="stylesheet" type="text/css" href="css/_settings.css">
<link rel="stylesheet" type="text/css" href="css/foundation.css">
<link rel="stylesheet" type="text/css" href="css/styles.css">
<title>Backbone Baseline</title>
<title>Movies</title>
</head>
<body>

<header>
<h1>Movie Store Rental System</h1>
</header>
<main>

<section id="order-form"></section>

<section class="row">
<div class="search-box columns small-12 large-4">
<label for="title"> What do we need?</label>
<input type="text" name="title" id="title"></input>
<button type="submit" class="button woogs" id="search">Search Warehouse</button>
<button type="submit" class="button" id="library">Reload Movie Library</button>

</div>
<section class="columns large-4 small-12" id='movie'>


</section>
</section>


<section >


<section class= "column large-10 medium-10 small-12">

<section class="movie-card"></section>

</section>
</section>
<section id='new-movie'></section>
</main>

<footer>Powered by The Movie DB</footer>

<!-- Templates -->


<script id="movie-card-template" type="text/template">
<img id= "poster" src=<%-movie.image_url%>>
<p>
<%- movie.title %>
</script>

<script id="search-card-template" type="text/template">
<img src=<%-movie.image_url%>>
<p><%- movie.title %></p>
<button type="submit" class="button" id="open">Movie Info</button>
</script>

<script id="movie-info-template" type="text/template">
<img src=<%-movie.image_url%>>
<h3>Title: <%- movie.title %></h3>
<h4>Synopsis: <%- movie.overview %></h4>
<h4>Release Date: <%- movie.release_date %></h4>
<label for="title"><h4>How Many Copies Would You Like to Order?</h4></label>
<input type="text" name="title" id="inventory"></input>
<button type="submit" class="button" id="order-movie">Order Movie</button>

</script>

<script src="/app.bundle.js"></script>




</body>


</html>
20 changes: 20 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,30 @@
// Import jQuery & Underscore
import $ from 'jquery';
import _ from 'underscore';
import MovieList from 'collections/movie_list';
import MovieListView from 'views/movie_list_view';

var movieList = new MovieList();

// ready to go
$(document).ready(function() {

$('section.main-content').append('<p>Hello World!</p>');

movieList.fetch();

var options = {
el: $('main'),
model: movieList
};

var movieListDisplay = new MovieListView(options);
movieListDisplay.render();

$('#order-form').hide();

$('#library').click(function() {
movieList.fetch();
});

});
9 changes: 9 additions & 0 deletions src/collections/movie_list.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Movie from '../models/movie';

var MovieList = Backbone.Collection.extend({
model: Movie,
url: 'http://localhost:3000/movies',

});

export default MovieList;
1 change: 0 additions & 1 deletion src/css/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -618,4 +618,3 @@ $topbar-submenu-background: $topbar-background;
$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
$topbar-input-width: 200px;
$topbar-unstack-breakpoint: medium;

19 changes: 17 additions & 2 deletions src/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,24 @@ aside label {

div {
display: inline;
border-style: solid;
border-color: black;
margin: .5em;
}

.movie-card div {
height: 100px;
border: solid, black, 2px;
border-style: solid;
border-color: black;
margin: .5em;
}
/*

* {
border-style: solid;
}
*/

img {
height: 100%;
border: 1px black;
}
16 changes: 16 additions & 0 deletions src/models/movie.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import Backbone from 'backbone';

var Movie = Backbone.Model.extend({
defaults: {
type : "rental",
inventory: 0,
url:'http://localhost:3000/movies',
},
initialize: function(options) {

}

});


export default Movie;
Loading