From 40e872d88fc69b09816e7d3cb34fd6a193b15b9a Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 13:09:31 -0800 Subject: [PATCH 01/46] adding movie model and collection --- src/collections/movie_list.js | 8 ++++++++ src/models/movie.js | 7 +++++++ 2 files changed, 15 insertions(+) create mode 100644 src/collections/movie_list.js create mode 100644 src/models/movie.js diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js new file mode 100644 index 000000000..08970c9fd --- /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..3e507b8f1 --- /dev/null +++ b/src/models/movie.js @@ -0,0 +1,7 @@ +import Backbone from 'backbone'; + +const Movie = Backbone.Model.extend({ + +}) + +export default Movie; From a3ce307c70a6a5087c5cb828d89c14a40884382f Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 13:16:20 -0800 Subject: [PATCH 02/46] adding views --- src/app.js | 5 +++++ src/models/movie.js | 2 +- src/views/movie_list_view.js | 8 ++++++++ src/views/movie_view.js | 8 ++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/views/movie_list_view.js create mode 100644 src/views/movie_view.js diff --git a/src/app.js b/src/app.js index 30c00d594..05ad96a76 100644 --- a/src/app.js +++ b/src/app.js @@ -2,6 +2,11 @@ import 'css/_settings.css'; import 'foundation-sites/dist/css/foundation.css'; import './css/styles.css'; +import Movie from 'models/movie'; +import MovieList from 'collections/movie_list'; +import MovieView from 'views/movie_view'; +import MovieListView from 'views/movie_list_view'; + // Import jQuery & Underscore import $ from 'jquery'; import _ from 'underscore'; diff --git a/src/models/movie.js b/src/models/movie.js index 3e507b8f1..2e3c413ca 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -2,6 +2,6 @@ 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..e9b376806 --- /dev/null +++ b/src/views/movie_list_view.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; +import MovieView from '../views/movie_view.js' + +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 7773e513296af35993dbe50991bcc6ef73682983 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 13:36:35 -0800 Subject: [PATCH 03/46] adding templates --- dist/index.html | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dist/index.html b/dist/index.html index 559b18ecd..ffa87e5a9 100644 --- a/dist/index.html +++ b/dist/index.html @@ -6,7 +6,44 @@
- +
+

CJ's Vidja Shtore

+
+ +
+
+
    + +
+ +
+
+
    + +
+
+
+
+ +
+ + + + + +
From c58c0b6d3ec1b8d139fc2474699283e8e2eb9e67 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 13:46:02 -0800 Subject: [PATCH 04/46] fixing bugs --- src/collections/movie_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 08970c9fd..e13b4b143 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -import Movie from './models/movie'; +import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ model: Movie From 98fa62739a2439bdc5787319e0e2feb458730f2f Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Mon, 18 Dec 2017 14:44:05 -0800 Subject: [PATCH 05/46] added titles to html and fixed bug --- dist/index.html | 6 ++++-- src/app.js | 6 +++++- src/css/styles.css | 6 ++++++ src/views/movie_list_view.js | 2 +- src/views/movie_view.js | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dist/index.html b/dist/index.html index ffa87e5a9..bfa6e6f39 100644 --- a/dist/index.html +++ b/dist/index.html @@ -11,13 +11,15 @@

CJ's Vidja Shtore

-
+
+

Database List

-
+
+

Catalog List

diff --git a/src/app.js b/src/app.js index 05ad96a76..0678df178 100644 --- a/src/app.js +++ b/src/app.js @@ -11,9 +11,13 @@ import MovieListView from 'views/movie_list_view'; import $ from 'jquery'; import _ from 'underscore'; +let catalog = new MovieList(); +let database = new MovieList(); + // ready to go $(document).ready(function() { - $('#main-content').append('

Hello World!

'); + + }); diff --git a/src/css/styles.css b/src/css/styles.css index 68a79a569..ca9e7ad99 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -42,3 +42,9 @@ div { border-style: solid; } */ +/* .workspace.row { + width: 100vw; +} */ +#database-container, #catalog-container { + display: inline-block; +} diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e9b376806..01ecc6dec 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -import MovieView from '../views/movie_view.js' +import MovieView from '../views/movie_view' const MovieListView = Backbone.View.extend({ diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 40bd7c437..f956375db 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -2,7 +2,7 @@ import Backbone from 'backbone'; import Movie from '../models/movie'; const MovieView = Backbone.View.extend({ - + }); export default MovieView; From 7af625096fdb4de74b32906f2bc63d82c0fc9d55 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 14:45:35 -0800 Subject: [PATCH 06/46] merging conflicts --- src/views/movie_list_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e9b376806..01ecc6dec 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -import MovieView from '../views/movie_view.js' +import MovieView from '../views/movie_view' const MovieListView = Backbone.View.extend({ From e399cdce5d9d5c9ab8b6ee797bb24919e734742a Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 15:10:15 -0800 Subject: [PATCH 07/46] adding urls --- src/app.js | 4 ++-- src/collections/movie_list.js | 3 ++- src/models/movie.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app.js b/src/app.js index 0678df178..c0669dbff 100644 --- a/src/app.js +++ b/src/app.js @@ -12,12 +12,12 @@ import $ from 'jquery'; import _ from 'underscore'; let catalog = new MovieList(); -let database = new MovieList(); +// let database = new MovieList(); // ready to go $(document).ready(function() { $('#main-content').append('

Hello World!

'); - + }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index e13b4b143..07193abda 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -2,7 +2,8 @@ import Backbone from 'backbone'; import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ - model: Movie + model: Movie, + url: 'https://localhost:3000/movies' }); export default MovieList; diff --git a/src/models/movie.js b/src/models/movie.js index 2e3c413ca..2a04d698d 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -1,7 +1,7 @@ import Backbone from 'backbone'; const Movie = Backbone.Model.extend({ - + // urlRoot: 'https://localhost:3000/movies/' }); export default Movie; From dbf21fc0f0079ef5714cbe85019cc94516622939 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Mon, 18 Dec 2017 15:36:18 -0800 Subject: [PATCH 08/46] added catalog template info to app.js --- src/app.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app.js b/src/app.js index c0669dbff..9a065ff4c 100644 --- a/src/app.js +++ b/src/app.js @@ -18,6 +18,13 @@ let catalog = new MovieList(); $(document).ready(function() { $('#main-content').append('

Hello World!

'); + const $catalogTemplate = _.template($("#catalog-template").html()); + const catalogView = new MovieListView({ + model: catalog, + template: $catalogTemplate, + el: 'main', + }); + catalog.fetch(); }); From 5f98afb9cfa6281e21300303c899fda130c10f2f Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 15:55:42 -0800 Subject: [PATCH 09/46] implementing .fetch to get data from api --- src/app.js | 7 ++++++- src/collections/movie_list.js | 2 +- src/views/movie_list_view.js | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app.js b/src/app.js index 9a065ff4c..55b19cbdf 100644 --- a/src/app.js +++ b/src/app.js @@ -11,11 +11,17 @@ import MovieListView from 'views/movie_list_view'; import $ from 'jquery'; import _ from 'underscore'; + + let catalog = new MovieList(); // let database = new MovieList(); // ready to go $(document).ready(function() { + let data = catalog.fetch().done() + console.log(data); + console.log('heres catalog'); + console.log(); $('#main-content').append('

