From 8d9f992eb7c736b9465dd9b9d543d21619be0eda Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 10:21:55 -0800 Subject: [PATCH 01/26] added initial customer and movie files --- src/models/customer.js | 6 ++++++ src/models/movie.js | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 src/models/customer.js create mode 100644 src/models/movie.js diff --git a/src/models/customer.js b/src/models/customer.js new file mode 100644 index 000000000..fcff43672 --- /dev/null +++ b/src/models/customer.js @@ -0,0 +1,6 @@ + +import Backbone from 'backbone'; + +var Customer = Backbone.Model.extend({}); + +export default Customer; diff --git a/src/models/movie.js b/src/models/movie.js new file mode 100644 index 000000000..1669cf781 --- /dev/null +++ b/src/models/movie.js @@ -0,0 +1,5 @@ +import Backbone from 'backbone'; + +var Movie = Backbone.Model.extend({}); + +export default Movie; From dc8c5b9ad21941b29cf7d1b7fc6140ee5e7ecc78 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 10:31:50 -0800 Subject: [PATCH 02/26] initial set up complete for imports and lists --- src/app.js | 13 +++++++++++++ src/collections/customer_list.js | 9 +++++++++ src/collections/movie_list.js | 9 +++++++++ src/views/customer_list_view.js | 0 src/views/movie_list_view.js | 0 5 files changed, 31 insertions(+) create mode 100644 src/collections/customer_list.js create mode 100644 src/collections/movie_list.js create mode 100644 src/views/customer_list_view.js create mode 100644 src/views/movie_list_view.js diff --git a/src/app.js b/src/app.js index 30c00d594..2cd486186 100644 --- a/src/app.js +++ b/src/app.js @@ -6,6 +6,19 @@ import './css/styles.css'; import $ from 'jquery'; import _ from 'underscore'; +// models +import Backbone from 'backbone'; +import Customer from '/models/customer'; +import Movie from '/models/movie'; + +//collections +import CustomerList from '/collections/customer_list'; +import MovieList from '/collections/movie_list'; + +//views +import CustomerListView from '/views/customer_list_view'; +import MovieListView from '/views/movie_list_view'; + // ready to go $(document).ready(function() { diff --git a/src/collections/customer_list.js b/src/collections/customer_list.js new file mode 100644 index 000000000..e1fa99136 --- /dev/null +++ b/src/collections/customer_list.js @@ -0,0 +1,9 @@ +import Backbone from 'backbone'; +import Customer from '../models/customer'; + +var CustomerList = Backbone.Collection.extend({ + model: Customer, + url: 'http://localhost:3000/customers' +}); + +export default CustomerList; diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js new file mode 100644 index 000000000..4e30cc407 --- /dev/null +++ b/src/collections/movie_list.js @@ -0,0 +1,9 @@ +import Backbone from 'backbone'; +import Movie from '../models/movie'; + +var MovieList = Backbone.Collection.extend({ + model: Movie, + url: 'http://localhost:3000/movies' +}); + +export default MovieList; diff --git a/src/views/customer_list_view.js b/src/views/customer_list_view.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js new file mode 100644 index 000000000..e69de29bb From 3d11f9b5c17eda855b8f7ead8b114906c394923d Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 10:34:48 -0800 Subject: [PATCH 03/26] minor changes from var to let to limit scope --- src/collections/customer_list.js | 2 +- src/collections/movie_list.js | 2 +- src/models/customer.js | 2 +- src/models/movie.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/collections/customer_list.js b/src/collections/customer_list.js index e1fa99136..6518ed107 100644 --- a/src/collections/customer_list.js +++ b/src/collections/customer_list.js @@ -1,7 +1,7 @@ import Backbone from 'backbone'; import Customer from '../models/customer'; -var CustomerList = Backbone.Collection.extend({ +let CustomerList = Backbone.Collection.extend({ model: Customer, url: 'http://localhost:3000/customers' }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 4e30cc407..3904b1101 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -1,7 +1,7 @@ import Backbone from 'backbone'; import Movie from '../models/movie'; -var MovieList = Backbone.Collection.extend({ +let MovieList = Backbone.Collection.extend({ model: Movie, url: 'http://localhost:3000/movies' }); diff --git a/src/models/customer.js b/src/models/customer.js index fcff43672..b9fae80f7 100644 --- a/src/models/customer.js +++ b/src/models/customer.js @@ -1,6 +1,6 @@ import Backbone from 'backbone'; -var Customer = Backbone.Model.extend({}); +let Customer = Backbone.Model.extend({}); export default Customer; diff --git a/src/models/movie.js b/src/models/movie.js index 1669cf781..20dc1006d 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var Movie = Backbone.Model.extend({}); +let Movie = Backbone.Model.extend({}); export default Movie; From 468600adf7a451f5fe78be16f623723415e44b71 Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 10:46:24 -0800 Subject: [PATCH 04/26] changes title --- dist/index.html | 4 ++-- src/app.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index 559b18ecd..c778e5023 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,11 +2,11 @@ - Backbone Baseline + Video Store
- +
diff --git a/src/app.js b/src/app.js index 2cd486186..778c14960 100644 --- a/src/app.js +++ b/src/app.js @@ -22,6 +22,6 @@ import MovieListView from '/views/movie_list_view'; // ready to go $(document).ready(function() { - $('#main-content').append('

