From 2794a9009f93f0f272ce57b5dbcd7039d1a36785 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Mon, 18 Dec 2017 12:41:17 -0800 Subject: [PATCH 01/17] created the movie model and collection and views for each --- src/collections/movie_list.js | 8 ++++++++ src/models/movie.js | 7 +++++++ src/views/movie_list_view.js | 11 +++++++++++ src/views/movie_view.js | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 src/collections/movie_list.js create mode 100644 src/models/movie.js create mode 100644 src/views/movie_list_view.js create mode 100644 src/views/movie_view.js diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js new file mode 100644 index 000000000..c0e72dcc8 --- /dev/null +++ b/src/collections/movie_list.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; +import Movie from 'models/movie'; + +const MovieList = Backbone.Collection.extend({ + model: Movie, +}); + +export default MovieList; diff --git a/src/models/movie.js b/src/models/movie.js new file mode 100644 index 000000000..2e3c413ca --- /dev/null +++ b/src/models/movie.js @@ -0,0 +1,7 @@ +import Backbone from 'backbone'; + +const Movie = Backbone.Model.extend({ + +}); + +export default Movie; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js new file mode 100644 index 000000000..df09a20db --- /dev/null +++ b/src/views/movie_list_view.js @@ -0,0 +1,11 @@ +import Backbone from 'backbone'; +import _ from 'underscore'; +import OrderView from '../views/movie_view'; +import Order from '../models/movie'; + +const MovieListView = Backbone.View.extend({ + +}); + + +export default MovieListView; diff --git a/src/views/movie_view.js b/src/views/movie_view.js new file mode 100644 index 000000000..40bd7c437 --- /dev/null +++ b/src/views/movie_view.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; +import Movie from '../models/movie'; + +const MovieView = Backbone.View.extend({ + +}); + +export default MovieView; From c68a437f40479316b69e49cff1e03ca90f23e5af Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Mon, 18 Dec 2017 13:43:02 -0800 Subject: [PATCH 02/17] Added a basic header and template for each movie (hid overview for the time being) --- dist/index.html | 28 +++++++++++++++++++++++++++- src/css/styles.css | 5 +++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dist/index.html b/dist/index.html index 559b18ecd..40517d226 100644 --- a/dist/index.html +++ b/dist/index.html @@ -5,11 +5,37 @@ Backbone Baseline +
+

SuperDuperVideo

+
+ + + +
+
- + +
+ +
+
+
+
+

© 2017, Ada Developers Academy