Hello World!

'); const $catalogTemplate = _.template($("#catalog-template").html()); @@ -24,7 +30,6 @@ $(document).ready(function() { template: $catalogTemplate, el: 'main', }); - catalog.fetch(); }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 07193abda..44a399967 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,7 +3,7 @@ import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ model: Movie, - url: 'https://localhost:3000/movies' + url: 'http://localhost:3000/movies' }); export default MovieList; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 01ecc6dec..1982e66c8 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -2,7 +2,7 @@ import Backbone from 'backbone'; import MovieView from '../views/movie_view' const MovieListView = Backbone.View.extend({ - + }); export default MovieListView; From 13a23a1c4a0effe92a2bbb280ac18343b15cacb1 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 16:06:45 -0800 Subject: [PATCH 10/46] got attributes to print to console --- src/app.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 55b19cbdf..dc70f3e54 100644 --- a/src/app.js +++ b/src/app.js @@ -18,7 +18,14 @@ let catalog = new MovieList(); // ready to go $(document).ready(function() { - let data = catalog.fetch().done() + let data = catalog.fetch({ + success: function(response) { + response.models.forEach((model) => { + console.log(model.attributes); + }) + } + }); + console.log(data); console.log('heres catalog'); console.log(); From 6405e41f5797527b7d20d7423ce79644f31b0ede Mon Sep 17 00:00:00 2001 From: Canaan West Date: Mon, 18 Dec 2017 16:34:11 -0800 Subject: [PATCH 11/46] rendering local rental database --- dist/index.html | 8 ++++---- src/app.js | 12 ++++-------- src/views/movie_list_view.js | 18 +++++++++++++++++- src/views/movie_view.js | 11 ++++++++++- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dist/index.html b/dist/index.html index bfa6e6f39..e35c06dcf 100644 --- a/dist/index.html +++ b/dist/index.html @@ -13,14 +13,14 @@

CJ's Vidja Shtore

Database List

-
    +

Catalog List

-
    +
@@ -31,7 +31,7 @@

Catalog List

