From 6b6f8513776d09a0b69d5a8e640f35a29ac74eaa Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 13 Jun 2017 15:57:19 -0700 Subject: [PATCH 01/40] edited html template from pets livecode --- build/index.html | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/build/index.html b/build/index.html index 03869595f..08c860344 100644 --- a/build/index.html +++ b/build/index.html @@ -5,10 +5,36 @@ - Backbone Baseline + Fluffers +
+

movies!

+
+
+
+
+
+
+ + + + + + + From aec14ac599815a44679add6acd6c6780b6a6ba9d Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Tue, 13 Jun 2017 15:59:58 -0700 Subject: [PATCH 02/40] initial commits for movie_list, movie_list_view, code for app to sync to them --- src/app.js | 22 +++++++++ src/collections/movie_list.js | 13 +++++ src/views/movie_list_view.js | 93 +++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 src/collections/movie_list.js create mode 100644 src/views/movie_list_view.js diff --git a/src/app.js b/src/app.js index 58b77997c..e91c4525b 100644 --- a/src/app.js +++ b/src/app.js @@ -3,10 +3,32 @@ // Import jQuery & Underscore import $ from 'jquery'; import _ from 'underscore'; +import MovieList from 'app/collections/movie_list'; +import MovieListView from 'app/views/movie_list_view'; +var petList = new PetList(); // ready to go $(document).ready(function() { $('section.main-content').append('

Hello World!

'); + movieList.fetch(); + + var options = { + el: $("#movie-list"), + model: petList + }; + + var movieListDisplay = new MovieListView(options); + movieListDisplay.render(); + +}); + + + + + +$(document).ready(function() { + + }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js new file mode 100644 index 000000000..4ef35acea --- /dev/null +++ b/src/collections/movie_list.js @@ -0,0 +1,13 @@ +import Movie from 'app/models/movie'; + +var MovieList = Backbone.Collection.extend({ + model: Movie, + url: 'http://petdibs.herokuapp.com/pets', + + // parse: function(data) { + // return data; + // } + +}); + +export default MovieList; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js new file mode 100644 index 000000000..3be75cfba --- /dev/null +++ b/src/views/movie_list_view.js @@ -0,0 +1,93 @@ +import $ from 'jquery'; +import _ from 'underscore'; +import Backbone from 'backbone'; +import PetView from './movie_view'; + +var MovieListView = Backbone.View.extend({ + initialize: function(options) { + this.movieTemplate = _.template($("#movie-card-template").html()); + + this.listElement = this.$(".movie-card"); + + this.movieList = []; + + this.model.forEach(function(rawMovie) { + this.addMovie(rawMovie); + }, this); + + this.input = { + name: this.$('.new-movie input[name="name"]'), + // age: this.$('.new-movie input[name="age"]'), + // breed: this.$('.new-movie input[name="breed"]') + }; + + this.listenTo(this.model, 'add', this.addMovie); + this.listenTo(this.model, 'update', this.render); + // this.listenTo(this.model, 'remove', this.removeMovie); + }, + + render: function() { + // var self = this; + this.listElement.empty(); + + this.movieList.forEach(function(movieView){ + movieView.render(); + + this.listElement.append(movieView.$el); + }, this); + console.log(this.model); + + return this; + }, + + events: { + 'submit .new-movie': 'createMovie', + 'click .clear-button': 'clearInput' + }, + + createMovie: function(event) { + event.preventDefault(); + + var rawMovie = this.getInput(); + this.model.create(rawMovie); + this.clearInput(); + }, + + addMovie: function(pet) { + var movieView = new MovieView({ + model: pet, + template: this.movieTemplate + }); + + // this.listenTo(petView, 'showDetailsClicked', this.showPetDetails); + + this.listenTo(movie, 'edit', this.editMovie); + + this.movieList.push(movieView); + }, + + getInput: function() { + var movie = { + name: this.input.name.val()//, + // age: this.input.age.val(), + // breed: this.input.breed.val() + }; + console.log("Added Movie:"); + console.log(movie); + + return movie; + }, + + clearInput: function(event) { + console.log("clearInput called!"); + this.input.name.val('')//; + // this.input.age.val(''); + // this.input.breed.val(''); + } + + // this.listenTo(pet, 'edit', this.editPet); + + +}); + +export default MovieListView; From 50c57008b7756dcc7798fdba86a04bd8a82646a6 Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Tue, 13 Jun 2017 16:13:16 -0700 Subject: [PATCH 03/40] fixed movie related typos --- build/index.html | 10 ++++++---- src/app.js | 2 +- src/collections/movie_list.js | 2 +- src/views/movie_list_view.js | 14 +++++++------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build/index.html b/build/index.html index 08c860344..dcdc7c1bc 100644 --- a/build/index.html +++ b/build/index.html @@ -5,7 +5,7 @@ - Fluffers + Movies @@ -14,18 +14,20 @@