+
+
+ + diff --git a/src/css/styles.css b/src/css/styles.css index 68a79a569..65b3c636c 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -4,6 +4,11 @@ main { background: lightblue; } +.movie h4{ + /* hide the overview */ + display: none; +} + header { background-color: lightgreen; padding: 0.5rem; From 7b6967411e89fb2a2071b95450bbb722056a2828 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Mon, 18 Dec 2017 14:06:47 -0800 Subject: [PATCH 03/17] added instances of movie and movielist instances to app.js& added url to movie list.js --- src/app.js | 10 ++++++++++ src/collections/movie_list.js | 4 ++++ src/views/movie_list_view.js | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 30c00d594..f23aa5210 100644 --- a/src/app.js +++ b/src/app.js @@ -6,9 +6,19 @@ import './css/styles.css'; import $ from 'jquery'; import _ from 'underscore'; + // ready to go $(document).ready(function() { + const movies = new MovieList(movieData); + + const MovieListView = new MovieListView({ + model: movies, + template: _.template($('#movie-template').html()), + el: 'main' + }); + $('#main-content').append('

Hello World!

'); + MovieListView.render(); }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index c0e72dcc8..ef2218754 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,6 +3,10 @@ import Movie from 'models/movie'; const MovieList = Backbone.Collection.extend({ model: Movie, + url: 'http://localhost:3000/movies/', + parse(response) { + return response; + }, }); export default MovieList; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index df09a20db..e27174edd 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -4,7 +4,10 @@ import OrderView from '../views/movie_view'; import Order from '../models/movie'; const MovieListView = Backbone.View.extend({ - + initialize(params) { + this.template = params.template; + this.listenTo(this.model,"update", this.render); + } }); From 6f35fa1b4f1ae219e6ba7a54b5dbf49ef8e54fb0 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Mon, 18 Dec 2017 14:33:24 -0800 Subject: [PATCH 04/17] added render function in movie_list_view.js --- src/app.js | 18 ++++++++++++++---- src/views/movie_list_view.js | 19 ++++++++++++++++++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/app.js b/src/app.js index f23aa5210..0654108fc 100644 --- a/src/app.js +++ b/src/app.js @@ -6,19 +6,29 @@ import './css/styles.css'; import $ from 'jquery'; import _ from 'underscore'; +// collections +import MovieList from 'collections/movie_list'; + +// views +import MovieView from './views/movie_view.js'; +import MovieListView from './views/movie_list_view.js'; + +// model +import Movie from 'models/movie'; + // ready to go $(document).ready(function() { - const movies = new MovieList(movieData); + const movies = new MovieList(); - const MovieListView = new MovieListView({ + const movieListView = new MovieListView({ model: movies, template: _.template($('#movie-template').html()), - el: 'main' + el: ('#movie') }); $('#main-content').append('

Hello World!

'); - MovieListView.render(); + movieListView.render(); }); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e27174edd..0154e9206 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -7,7 +7,24 @@ const MovieListView = Backbone.View.extend({ initialize(params) { this.template = params.template; this.listenTo(this.model,"update", this.render); - } + }, + render() { + this.$('#MOVIE').empty(); + + this.model.each((movie) => { + const movieView = new MovieView({ + model: movie, + template: this.template, + tagName: 'li', + className: 'movie', + }); + this.$('#movie').prepend(movieView.render().$el); + }); + return this; + }, + events: { + + }, }); From 5314e3e9a6a6fb8507f5124925e8e32f76e935d0 Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Mon, 18 Dec 2017 15:17:20 -0800 Subject: [PATCH 05/17] Created render logic for Movie view and renamed wrong variable names --- src/app.js | 4 +--- src/collections/movie_list.js | 2 +- src/views/movie_list_view.js | 9 +++++---- src/views/movie_view.js | 9 +++++++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/app.js b/src/app.js index 0654108fc..dad818d58 100644 --- a/src/app.js +++ b/src/app.js @@ -21,14 +21,12 @@ import Movie from 'models/movie'; $(document).ready(function() { const movies = new MovieList(); - const movieListView = new MovieListView({ model: movies, template: _.template($('#movie-template').html()), el: ('#movie') }); - $('#main-content').append('

Hello World!

'); - + movies.fetch(); movieListView.render(); }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index ef2218754..f11bcb102 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -6,7 +6,7 @@ const MovieList = Backbone.Collection.extend({ url: 'http://localhost:3000/movies/', parse(response) { return response; - }, + } }); export default MovieList; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 0154e9206..c166e1940 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -1,21 +1,22 @@ import Backbone from 'backbone'; import _ from 'underscore'; -import OrderView from '../views/movie_view'; -import Order from '../models/movie'; +import MovieView from '../views/movie_view'; +import Movie from '../models/movie'; const MovieListView = Backbone.View.extend({ initialize(params) { + console.log(params); this.template = params.template; this.listenTo(this.model,"update", this.render); }, render() { - this.$('#MOVIE').empty(); + this.$('#movie').empty(); this.model.each((movie) => { const movieView = new MovieView({ model: movie, template: this.template, - tagName: 'li', + tagName: 'article', className: 'movie', }); this.$('#movie').prepend(movieView.render().$el); diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 40bd7c437..e3e58e3b9 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -2,7 +2,16 @@ import Backbone from 'backbone'; import Movie from '../models/movie'; const MovieView = Backbone.View.extend({ + initialize(params){ + this.template = params.template; + this.listenTo(this.model, 'change', this.render); + }, + render(){ + const compiledTemplate = this.template(this.model.toJSON()); + this.$el.html(compiledTemplate); + return this; + }, }); export default MovieView; From a81bdc5d0532ee18d3dcbced504afeb11b2431b3 Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Mon, 18 Dec 2017 15:45:49 -0800 Subject: [PATCH 06/17] render the MovieListView when .fetch is finished --- src/app.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app.js b/src/app.js index dad818d58..86d6b81e2 100644 --- a/src/app.js +++ b/src/app.js @@ -24,9 +24,12 @@ $(document).ready(function() { const movieListView = new MovieListView({ model: movies, template: _.template($('#movie-template').html()), - el: ('#movie') + el: ('#main-content') }); - movies.fetch(); - movieListView.render(); + movies.fetch({ + success: function(){ + movieListView.render(); + } + }); }); From 58cfe9e823ef2ae60d4e1ef1f603e6bc3d902b99 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Mon, 18 Dec 2017 16:16:53 -0800 Subject: [PATCH 07/17] added button to add add a movie to inventory. --- dist/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/index.html b/dist/index.html index 40517d226..9cef6a7f9 100644 --- a/dist/index.html +++ b/dist/index.html @@ -35,6 +35,7 @@

<%= title %>

<%= overview %>

<%= release_date %>

+ From 3677f2a2c34933e870aaed5e623583f5f196ea7c Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Mon, 18 Dec 2017 16:21:57 -0800 Subject: [PATCH 08/17] removed button --- dist/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/dist/index.html b/dist/index.html index 9cef6a7f9..40517d226 100644 --- a/dist/index.html +++ b/dist/index.html @@ -35,7 +35,6 @@

<%= title %>

<%= overview %>

<%= release_date %>

- From 5677b120b16d7f49a8d30809b1e5fcb34817989c Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Tue, 19 Dec 2017 11:05:48 -0800 Subject: [PATCH 09/17] added a listener for the search form inside MovieListView --- dist/index.html | 16 ++++++++-------- src/app.js | 1 + src/views/movie_list_view.js | 7 ++++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dist/index.html b/dist/index.html index 40517d226..57ff30570 100644 --- a/dist/index.html +++ b/dist/index.html @@ -5,15 +5,15 @@ Backbone Baseline -
-

SuperDuperVideo

-
- - - -
-
+
+

SuperDuperVideo

+
+ + + +
+
diff --git a/src/app.js b/src/app.js index 86d6b81e2..67c5cf858 100644 --- a/src/app.js +++ b/src/app.js @@ -27,6 +27,7 @@ $(document).ready(function() { el: ('#main-content') }); + // after call to external API, render the movieListView movies.fetch({ success: function(){ movieListView.render(); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index c166e1940..7afcbe3f4 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -24,8 +24,13 @@ const MovieListView = Backbone.View.extend({ return this; }, events: { - + 'submit #search-movies': 'searchMovies', }, + searchMovies: function(e){ + e.preventDefault(); + console.log('Tried to search a movie!'); + } + }); From e80a53b5b4cc02cbdde38367d6436fb236e8f0a5 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Tue, 19 Dec 2017 11:33:53 -0800 Subject: [PATCH 10/17] added searchMovies function --- src/views/movie_list_view.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 7afcbe3f4..a7664e3f2 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -1,4 +1,5 @@ import Backbone from 'backbone'; + import _ from 'underscore'; import MovieView from '../views/movie_view'; import Movie from '../models/movie'; @@ -29,6 +30,14 @@ const MovieListView = Backbone.View.extend({ searchMovies: function(e){ e.preventDefault(); console.log('Tried to search a movie!'); + this.url = `http://localhost:3000/movies?query=${this.$('input[name=query]').val()}`; + console.log(this.url); + this.model.fetch({ + success: function(){ + console.log(this); + this.render(); + } + }); } }); From 6166069e77169c95ab6a75fbde9f084ea65570f6 Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Tue, 19 Dec 2017 12:29:10 -0800 Subject: [PATCH 11/17] created searchMovies function for submitting the search form --- dist/index.html | 10 ++++----- src/app.js | 3 +-- src/collections/movie_list.js | 2 +- src/views/movie_list_view.js | 21 ++++++++---------- src/views/search_movies_view.js | 39 +++++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 src/views/search_movies_view.js diff --git a/dist/index.html b/dist/index.html index 57ff30570..938c06f35 100644 --- a/dist/index.html +++ b/dist/index.html @@ -29,12 +29,10 @@

SuperDuperVideo

diff --git a/src/app.js b/src/app.js index 67c5cf858..48fb64c0e 100644 --- a/src/app.js +++ b/src/app.js @@ -12,14 +12,13 @@ import MovieList from 'collections/movie_list'; // views import MovieView from './views/movie_view.js'; import MovieListView from './views/movie_list_view.js'; +import SearchMoviesView from './views/movie_list_view.js'; // model import Movie from 'models/movie'; - // ready to go $(document).ready(function() { - const movies = new MovieList(); const movieListView = new MovieListView({ model: movies, diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index f11bcb102..ef2218754 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -6,7 +6,7 @@ const MovieList = Backbone.Collection.extend({ url: 'http://localhost:3000/movies/', parse(response) { return response; - } + }, }); export default MovieList; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index a7664e3f2..8117afcb2 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -6,7 +6,7 @@ import Movie from '../models/movie'; const MovieListView = Backbone.View.extend({ initialize(params) { - console.log(params); + // console.log(params); this.template = params.template; this.listenTo(this.model,"update", this.render); }, @@ -24,20 +24,17 @@ const MovieListView = Backbone.View.extend({ }); return this; }, + events: { 'submit #search-movies': 'searchMovies', }, - searchMovies: function(e){ - e.preventDefault(); - console.log('Tried to search a movie!'); - this.url = `http://localhost:3000/movies?query=${this.$('input[name=query]').val()}`; - console.log(this.url); - this.model.fetch({ - success: function(){ - console.log(this); - this.render(); - } - }); + + searchMovies: function(event){ + event.preventDefault(); + const query = this.$('input[name=query]').val(); + this.model.fetch({data: {"query": query}}); + console.log('Inside searchMovies'); + console.log(this.model); } }); diff --git a/src/views/search_movies_view.js b/src/views/search_movies_view.js new file mode 100644 index 000000000..2075a05fe --- /dev/null +++ b/src/views/search_movies_view.js @@ -0,0 +1,39 @@ +// // events: { +// // 'submit #search-movies': 'searchMovies', +// // }, +// +// import Backbone from 'backbone'; +// import MovieView from '../views/movie_view'; +// +// const SearchMoviesView = Backbone.View.extend({ +// initialize(params) { +// this.template = params.template; +// this.listenTo(this.model,"update", this.render); +// }, +// +// render() { +// this.$('#movie').empty(); +// +// this.model.each((movie) => { +// const movieView = new MovieView({ +// model: movie, +// template: this.template, +// tagName: 'article', +// className: 'movie', +// }); +// this.$('#movie').prepend(movieView.render().$el); +// }); +// return this; +// }, +// +// events: { +// 'submit #search-movies': 'searchMovies', +// }, +// searchMovies: function(event){ +// event.preventDefault(); +// console.log('inside seachMovies from SearchMoviesView'); +// console.log(this); +// } +// }) +// +// export default SearchMoviesView; From 6bebad18ccda112666f89122b61c142c05adae22 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Tue, 19 Dec 2017 12:54:48 -0800 Subject: [PATCH 12/17] added template for searched movies and addionals render function for search --- dist/index.html | 8 +++++++ src/app.js | 1 + src/views/movie_list_view.js | 10 +++++++++ src/views/search_movies_view.js | 39 --------------------------------- 4 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 src/views/search_movies_view.js diff --git a/dist/index.html b/dist/index.html index 938c06f35..04c1af1c6 100644 --- a/dist/index.html +++ b/dist/index.html @@ -35,5 +35,13 @@

<%= overview %>

<%= release_date %>

+ + diff --git a/src/app.js b/src/app.js index 48fb64c0e..d2aaa11e8 100644 --- a/src/app.js +++ b/src/app.js @@ -23,6 +23,7 @@ $(document).ready(function() { const movieListView = new MovieListView({ model: movies, template: _.template($('#movie-template').html()), + searchTemplate: _.template($('#search-template').html()), el: ('#main-content') }); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 8117afcb2..8befe27ad 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -8,9 +8,12 @@ const MovieListView = Backbone.View.extend({ initialize(params) { // console.log(params); this.template = params.template; + this.searchTemplate = params.searchTemplate; this.listenTo(this.model,"update", this.render); + this.listenTo(this,"showSearched", this.renderSearch); }, render() { + console.log("INSIDE OF RENDER"); this.$('#movie').empty(); this.model.each((movie) => { @@ -25,6 +28,12 @@ const MovieListView = Backbone.View.extend({ return this; }, + renderSearch() { + console.log("************"); + console.log("INSIDE RENDER SEARCH"); + this.template = this.searchTemplate; + }, + events: { 'submit #search-movies': 'searchMovies', }, @@ -33,6 +42,7 @@ const MovieListView = Backbone.View.extend({ event.preventDefault(); const query = this.$('input[name=query]').val(); this.model.fetch({data: {"query": query}}); + this.trigger('showSearched', this); console.log('Inside searchMovies'); console.log(this.model); } diff --git a/src/views/search_movies_view.js b/src/views/search_movies_view.js deleted file mode 100644 index 2075a05fe..000000000 --- a/src/views/search_movies_view.js +++ /dev/null @@ -1,39 +0,0 @@ -// // events: { -// // 'submit #search-movies': 'searchMovies', -// // }, -// -// import Backbone from 'backbone'; -// import MovieView from '../views/movie_view'; -// -// const SearchMoviesView = Backbone.View.extend({ -// initialize(params) { -// this.template = params.template; -// this.listenTo(this.model,"update", this.render); -// }, -// -// render() { -// this.$('#movie').empty(); -// -// this.model.each((movie) => { -// const movieView = new MovieView({ -// model: movie, -// template: this.template, -// tagName: 'article', -// className: 'movie', -// }); -// this.$('#movie').prepend(movieView.render().$el); -// }); -// return this; -// }, -// -// events: { -// 'submit #search-movies': 'searchMovies', -// }, -// searchMovies: function(event){ -// event.preventDefault(); -// console.log('inside seachMovies from SearchMoviesView'); -// console.log(this); -// } -// }) -// -// export default SearchMoviesView; From 8ddbac3001afeb22f6e1eb797fd7731e9bfe626b Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Tue, 19 Dec 2017 14:47:06 -0800 Subject: [PATCH 13/17] removed fetch fix because when you fetch, the render in the MovieListView automatically happens --- src/app.js | 7 +------ src/views/movie_list_view.js | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app.js b/src/app.js index 48fb64c0e..d82322945 100644 --- a/src/app.js +++ b/src/app.js @@ -26,10 +26,5 @@ $(document).ready(function() { el: ('#main-content') }); - // after call to external API, render the movieListView - movies.fetch({ - success: function(){ - movieListView.render(); - } - }); + movies.fetch(); }); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 8117afcb2..ffd2f03e0 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -11,6 +11,7 @@ const MovieListView = Backbone.View.extend({ this.listenTo(this.model,"update", this.render); }, render() { + console.log("INSIDE RENDER"); this.$('#movie').empty(); this.model.each((movie) => { @@ -39,5 +40,4 @@ const MovieListView = Backbone.View.extend({ }); - export default MovieListView; From c6368520c14f3256132fd2bc015d94602820396e Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Tue, 19 Dec 2017 14:49:20 -0800 Subject: [PATCH 14/17] button to view internal api inventory working. --- dist/index.html | 1 + src/views/movie_list_view.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dist/index.html b/dist/index.html index 04c1af1c6..49e9f5e59 100644 --- a/dist/index.html +++ b/dist/index.html @@ -13,6 +13,7 @@

SuperDuperVideo

+
diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 8befe27ad..5e5b3ae68 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -11,6 +11,8 @@ const MovieListView = Backbone.View.extend({ this.searchTemplate = params.searchTemplate; this.listenTo(this.model,"update", this.render); this.listenTo(this,"showSearched", this.renderSearch); + + this.listenTo(this.model,"currentInv", this.render); }, render() { console.log("INSIDE OF RENDER"); @@ -36,15 +38,24 @@ const MovieListView = Backbone.View.extend({ events: { 'submit #search-movies': 'searchMovies', + 'click button.view-inventory': 'showInventory', }, - searchMovies: function(event){ + searchMovies: function(event) + { event.preventDefault(); const query = this.$('input[name=query]').val(); this.model.fetch({data: {"query": query}}); this.trigger('showSearched', this); console.log('Inside searchMovies'); console.log(this.model); + }, + + showInventory: function(event) { + event.stopImmediatePropagation(); + console.log("inside showInventory"); + this.model.fetch(); + this.trigger('currentInv'); } }); From b69e724bfdb9cd361d4f03ac9b79726e74fc6101 Mon Sep 17 00:00:00 2001 From: HelloMarisaMorris Date: Tue, 19 Dec 2017 16:42:55 -0800 Subject: [PATCH 15/17] added function to add a movie from the external API to the rails API --- dist/index.html | 2 +- src/views/movie_list_view.js | 3 +-- src/views/movie_view.js | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index 49e9f5e59..ee912d81a 100644 --- a/dist/index.html +++ b/dist/index.html @@ -41,7 +41,7 @@

<%= overview %>

<%= title %>

<%= overview %>

<%= release_date %>

- + diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index f6c8bc11e..2a965d14b 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -56,8 +56,7 @@ const MovieListView = Backbone.View.extend({ console.log("inside showInventory"); this.model.fetch(); this.trigger('currentInv'); - } - + }, }); export default MovieListView; diff --git a/src/views/movie_view.js b/src/views/movie_view.js index e3e58e3b9..b4f72f912 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -12,6 +12,20 @@ const MovieView = Backbone.View.extend({ this.$el.html(compiledTemplate); return this; }, + events: { + 'click .add-to-inventory': 'addMovie', + }, + addMovie: function(event) { + event.preventDefault(); + console.log('REACHED addMovie'); + console.log('***********'); + console.log(this.model); + console.log(this.model.attributes); + console.log('***********'); + + this.model.save(this.model.attributes,{type: 'POST'}); + + }, }); export default MovieView; From e01961eb0def85d23be42a178847367ceb500804 Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Wed, 20 Dec 2017 09:59:34 -0800 Subject: [PATCH 16/17] got rid of console.logs --- src/views/movie_list_view.js | 10 +--------- src/views/movie_view.js | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 2a965d14b..e2fa6264b 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -1,5 +1,4 @@ import Backbone from 'backbone'; - import _ from 'underscore'; import MovieView from '../views/movie_view'; import Movie from '../models/movie'; @@ -15,7 +14,6 @@ const MovieListView = Backbone.View.extend({ this.listenTo(this.model,"currentInv", this.render); }, render() { - console.log("INSIDE RENDER"); this.$('#movie').empty(); this.model.each((movie) => { @@ -31,8 +29,6 @@ const MovieListView = Backbone.View.extend({ }, renderSearch() { - console.log("************"); - console.log("INSIDE RENDER SEARCH"); this.template = this.searchTemplate; }, @@ -41,19 +37,15 @@ const MovieListView = Backbone.View.extend({ 'click button.view-inventory': 'showInventory', }, - searchMovies: function(event) - { + searchMovies: function(event) { event.preventDefault(); const query = this.$('input[name=query]').val(); this.model.fetch({data: {"query": query}}); this.trigger('showSearched', this); - console.log('Inside searchMovies'); - console.log(this.model); }, showInventory: function(event) { event.stopImmediatePropagation(); - console.log("inside showInventory"); this.model.fetch(); this.trigger('currentInv'); }, diff --git a/src/views/movie_view.js b/src/views/movie_view.js index b4f72f912..1d9f33c80 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -17,12 +17,6 @@ const MovieView = Backbone.View.extend({ }, addMovie: function(event) { event.preventDefault(); - console.log('REACHED addMovie'); - console.log('***********'); - console.log(this.model); - console.log(this.model.attributes); - console.log('***********'); - this.model.save(this.model.attributes,{type: 'POST'}); }, From 0e347826586b727114d7c792de52e58500ebdcee Mon Sep 17 00:00:00 2001 From: Isaac Del Rosario Date: Wed, 20 Dec 2017 10:05:15 -0800 Subject: [PATCH 17/17] got rid of extra dependencies --- src/app.js | 15 +++++---------- src/views/movie_list_view.js | 2 -- src/views/movie_view.js | 1 - 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/app.js b/src/app.js index 5f89d90ec..989fe127f 100644 --- a/src/app.js +++ b/src/app.js @@ -1,21 +1,16 @@ -import 'css/_settings.css'; -import 'foundation-sites/dist/css/foundation.css'; -import './css/styles.css'; - // Import jQuery & Underscore import $ from 'jquery'; import _ from 'underscore'; +import 'foundation-sites/dist/css/foundation.css'; // collections -import MovieList from 'collections/movie_list'; +import MovieList from './collections/movie_list'; // views -import MovieView from './views/movie_view.js'; -import MovieListView from './views/movie_list_view.js'; -import SearchMoviesView from './views/movie_list_view.js'; +import MovieListView from './views/movie_list_view'; -// model -import Movie from 'models/movie'; +import './css/_settings.css'; +import './css/styles.css'; // ready to go $(document).ready(function() { diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e2fa6264b..c9b0d593f 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -1,7 +1,5 @@ import Backbone from 'backbone'; -import _ from 'underscore'; import MovieView from '../views/movie_view'; -import Movie from '../models/movie'; const MovieListView = Backbone.View.extend({ initialize(params) { diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 1d9f33c80..71204f157 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -1,5 +1,4 @@ import Backbone from 'backbone'; -import Movie from '../models/movie'; const MovieView = Backbone.View.extend({ initialize(params){