Hello World!

'); + $('#main-content').append('

this is the main content. I am in app.js

'); }); From e63ed4a910a280320dd7ab6f5703dec9264ffd06 Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 11:17:48 -0800 Subject: [PATCH 05/26] sets up basic HTML for the page --- dist/images/search.png | Bin 0 -> 2224 bytes dist/images/themoviedb.png | Bin 0 -> 653 bytes dist/index.html | 16 ++++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 dist/images/search.png create mode 100644 dist/images/themoviedb.png diff --git a/dist/images/search.png b/dist/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..5a286bf0875c4b5aae5bf1a28f94017dc41d6711 GIT binary patch literal 2224 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 literal 0 HcmV?d00001 diff --git a/dist/index.html b/dist/index.html index c778e5023..0db33d127 100644 --- a/dist/index.html +++ b/dist/index.html @@ -7,6 +7,22 @@
+
+

K & T VIDEO STORE

 + + + +
+
Powered by + The Movie DB +
From a79473abb0aecc42774d0591c471f604e78a7051 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 11:39:21 -0800 Subject: [PATCH 06/26] now renders movie list --- dist/index.html | 19 +++++++++++++++++++ src/app.js | 21 +++++++++++++++------ src/models/movie.js | 8 +++++++- src/views/movie_list_view.js | 28 ++++++++++++++++++++++++++++ src/views/movie_view.js | 17 +++++++++++++++++ 5 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 src/views/movie_view.js diff --git a/dist/index.html b/dist/index.html index c778e5023..905514146 100644 --- a/dist/index.html +++ b/dist/index.html @@ -6,7 +6,26 @@
+
+

MOVIES

+
+
+
+
+
+ + + + +
diff --git a/src/app.js b/src/app.js index 778c14960..3b1d25122 100644 --- a/src/app.js +++ b/src/app.js @@ -9,19 +9,28 @@ import _ from 'underscore'; // models import Backbone from 'backbone'; import Customer from '/models/customer'; -import Movie from '/models/movie'; +import Movie from './models/movie'; //collections import CustomerList from '/collections/customer_list'; -import MovieList from '/collections/movie_list'; +import MovieList from './collections/movie_list'; //views import CustomerListView from '/views/customer_list_view'; -import MovieListView from '/views/movie_list_view'; +import MovieListView from './views/movie_list_view'; +import MovieView from './views/movie_view'; -// ready to go -$(document).ready(function() { +let movieList = new MovieList(); +movieList.fetch(); - $('#main-content').append('

this is the main content. I am in app.js

'); +// $('#main-content').append('

this is the main content. I am in app.js

