From 2810b021eea3a8e2dca3a7868f7a412a35849c3c Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Mon, 18 Dec 2017 10:41:38 -0800 Subject: [PATCH 01/31] Initial models, collections, and views --- src/collections/customer_list.js | 0 src/collections/movie_list.js | 0 src/collections/rental_list.js | 0 src/models/customer.js | 0 src/models/movie.js | 0 src/models/rental.js | 0 src/views/customer_list_view.js | 0 src/views/customer_view.js | 0 src/views/movie_list_view.js | 0 src/views/movie_view.js | 0 src/views/rental_list_view.js | 0 src/views/rental_view.js | 0 12 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/collections/customer_list.js create mode 100644 src/collections/movie_list.js create mode 100644 src/collections/rental_list.js create mode 100644 src/models/customer.js create mode 100644 src/models/movie.js create mode 100644 src/models/rental.js create mode 100644 src/views/customer_list_view.js create mode 100644 src/views/customer_view.js create mode 100644 src/views/movie_list_view.js create mode 100644 src/views/movie_view.js create mode 100644 src/views/rental_list_view.js create mode 100644 src/views/rental_view.js diff --git a/src/collections/customer_list.js b/src/collections/customer_list.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/collections/rental_list.js b/src/collections/rental_list.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/models/customer.js b/src/models/customer.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/models/movie.js b/src/models/movie.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/models/rental.js b/src/models/rental.js new file mode 100644 index 000000000..e69de29bb 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/customer_view.js b/src/views/customer_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 diff --git a/src/views/movie_view.js b/src/views/movie_view.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/rental_list_view.js b/src/views/rental_list_view.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/rental_view.js b/src/views/rental_view.js new file mode 100644 index 000000000..e69de29bb From dd726a0212eb2979535286b9dee6820ceab67440 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Mon, 18 Dec 2017 11:15:07 -0800 Subject: [PATCH 02/31] Base templates and HTML naming(ids, classes) --- dist/index.html | 47 ++++++++++++++++++++++++++++++++++++++++++++-- src/css/styles.css | 2 +- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index 559b18ecd..35b58cede 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,13 +2,56 @@ - Backbone Baseline + VideoVideo +
+

VideoStore

+ +
+
+ + +
+
+
+
- +
    + +
+
+
+ + + + + + + + + diff --git a/src/css/styles.css b/src/css/styles.css index 68a79a569..11d35ebe8 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -5,7 +5,7 @@ main { } header { - background-color: lightgreen; + background-color: pink; padding: 0.5rem; } From 982512efb668fa7469e1e97dab40eb30ac60d1b7 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Mon, 18 Dec 2017 11:28:23 -0800 Subject: [PATCH 03/31] Collection default code added --- src/collections/customer_list.js | 8 ++++++++ src/collections/movie_list.js | 8 ++++++++ src/collections/rental_list.js | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/src/collections/customer_list.js b/src/collections/customer_list.js index e69de29bb..f8698fb0e 100644 --- a/src/collections/customer_list.js +++ b/src/collections/customer_list.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; +import Customer from '../models/customer'; + +const CustomerList = Backbone.Collection.extend({ + model: Customer, +}); + +export default CustomerList; diff --git a/src/collections/movie_list.js b/src/collections/movie_list.js index e69de29bb..72d4e3d67 100644 --- a/src/collections/movie_list.js +++ 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/collections/rental_list.js b/src/collections/rental_list.js index e69de29bb..bd8a2bb6c 100644 --- a/src/collections/rental_list.js +++ b/src/collections/rental_list.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; +import Rental from '../models/rental'; + +const RentalList = Backbone.Collection.extend({ + model: Rental, +}); + +export default RentalList; From b8928b342231f435574224e4de9e7ab43d70e981 Mon Sep 17 00:00:00 2001 From: Severin Wiggenhorn Date: Mon, 18 Dec 2017 11:32:24 -0800 Subject: [PATCH 04/31] added basic model code --- src/models/customer.js | 11 +++++++++++ src/models/movie.js | 16 ++++++++++++++++ src/models/rental.js | 17 +++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/src/models/customer.js b/src/models/customer.js index e69de29bb..3043cd68e 100644 --- a/src/models/customer.js +++ b/src/models/customer.js @@ -0,0 +1,11 @@ +import Backbone from 'backbone'; + + +const Customer = Backbone.Model.extend({ + initialize(attributes) { + }, + validate(attributes) { + } +}); + +export default Customer; diff --git a/src/models/movie.js b/src/models/movie.js index e69de29bb..a8a29b352 100644 --- a/src/models/movie.js +++ b/src/models/movie.js @@ -0,0 +1,16 @@ +import Backbone from 'backbone'; + + +const Movie = Backbone.Model.extend({ + initialize(attributes) { + }, + validate(attributes) { + const errors = {}; + + if (!attributes.title) { + errors['title'] = ['Title is required']; + } + } +}); + +export default Movie; diff --git a/src/models/rental.js b/src/models/rental.js index e69de29bb..8266faeda 100644 --- a/src/models/rental.js +++ b/src/models/rental.js @@ -0,0 +1,17 @@ +import Backbone from 'backbone'; + + +const Rental = Backbone.Model.extend({ + initialize(attributes) { + }, + validate(attributes) { + const errors = {}; + + if (!attributes.due_date) { + errors['due_date'] = ['Due Date is required']; + } + } + +}); + +export default Rental; From 460f54fd6bdf202049a9e2c60e323ce5269412e2 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Mon, 18 Dec 2017 12:45:30 -0800 Subject: [PATCH 05/31] Reformated templates to be single list elements --- dist/index.html | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/dist/index.html b/dist/index.html index 35b58cede..8035d40ff 100644 --- a/dist/index.html +++ b/dist/index.html @@ -26,30 +26,38 @@

VideoStore

From 29fc502e9c9500ec7946a153130e56fa6804ccf3 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Mon, 18 Dec 2017 13:17:27 -0800 Subject: [PATCH 06/31] Templating setup for MovieListView --- dist/index.html | 5 +++++ src/app.js | 13 ++++++++++++- src/collections/movie_list.js | 2 +- src/css/styles.css | 3 +++ src/views/movie_list_view.js | 17 +++++++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dist/index.html b/dist/index.html index 8035d40ff..152720bd9 100644 --- a/dist/index.html +++ b/dist/index.html @@ -17,9 +17,14 @@

VideoStore

+ + + +
+