movies!

-
+
+
    +
    + + diff --git a/src/css/styles.css b/src/css/styles.css index 68a79a569..5a03ccb58 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -36,9 +36,17 @@ aside label { div { display: inline; + border-style: solid; + border-color: black; } -/* + +.movie-card div { + height: 100px; + border: solid, black, 2px; + border-style: solid; + border-color: black; +} + * { border-style: solid; } -*/ From 0342ef24013d22c66443589a5a2732e84804c911 Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Wed, 14 Jun 2017 15:53:44 -0700 Subject: [PATCH 13/40] intitial code for showMovieDetails function --- build/index.html | 3 ++- src/views/movie_list_view.js | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/index.html b/build/index.html index 55275c42e..7c86f6395 100644 --- a/build/index.html +++ b/build/index.html @@ -34,7 +34,8 @@

    movies!

    - + +
    diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index f8b099b93..d0b1c5d40 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -43,7 +43,8 @@ }, events: { - 'click #search': 'getInput' + 'click #search': 'getInput', + 'click .movie-poster': 'showMovieDetails' // 'submit .new-movie': 'createMovie', // 'click .clear-button': 'clearInput' }, @@ -69,6 +70,11 @@ this.movieList.push(movieView); }, + showMovieDetails: function(event) { + event.preventDefault(); + console.log("in Show Movie Details"); + }, + getInput: function() { var searchList = new MovieList(), query = this.$('#title').val(), From c7799aa5e134f5a031565255c60f123333c55204 Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Wed, 14 Jun 2017 16:17:30 -0700 Subject: [PATCH 14/40] showMovieDetails function testing --- src/views/movie_list_view.js | 13 ++++++++----- src/views/movie_view.js | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index d0b1c5d40..890018851 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -7,6 +7,8 @@ var MovieListView = Backbone.View.extend({ initialize: function(options) { this.movieTemplate = _.template($("#movie-card-template").html()); + this.movieDetailTemplate = _.template($("#movie-info-template").html()); + this.listElement = this.$(".movie-card"); @@ -37,7 +39,6 @@ this.listElement.append(movieView.$el); }, this); - // console.log(this.model); return this; }, @@ -63,7 +64,7 @@ template: this.movieTemplate }); - // this.listenTo(petView, 'showDetailsClicked', this.showPetDetails); + this.listenTo(movieView, 'showDetailsClicked', this.showMovieDetails); this.listenTo(movie, 'edit', this.editMovie); @@ -73,15 +74,17 @@ showMovieDetails: function(event) { event.preventDefault(); console.log("in Show Movie Details"); + console.log(this); + this.render(); }, getInput: function() { var searchList = new MovieList(), query = this.$('#title').val(), url = this.model.url, - result =searchList.fetch({url:url + "?query=" +query}) - console.log(searchList); - var options = {el: $('main'),model: searchList}, + result = searchList.fetch({url:url + "?query=" + query}) + console.log(searchList); + var options = {el: $('main'),model: searchList}, searchListView = new MovieListView(options); searchListView.render() diff --git a/src/views/movie_view.js b/src/views/movie_view.js index e2cabb179..eb4e31def 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -8,9 +8,7 @@ var MovieView = Backbone.View.extend({ }, render: function() { - // console.log(this.model.attributes.name); var html = this.template({movie: this.model.toJSON()}); - // console.log(info); this.$el.html(html); this.delegateEvents(); @@ -18,7 +16,7 @@ var MovieView = Backbone.View.extend({ return this; }, events: { - // "click .show-details": "onClick", + "click .show-details": "onClick", "click .delete-button": "deleteMovie", }, deleteMovie: function(event) { From 88358a043edc2000e1042da2c2edcf694a79f28e Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Thu, 15 Jun 2017 09:40:05 -0700 Subject: [PATCH 15/40] css strip down for movie lists --- build/index.html | 6 +++--- src/css/styles.css | 2 ++ src/views/movie_list_view.js | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/index.html b/build/index.html index 7c86f6395..aaba42d59 100644 --- a/build/index.html +++ b/build/index.html @@ -29,11 +29,11 @@

    movies!

    -
    +
    -
    +
    @@ -50,7 +50,7 @@

    movies!

    <%- movie.title %> - + + - + + + diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index d77d9fbba..59970d66b 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -31,7 +31,7 @@ var MovieListView = Backbone.View.extend({ }, render: function() { - // var self = this; + var self = this; console.log("here!"); this.listElement.empty(); @@ -42,14 +42,23 @@ var MovieListView = Backbone.View.extend({ // console.log(movieView.model); this.listElement.append(movieView.$el); - }, this); + + self.listenTo(movieView, 'openorderform', self.showMovieDetails); + + }, this, + + + + ); + + return this; }, events: { 'click #search': 'getInput', - 'click .movie-poster': 'showMovieDetails' + 'click #open': 'showMovieDetails' // 'click #library': 'render' // 'submit .new-movie': 'createMovie', // 'click .clear-button': 'clearInput' @@ -77,13 +86,19 @@ var MovieListView = Backbone.View.extend({ this.movieList.push(movieView); }, - showMovieDetails: function(event) { - event.preventDefault(); + showMovieDetails: function(movieView) { + // event.preventDefault(); console.log("in Show Movie Details"); // console.log(this); + var movieDetailsTemplate = this.movieDetailTemplate(movieView.model.toJSON()); + $('#movie-info-template').html(movieDetailsTemplate); this.render(); }, + hideMovieDetails: function(event) { + $("#movie-info-template").hide(); + }, + // this.listElement.empty(); // this.movieList.forEach(function(movieView){ diff --git a/src/views/movie_view.js b/src/views/movie_view.js index db11d8912..56b1baa83 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -1,3 +1,5 @@ +import $ from 'jquery'; +import _ from 'underscore'; import Backbone from 'backbone'; var MovieView = Backbone.View.extend({ @@ -26,9 +28,10 @@ var MovieView = Backbone.View.extend({ return this; }, events: { - "click .show-details": "onClick", - "click .delete-button": "deleteMovie", + // "click .show-details": "onClick", + // "click .delete-button": "deleteMovie", "click #add": "orderMovie", + "click #open": "openForm" // "click #rent: " }, @@ -65,6 +68,12 @@ var MovieView = Backbone.View.extend({ console.log(collection); console.log(response); console.log(options); + }, + + openForm: function(event) { + console.log("open form"); + $('#order-form').show(); + this.trigger('openorderform', this) } }); From 55013d756d0a26a191d21ed9b15adb0f73961205 Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Tue, 20 Jun 2017 14:24:40 -0700 Subject: [PATCH 27/40] got modal to show up and populate with template on open click --- build/css/styles.css | 14 ++++++++++++++ src/app.js | 4 ++++ src/views/movie_list_view.js | 8 +++++--- src/views/movie_view.js | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/build/css/styles.css b/build/css/styles.css index 68a79a569..549d27e4f 100644 --- a/build/css/styles.css +++ b/build/css/styles.css @@ -37,6 +37,20 @@ aside label { div { display: inline; } + +#order-form { + z-index: 10; + position: fixed; + width: 30%; + height: 30%; + top: 30%; + left: 30%; + background-color: #538ca3; + text-align: center; + border: 1em solid white; + margin-left: 20%; + border-radius: 20%; +} /* * { border-style: solid; diff --git a/src/app.js b/src/app.js index fe0136ec8..7664c4f70 100644 --- a/src/app.js +++ b/src/app.js @@ -8,6 +8,9 @@ import MovieListView from 'views/movie_list_view'; var movieList = new MovieList(); +// $("#order-form").hide(); + + // ready to go $(document).ready(function() { @@ -23,6 +26,7 @@ $(document).ready(function() { var movieListDisplay = new MovieListView(options); movieListDisplay.render(); + $("#order-form").hide(); $('#library').click(function() { movieList.fetch(); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 59970d66b..2561d373d 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -58,7 +58,8 @@ var MovieListView = Backbone.View.extend({ events: { 'click #search': 'getInput', - 'click #open': 'showMovieDetails' + 'click #open': 'showMovieDetails', + 'click #close': 'hideMovieDetails' // 'click #library': 'render' // 'submit .new-movie': 'createMovie', // 'click .clear-button': 'clearInput' @@ -91,12 +92,13 @@ var MovieListView = Backbone.View.extend({ console.log("in Show Movie Details"); // console.log(this); var movieDetailsTemplate = this.movieDetailTemplate(movieView.model.toJSON()); - $('#movie-info-template').html(movieDetailsTemplate); + $('#order-form').html(movieDetailsTemplate); + $("#order-form").show(); this.render(); }, hideMovieDetails: function(event) { - $("#movie-info-template").hide(); + $("#order-form").hide(); }, // this.listElement.empty(); diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 56b1baa83..4ffe6063e 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -71,6 +71,7 @@ var MovieView = Backbone.View.extend({ }, openForm: function(event) { + event.preventDefault(); console.log("open form"); $('#order-form').show(); this.trigger('openorderform', this) From 1684e19ed47b91a0234e4d039fd92ace1a7c65b1 Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Tue, 20 Jun 2017 16:05:16 -0700 Subject: [PATCH 28/40] populated modal with movie info --- build/css/styles.css | 13 +++++++------ build/index.html | 2 +- src/app.js | 5 +---- src/views/movie_list_view.js | 14 ++++++++------ src/views/movie_view.js | 3 ++- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build/css/styles.css b/build/css/styles.css index 549d27e4f..f5ca838fe 100644 --- a/build/css/styles.css +++ b/build/css/styles.css @@ -40,16 +40,17 @@ div { #order-form { z-index: 10; - position: fixed; - width: 30%; - height: 30%; + /*position: fixed;*/ + width: 50%; + height: 60%; top: 30%; left: 30%; - background-color: #538ca3; + background-color: gray; text-align: center; - border: 1em solid white; + /*border: solid black;*/ margin-left: 20%; - border-radius: 20%; + margin-right: 20%; + border-radius: 5%; } /* * { diff --git a/build/index.html b/build/index.html index b08464acc..b3daa9ff6 100644 --- a/build/index.html +++ b/build/index.html @@ -63,7 +63,7 @@

    movies!

    Title: <%- movie.title %>

    Synopsis: <%- movie.overview %>

    Release Date: <%- movie.release_date %>

    - + diff --git a/src/app.js b/src/app.js index 7664c4f70..4a062aea2 100644 --- a/src/app.js +++ b/src/app.js @@ -8,9 +8,6 @@ import MovieListView from 'views/movie_list_view'; var movieList = new MovieList(); -// $("#order-form").hide(); - - // ready to go $(document).ready(function() { @@ -26,7 +23,7 @@ $(document).ready(function() { var movieListDisplay = new MovieListView(options); movieListDisplay.render(); - $("#order-form").hide(); + $('#order-form').hide(); $('#library').click(function() { movieList.fetch(); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 2561d373d..04d95ed10 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -44,6 +44,7 @@ var MovieListView = Backbone.View.extend({ this.listElement.append(movieView.$el); self.listenTo(movieView, 'openorderform', self.showMovieDetails); + // self.listenTo(movieView, 'showModal', self.showContactInfo ) }, this, @@ -58,10 +59,11 @@ var MovieListView = Backbone.View.extend({ events: { 'click #search': 'getInput', - 'click #open': 'showMovieDetails', - 'click #close': 'hideMovieDetails' + // 'click #open': 'showMovieDetails', + 'click #close': 'hideMovieDetails', + 'click #add': 'addMovie' // 'click #library': 'render' - // 'submit .new-movie': 'createMovie', + // 'submit .new-movie': 'createMovie' // 'click .clear-button': 'clearInput' }, @@ -90,11 +92,11 @@ var MovieListView = Backbone.View.extend({ showMovieDetails: function(movieView) { // event.preventDefault(); console.log("in Show Movie Details"); - // console.log(this); - var movieDetailsTemplate = this.movieDetailTemplate(movieView.model.toJSON()); + + var movieDetailsTemplate = this.movieDetailTemplate({movie: movieView.model.toJSON()}); $('#order-form').html(movieDetailsTemplate); $("#order-form").show(); - this.render(); + // this.render(); }, hideMovieDetails: function(event) { diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 4ffe6063e..c2d5bcca0 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -60,7 +60,8 @@ var MovieView = Backbone.View.extend({ // console.log( this.model.attributes.url); // console.log(this.model.toJSON()); this.model.emulateHTTP = true; - this.model.sync("create",selectedMovie,[options]) + this.model.sync("create",selectedMovie,[options]); + $('#order-form').hide(); }, From b0dd1191144d1a5ad67409685cb46c716f14d54f Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Tue, 20 Jun 2017 16:46:03 -0700 Subject: [PATCH 29/40] reconnected orderMovie function --- build/index.html | 2 +- src/views/movie_list_view.js | 15 ++++++++++----- src/views/movie_view.js | 7 +++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/index.html b/build/index.html index b3daa9ff6..5e5e197b4 100644 --- a/build/index.html +++ b/build/index.html @@ -65,7 +65,7 @@

    Synopsis: <%- movie.overview %>

    Release Date: <%- movie.release_date %>

    - + -
    - +
    +
    -     +
    @@ -49,13 +49,16 @@

    Movie Store Rental System

    diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 929aff7d4..363626d23 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -41,7 +41,7 @@ var MovieListView = Backbone.View.extend({ movieView.render(); // console.log(movieView.model); - this.listElement.append(movieView.$el); + this.listElement.prepend(movieView.$el); self.listenTo(movieView, 'openorderform', self.showMovieDetails); // self.listenTo(movieView, 'showModal', self.showContactInfo ) @@ -80,12 +80,17 @@ var MovieListView = Backbone.View.extend({ }, addMovie: function(movie) { + // console.log("this is movie"); + // console.log(movie); + var cleanImage_url = movie.attributes.image_url.replace("https://image.tmdb.org/t/p/w185",""); var movieView = new MovieView({ model: movie, template: this.movieTemplate, movieSearchTemplate : this.movieSearchTemplate }); + movie.set({image_url:cleanImage_url}) + // this.listenTo(movieView, 'showDetailsClicked', this.showMovieDetails); // this.listenTo(movieView,'getInput') find the right callback // this.listenTo(movie, 'edit', this.editMovie); diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 4b9837280..7e78045a2 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -15,28 +15,29 @@ var MovieView = Backbone.View.extend({ render: function() { const backgroundImageStyleProperty = "url(\" " + this.model.attributes.image_url.replace("https://image.tmdb.org/t/p/w185","")+ "\") "; - console.log(this.model.attributes.image_url); + // console.log(this.model.attributes.image_url); if (this.model.attributes.type === "rental") { // console.log(backgroundImageStyleProperty); var html = this.template({movie: this.model.toJSON()}); - this.$el.css({ - 'background-image':backgroundImageStyleProperty, - 'height': '278px', - 'width': '185px', - 'display': 'inline-block' - }); - this.$el.html(html); + // this.$el.css({ + // 'background-image':backgroundImageStyleProperty, + // 'background-size':'contain', + // 'height': '278px', + // 'width': '185px', + // 'display': 'inline-block' + // }); + this.$el.html(html) // console.log("in movie render"); this.delegateEvents(); }else if (this.model.attributes.type === "search"){ const backgroundImageStyleProperty = "url(\" " + this.model.attributes.image_url+ "\") "; var html = this.movieSearchTemplate({movie: this.model.toJSON()}); - this.$el.css({ - 'background-image':backgroundImageStyleProperty, - 'height': '278px', - 'width': '185px', - 'display': 'inline-block' - }); + // this.$el.css({ + // 'background-image':backgroundImageStyleProperty, + // 'height': '278px', + // 'width': '185px', + // 'display': 'inline-block' + // }); this.$el.html(html); } From c1bfe92f73dc9dc800a650b3ceef62581e58258d Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Wed, 21 Jun 2017 16:32:39 -0700 Subject: [PATCH 37/40] removed impotent rent button and relabeled search and search input text --- build/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/index.html b/build/index.html index 97e5fe8a1..359e34a8f 100644 --- a/build/index.html +++ b/build/index.html @@ -18,9 +18,9 @@

    Movie Store Rental System

    - + - +
    @@ -36,7 +36,7 @@

    Movie Store Rental System

    - +
    @@ -53,7 +53,7 @@

    Movie Store Rental System

    <%- movie.title %> - + @@ -71,21 +71,14 @@

    Release Date: <%- movie.release_date %>

    - - - + + + + + diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 85ed09977..9b5734746 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -4,10 +4,6 @@ var MovieList = Backbone.Collection.extend({ model: Movie, url: 'http://localhost:3000/movies', - // parse: function(data) { - // return data; - // } - }); export default MovieList; diff --git a/src/css/_settings.scss b/src/css/_settings.scss index 2653c4854..af784b6d6 100644 --- a/src/css/_settings.scss +++ b/src/css/_settings.scss @@ -42,8 +42,6 @@ // 37. Top Bar @import 'util/util'; -@import url('https://fonts.googleapis.com/css?family=Slabo+27px'); - // 1. Global // --------- @@ -65,7 +63,7 @@ $black: #0a0a0a; $white: #fefefe; $body-background: $white; $body-font-color: $black; -$body-font-family: 'Slabo 27px', serif; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; $body-antialiased: true; $global-margin: 1rem; $global-padding: 1rem; @@ -109,7 +107,7 @@ $block-grid-max: 8; $header-font-family: $body-font-family; $header-font-weight: $global-weight-normal; $header-font-style: normal; -$font-family-monospace: 'Slabo 27px', serif; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; $header-color: inherit; $header-lineheight: 1.4; $header-margin-bottom: 0.5rem; diff --git a/src/models/movie.js b/src/models/movie.js index 60305beea..c781e279c 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -7,15 +7,9 @@ var Movie = Backbone.Model.extend({ url:'http://localhost:3000/movies', }, initialize: function(options) { - - // console.log(this); - + } - // toggleComplete: function() { - // var newStatus = !(this.get('complete')); - // this.set('complete', newStatus); - // this.save(); - // } + }); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 363626d23..3e3936ea8 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -18,16 +18,9 @@ var MovieListView = Backbone.View.extend({ this.addMovie(rawMovie); }, this); - // this.input = { - // title: this.$('.new-movie input[name="name"]'), - // age: this.$('.new-movie input[name="age"]'), - // breed: this.$('.new-movie input[name="breed"]') - // }; this.listenTo(this.model, '#search', this.getInput); this.listenTo(this.model, 'add', this.addMovie); this.listenTo(this.model, 'update', this.render); - // this.listenTo(this.model, 'library', this.render); - // this.listenTo(this.model, 'remove', this.removeMovie); }, render: function() { @@ -37,14 +30,11 @@ var MovieListView = Backbone.View.extend({ this.movieList.forEach(function(movieView){ - // movieView.model.set({type:"rental"}); movieView.render(); - // console.log(movieView.model); this.listElement.prepend(movieView.$el); self.listenTo(movieView, 'openorderform', self.showMovieDetails); - // self.listenTo(movieView, 'showModal', self.showContactInfo ) }, this, @@ -55,12 +45,8 @@ var MovieListView = Backbone.View.extend({ events: { 'click #search': 'getInput', - // 'click #open': 'showMovieDetails', 'click #close': 'hideMovieDetails', 'click #order-movie': 'orderMovie' - // 'click #library': 'render' - // 'submit .new-movie': 'createMovie' - // 'click .clear-button': 'clearInput' }, orderMovie: function(event) { @@ -80,8 +66,9 @@ var MovieListView = Backbone.View.extend({ }, addMovie: function(movie) { - // console.log("this is movie"); - // console.log(movie); + console.log("orig url"); + console.log("test" + movie.attributes.image_url); + var cleanImage_url = movie.attributes.image_url.replace("https://image.tmdb.org/t/p/w185",""); var movieView = new MovieView({ model: movie, @@ -89,17 +76,17 @@ var MovieListView = Backbone.View.extend({ movieSearchTemplate : this.movieSearchTemplate }); - movie.set({image_url:cleanImage_url}) + // if (movie.attributes.image_url.includes("lorem")) { + // movie.set({image_url:cleanImage_url}); + // console.log("clean url"); + // } - // this.listenTo(movieView, 'showDetailsClicked', this.showMovieDetails); - // this.listenTo(movieView,'getInput') find the right callback - // this.listenTo(movie, 'edit', this.editMovie); + console.log(movie.attributes.image_url); this.movieList.push(movieView); }, showMovieDetails: function(movieView) { - // event.preventDefault(); console.log("in Show Movie Details"); this.movieInModal = movieView; @@ -107,7 +94,6 @@ var MovieListView = Backbone.View.extend({ var movieDetailsTemplate = this.movieDetailTemplate({movie: movieView.model.toJSON()}); $('#order-form').html(movieDetailsTemplate); $("#order-form").show(); - // this.render(); }, hideMovieDetails: function(event) { @@ -115,22 +101,12 @@ var MovieListView = Backbone.View.extend({ $("#order-form").hide(); }, - // this.listElement.empty(); - - // this.movieList.forEach(function(movieView){ - // movieView.searchRender(); - // console.log("word"); - // - // this.listElement.append(movieView.$el); - // }, this); - - // return this; - // }, - getInput: function() { var searchList = new MovieList(), query = this.$('#title').val(), url = this.model.url; + console.log("search url"); + console.log(url); searchList.fetch({ url:url + "?query=" + query, success:this.searchRender @@ -151,9 +127,6 @@ var MovieListView = Backbone.View.extend({ }) }, - // this.listenTo(movie, 'edit', this.editPet); - - }); export default MovieListView; diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 7e78045a2..5f3dbe95b 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -11,13 +11,9 @@ var MovieView = Backbone.View.extend({ }, - - render: function() { const backgroundImageStyleProperty = "url(\" " + this.model.attributes.image_url.replace("https://image.tmdb.org/t/p/w185","")+ "\") "; - // console.log(this.model.attributes.image_url); if (this.model.attributes.type === "rental") { - // console.log(backgroundImageStyleProperty); var html = this.template({movie: this.model.toJSON()}); // this.$el.css({ // 'background-image':backgroundImageStyleProperty, @@ -27,7 +23,6 @@ var MovieView = Backbone.View.extend({ // 'display': 'inline-block' // }); this.$el.html(html) - // console.log("in movie render"); this.delegateEvents(); }else if (this.model.attributes.type === "search"){ const backgroundImageStyleProperty = "url(\" " + this.model.attributes.image_url+ "\") "; @@ -44,11 +39,8 @@ var MovieView = Backbone.View.extend({ return this }, events: { - // "click .show-details": "onClick", - // "click .delete-button": "deleteMovie", "click #add": "orderMovie", "click #open": "openForm" - // "click #rent: " }, deleteMovie: function(event) { @@ -65,26 +57,17 @@ var MovieView = Backbone.View.extend({ // event.preventDefault(); console.log("orderMovie called"); - var selectedMovie = this.model + var selectedMovie = this.model; selectedMovie.set({inventory:order_count}); - console.log(selectedMovie.attributes) + console.log(selectedMovie.attributes); var options = { success: 'syncSuccessCallback', url: this.model.attributes.url, method: "create", - // inventory: inventory - - // data: this.model.toJSON(), } - // console.log( this); - // console.log( this.model.attributes.url); - // console.log(this.model.toJSON()); this.model.emulateHTTP = true; this.model.sync("create",selectedMovie,[options]); $('#order-form').hide(); - console.log(order_count); - - }, syncSuccessCallback: function(collection, response, options){ From c709a6e44dfb90f63190b6aa34b3c5721ac1ccf6 Mon Sep 17 00:00:00 2001 From: Elizabeth Deutsch Date: Tue, 27 Jun 2017 11:41:31 -0700 Subject: [PATCH 40/40] deleted unnecessary notes --- build/index.html | 2 -- src/views/movie_view.js | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build/index.html b/build/index.html index ca03e9dbf..c3be4df90 100644 --- a/build/index.html +++ b/build/index.html @@ -36,7 +36,6 @@

    Movie Store Rental System

    -
    @@ -53,7 +52,6 @@

    Movie Store Rental System

    >

    <%- movie.title %> -