'); +// ready to go +$(document).ready(function() { + let movieListView = new MovieListView({ + model: movieList, + template: _.template($('#movie-template').html()), + el: 'body' + }); + movieListView.render(); }); diff --git a/src/models/movie.js b/src/models/movie.js index 20dc1006d..44c43800a 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -1,5 +1,11 @@ import Backbone from 'backbone'; -let Movie = Backbone.Model.extend({}); +let Movie = Backbone.Model.extend({ + defaults: { + 'title': 'DEFAULT TITLE', + 'overview': 'DEFAULT OVERVIEW', + 'release_date': 'DEFAULT RELEASE DATE', + } +}); export default Movie; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e69de29bb..a839793e4 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -0,0 +1,28 @@ +import Backbone from 'backbone'; +import _ from 'underscore'; +import $ from 'jquery'; +import Movie from '../models/movie.js'; +import MovieView from './movie_view.js'; + +let MovieListView = Backbone.View.extend({ + initialize: function(params) { + this.template = params.template; + this.listenTo(this.model, 'update', this.render); + }, + render: function() { + this.$('#movie-list').html('
    '); + let that = this; + + this.model.each(function(movie) { + let movieView = new MovieView({ + model: movie, + template: that.template, + tagName: 'li' + }); + that.$('#movie-list ul').append(movieView.render().$el); + }); + return this; + } +}); + +export default MovieListView; diff --git a/src/views/movie_view.js b/src/views/movie_view.js new file mode 100644 index 000000000..1731226ec --- /dev/null +++ b/src/views/movie_view.js @@ -0,0 +1,17 @@ +import Backbone from 'backbone'; +import _ from 'underscore'; +import $ from 'jquery'; +import Movie from '../models/movie.js'; + +let MovieView = Backbone.View.extend({ + initialize: function(params) { + this.template = params.template; + }, + render: function() { + let compiledTemplate = this.template(this.model.toJSON()); + this.$el.html(compiledTemplate); + return this; + } +}); + +export default MovieView; From eba95972c0b21cee6778a8ed5e2ba2b9bb59bfb4 Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 11:47:45 -0800 Subject: [PATCH 07/26] rearranges HTML so that sections are in the right place --- dist/index.html | 73 +++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/dist/index.html b/dist/index.html index 72c3b5e8c..199225041 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1,34 +1,13 @@ - - - Video Store - - -
    -
    -

    MOVIES

    -
    -
    -
    -
    -
    - - - - - - - -
    -

    K & T VIDEO STORE

     + + + Video Store + + + +
    +

    K & T VIDEO STORE
    -
    Powered by - The Movie DB -
    + +
    + +
    +
    +
    + + + + + +
    - - - + + +
    Powered by + The Movie DB +
    +
    + + + + + From a7b55516981fc0e1fbf79b051f0437a7eed986f0 Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 13:16:18 -0800 Subject: [PATCH 08/26] adds button --- dist/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/index.html b/dist/index.html index 199225041..90303d553 100644 --- a/dist/index.html +++ b/dist/index.html @@ -17,6 +17,7 @@
    From afd4a64518e36236305e11dc64649784f92890f9 Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 14:08:18 -0800 Subject: [PATCH 09/26] adds themoviedb png file --- dist/images/search.png | Bin 2224 -> 0 bytes dist/images/themoviedb.png | Bin 653 -> 4032 bytes dist/index.html | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 dist/images/search.png diff --git a/dist/images/search.png b/dist/images/search.png deleted file mode 100644 index 5a286bf0875c4b5aae5bf1a28f94017dc41d6711..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2224 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 diff --git a/dist/index.html b/dist/index.html index 90303d553..177a85958 100644 --- a/dist/index.html +++ b/dist/index.html @@ -29,7 +29,7 @@ From 53ce1023a7b837c5980dc58e74fb731730e1c7fd Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 14:10:38 -0800 Subject: [PATCH 10/26] resizing image --- dist/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.html b/dist/index.html index 177a85958..cd1f37f56 100644 --- a/dist/index.html +++ b/dist/index.html @@ -29,7 +29,7 @@ @@ -45,7 +45,7 @@

    Release Date: <%- release_date %>

    Powered by - The Movie DB + The Movie DB
    From 462f61fe08dcf149ce9fb869c7ceb4f1a1505903 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 14:11:22 -0800 Subject: [PATCH 11/26] added application pages and basic import/export --- dist/images/search.png | Bin 2224 -> 0 bytes dist/images/themoviedb.png | Bin 653 -> 0 bytes src/app.js | 3 +++ src/models/application.js | 4 ++++ src/models/movie.js | 1 + src/views/application_view.js | 6 ++++++ 6 files changed, 14 insertions(+) delete mode 100644 dist/images/search.png delete mode 100644 dist/images/themoviedb.png create mode 100644 src/models/application.js create mode 100644 src/views/application_view.js diff --git a/dist/images/search.png b/dist/images/search.png deleted file mode 100644 index 5a286bf0875c4b5aae5bf1a28f94017dc41d6711..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2224 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 diff --git a/src/app.js b/src/app.js index 3b1d25122..225863ef9 100644 --- a/src/app.js +++ b/src/app.js @@ -10,6 +10,7 @@ import _ from 'underscore'; import Backbone from 'backbone'; import Customer from '/models/customer'; import Movie from './models/movie'; +import Application from './models/application.js'; //collections import CustomerList from '/collections/customer_list'; @@ -19,7 +20,9 @@ import MovieList from './collections/movie_list'; import CustomerListView from '/views/customer_list_view'; import MovieListView from './views/movie_list_view'; import MovieView from './views/movie_view'; +import ApplicationView from './views/application_view.js'; +let application = new Application(); let movieList = new MovieList(); movieList.fetch(); diff --git a/src/models/application.js b/src/models/application.js new file mode 100644 index 000000000..6002f7355 --- /dev/null +++ b/src/models/application.js @@ -0,0 +1,4 @@ +import Backbone from 'backbone'; + + +export default Application; diff --git a/src/models/movie.js b/src/models/movie.js index 44c43800a..9cef5aad2 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -5,6 +5,7 @@ let Movie = Backbone.Model.extend({ 'title': 'DEFAULT TITLE', 'overview': 'DEFAULT OVERVIEW', 'release_date': 'DEFAULT RELEASE DATE', +// 'image_url': "http://lorempixel.com/185/278/", } }); diff --git a/src/views/application_view.js b/src/views/application_view.js new file mode 100644 index 000000000..daeaaabbe --- /dev/null +++ b/src/views/application_view.js @@ -0,0 +1,6 @@ +import Backbone from 'backbone'; +import MovieListView from './movie_list_view.js'; + + + +export default ApplicationView; From e342b5f163df120fd1636edff9aaa9d34cde0fa9 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 15:59:17 -0800 Subject: [PATCH 12/26] pending image --- dist/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/index.html b/dist/index.html index cd1f37f56..9f921c387 100644 --- a/dist/index.html +++ b/dist/index.html @@ -34,6 +34,7 @@

    <%- title %>

    + + @@ -48,7 +63,6 @@

    Release Date: <%- release_date %>

    Powered by The Movie DB
    - diff --git a/src/views/movie_view.js b/src/views/movie_view.js index d6b6cf00a..cc32b0604 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -15,6 +15,7 @@ let MovieView = Backbone.View.extend({ events: { 'click' : 'showDetails' }, + showDetails: function () { this.trigger('showMovieDetails', this.model); } From f21aac8a77504f3c160f9320259fd3e17acdd883 Mon Sep 17 00:00:00 2001 From: Kayla Ecker Date: Mon, 18 Dec 2017 16:35:30 -0800 Subject: [PATCH 17/26] navigates back to view all when you click on title --- src/views/application_view.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/application_view.js b/src/views/application_view.js index 615613ee5..6660a4239 100644 --- a/src/views/application_view.js +++ b/src/views/application_view.js @@ -8,6 +8,9 @@ let ApplicationView = Backbone.View.extend({ this.movieListTemplate = params.movieListTemplate; this.movieDetailsTemplate = params.movieDetailsTemplate; }, + events: { + 'click h1' : 'showList' + }, showList: function () { let movieListView = new MovieListView({ model: this.movieList, From 111f8fe39e599b7baeccf7d6a1eb0da13fd4268c Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 18:34:55 -0800 Subject: [PATCH 18/26] searches api, renders search --- dist/index.html | 22 ++-------------------- src/views/application_view.js | 11 +++++++++-- src/views/movie_details_view.js | 2 +- src/views/movie_list_view.js | 20 ++++++++++++++++---- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dist/index.html b/dist/index.html index 7fea837e2..39a8eb940 100644 --- a/dist/index.html +++ b/dist/index.html @@ -16,7 +16,7 @@ @@ -37,29 +37,11 @@

    <%- title %>

    Title: <%- title %>

    Overview: <%- overview %>

    Release Date: <%- release_date %>

    +

    Add Movie to Store

    - - - - -
    Powered by The Movie DB
    diff --git a/src/views/application_view.js b/src/views/application_view.js index 6660a4239..c10a4baad 100644 --- a/src/views/application_view.js +++ b/src/views/application_view.js @@ -1,6 +1,8 @@ import Backbone from 'backbone'; import MovieListView from './movie_list_view.js'; import MovieDetailsView from './movie_details_view.js'; +import $ from 'jquery'; +import _ from 'underscore'; let ApplicationView = Backbone.View.extend({ initialize: function (params) { @@ -9,8 +11,9 @@ let ApplicationView = Backbone.View.extend({ this.movieDetailsTemplate = params.movieDetailsTemplate; }, events: { - 'click h1' : 'showList' + 'click h1' : 'showList', }, + showList: function () { let movieListView = new MovieListView({ model: this.movieList, @@ -27,7 +30,11 @@ let ApplicationView = Backbone.View.extend({ el: 'body' }); movieDetailsView.render(); - } + }, + + // renderForm: function() { + // $('aside').show(); + // } }); export default ApplicationView; diff --git a/src/views/movie_details_view.js b/src/views/movie_details_view.js index 91259261a..400c56fc8 100644 --- a/src/views/movie_details_view.js +++ b/src/views/movie_details_view.js @@ -11,7 +11,7 @@ let MovieDetailsView = Backbone.View.extend({ render: function() { let compiledTemplate = this.template(this.model.toJSON()); this.$('main').html(compiledTemplate); - } + }, }); export default MovieDetailsView; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e5b40edfe..2e086f179 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -23,10 +23,22 @@ let MovieListView = Backbone.View.extend({ that.listenTo(movieView, 'showMovieDetails', that.showMovieDetails); }); return this; - }, - showMovieDetails: function (movie) { - this.trigger('showMovieDetails', movie); - } + }, + events: { + 'click #search-button' : 'searchMovies' + }, + showMovieDetails: function (movie) { + this.trigger('showMovieDetails', movie); + }, + searchMovies: function () { + var queryTerm = $('#search-box').val(); + $('#search-box').val(''); + + this.model.fetch({ + data: { query: queryTerm }, + processData: true + }); + }, }); export default MovieListView; From 6908578d0a765a89e6dcb8321ca4de52bbbcb281 Mon Sep 17 00:00:00 2001 From: Tanja Stroble Date: Mon, 18 Dec 2017 18:47:04 -0800 Subject: [PATCH 19/26] adding moviedb image again --- dist/index.html | 4 ++-- dist/themoviedb.png | Bin 0 -> 4019 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 dist/themoviedb.png diff --git a/dist/index.html b/dist/index.html index 39a8eb940..5eec1053d 100644 --- a/dist/index.html +++ b/dist/index.html @@ -42,8 +42,8 @@

    Add Movie to Store

    -