diff --git a/package-lock.json b/package-lock.json index 2d3371d51..0962796f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3045,9 +3045,9 @@ "dev": true }, "foundation-sites": { - "version": "6.4.4-rc1", - "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.4.4-rc1.tgz", - "integrity": "sha512-26cL66QFNqMVwM7bmIEqq4jiW+6CkIeW719ci1pchdJ4UK0Om+3Jl7MhkX/lzdzRHB75f2m1IK9lxk3JGOwApA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.3.1.tgz", + "integrity": "sha1-I4Uzct65SAwTtCZJnq8Mj5DNvh0=", "requires": { "jquery": "3.2.1", "what-input": "4.3.1" diff --git a/package.json b/package.json index 97144b128..e5071c617 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "backbone": "^1.3.3", - "foundation-sites": "^6.4.4-rc1", + "foundation-sites": "^6.3.1", "jquery": "^3.2.1", "underscore": "^1.8.3" } diff --git a/src/css/styles.css b/src/css/styles.css index ca9e7ad99..a0afa1129 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -1,14 +1,69 @@ @include foundation-everything; +* { + padding: 0; + margin: 0; + box-sizing: border-box; +} +body { + color: #465362; +} + +h1 { + font-size: 2em; +} + +h1, h2, h3 { + text-align: center; +} + + main { - background: lightblue; + background: white; } -header { - background-color: lightgreen; +nav { + background: #C3DFE0; + position: sticky; + box-shadow: 0 2px 5px -2px #465362; padding: 0.5rem; } +article { + margin: 20px 0; +} + +#database-container, #catalog-container { + background: #C3DFE0; + color: #233831; + border: 1px solid #ADA8B6; + /* margin: 10px; */ +} + +ul#catalog-movies { + list-style-type: none; +} + +.catalog-movie { + background: white; + margin: 15px 0; + box-shadow: 0 2px 5px -2px #465362; +} +.catalog-movie span{ + font-weight: bold; +} + +#title-image{ + display: block; + text-align: center; +} +#title-image img { + width: 100%; +} +#overview { + padding-top: 10px; +} + #completed-checkbox { display: inline; } @@ -37,14 +92,3 @@ aside label { div { display: inline; } -/* -* { - border-style: solid; -} -*/ -/* .workspace.row { - width: 100vw; -} */ -#database-container, #catalog-container { - display: inline-block; -} From c77dbcf46e2090e716bb89b80a21a348897eee7d Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Mon, 18 Dec 2017 23:42:23 -0800 Subject: [PATCH 13/46] css buttons --- dist/index.html | 22 ++++++++++++++-------- src/css/styles.css | 12 ++++++++++-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dist/index.html b/dist/index.html index 357c214f8..1e935d544 100644 --- a/dist/index.html +++ b/dist/index.html @@ -14,29 +14,31 @@

CJ's Vidja Shtore

-
-

sort

+
+
+

sort

+
+ +
+

track history

+
- -
+

Catalog List

-
-

track history

-
-
@@ -68,7 +70,11 @@

track history

Release Date: <%- release_date %>

+

+

Add to Inventory

+

+
diff --git a/src/css/styles.css b/src/css/styles.css index a0afa1129..0c5bcbc5e 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -36,10 +36,12 @@ article { #database-container, #catalog-container { background: #C3DFE0; color: #233831; - border: 1px solid #ADA8B6; - /* margin: 10px; */ + /* border: 1px solid #ADA8B6; */ + box-shadow: 0 -2px 5px -2px #465362; } + + ul#catalog-movies { list-style-type: none; } @@ -92,3 +94,9 @@ aside label { div { display: inline; } + +/* #sort, #add-history, #add-button { */ +h3 { + background: #BCD979; + box-shadow: 0 2px 5px -2px #465362; +} From e31d7d5f02861869d5bd04c400708acea119dbad Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 11:02:40 -0800 Subject: [PATCH 14/46] adding form for queries --- dist/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dist/index.html b/dist/index.html index 1e935d544..4c040c506 100644 --- a/dist/index.html +++ b/dist/index.html @@ -12,6 +12,11 @@

CJ's Vidja Shtore

+
+ + + +
From 134ae0a6794c3cc25e5f232b2f094de4943ee20a Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 11:36:48 -0800 Subject: [PATCH 15/46] adding url function to movielist model --- dist/index.html | 4 ++-- src/collections/movie_list.js | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index 4c040c506..e00597cd0 100644 --- a/dist/index.html +++ b/dist/index.html @@ -30,12 +30,12 @@

track history

- +

Catalog List

diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 44a399967..272a7ac1e 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,7 +3,17 @@ import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ model: Movie, - url: 'http://localhost:3000/movies' + urlRoot: 'http://localhost:3000/movies', + url: function(query) { + console.log("in URL function") + if (query) { + console.log("in IF!") + return this.urlRoot + '/query=' + this.query + } else { + console.log("in ELSE!") + return this.urlRoot + } + } }); export default MovieList; From 6d115c6da8c23ab64f9aa2d53be9683d18bcabd8 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 12:56:53 -0800 Subject: [PATCH 16/46] minor modification to movielist.js --- src/app.js | 8 ++++++++ src/collections/movie_list.js | 13 +++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/app.js b/src/app.js index f6ed3f154..3847ba2df 100644 --- a/src/app.js +++ b/src/app.js @@ -16,6 +16,7 @@ import _ from 'underscore'; // let database = new MovieList(); let catalog = new MovieList(); + // ready to go $(document).ready(function() { catalog.fetch({ @@ -25,6 +26,7 @@ $(document).ready(function() { }) } }); + console.log(catalog); const $catalogTemplate = _.template($("#catalog-template").html()); @@ -34,5 +36,11 @@ $(document).ready(function() { el: 'main', }); + let database = new MovieList({ + query: "something" + }); + + database.fetch(); + }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 272a7ac1e..2de3067cd 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -2,18 +2,23 @@ import Backbone from 'backbone'; import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ + default: { + query: null + }, + model: Movie, urlRoot: 'http://localhost:3000/movies', - url: function(query) { + url: function() { console.log("in URL function") - if (query) { + if (this.query) { console.log("in IF!") return this.urlRoot + '/query=' + this.query } else { - console.log("in ELSE!") + console.log("in ELSE!"); + console.log(this); return this.urlRoot } - } + }, }); export default MovieList; From f4c2b70edb0e33e02d464f632595c3a2fcefb8e4 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 13:15:32 -0800 Subject: [PATCH 17/46] adding options hash to movielistview --- src/app.js | 6 ++---- src/collections/movie_list.js | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/app.js b/src/app.js index 3847ba2df..7407974cf 100644 --- a/src/app.js +++ b/src/app.js @@ -14,7 +14,7 @@ import _ from 'underscore'; // let database = new MovieList(); -let catalog = new MovieList(); +let catalog = new MovieList([], {}); // ready to go @@ -27,8 +27,6 @@ $(document).ready(function() { } }); - console.log(catalog); - const $catalogTemplate = _.template($("#catalog-template").html()); const catalogView = new MovieListView({ model: catalog, @@ -36,7 +34,7 @@ $(document).ready(function() { el: 'main', }); - let database = new MovieList({ + let database = new MovieList([], { query: "something" }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 2de3067cd..fd4607cb8 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -2,12 +2,10 @@ import Backbone from 'backbone'; import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ - default: { - query: null - }, - - model: Movie, urlRoot: 'http://localhost:3000/movies', + initialize(models, options){ + this.query = options.query + }, url: function() { console.log("in URL function") if (this.query) { @@ -15,10 +13,12 @@ const MovieList = Backbone.Collection.extend({ return this.urlRoot + '/query=' + this.query } else { console.log("in ELSE!"); - console.log(this); + console.log(this.query); return this.urlRoot } }, + + model: Movie, }); export default MovieList; From a58449c955d8374fa6a88014b4465688824e689d Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Tue, 19 Dec 2017 13:16:06 -0800 Subject: [PATCH 18/46] playing with adding search --- src/app.js | 13 ++++++++++--- src/views/movie_list_view.js | 9 ++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/app.js b/src/app.js index 3847ba2df..9c5d0a65c 100644 --- a/src/app.js +++ b/src/app.js @@ -13,7 +13,7 @@ import _ from 'underscore'; -// let database = new MovieList(); +let database = new MovieList(); let catalog = new MovieList(); @@ -30,16 +30,23 @@ $(document).ready(function() { console.log(catalog); const $catalogTemplate = _.template($("#catalog-template").html()); + const $databaseTemplate = _.template($("#database-template").html()); const catalogView = new MovieListView({ model: catalog, template: $catalogTemplate, el: 'main', }); - let database = new MovieList({ - query: "something" + let databaseView = new MovieListView({ + model: database, + template: $databaseTemplate, + el: 'main', }); + // let database = new MovieList({ + // query: "something" + // }); + database.fetch(); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 8e73c10ea..2eb919af8 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -18,7 +18,14 @@ const MovieListView = Backbone.View.extend({ }); this.$('#catalog-movies').append(movieView.render().$el); }) - } + }, + // events: { + // 'click button.btn-query': 'search', + // }, + // search: function(query) { + // }, + + }); export default MovieListView; From 0f7befd4cd8b2ec5aaef63b773cba9014bddfc96 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 13:34:12 -0800 Subject: [PATCH 19/46] utilizing specifyTemp attribute to determine where to append movielist --- dist/index.html | 2 +- src/app.js | 5 ++++- src/collections/movie_list.js | 2 +- src/views/movie_list_view.js | 10 ++++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dist/index.html b/dist/index.html index e00597cd0..4f3644f12 100644 --- a/dist/index.html +++ b/dist/index.html @@ -24,7 +24,7 @@

CJ's Vidja Shtore

sort

-
+

track history

diff --git a/src/app.js b/src/app.js index 258c4b796..8e0ca31c7 100644 --- a/src/app.js +++ b/src/app.js @@ -29,20 +29,23 @@ $(document).ready(function() { const $catalogTemplate = _.template($("#catalog-template").html()); const $databaseTemplate = _.template($("#database-template").html()); + const catalogView = new MovieListView({ model: catalog, template: $catalogTemplate, el: 'main', + speficyTemp: "catalog" }); let database = new MovieList([], { query: "something" -}); + }); let databaseView = new MovieListView({ model: database, template: $databaseTemplate, el: 'main', + specifyTemp: "database" }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index fd4607cb8..b96cbdedd 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -10,7 +10,7 @@ const MovieList = Backbone.Collection.extend({ console.log("in URL function") if (this.query) { console.log("in IF!") - return this.urlRoot + '/query=' + this.query + return this.urlRoot + '/?query=' + this.query } else { console.log("in ELSE!"); console.log(this.query); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 2eb919af8..1f3510b47 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -5,6 +5,8 @@ const MovieListView = Backbone.View.extend({ initialize(params) { this.template = params.template; this.listenTo(this.model, 'update', this.render); + this.specifyTemp = params.specifyTemp; + console.log(params.specifyTemp); }, render() { @@ -16,8 +18,12 @@ const MovieListView = Backbone.View.extend({ tagName: 'li', className: 'movie' }); - this.$('#catalog-movies').append(movieView.render().$el); - }) + if (this.specifyTemp === "catalog"){ + this.$('#catalog-movies').append(movieView.render().$el); + } else if (this.specifyTemp === "database"){ + this.$('#database-movies').append(movieView.render().$el); + } + }); }, // events: { // 'click button.btn-query': 'search', From 5325d3c2e2c939f7197eaa4e074cae0165ded1b5 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Tue, 19 Dec 2017 13:58:03 -0800 Subject: [PATCH 20/46] playing with query --- src/app.js | 29 +++++++++++++++++++---------- src/views/movie_list_view.js | 9 ++++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/app.js b/src/app.js index 8e0ca31c7..d38f6932d 100644 --- a/src/app.js +++ b/src/app.js @@ -34,20 +34,29 @@ $(document).ready(function() { model: catalog, template: $catalogTemplate, el: 'main', - speficyTemp: "catalog" + specifyTemp: "catalog" }); - let database = new MovieList([], { - query: "something" - }); - let databaseView = new MovieListView({ - model: database, - template: $databaseTemplate, - el: 'main', - specifyTemp: "database" - }); + $('.btn-query').click(function(){ +console.log('submit button was clicked'); + let query = this.$(`[name='query']`).val(); + debugger; + let database = new MovieList([], { + query: query, + }); + + let databaseView = new MovieListView({ + model: database, + template: $databaseTemplate, + el: 'main', + specifyTemp: "database" + }); database.fetch(); + }); + + + }); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 1f3510b47..df112980b 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -25,10 +25,13 @@ const MovieListView = Backbone.View.extend({ } }); }, - // events: { - // 'click button.btn-query': 'search', - // }, + events: { + 'click button.btn-query': 'search', + }, // search: function(query) { + // query.preventDefault(); + // query = this.$(`[name='query']`).val(); + // // }, From e6029699aec40fc47a333cb25c15355d90487759 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 14:01:23 -0800 Subject: [PATCH 21/46] debugged submit button --- src/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.js b/src/app.js index d38f6932d..fe7097ea4 100644 --- a/src/app.js +++ b/src/app.js @@ -39,10 +39,10 @@ $(document).ready(function() { - $('.btn-query').click(function(){ + $('.btn-query').click(function(event){ + event.preventDefault(); console.log('submit button was clicked'); - let query = this.$(`[name='query']`).val(); - debugger; + let query = $(`[name='query']`).val(); let database = new MovieList([], { query: query, }); From c5dc698cacd0b69324d021488f2140a007b19c3d Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Tue, 19 Dec 2017 14:45:39 -0800 Subject: [PATCH 22/46] playing with search --- src/app.js | 26 +++++++++++++------------- src/collections/movie_list.js | 8 ++++---- src/views/movie_list_view.js | 17 ++++++++++++----- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/app.js b/src/app.js index fe7097ea4..e53554277 100644 --- a/src/app.js +++ b/src/app.js @@ -28,7 +28,7 @@ $(document).ready(function() { }); const $catalogTemplate = _.template($("#catalog-template").html()); - const $databaseTemplate = _.template($("#database-template").html()); + // const $databaseTemplate = _.template($("#database-template").html()); const catalogView = new MovieListView({ model: catalog, @@ -39,23 +39,23 @@ $(document).ready(function() { - $('.btn-query').click(function(event){ - event.preventDefault(); -console.log('submit button was clicked'); +// $('.btn-query').click(function(event){ +// event.preventDefault(); +// console.log('submit button was clicked'); let query = $(`[name='query']`).val(); let database = new MovieList([], { query: query, }); - let databaseView = new MovieListView({ - model: database, - template: $databaseTemplate, - el: 'main', - specifyTemp: "database" - }); - - database.fetch(); - }); + // let databaseView = new MovieListView({ + // model: database, + // template: $databaseTemplate, + // el: 'main', + // specifyTemp: "database" + // }); + // + // database.fetch(); + // }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index b96cbdedd..22a31abef 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,9 +3,9 @@ import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ urlRoot: 'http://localhost:3000/movies', - initialize(models, options){ - this.query = options.query - }, + // initialize(models, options){ + // this.query = options.query + // }, url: function() { console.log("in URL function") if (this.query) { @@ -17,8 +17,8 @@ const MovieList = Backbone.Collection.extend({ return this.urlRoot } }, - model: Movie, + }); export default MovieList; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index df112980b..995781d1e 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' const MovieListView = Backbone.View.extend({ @@ -28,11 +29,17 @@ const MovieListView = Backbone.View.extend({ events: { 'click button.btn-query': 'search', }, - // search: function(query) { - // query.preventDefault(); - // query = this.$(`[name='query']`).val(); - // - // }, + search: function(e) { + e.preventDefault(); + + + this.query = this.$(`[name='query']`).val(); + debugger; + console.log(this.query.url()); + + + + }, }); From 048ca7c2996dc9440cbd070ea27b7be9c2069f34 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 15:15:12 -0800 Subject: [PATCH 23/46] hacky work-around for getting from db --- src/app.js | 30 +++++++++++++++--------------- src/collections/movie_list.js | 6 +++--- src/views/movie_list_view.js | 29 +++++++++++++++-------------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/app.js b/src/app.js index e53554277..49658343f 100644 --- a/src/app.js +++ b/src/app.js @@ -17,6 +17,9 @@ import _ from 'underscore'; let catalog = new MovieList([], {}); +const $catalogTemplate = _.template($("#catalog-template").html()); +const $databaseTemplate = _.template($("#database-template").html()); + // ready to go $(document).ready(function() { catalog.fetch({ @@ -27,9 +30,6 @@ $(document).ready(function() { } }); - const $catalogTemplate = _.template($("#catalog-template").html()); - // const $databaseTemplate = _.template($("#database-template").html()); - const catalogView = new MovieListView({ model: catalog, template: $catalogTemplate, @@ -39,23 +39,23 @@ $(document).ready(function() { -// $('.btn-query').click(function(event){ -// event.preventDefault(); -// console.log('submit button was clicked'); + $('.btn-query').click(function(event){ + event.preventDefault(); + console.log('submit button was clicked'); let query = $(`[name='query']`).val(); let database = new MovieList([], { query: query, }); - // let databaseView = new MovieListView({ - // model: database, - // template: $databaseTemplate, - // el: 'main', - // specifyTemp: "database" - // }); - // - // database.fetch(); - // }); + let databaseView = new MovieListView({ + model: database, + template: $databaseTemplate, + el: 'main', + specifyTemp: "database" + }); + + database.fetch(); + }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 22a31abef..771ed9bf7 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,9 +3,9 @@ import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ urlRoot: 'http://localhost:3000/movies', - // initialize(models, options){ - // this.query = options.query - // }, + initialize(models, options){ + this.query = options.query + }, url: function() { console.log("in URL function") if (this.query) { diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 995781d1e..6d75f57d6 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -7,7 +7,6 @@ const MovieListView = Backbone.View.extend({ this.template = params.template; this.listenTo(this.model, 'update', this.render); this.specifyTemp = params.specifyTemp; - console.log(params.specifyTemp); }, render() { @@ -26,20 +25,22 @@ const MovieListView = Backbone.View.extend({ } }); }, - events: { - 'click button.btn-query': 'search', - }, - search: function(e) { - e.preventDefault(); - - - this.query = this.$(`[name='query']`).val(); - debugger; - console.log(this.query.url()); - - - }, + // events: { + // 'click button.btn-query': 'search', + // }, + // search: function(e) { + // e.preventDefault(); + // console.log("this . MODEL:") + // console.log(this.model); + // + // console.log("this") + // console.log(this.$(`input[name='query']`).val()) + // + // + // this.model.set('query', this.$(`input[name='query']`).val()); + // this.render() + // }, }); From 9042c187d32fa3a7f7aa7ff102ff8fe81056e026 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Tue, 19 Dec 2017 16:00:17 -0800 Subject: [PATCH 24/46] added new database list view to movie view --- src/app.js | 6 ++--- src/views/database_list_view.js | 44 +++++++++++++++++++++++++++++++++ src/views/movie_list_view.js | 7 +----- 3 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 src/views/database_list_view.js diff --git a/src/app.js b/src/app.js index 49658343f..dfc0643ef 100644 --- a/src/app.js +++ b/src/app.js @@ -6,6 +6,7 @@ import Movie from 'models/movie'; import MovieList from 'collections/movie_list'; import MovieView from 'views/movie_view'; import MovieListView from 'views/movie_list_view'; +import DatabaseListView from 'views/database_list_view'; // Import jQuery & Underscore import $ from 'jquery'; @@ -34,7 +35,6 @@ $(document).ready(function() { model: catalog, template: $catalogTemplate, el: 'main', - specifyTemp: "catalog" }); @@ -47,14 +47,14 @@ $(document).ready(function() { query: query, }); - let databaseView = new MovieListView({ + let databaseView = new DatabaseListView({ model: database, template: $databaseTemplate, el: 'main', - specifyTemp: "database" }); database.fetch(); + console.log(database.fetch()); }); diff --git a/src/views/database_list_view.js b/src/views/database_list_view.js new file mode 100644 index 000000000..7636f93a7 --- /dev/null +++ b/src/views/database_list_view.js @@ -0,0 +1,44 @@ +import Backbone from 'backbone'; +import _ from 'underscore'; +import MovieView from '../views/movie_view' + +const DatabaseListView = Backbone.View.extend({ + initialize(params) { + this.template = params.template; + this.listenTo(this.model, 'update', this.render); + + }, + + render() { + this.$('#database-movies').empty(); + this.model.forEach((movie) => { + const movieView = new MovieView({ + model: movie, + template: this.template, + tagName: 'li', + className: 'movie' + }); + this.$('#database-movies').append(movieView.render().$el); + }); + }, + + // events: { + // 'click button.btn-query': 'search', + // }, + // search: function(e) { + // e.preventDefault(); + // console.log("this . MODEL:") + // console.log(this.model); + // + // console.log("this") + // console.log(this.$(`input[name='query']`).val()) + // + // + // this.model.set('query', this.$(`input[name='query']`).val()); + // this.render() + // }, + + +}); + +export default DatabaseListView; diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 6d75f57d6..b1e960f55 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -6,7 +6,6 @@ const MovieListView = Backbone.View.extend({ initialize(params) { this.template = params.template; this.listenTo(this.model, 'update', this.render); - this.specifyTemp = params.specifyTemp; }, render() { @@ -18,11 +17,7 @@ const MovieListView = Backbone.View.extend({ tagName: 'li', className: 'movie' }); - if (this.specifyTemp === "catalog"){ - this.$('#catalog-movies').append(movieView.render().$el); - } else if (this.specifyTemp === "database"){ - this.$('#database-movies').append(movieView.render().$el); - } + this.$('#catalog-movies').append(movieView.render().$el); }); }, From f10833e3fe1a1a274b56d825c2d9569ff2a1c447 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 16:12:33 -0800 Subject: [PATCH 25/46] database movies rendering in list --- dist/index.html | 48 ++++++++++++++++++++++++++++----- src/app.js | 6 ++--- src/collections/movie_list.js | 6 ++--- src/views/database_list_view.js | 2 +- src/views/movie_list_view.js | 8 +++++- 5 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dist/index.html b/dist/index.html index 4f3644f12..1a903619b 100644 --- a/dist/index.html +++ b/dist/index.html @@ -32,9 +32,30 @@

track history

Database List

-
    - -
+ + + + + + + + + + + + + +
+ img + + Title + + release date + + overview + + status +
@@ -50,10 +71,25 @@

Catalog List

diff --git a/src/app.js b/src/app.js index dfc0643ef..49658343f 100644 --- a/src/app.js +++ b/src/app.js @@ -6,7 +6,6 @@ import Movie from 'models/movie'; import MovieList from 'collections/movie_list'; import MovieView from 'views/movie_view'; import MovieListView from 'views/movie_list_view'; -import DatabaseListView from 'views/database_list_view'; // Import jQuery & Underscore import $ from 'jquery'; @@ -35,6 +34,7 @@ $(document).ready(function() { model: catalog, template: $catalogTemplate, el: 'main', + specifyTemp: "catalog" }); @@ -47,14 +47,14 @@ $(document).ready(function() { query: query, }); - let databaseView = new DatabaseListView({ + let databaseView = new MovieListView({ model: database, template: $databaseTemplate, el: 'main', + specifyTemp: "database" }); database.fetch(); - console.log(database.fetch()); }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 771ed9bf7..22a31abef 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,9 +3,9 @@ import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ urlRoot: 'http://localhost:3000/movies', - initialize(models, options){ - this.query = options.query - }, + // initialize(models, options){ + // this.query = options.query + // }, url: function() { console.log("in URL function") if (this.query) { diff --git a/src/views/database_list_view.js b/src/views/database_list_view.js index 7636f93a7..5a104e408 100644 --- a/src/views/database_list_view.js +++ b/src/views/database_list_view.js @@ -15,7 +15,7 @@ const DatabaseListView = Backbone.View.extend({ const movieView = new MovieView({ model: movie, template: this.template, - tagName: 'li', + tagName: 'tr', className: 'movie' }); this.$('#database-movies').append(movieView.render().$el); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index b1e960f55..6aeb2fce1 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -6,6 +6,7 @@ const MovieListView = Backbone.View.extend({ initialize(params) { this.template = params.template; this.listenTo(this.model, 'update', this.render); + this.specifyTemp = params.specifyTemp; }, render() { @@ -17,13 +18,18 @@ const MovieListView = Backbone.View.extend({ tagName: 'li', className: 'movie' }); - this.$('#catalog-movies').append(movieView.render().$el); + if (this.specifyTemp === "catalog"){ + this.$('#catalog-movies').append(movieView.render().$el); + } else if (this.specifyTemp === "database"){ + this.$('#database-movies').append(movieView.render().$el); + } }); }, // events: { // 'click button.btn-query': 'search', // }, + // search: function(e) { // e.preventDefault(); // console.log("this . MODEL:") From 0eca88385702973d3b26b4f8833fe8cb3918f42c Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 16:17:53 -0800 Subject: [PATCH 26/46] fixing database miscommunication --- src/app.js | 3 ++- src/collections/movie_list.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app.js b/src/app.js index 49658343f..4a15866c0 100644 --- a/src/app.js +++ b/src/app.js @@ -6,6 +6,7 @@ import Movie from 'models/movie'; import MovieList from 'collections/movie_list'; import MovieView from 'views/movie_view'; import MovieListView from 'views/movie_list_view'; +import DatabaseListView from 'views/database_list_view' // Import jQuery & Underscore import $ from 'jquery'; @@ -47,7 +48,7 @@ $(document).ready(function() { query: query, }); - let databaseView = new MovieListView({ + let databaseView = new DatabaseListView({ model: database, template: $databaseTemplate, el: 'main', diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 22a31abef..771ed9bf7 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -3,9 +3,9 @@ import Movie from '../models/movie'; const MovieList = Backbone.Collection.extend({ urlRoot: 'http://localhost:3000/movies', - // initialize(models, options){ - // this.query = options.query - // }, + initialize(models, options){ + this.query = options.query + }, url: function() { console.log("in URL function") if (this.query) { From a7dcc323b96dea3f47777831d877683957db4200 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Tue, 19 Dec 2017 16:19:42 -0800 Subject: [PATCH 27/46] fixed image bug --- dist/index.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dist/index.html b/dist/index.html index 1a903619b..e4a0e218f 100644 --- a/dist/index.html +++ b/dist/index.html @@ -73,7 +73,7 @@

Catalog List

diff --git a/src/views/database_list_view.js b/src/views/database_list_view.js index 13edad605..3b79c5db9 100644 --- a/src/views/database_list_view.js +++ b/src/views/database_list_view.js @@ -13,13 +13,12 @@ const DatabaseListView = Backbone.View.extend({ render() { this.$('#database-movies').empty(); this.model.forEach((movie) => { - // let inventory = false; - // this.inventory.forEach((availableMovie) => { - // if (availableMovie.get('overview') === movie.get('overview')) { - // inventory = true - // } - // return inventory - // }) + let inventory = false; + this.inventory.forEach((availableMovie) => { + if (availableMovie.get('overview') === movie.get('overview')) { + inventory = true + } + }) const movieView = new MovieView({ model: movie, @@ -29,7 +28,9 @@ const DatabaseListView = Backbone.View.extend({ // inInventory: inventory }); - this.$('#database-movies').append(movieView.render().$el); + movieView.model.set('inInventory', inventory) + + this.$('#database-movies').append(movieView.render().$el); // console.log(this.inInventory) // debugger }); diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index 697b1f472..e32d79704 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -15,9 +15,9 @@ const MovieListView = Backbone.View.extend({ model: movie, template: this.template, tagName: 'li', - className: 'movie', - inventory: true, + className: 'movie' }); + this.$('#catalog-movies').append(movieView.render().$el); }); }, From 95fcd3e370d26b42c76e1ea23f652d748473d570 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 20:24:06 -0800 Subject: [PATCH 34/46] button displaying based on inventory relationship --- dist/index.html | 2 +- src/views/database_list_view.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dist/index.html b/dist/index.html index 02e7e334b..aa5ae4098 100644 --- a/dist/index.html +++ b/dist/index.html @@ -96,7 +96,7 @@

Catalog List

<%- overview %> - + diff --git a/src/views/database_list_view.js b/src/views/database_list_view.js index 3b79c5db9..8f1e88f9c 100644 --- a/src/views/database_list_view.js +++ b/src/views/database_list_view.js @@ -25,14 +25,11 @@ const DatabaseListView = Backbone.View.extend({ template: this.template, tagName: 'tr', className: 'movie', - // inInventory: inventory }); movieView.model.set('inInventory', inventory) - this.$('#database-movies').append(movieView.render().$el); - // console.log(this.inInventory) - // debugger + }); }, From e8230d3b3deeb5eb07eb67b4e599c14e168c4052 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Tue, 19 Dec 2017 20:34:47 -0800 Subject: [PATCH 35/46] beginning stages of add --- src/views/movie_view.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/movie_view.js b/src/views/movie_view.js index d420719e0..ebd13abf9 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -8,10 +8,18 @@ const MovieView = Backbone.View.extend({ this.inventoried = params.inInventory; }, render() { - console.log(this.template); const compiledTemplate = this.template(this.model.toJSON()); this.$el.html(compiledTemplate); return this; + }, + + events: { + 'click .btn-add': 'addToInventory' + }, + + addToInventory(e){ + e.preventDefault() + this.trigger('addMeToYourRentalStore', this.model) } }); From 714098288aee921437df774ae6d4f9fb49840eac Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Wed, 20 Dec 2017 00:14:02 -0800 Subject: [PATCH 36/46] add to inventory --- dist/index.html | 6 +++++- src/css/styles.css | 1 + src/views/database_list_view.js | 35 +++++++++++---------------------- src/views/movie_view.js | 26 +++++++++++++++++++++++- 4 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dist/index.html b/dist/index.html index c7846a4b0..c6507c81d 100644 --- a/dist/index.html +++ b/dist/index.html @@ -30,6 +30,9 @@

CJ's Vidja Shtore

+
+ +
@@ -97,7 +100,8 @@

Catalog List

<%- overview %> - + <%- inInventory %> + diff --git a/src/css/styles.css b/src/css/styles.css index ed3558043..7513b4e08 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -20,6 +20,7 @@ h1, h2, h3 { main { background: white; + margin: 10px; } nav { diff --git a/src/views/database_list_view.js b/src/views/database_list_view.js index 56b3b1770..91ffe49ea 100644 --- a/src/views/database_list_view.js +++ b/src/views/database_list_view.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; import _ from 'underscore'; +import Movie from '../models/movie'; import MovieView from '../views/movie_view' const DatabaseListView = Backbone.View.extend({ @@ -7,7 +8,6 @@ const DatabaseListView = Backbone.View.extend({ this.template = params.template; this.listenTo(this.model, 'update', this.render); this.inventory = params.availableInventory; - }, render() { @@ -18,43 +18,30 @@ const DatabaseListView = Backbone.View.extend({ if (availableMovie.get('overview') === movie.get('overview')) { inventoried = true; } + movie.set('inInventory', inventoried); }) const movieView = new MovieView({ model: movie, + inventory: this.inventory, template: this.template, tagName: 'tr', className: 'movie', }); - this.$('#database-movies').append(movieView.render().$el); return this; }); }, - - events: { - 'click button.add': 'addToInventory', - }, - addToInventory: function(e) { - e.preventDefault(); - const orderData = { - title: this.$(title).val(), - image: image_url, - overview: overview, - inInventory: inventoried, - matchedQuote: this.quoteList.findWhere({ symbol: this.$('select[name=symbol]').val() }), - console.log("this . MODEL:") - console.log(this.model); - - console.log("this") - console.log(this.$(`input[name='query']`).val()) - - - this.model.set('query', this.$(`input[name='query']`).val()); - this.render() + updateStatusMessageFrom: function(messageHash) { + const errorMessageEl = this.$('.form-errors'); + errorMessageEl.empty(); + _.each(messageHash, (messageType) => { + messageType.forEach((message) => { + errorMessageEl.append(`

${message}

`); + }); + }); }, - }); export default DatabaseListView; diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 4e4ae8a97..3a6648fa6 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -5,13 +5,37 @@ const MovieView = Backbone.View.extend({ initialize(params) { this.template = params.template; this.listenTo(this.model, 'change', this.render); + this.inventory = params.inventory; }, render() { console.log(this.template); const compiledTemplate = this.template(this.model.toJSON()); this.$el.html(compiledTemplate); return this; - } + }, + events: { + 'click .btn-add': 'addToInventory', + }, + addToInventory: function(e) { + e.preventDefault(); + if (this.model.get("inInventory")) { + console.log("already exists in inventory"); + } else { + const databaseInfo = { + title: this.model.get("title"), + image_url: this.model.get("image_url").slice(32), + overview: this.model.get("overview"), + release_date: this.model.get("release_date"), + }; + + const addMovieFromDatabase = new Movie(databaseInfo); + if (addMovieFromDatabase.isValid()) { + this.inventory.add(addMovieFromDatabase); + console.log(this.inventory); + } + } + + }, }); export default MovieView; From 602932f3d20656e31d7ea2452f6e92fd271d0807 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Wed, 20 Dec 2017 10:33:08 -0800 Subject: [PATCH 37/46] working on adding to db --- src/collections/movie_list.js | 4 ---- src/views/movie_view.js | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 771ed9bf7..16fcbfb34 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -7,13 +7,9 @@ const MovieList = Backbone.Collection.extend({ this.query = options.query }, url: function() { - console.log("in URL function") if (this.query) { - console.log("in IF!") return this.urlRoot + '/?query=' + this.query } else { - console.log("in ELSE!"); - console.log(this.query); return this.urlRoot } }, diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 388e02d6b..336b1f1ef 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -31,6 +31,12 @@ const MovieView = Backbone.View.extend({ const addMovieFromDatabase = new Movie(databaseInfo); if (addMovieFromDatabase.isValid()) { this.inventory.add(addMovieFromDatabase); + addMovieFromDatabase.save({}, { + // success: events.successfulSave, + // error: events.failedSave, + success: console.log("yes, added to db probably"), + error: console.log("not added i think"), + }); console.log(this.inventory); } } From d7ec8ff87dfaaab12a993982d07f77b34048ea16 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Wed, 20 Dec 2017 11:24:28 -0800 Subject: [PATCH 38/46] minor change to success and fail functions in movie view --- src/models/movie.js | 2 +- src/views/movie_view.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/models/movie.js b/src/models/movie.js index 2a04d698d..031bba75a 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -1,7 +1,7 @@ import Backbone from 'backbone'; const Movie = Backbone.Model.extend({ - // urlRoot: 'https://localhost:3000/movies/' + urlRoot: 'https://localhost:3000/movies/' }); export default Movie; diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 336b1f1ef..83ba3e8f9 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -34,8 +34,12 @@ const MovieView = Backbone.View.extend({ addMovieFromDatabase.save({}, { // success: events.successfulSave, // error: events.failedSave, - success: console.log("yes, added to db probably"), - error: console.log("not added i think"), + success: function(response){ + console.log("yes, added to db probably") + }, + error: function(){ + console.log("not added i think") + }, }); console.log(this.inventory); } From f68f55d43823e0a22da9039ce8c4670acb20a512 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Wed, 20 Dec 2017 11:30:35 -0800 Subject: [PATCH 39/46] fixing options issue --- src/models/movie.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/movie.js b/src/models/movie.js index 031bba75a..2a04d698d 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -1,7 +1,7 @@ import Backbone from 'backbone'; const Movie = Backbone.Model.extend({ - urlRoot: 'https://localhost:3000/movies/' + // urlRoot: 'https://localhost:3000/movies/' }); export default Movie; From bbfa609d256e46c357a5e9e978259e71edf59787 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Wed, 20 Dec 2017 13:29:00 -0800 Subject: [PATCH 40/46] photo rendering now --- spec/movie_spec.js | 0 src/views/movie_view.js | 1 + 2 files changed, 1 insertion(+) create mode 100644 spec/movie_spec.js diff --git a/spec/movie_spec.js b/spec/movie_spec.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 83ba3e8f9..41fe18686 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -20,6 +20,7 @@ const MovieView = Backbone.View.extend({ e.preventDefault(); if (this.model.get("inInventory")) { console.log("already exists in inventory"); + console.log(this.$el); } else { const databaseInfo = { title: this.model.get("title"), From 84e8748bc804b59d6115c2f7f3410f44137f2d86 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Wed, 20 Dec 2017 13:34:32 -0800 Subject: [PATCH 41/46] playing with adding status messages --- dist/index.html | 2 ++ src/views/movie_view.js | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dist/index.html b/dist/index.html index 13bd38123..13b17c5f1 100644 --- a/dist/index.html +++ b/dist/index.html @@ -31,7 +31,9 @@

CJ's Vidja Shtore

+
    +
diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 336b1f1ef..f434946f2 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import Backbone from 'backbone'; import Movie from '../models/movie'; @@ -15,6 +16,7 @@ const MovieView = Backbone.View.extend({ }, events: { 'click .btn-add': 'addToInventory', + // } }, addToInventory: function(e) { e.preventDefault(); @@ -27,21 +29,23 @@ const MovieView = Backbone.View.extend({ overview: this.model.get("overview"), release_date: this.model.get("release_date"), }; - const addMovieFromDatabase = new Movie(databaseInfo); if (addMovieFromDatabase.isValid()) { this.inventory.add(addMovieFromDatabase); addMovieFromDatabase.save({}, { - // success: events.successfulSave, - // error: events.failedSave, + // success: addMovieFromDatabase.successfulSave(), + // error: addMovieFromDatabase.failedSave(), success: console.log("yes, added to db probably"), error: console.log("not added i think"), }); - console.log(this.inventory); } } - }, + // successfulSave(addMovieFromDatabase, response) { + // $('.form-errors ul').empty(); + // $('.form-errors ul').append(`
  • ${addMovieFromDatabase.get('title')} was added to your catalog!
    • `); + // }, + }); export default MovieView; From fe20718559c1c834d702bde5a4d7d47f10f45677 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Wed, 20 Dec 2017 14:34:27 -0800 Subject: [PATCH 42/46] updated side by side css --- dist/index.html | 65 +++++++++++++++++++--------------------------- src/css/styles.css | 17 +++++++----- 2 files changed, 36 insertions(+), 46 deletions(-) diff --git a/dist/index.html b/dist/index.html index 13b17c5f1..fedf09960 100644 --- a/dist/index.html +++ b/dist/index.html @@ -32,50 +32,40 @@

    CJ's Vidja Shtore

      -
    -
    -
    -

    sort

    -
    + -
    -

    track history

    -
    -
    -
    -

    Database List

    - - - - - - - - - - - - - -
    - img - - Title - - release date - - overview - - status -
    +
    +

    Database List

    + + + + + + + + + + + + +
    + img + + Title + + release date + + status +
    +
    -
    +

    Catalog List

      @@ -97,9 +87,6 @@

      Catalog List

      <%- release_date %> - - <%- overview %> - diff --git a/src/css/styles.css b/src/css/styles.css index 7513b4e08..e58b2eab6 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -7,6 +7,7 @@ } body { color: #465362; + padding: 10px; } h1 { @@ -26,8 +27,7 @@ main { nav { background: #C3DFE0; position: sticky; - box-shadow: 0 2px 5px -2px #465362; - /* padding: 0.5rem; */ + box-shadow: 0 2px 3px -2px #465362; } input[type="text"], input[type="text"]:focus { margin: 0; @@ -35,8 +35,6 @@ input[type="text"], input[type="text"]:focus { font-size: 1.25em; width: 100%; border-width: 0; - /* display: inline-block; */ - /* background: none; */ box-shadow: 0 -2px -5px -2px #465362; } @@ -48,14 +46,19 @@ article { margin: 20px 0; } +table td, #database-container h2 { + color: #465362; +} + #database-container, #catalog-container { background: #C3DFE0; color: #233831; /* border: 1px solid #ADA8B6; */ box-shadow: 0 -2px 5px -2px #465362; } - - +#database-container { + background: #C2DC85; +} ul#catalog-movies { list-style-type: none; @@ -110,7 +113,7 @@ div { display: inline; } -/* #sort, #add-history, #add-button { */ + h3 { background: #BCD979; box-shadow: 0 2px 5px -2px #465362; From fab8055880783c8e0fe3398863dee0844625a308 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Wed, 20 Dec 2017 14:35:27 -0800 Subject: [PATCH 43/46] adding error messages for empty results --- src/app.js | 30 ++++++++++++++++++------------ src/collections/movie_list.js | 2 +- src/views/database_list_view.js | 1 + 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/app.js b/src/app.js index c713c558b..2d4747578 100644 --- a/src/app.js +++ b/src/app.js @@ -43,18 +43,24 @@ $(document).ready(function() { event.preventDefault(); console.log('submit button was clicked'); let query = $(`[name='query']`).val(); - let database = new MovieList([], { - query: query, - }); - - let databaseView = new DatabaseListView({ - model: database, - template: $databaseTemplate, - el: 'main', - availableInventory: catalog - }); - - database.fetch(); + + if (query.length > 0) { + let database = new MovieList([], { + query: query, + }); + + let databaseView = new DatabaseListView({ + model: database, + template: $databaseTemplate, + el: 'main', + availableInventory: catalog + }); + + database.fetch(); + } else { + $('.form-errors').append('

      There were no results

      ') + } + }); diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index 16fcbfb34..76a814e00 100644 --- a/src/collections/movie_list.js +++ b/src/collections/movie_list.js @@ -7,7 +7,7 @@ const MovieList = Backbone.Collection.extend({ this.query = options.query }, url: function() { - if (this.query) { + if (this.query && this.query.length > 1) { return this.urlRoot + '/?query=' + this.query } else { return this.urlRoot diff --git a/src/views/database_list_view.js b/src/views/database_list_view.js index ff98b078d..1c1081183 100644 --- a/src/views/database_list_view.js +++ b/src/views/database_list_view.js @@ -12,6 +12,7 @@ const DatabaseListView = Backbone.View.extend({ render() { this.$('#database-movies').empty(); + this.$('.form-errors').empty(); this.model.forEach((movie) => { let inventory = false; this.inventory.forEach((availableMovie) => { From 09e0a9f40a2709a96c0246745bc086c1df1c31fa Mon Sep 17 00:00:00 2001 From: Canaan West Date: Wed, 20 Dec 2017 15:19:55 -0800 Subject: [PATCH 44/46] prepending instead of appending so most recent is at the top --- src/views/movie_list_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index e32d79704..aece7a217 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -18,7 +18,7 @@ const MovieListView = Backbone.View.extend({ className: 'movie' }); - this.$('#catalog-movies').append(movieView.render().$el); + this.$('#catalog-movies').prepend(movieView.render().$el); }); }, From b6e93f06e83833386b4564af77a79c10f550cc05 Mon Sep 17 00:00:00 2001 From: Canaan West Date: Wed, 20 Dec 2017 15:44:05 -0800 Subject: [PATCH 45/46] database buttons switching when adding inventory to a list --- dist/index.html | 2 +- src/css/styles.css | 8 ++++++++ src/views/movie_list_view.js | 19 ------------------- src/views/movie_view.js | 10 +++++++--- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dist/index.html b/dist/index.html index fedf09960..255f4f015 100644 --- a/dist/index.html +++ b/dist/index.html @@ -40,7 +40,7 @@

      CJ's Vidja Shtore

      -

      Database List

      +

      Database Results

      diff --git a/src/css/styles.css b/src/css/styles.css index e58b2eab6..00c3678a0 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -118,3 +118,11 @@ h3 { background: #BCD979; box-shadow: 0 2px 5px -2px #465362; } + +h4 { + text-align: center; +} +/* +button.btn-add.alreadyAdded { + background: grey; +} */ diff --git a/src/views/movie_list_view.js b/src/views/movie_list_view.js index aece7a217..8374e2c59 100644 --- a/src/views/movie_list_view.js +++ b/src/views/movie_list_view.js @@ -21,25 +21,6 @@ const MovieListView = Backbone.View.extend({ this.$('#catalog-movies').prepend(movieView.render().$el); }); }, - - // events: { - // 'click button.btn-query': 'search', - // }, - - // search: function(e) { - // e.preventDefault(); - // console.log("this . MODEL:") - // console.log(this.model); - // - // console.log("this") - // console.log(this.$(`input[name='query']`).val()) - // - // - // this.model.set('query', this.$(`input[name='query']`).val()); - // this.render() - // }, - - }); export default MovieListView; diff --git a/src/views/movie_view.js b/src/views/movie_view.js index 239458874..6efb63c23 100644 --- a/src/views/movie_view.js +++ b/src/views/movie_view.js @@ -16,26 +16,30 @@ const MovieView = Backbone.View.extend({ }, events: { 'click .btn-add': 'addToInventory', - // } }, + addToInventory: function(e) { e.preventDefault(); + // this.$('button.btn-add').toggleClass('button.btn-add.alreadyAdded') + this.$('button.btn-add').css({"background": "grey"}) if (this.model.get("inInventory")) { console.log("already exists in inventory"); console.log(this.$el); } else { + this.model.set('inInventory', 'true') + this.$('button.btn-add').css({"background": "grey"}) const databaseInfo = { title: this.model.get("title"), image_url: this.model.get("image_url").slice(32), overview: this.model.get("overview"), release_date: this.model.get("release_date"), + inInventory: true, }; + const addMovieFromDatabase = new Movie(databaseInfo); if (addMovieFromDatabase.isValid()) { this.inventory.add(addMovieFromDatabase); addMovieFromDatabase.save({}, { - // success: events.successfulSave, - // error: events.failedSave, success: function(response){ console.log("yes, added to db probably") }, From ccf09e40bf4f2f494df00ced56ad097025c8b19e Mon Sep 17 00:00:00 2001 From: Canaan West Date: Thu, 21 Dec 2017 09:16:49 -0800 Subject: [PATCH 46/46] scrolly barssssssz --- dist/index.html | 2 +- src/css/styles.css | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dist/index.html b/dist/index.html index 255f4f015..f4d3079f9 100644 --- a/dist/index.html +++ b/dist/index.html @@ -16,7 +16,7 @@

      CJ's Vidja Shtore

      - +
      diff --git a/src/css/styles.css b/src/css/styles.css index 00c3678a0..0848b80a0 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -122,7 +122,17 @@ h3 { h4 { text-align: center; } -/* + +#database-container { + height: 40vw; + overflow: scroll; +} + +#catalog-container { + height: 40vw; + overflow: scroll; +} +/* button.btn-add.alreadyAdded { background: grey; } */