From 768e04305ac3e583e24e107ca5adb4d5072b81e9 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:34:57 -0700 Subject: [PATCH 01/79] end of video commit --- app/app.component.ts | 7 +++++++ app/main.ts | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/app/app.component.ts b/app/app.component.ts index e69de29..af037af 100644 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -0,0 +1,7 @@ +import {Component} from 'angular2/core'; + +@Component({ + selector: 'app', + template: '

My App

' +}) +export class AppComponent {} \ No newline at end of file diff --git a/app/main.ts b/app/main.ts index e69de29..acb4b62 100644 --- a/app/main.ts +++ b/app/main.ts @@ -0,0 +1,4 @@ +import {bootstrap} from 'angular2/platform/browser'; +import {AppComponent} from './app.component'; + +bootstrap(AppComponent); \ No newline at end of file From 627c5322a059c476021a0747b9ddb871ff52da57 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:46:56 -0700 Subject: [PATCH 02/79] end of video commit --- app/app.component.ts | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.component.ts b/app/app.component.ts index af037af..2c7bddc 100644 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,7 +1,7 @@ import {Component} from 'angular2/core'; @Component({ - selector: 'app', + selector: 'media-tracker-app', template: '

My App

' }) export class AppComponent {} \ No newline at end of file diff --git a/index.html b/index.html index b4749c0..249ee45 100644 --- a/index.html +++ b/index.html @@ -31,7 +31,7 @@ - Loading... + Loading... \ No newline at end of file From 233516f0bdc5e0f191e3d1ec2bd8d111f7422f31 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:48:49 -0700 Subject: [PATCH 03/79] end of video commit --- app/app.component.html | 2 ++ app/app.component.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 app/app.component.html diff --git a/app/app.component.html b/app/app.component.html new file mode 100644 index 0000000..9a25cb1 --- /dev/null +++ b/app/app.component.html @@ -0,0 +1,2 @@ +

My App

+

Keeping track of the media I want to watch.

\ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts index 2c7bddc..0768888 100644 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -2,6 +2,6 @@ import {Component} from 'angular2/core'; @Component({ selector: 'media-tracker-app', - template: '

My App

' + templateUrl: 'app/app.component.html' }) export class AppComponent {} \ No newline at end of file From 0ffac31f8477654f5a36aa18850c241a7e760fde Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:50:26 -0700 Subject: [PATCH 04/79] end of video commit --- app/app.component.css | 18 ++++++++++++ app/app.component.html | 8 +++-- app/app.component.ts | 3 +- app/media-item.component.css | 55 +++++++++++++++++++++++++++++++++++ app/media-item.component.html | 16 ++++++++++ app/media-item.component.ts | 9 ++++++ 6 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 app/app.component.css create mode 100644 app/media-item.component.css create mode 100644 app/media-item.component.html create mode 100644 app/media-item.component.ts diff --git a/app/app.component.css b/app/app.component.css new file mode 100644 index 0000000..4872cdd --- /dev/null +++ b/app/app.component.css @@ -0,0 +1,18 @@ +:host { + display: flex; + font-family: Arial, Helvetica, sans-serif; +} +section { + width: 100%; + background-color: #32435b; +} +section > header { + color: #ffffff; + padding: 10px; +} +section > header > h1 { + font-size: 2em; +} +section > header .description { + font-style: italic; +} \ No newline at end of file diff --git a/app/app.component.html b/app/app.component.html index 9a25cb1..2fc4c75 100644 --- a/app/app.component.html +++ b/app/app.component.html @@ -1,2 +1,6 @@ -

My App

-

Keeping track of the media I want to watch.

\ No newline at end of file +
+
+

Media Watch List

+

Keeping track of the media I want to watch.

+
+
\ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts index 0768888..4d48e7a 100644 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -2,6 +2,7 @@ import {Component} from 'angular2/core'; @Component({ selector: 'media-tracker-app', - templateUrl: 'app/app.component.html' + templateUrl: 'app/app.component.html', + styleUrls: ['app/app.component.css'] }) export class AppComponent {} \ No newline at end of file diff --git a/app/media-item.component.css b/app/media-item.component.css new file mode 100644 index 0000000..11163b6 --- /dev/null +++ b/app/media-item.component.css @@ -0,0 +1,55 @@ +:host { + display: flex; + flex-direction: column; + width: 140px; + height: 200px; + border: 2px solid; + background-color: #29394b; + padding: 10px; + color: #bdc2c5; +} +h2 { + font-size: 1.6em; + flex: 1; +} +:host.medium-movies { + border-color: #53ace4; +} +:host.medium-movies > h2 { + color: #53ace4; +} +:host.medium-series { + border-color: #45bf94; +} +:host.medium-series > h2 { + color: #45bf94; +} +.tools { + margin-top: 8px; + display: flex; + flex-wrap: nowrap; + justify-content: space-between; +} +.favorite { + width: 24px; + height: 24px; + fill: #bdc2c5; +} +.delete { + display: block; + background-color: #ec4342; + padding: 4px; + font-size: .8em; + border-radius: 4px; + color: #ffffff; + cursor: pointer; +} +.details { + display: block; + background-color: #37ad79; + padding: 4px; + font-size: .8em; + border-radius: 4px; + color: #ffffff; + text-decoration: none; +} \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html new file mode 100644 index 0000000..444ebcf --- /dev/null +++ b/app/media-item.component.html @@ -0,0 +1,16 @@ +

The Redemption

+
Watched on 1/13/2016
+
Action
+
2016
+
+ + + + + remove + + + watch + +
\ No newline at end of file diff --git a/app/media-item.component.ts b/app/media-item.component.ts new file mode 100644 index 0000000..fb70020 --- /dev/null +++ b/app/media-item.component.ts @@ -0,0 +1,9 @@ +import {Component} from 'angular2/core'; + +@Component({ + selector: 'media-item', + templateUrl: 'app/media-item.component.html', + styleUrls: ['app/media-item.component.css'] +}) +export class MediaItemComponent { +} \ No newline at end of file From 82b76f4cdae53363f7d7f3f389aa9ccdbb1cc82d Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:51:22 -0700 Subject: [PATCH 05/79] end of video commit --- app/app.component.html | 3 +++ app/app.component.ts | 2 ++ 2 files changed, 5 insertions(+) diff --git a/app/app.component.html b/app/app.component.html index 2fc4c75..c37d12d 100644 --- a/app/app.component.html +++ b/app/app.component.html @@ -3,4 +3,7 @@

Media Watch List

Keeping track of the media I want to watch.

+ + + \ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts index 4d48e7a..634c92e 100644 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,7 +1,9 @@ import {Component} from 'angular2/core'; +import {MediaItemComponent} from './media-item.component'; @Component({ selector: 'media-tracker-app', + directives: [MediaItemComponent], templateUrl: 'app/app.component.html', styleUrls: ['app/app.component.css'] }) From 05dbce6681e1b83af284f9578bab2ea7e218fcd0 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:52:18 -0700 Subject: [PATCH 06/79] end of video commit --- app/app.component.html | 2 -- app/media-item.component.html | 2 +- app/media-item.component.ts | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/app.component.html b/app/app.component.html index c37d12d..e786f09 100644 --- a/app/app.component.html +++ b/app/app.component.html @@ -4,6 +4,4 @@

Media Watch List

Keeping track of the media I want to watch.

- - \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html index 444ebcf..80c1d4d 100644 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -1,4 +1,4 @@ -

The Redemption

+

{{ name }}

Watched on 1/13/2016
Action
2016
diff --git a/app/media-item.component.ts b/app/media-item.component.ts index fb70020..6cbe390 100644 --- a/app/media-item.component.ts +++ b/app/media-item.component.ts @@ -6,4 +6,5 @@ import {Component} from 'angular2/core'; styleUrls: ['app/media-item.component.css'] }) export class MediaItemComponent { + name = 'The Redemption'; } \ No newline at end of file From 5b1f1c260d4cd3493302f23e0f7104f41523b826 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:53:42 -0700 Subject: [PATCH 07/79] end of video commit --- app/media-item.component.html | 2 +- app/media-item.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/media-item.component.html b/app/media-item.component.html index 80c1d4d..444ebcf 100644 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -1,4 +1,4 @@ -

{{ name }}

+

The Redemption

Watched on 1/13/2016
Action
2016
diff --git a/app/media-item.component.ts b/app/media-item.component.ts index 6cbe390..fb70020 100644 --- a/app/media-item.component.ts +++ b/app/media-item.component.ts @@ -6,5 +6,4 @@ import {Component} from 'angular2/core'; styleUrls: ['app/media-item.component.css'] }) export class MediaItemComponent { - name = 'The Redemption'; } \ No newline at end of file From 5703f0941e0e0749ef7a3ea893fe3c38dc198af3 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:56:31 -0700 Subject: [PATCH 08/79] end of video commit --- app/app.component.ts | 12 +++++++++++- app/media-item.component.css | 9 +++++++++ app/media-item.component.html | 2 +- app/media-item.component.ts | 3 +++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/app.component.ts b/app/app.component.ts index 634c92e..24275c9 100644 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -7,4 +7,14 @@ import {MediaItemComponent} from './media-item.component'; templateUrl: 'app/app.component.html', styleUrls: ['app/app.component.css'] }) -export class AppComponent {} \ No newline at end of file +export class AppComponent { + firstMediaItem = { + id: 1, + name: "Firebug", + medium: "Series", + category: "Science Fiction", + year: 2010, + watchedOn: 1294166565384, + isFavorite: false + }; +} \ No newline at end of file diff --git a/app/media-item.component.css b/app/media-item.component.css index 11163b6..8cfcb4e 100644 --- a/app/media-item.component.css +++ b/app/media-item.component.css @@ -35,6 +35,15 @@ h2 { height: 24px; fill: #bdc2c5; } +.favorite.is-favorite { + fill: #37ad79; +} +.favorite.is-favorite-hovering { + fill: #45bf94; +} +.favorite.is-favorite.is-favorite-hovering { + fill: #ec4342; +} .delete { display: block; background-color: #ec4342; diff --git a/app/media-item.component.html b/app/media-item.component.html index 444ebcf..659196d 100644 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -7,7 +7,7 @@

The Redemption

- + remove diff --git a/app/media-item.component.ts b/app/media-item.component.ts index fb70020..3ece851 100644 --- a/app/media-item.component.ts +++ b/app/media-item.component.ts @@ -6,4 +6,7 @@ import {Component} from 'angular2/core'; styleUrls: ['app/media-item.component.css'] }) export class MediaItemComponent { + onDelete() { + console.log('deleted'); + } } \ No newline at end of file From 38e8eea342f575c50d0a11375764befcb703cf4b Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Wed, 6 Jul 2016 00:57:39 -0700 Subject: [PATCH 09/79] end of video commit --- app/app.component.html | 2 +- app/media-item.component.html | 8 ++++---- app/media-item.component.ts | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/app.component.html b/app/app.component.html index e786f09..9907dde 100644 --- a/app/app.component.html +++ b/app/app.component.html @@ -3,5 +3,5 @@

Media Watch List

Keeping track of the media I want to watch.

- + \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html index 659196d..253ae48 100644 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -1,7 +1,7 @@ -

The Redemption

-
Watched on 1/13/2016
-
Action
-
2016
+

{{ mediaItem.name }}

+
Watched on {{ mediaItem.watchedOn }}
+
{{ mediaItem.category }}
+
{{ mediaItem.year }}
Date: Sat, 16 Jul 2016 09:54:53 -0700 Subject: [PATCH 10/79] end of video commit --- app/app.component.css | 34 ++++----- app/app.component.html | 13 ++-- app/app.component.ts | 42 +++++++----- app/main.ts | 6 +- app/media-item.component.css | 126 +++++++++++++++++----------------- app/media-item.component.html | 30 ++++---- app/media-item.component.ts | 27 ++++---- 7 files changed, 142 insertions(+), 136 deletions(-) mode change 100644 => 100755 app/app.component.css mode change 100644 => 100755 app/app.component.html mode change 100644 => 100755 app/app.component.ts mode change 100644 => 100755 app/main.ts mode change 100644 => 100755 app/media-item.component.css mode change 100644 => 100755 app/media-item.component.html mode change 100644 => 100755 app/media-item.component.ts diff --git a/app/app.component.css b/app/app.component.css old mode 100644 new mode 100755 index 4872cdd..93654a0 --- a/app/app.component.css +++ b/app/app.component.css @@ -1,18 +1,18 @@ -:host { - display: flex; - font-family: Arial, Helvetica, sans-serif; -} -section { - width: 100%; - background-color: #32435b; -} -section > header { - color: #ffffff; - padding: 10px; -} -section > header > h1 { - font-size: 2em; -} -section > header .description { - font-style: italic; +:host { + display: flex; + font-family: Arial, Helvetica, sans-serif; +} +section { + width: 100%; + background-color: #32435b; +} +section > header { + color: #ffffff; + padding: 10px; +} +section > header > h1 { + font-size: 2em; +} +section > header .description { + font-style: italic; } \ No newline at end of file diff --git a/app/app.component.html b/app/app.component.html old mode 100644 new mode 100755 index 9907dde..a50515e --- a/app/app.component.html +++ b/app/app.component.html @@ -1,7 +1,8 @@ -
-
-

Media Watch List

-

Keeping track of the media I want to watch.

- - +
+
+

Media Watch List

+

Keeping track of the media I want to watch.

+
+
\ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts old mode 100644 new mode 100755 index 24275c9..98203bc --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,20 +1,24 @@ -import {Component} from 'angular2/core'; -import {MediaItemComponent} from './media-item.component'; - -@Component({ - selector: 'media-tracker-app', - directives: [MediaItemComponent], - templateUrl: 'app/app.component.html', - styleUrls: ['app/app.component.css'] -}) -export class AppComponent { - firstMediaItem = { - id: 1, - name: "Firebug", - medium: "Series", - category: "Science Fiction", - year: 2010, - watchedOn: 1294166565384, - isFavorite: false - }; +import {Component} from 'angular2/core'; +import {MediaItemComponent} from './media-item.component'; + +@Component({ + selector: 'media-tracker-app', + directives: [MediaItemComponent], + templateUrl: 'app/app.component.html', + styleUrls: ['app/app.component.css'] +}) +export class AppComponent { + firstMediaItem = { + id: 1, + name: "Firebug", + medium: "Series", + category: "Science Fiction", + year: 2010, + watchedOn: 1294166565384, + isFavorite: false + }; + + onMediaItemDeleted(mediaItem) { + + } } \ No newline at end of file diff --git a/app/main.ts b/app/main.ts old mode 100644 new mode 100755 index acb4b62..c772c66 --- a/app/main.ts +++ b/app/main.ts @@ -1,4 +1,4 @@ -import {bootstrap} from 'angular2/platform/browser'; -import {AppComponent} from './app.component'; - +import {bootstrap} from 'angular2/platform/browser'; +import {AppComponent} from './app.component'; + bootstrap(AppComponent); \ No newline at end of file diff --git a/app/media-item.component.css b/app/media-item.component.css old mode 100644 new mode 100755 index 8cfcb4e..3d2c660 --- a/app/media-item.component.css +++ b/app/media-item.component.css @@ -1,64 +1,64 @@ -:host { - display: flex; - flex-direction: column; - width: 140px; - height: 200px; - border: 2px solid; - background-color: #29394b; - padding: 10px; - color: #bdc2c5; -} -h2 { - font-size: 1.6em; - flex: 1; -} -:host.medium-movies { - border-color: #53ace4; -} -:host.medium-movies > h2 { - color: #53ace4; -} -:host.medium-series { - border-color: #45bf94; -} -:host.medium-series > h2 { - color: #45bf94; -} -.tools { - margin-top: 8px; - display: flex; - flex-wrap: nowrap; - justify-content: space-between; -} -.favorite { - width: 24px; - height: 24px; - fill: #bdc2c5; -} -.favorite.is-favorite { - fill: #37ad79; -} -.favorite.is-favorite-hovering { - fill: #45bf94; -} -.favorite.is-favorite.is-favorite-hovering { - fill: #ec4342; -} -.delete { - display: block; - background-color: #ec4342; - padding: 4px; - font-size: .8em; - border-radius: 4px; - color: #ffffff; - cursor: pointer; -} -.details { - display: block; - background-color: #37ad79; - padding: 4px; - font-size: .8em; - border-radius: 4px; - color: #ffffff; - text-decoration: none; +:host { + display: flex; + flex-direction: column; + width: 140px; + height: 200px; + border: 2px solid; + background-color: #29394b; + padding: 10px; + color: #bdc2c5; +} +h2 { + font-size: 1.6em; + flex: 1; +} +:host.medium-movies { + border-color: #53ace4; +} +:host.medium-movies > h2 { + color: #53ace4; +} +:host.medium-series { + border-color: #45bf94; +} +:host.medium-series > h2 { + color: #45bf94; +} +.tools { + margin-top: 8px; + display: flex; + flex-wrap: nowrap; + justify-content: space-between; +} +.favorite { + width: 24px; + height: 24px; + fill: #bdc2c5; +} +.favorite.is-favorite { + fill: #37ad79; +} +.favorite.is-favorite-hovering { + fill: #45bf94; +} +.favorite.is-favorite.is-favorite-hovering { + fill: #ec4342; +} +.delete { + display: block; + background-color: #ec4342; + padding: 4px; + font-size: .8em; + border-radius: 4px; + color: #ffffff; + cursor: pointer; +} +.details { + display: block; + background-color: #37ad79; + padding: 4px; + font-size: .8em; + border-radius: 4px; + color: #ffffff; + text-decoration: none; } \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html old mode 100644 new mode 100755 index 253ae48..a9b1133 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -1,16 +1,16 @@ -

{{ mediaItem.name }}

-
Watched on {{ mediaItem.watchedOn }}
-
{{ mediaItem.category }}
-
{{ mediaItem.year }}
-
- - - - - remove - - - watch - +

{{ mediaItem.name }}

+
Watched on {{ mediaItem.watchedOn }}
+
{{ mediaItem.category }}
+
{{ mediaItem.year }}
+
+ + + + + remove + + + watch +
\ No newline at end of file diff --git a/app/media-item.component.ts b/app/media-item.component.ts old mode 100644 new mode 100755 index a90ea8b..ef27144 --- a/app/media-item.component.ts +++ b/app/media-item.component.ts @@ -1,14 +1,15 @@ -import {Component, Input} from 'angular2/core'; - -@Component({ - selector: 'media-item', - templateUrl: 'app/media-item.component.html', - styleUrls: ['app/media-item.component.css'] -}) -export class MediaItemComponent { - @Input('mediaItemToWatch') mediaItem; - - onDelete() { - console.log('deleted'); - } +import {Component, Input, Output, EventEmitter} from 'angular2/core'; + +@Component({ + selector: 'media-item', + templateUrl: 'app/media-item.component.html', + styleUrls: ['app/media-item.component.css'] +}) +export class MediaItemComponent { + @Input('mediaItemToWatch') mediaItem; + @Output('deleted') delete = new EventEmitter(); + + onDelete() { + this.delete.emit(this.mediaItem); + } } \ No newline at end of file From 8b1f537d9e7dfaf1c2f1c712768876f22ee1891d Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 09:56:17 -0700 Subject: [PATCH 11/79] end of video commit --- app/app.component.html | 3 +- app/app.component.ts | 17 +-------- app/media-item-list.component.css | 38 +++++++++++++++++++ app/media-item-list.component.html | 4 ++ app/media-item-list.component.ts | 59 ++++++++++++++++++++++++++++++ app/media-item.component.html | 4 +- 6 files changed, 107 insertions(+), 18 deletions(-) create mode 100755 app/media-item-list.component.css create mode 100755 app/media-item-list.component.html create mode 100755 app/media-item-list.component.ts diff --git a/app/app.component.html b/app/app.component.html index a50515e..216d12d 100755 --- a/app/app.component.html +++ b/app/app.component.html @@ -3,6 +3,5 @@

Media Watch List

Keeping track of the media I want to watch.

- + \ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts index 98203bc..8478339 100755 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,24 +1,11 @@ import {Component} from 'angular2/core'; -import {MediaItemComponent} from './media-item.component'; +import {MediaItemListComponent} from './media-item-list.component'; @Component({ selector: 'media-tracker-app', - directives: [MediaItemComponent], + directives: [MediaItemListComponent], templateUrl: 'app/app.component.html', styleUrls: ['app/app.component.css'] }) export class AppComponent { - firstMediaItem = { - id: 1, - name: "Firebug", - medium: "Series", - category: "Science Fiction", - year: 2010, - watchedOn: 1294166565384, - isFavorite: false - }; - - onMediaItemDeleted(mediaItem) { - - } } \ No newline at end of file diff --git a/app/media-item-list.component.css b/app/media-item-list.component.css new file mode 100755 index 0000000..5383cf2 --- /dev/null +++ b/app/media-item-list.component.css @@ -0,0 +1,38 @@ +:host { + display: flex; + min-height: 90vh; + flex-direction: column; + padding: 10px; +} +header { + color: #c6c5c3; +} +header.medium-movies { + color: #53ace4; +} +header.medium-series { + color: #45bf94; +} +header > h2 { + font-size: 1.4em; +} +header > h2.error { + color: #d93a3e; +} +section { + flex: 1; + display: flex; + flex-flow: row wrap; + align-content: flex-start; +} +section > media-item { + margin: 10px; +} +footer { + text-align: right; +} +footer .icon { + width: 64px; + height: 64px; + margin: 15px; +} \ No newline at end of file diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html new file mode 100755 index 0000000..b0e814e --- /dev/null +++ b/app/media-item-list.component.html @@ -0,0 +1,4 @@ +
+ +
\ No newline at end of file diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts new file mode 100755 index 0000000..05c5e3f --- /dev/null +++ b/app/media-item-list.component.ts @@ -0,0 +1,59 @@ +import {Component} from 'angular2/core'; +import {MediaItemComponent} from './media-item.component'; + +@Component({ + selector: 'media-item-list', + directives: [MediaItemComponent], + templateUrl: 'app/media-item-list.component.html', + styleUrls: ['app/media-item-list.component.css'] +}) +export class MediaItemListComponent { + + onMediaItemDeleted(mediaItem) { + } + + mediaItems = [ + { + id: 1, + name: "Firebug", + medium: "Series", + category: "Science Fiction", + year: 2010, + watchedOn: 1294166565384, + isFavorite: false + }, + { + id: 2, + name: "The Small Tall", + medium: "Movies", + category: "Comedy", + year: 2015, + watchedOn: null, + isFavorite: true + }, { + id: 3, + name: "The Redemption", + medium: "Movies", + category: "Action", + year: 2016, + watchedOn: null, + isFavorite: false + }, { + id: 4, + name: "Hoopers", + medium: "Series", + category: "Drama", + year: null, + watchedOn: null, + isFavorite: true + }, { + id: 5, + name: "Happy Joe: Cheery Road", + medium: "Movies", + category: "Action", + year: 2015, + watchedOn: 1457166565384, + isFavorite: false + } + ]; +} \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html index a9b1133..59f84ee 100755 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -1,5 +1,7 @@

{{ mediaItem.name }}

-
Watched on {{ mediaItem.watchedOn }}
+
{{ mediaItem.category }}
{{ mediaItem.year }}
From 3d68078ded41833135fc09c2421d07bee12ae27a Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 09:57:12 -0700 Subject: [PATCH 12/79] end of video commit --- app/media-item-list.component.html | 3 ++- app/media-item-list.component.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html index b0e814e..b4426ac 100755 --- a/app/media-item-list.component.html +++ b/app/media-item-list.component.html @@ -1,4 +1,5 @@
-
\ No newline at end of file diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index 05c5e3f..8f421ee 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -8,7 +8,7 @@ import {MediaItemComponent} from './media-item.component'; styleUrls: ['app/media-item-list.component.css'] }) export class MediaItemListComponent { - + onMediaItemDeleted(mediaItem) { } From 22e5270ea1e261fdb7e4ceb60da4b361e6a1d857 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 09:58:14 -0700 Subject: [PATCH 13/79] end of video commit --- app/media-item-list.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html index b4426ac..fbaa919 100755 --- a/app/media-item-list.component.html +++ b/app/media-item-list.component.html @@ -1,5 +1,6 @@
+ (deleted)="onMediaItemDeleted($event)" + [ngClass]="{'medium-movies': mediaItem.medium === 'Movies', 'medium-series': mediaItem.medium === 'Series'}">
\ No newline at end of file From 9ab79ab5fa6eda73c7ddb4046c035d33ac31c9fd Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 09:59:58 -0700 Subject: [PATCH 14/79] end of video commit --- app/favorite.directive.ts | 8 ++++++++ app/media-item.component.html | 3 ++- app/media-item.component.ts | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 app/favorite.directive.ts diff --git a/app/favorite.directive.ts b/app/favorite.directive.ts new file mode 100755 index 0000000..cdeda93 --- /dev/null +++ b/app/favorite.directive.ts @@ -0,0 +1,8 @@ +import {Directive, HostBinding} from 'angular2/core'; + +@Directive({ + selector: '[mwFavorite]' +}) +export class FavoriteDirective { + @HostBinding('class.is-favorite') isFavorite = true; +} \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html index 59f84ee..edb3d6a 100755 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -5,7 +5,8 @@

{{ mediaItem.name }}

{{ mediaItem.category }}
{{ mediaItem.year }}
- + diff --git a/app/media-item.component.ts b/app/media-item.component.ts index ef27144..a12d2fb 100755 --- a/app/media-item.component.ts +++ b/app/media-item.component.ts @@ -1,7 +1,9 @@ import {Component, Input, Output, EventEmitter} from 'angular2/core'; +import {FavoriteDirective} from './favorite.directive'; @Component({ selector: 'media-item', + directives: [FavoriteDirective], templateUrl: 'app/media-item.component.html', styleUrls: ['app/media-item.component.css'] }) From d6d72a7e0e04f45c84697a2fefeed3f7070b6ccb Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:01:18 -0700 Subject: [PATCH 15/79] end of video commit --- app/favorite.directive.ts | 7 ++++++- app/media-item.component.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/favorite.directive.ts b/app/favorite.directive.ts index cdeda93..b59be6e 100755 --- a/app/favorite.directive.ts +++ b/app/favorite.directive.ts @@ -1,8 +1,13 @@ -import {Directive, HostBinding} from 'angular2/core'; +import {Directive, HostBinding, Input} from 'angular2/core'; @Directive({ selector: '[mwFavorite]' }) export class FavoriteDirective { @HostBinding('class.is-favorite') isFavorite = true; + + @Input() + set mwFavorite(value) { + this.isFavorite = value; + } } \ No newline at end of file diff --git a/app/media-item.component.html b/app/media-item.component.html index edb3d6a..0b04949 100755 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -5,7 +5,7 @@

{{ mediaItem.name }}

{{ mediaItem.category }}
{{ mediaItem.year }}
- From e249ccb6c346bf4411ba90d86b9911d7752ca912 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:02:04 -0700 Subject: [PATCH 16/79] end of video commit --- app/favorite.directive.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/favorite.directive.ts b/app/favorite.directive.ts index b59be6e..d502433 100755 --- a/app/favorite.directive.ts +++ b/app/favorite.directive.ts @@ -1,10 +1,21 @@ -import {Directive, HostBinding, Input} from 'angular2/core'; +import {Directive, HostBinding, HostListener, Input} from 'angular2/core'; @Directive({ selector: '[mwFavorite]' }) export class FavoriteDirective { @HostBinding('class.is-favorite') isFavorite = true; + @HostBinding('class.is-favorite-hovering') hovering = false; + + @HostListener('mouseenter') + onMouseEnter() { + this.hovering = true; + } + + @HostListener('mouseleave') + onMouseLeave() { + this.hovering = false; + } @Input() set mwFavorite(value) { From a5cd3a5dd622ce869371791b41b3652ab6cb9f35 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:02:46 -0700 Subject: [PATCH 17/79] end of video commit --- app/media-item.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/media-item.component.html b/app/media-item.component.html index 0b04949..d746d6e 100755 --- a/app/media-item.component.html +++ b/app/media-item.component.html @@ -1,6 +1,6 @@

{{ mediaItem.name }}

{{ mediaItem.category }}
{{ mediaItem.year }}
From bc2dc6b2ac17c8df76399f34d4ccd387930f0f83 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:06:17 -0700 Subject: [PATCH 18/79] end of video commit --- app/app.component.html | 1 + app/app.component.ts | 3 +- app/category-list.pipe.ts | 16 +++++++++ app/media-item-form.component.css | 52 ++++++++++++++++++++++++++++++ app/media-item-form.component.html | 34 +++++++++++++++++++ app/media-item-form.component.ts | 9 ++++++ app/media-item-list.component.html | 3 ++ app/media-item-list.component.ts | 2 ++ 8 files changed, 119 insertions(+), 1 deletion(-) create mode 100755 app/category-list.pipe.ts create mode 100755 app/media-item-form.component.css create mode 100755 app/media-item-form.component.html create mode 100755 app/media-item-form.component.ts diff --git a/app/app.component.html b/app/app.component.html index 216d12d..451928a 100755 --- a/app/app.component.html +++ b/app/app.component.html @@ -3,5 +3,6 @@

Media Watch List

Keeping track of the media I want to watch.

+ \ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts index 8478339..9940f64 100755 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,9 +1,10 @@ import {Component} from 'angular2/core'; import {MediaItemListComponent} from './media-item-list.component'; +import {MediaItemFormComponent} from './media-item-form.component'; @Component({ selector: 'media-tracker-app', - directives: [MediaItemListComponent], + directives: [MediaItemListComponent, MediaItemFormComponent], templateUrl: 'app/app.component.html', styleUrls: ['app/app.component.css'] }) diff --git a/app/category-list.pipe.ts b/app/category-list.pipe.ts new file mode 100755 index 0000000..8c7e0da --- /dev/null +++ b/app/category-list.pipe.ts @@ -0,0 +1,16 @@ +import {Pipe} from 'angular2/core'; + +@Pipe({ + name: 'categoryList' +}) +export class CategoryListPipe { + transform(mediaItems) { + var categories = []; + mediaItems.forEach(mediaItem => { + if (categories.indexOf(mediaItem.category) <= -1) { + categories.push(mediaItem.category); + } + }); + return categories.join(', '); + } +} \ No newline at end of file diff --git a/app/media-item-form.component.css b/app/media-item-form.component.css new file mode 100755 index 0000000..e548720 --- /dev/null +++ b/app/media-item-form.component.css @@ -0,0 +1,52 @@ +:host { + display: block; + padding: 10px; +} +ul { + list-style-type: none; +} +ul li { + margin: 10px 0; +} +header, label { + color: #53ace4; +} +input, select { + background-color: #29394b; + color: #c6c5c3; + border-radius: 3px; + border: none; + box-shadow: 0 1px 2px rgba(0,0,0,0.2) inset, 0 -1px 0 rgba(0,0,0,0.05) inset; + border-color: #53ace4; + padding: 6px; +} +.ng-invalid:not(.ng-pristine):not(.required-invalid) { + border: 1px solid #d93a3e; +} +input[required].ng-invalid { + border-right: 5px solid #d93a3e; +} +input[required]:not(.required-invalid), +input[required].ng-invalid:not(.required-invalid) { + border-right: 5px solid #37ad79; +} +.error { + color: #d93a3e; +} +#year { + width: 50px; +} +button[type=submit] { + background-color: #45bf94; + border: 0; + padding: 10px; + font-size: 1em; + border-radius: 4px; + color: #ffffff; + cursor: pointer; +} +button[type=submit]:disabled { + background-color: #333; + color: #666; + cursor: default; +} \ No newline at end of file diff --git a/app/media-item-form.component.html b/app/media-item-form.component.html new file mode 100755 index 0000000..7fa9bef --- /dev/null +++ b/app/media-item-form.component.html @@ -0,0 +1,34 @@ +
+

Add Media to Watch

+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
+ +
\ No newline at end of file diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts new file mode 100755 index 0000000..ee87ca6 --- /dev/null +++ b/app/media-item-form.component.ts @@ -0,0 +1,9 @@ +import {Component} from 'angular2/core'; + +@Component({ + selector: 'media-item-form', + templateUrl: 'app/media-item-form.component.html', + styleUrls: ['app/media-item-form.component.css'] +}) +export class MediaItemFormComponent { +} \ No newline at end of file diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html index fbaa919..4b4335a 100755 --- a/app/media-item-list.component.html +++ b/app/media-item-list.component.html @@ -1,3 +1,6 @@ +
+
{{ mediaItems | categoryList }}
+
Date: Sat, 16 Jul 2016 10:07:16 -0700 Subject: [PATCH 19/79] end of video commit --- app/media-item-form.component.html | 14 +++++++++----- app/media-item-form.component.ts | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/media-item-form.component.html b/app/media-item-form.component.html index 7fa9bef..6d657c4 100755 --- a/app/media-item-form.component.html +++ b/app/media-item-form.component.html @@ -1,22 +1,25 @@

Add Media to Watch

-
+
  • -
  • - +
  • - @@ -27,7 +30,8 @@

    Add Media to Watch

  • - +
diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index ee87ca6..809fd32 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -6,4 +6,7 @@ import {Component} from 'angular2/core'; styleUrls: ['app/media-item-form.component.css'] }) export class MediaItemFormComponent { + onSubmit(mediaItem) { + console.log(mediaItem); + } } \ No newline at end of file From c1dcd4b261af2dfb4723e90b75b62950cdde0885 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:09:04 -0700 Subject: [PATCH 20/79] end of video commit --- app/media-item-form.component.html | 2 +- app/media-item-form.component.ts | 12 ++++++++++++ sample.txt | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100755 sample.txt diff --git a/app/media-item-form.component.html b/app/media-item-form.component.html index 6d657c4..c42b888 100755 --- a/app/media-item-form.component.html +++ b/app/media-item-form.component.html @@ -1,7 +1,7 @@

Add Media to Watch

- +
  • diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 809fd32..643f651 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -1,4 +1,5 @@ import {Component} from 'angular2/core'; +import {ControlGroup, Control} from 'angular2/common'; @Component({ selector: 'media-item-form', @@ -6,6 +7,17 @@ import {Component} from 'angular2/core'; styleUrls: ['app/media-item-form.component.css'] }) export class MediaItemFormComponent { + form; + + ngOnInit() { + this.form = new ControlGroup({ + 'medium': new Control('Movies'), + 'name': new Control(''), + 'category': new Control(''), + 'year': new Control('') + }); + } + onSubmit(mediaItem) { console.log(mediaItem); } diff --git a/sample.txt b/sample.txt new file mode 100755 index 0000000..ee2b104 --- /dev/null +++ b/sample.txt @@ -0,0 +1 @@ +[\\w\\-\\s\\/]+ \ No newline at end of file From 67a5a4ea14a56fa58dcc3f24e83659faf860d9d9 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:09:55 -0700 Subject: [PATCH 21/79] end of video commit --- app/media-item-form.component.html | 2 +- app/media-item-form.component.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/media-item-form.component.html b/app/media-item-form.component.html index c42b888..908c1b0 100755 --- a/app/media-item-form.component.html +++ b/app/media-item-form.component.html @@ -34,5 +34,5 @@

    Add Media to Watch

    ngControl="year">
- + \ No newline at end of file diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 643f651..5202ac1 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -1,5 +1,5 @@ import {Component} from 'angular2/core'; -import {ControlGroup, Control} from 'angular2/common'; +import {ControlGroup, Control, Validators} from 'angular2/common'; @Component({ selector: 'media-item-form', @@ -12,7 +12,10 @@ export class MediaItemFormComponent { ngOnInit() { this.form = new ControlGroup({ 'medium': new Control('Movies'), - 'name': new Control(''), + 'name': new Control('', Validators.compose([ + Validators.required, + Validators.pattern('[\\w\\-\\s\\/]+') + ])), 'category': new Control(''), 'year': new Control('') }); From 00f39e97356dab9a6d32d48e5b747eff30ce2c18 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:12:48 -0700 Subject: [PATCH 22/79] end of video commit --- app/media-item-form.component.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 5202ac1..64ac9ce 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -17,9 +17,18 @@ export class MediaItemFormComponent { Validators.pattern('[\\w\\-\\s\\/]+') ])), 'category': new Control(''), - 'year': new Control('') + 'year': new Control('', this.yearValidator) }); } + + yearValidator(control) { + if (control.value.trim().length === 0) return null; + var year = parseInt(control.value); + var minYear = 1900; + var maxYear = 2100; + if (year >= minYear && year <= maxYear) return null; + return {'year': true}; + } onSubmit(mediaItem) { console.log(mediaItem); From 0162a271f136e468ccf59eb384c2fa1248ba5b17 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:13:59 -0700 Subject: [PATCH 23/79] end of video commit --- app/media-item-form.component.html | 12 ++++++++++-- app/media-item-form.component.ts | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/media-item-form.component.html b/app/media-item-form.component.html index 908c1b0..5eff419 100755 --- a/app/media-item-form.component.html +++ b/app/media-item-form.component.html @@ -14,7 +14,11 @@

Add Media to Watch

  • + ngControl="name" + #name="ngForm"> +
    + name has invalid characters +
  • @@ -31,7 +35,11 @@

    Add Media to Watch

  • + ngControl="year" + #year="ngForm"> +
    + must be between {{year.errors?.year.min}} and {{year.errors?.year.max}} +
    • diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 64ac9ce..fb50dd9 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -24,10 +24,10 @@ export class MediaItemFormComponent { yearValidator(control) { if (control.value.trim().length === 0) return null; var year = parseInt(control.value); - var minYear = 1900; - var maxYear = 2100; + var minYear = 1800; + var maxYear = 2500; if (year >= minYear && year <= maxYear) return null; - return {'year': true}; + return {'year': { 'min': minYear, 'max': maxYear }}; } onSubmit(mediaItem) { From a9d0ec9cc7101f8c46869da143fcd0bc909fe799 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:14:39 -0700 Subject: [PATCH 24/79] end of video commit --- app/media-item-form.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index fb50dd9..95ffb95 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -1,5 +1,5 @@ import {Component} from 'angular2/core'; -import {ControlGroup, Control, Validators} from 'angular2/common'; +import {Control, Validators, FormBuilder} from 'angular2/common'; @Component({ selector: 'media-item-form', @@ -8,9 +8,11 @@ import {ControlGroup, Control, Validators} from 'angular2/common'; }) export class MediaItemFormComponent { form; + + constructor(private formBuilder: FormBuilder) {} ngOnInit() { - this.form = new ControlGroup({ + this.form = this.formBuilder.group({ 'medium': new Control('Movies'), 'name': new Control('', Validators.compose([ Validators.required, From 7932afa1c7f6cc26ac828cebd66c116eeb7f1f4d Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:15:16 -0700 Subject: [PATCH 25/79] end of video commit --- app/media-item-form.component.ts | 7 ++-- app/media-item-list.component.ts | 53 +++++---------------------- app/media-item.service.ts | 61 ++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 46 deletions(-) create mode 100755 app/media-item.service.ts diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 95ffb95..c72938a 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -1,15 +1,18 @@ import {Component} from 'angular2/core'; import {Control, Validators, FormBuilder} from 'angular2/common'; +import {MediaItemService} from './media-item.service'; @Component({ selector: 'media-item-form', + providers: [MediaItemService], templateUrl: 'app/media-item-form.component.html', styleUrls: ['app/media-item-form.component.css'] }) export class MediaItemFormComponent { form; - constructor(private formBuilder: FormBuilder) {} + constructor(private formBuilder: FormBuilder, + private mediaItemService: MediaItemService) {} ngOnInit() { this.form = this.formBuilder.group({ @@ -33,6 +36,6 @@ export class MediaItemFormComponent { } onSubmit(mediaItem) { - console.log(mediaItem); + this.mediaItemService.add(mediaItem); } } \ No newline at end of file diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index a238623..e0aef0b 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -1,61 +1,26 @@ import {Component} from 'angular2/core'; import {MediaItemComponent} from './media-item.component'; import {CategoryListPipe} from './category-list.pipe'; +import {MediaItemService} from './media-item.service'; @Component({ selector: 'media-item-list', directives: [MediaItemComponent], pipes: [CategoryListPipe], + providers: [MediaItemService], templateUrl: 'app/media-item-list.component.html', styleUrls: ['app/media-item-list.component.css'] }) export class MediaItemListComponent { + constructor(private mediaItemService: MediaItemService) {} + + ngOnInit() { + this.mediaItems = this.mediaItemService.get(); + } onMediaItemDeleted(mediaItem) { + this.mediaItemService.delete(mediaItem); } - mediaItems = [ - { - id: 1, - name: "Firebug", - medium: "Series", - category: "Science Fiction", - year: 2010, - watchedOn: 1294166565384, - isFavorite: false - }, - { - id: 2, - name: "The Small Tall", - medium: "Movies", - category: "Comedy", - year: 2015, - watchedOn: null, - isFavorite: true - }, { - id: 3, - name: "The Redemption", - medium: "Movies", - category: "Action", - year: 2016, - watchedOn: null, - isFavorite: false - }, { - id: 4, - name: "Hoopers", - medium: "Series", - category: "Drama", - year: null, - watchedOn: null, - isFavorite: true - }, { - id: 5, - name: "Happy Joe: Cheery Road", - medium: "Movies", - category: "Action", - year: 2015, - watchedOn: 1457166565384, - isFavorite: false - } - ]; + mediaItems; } \ No newline at end of file diff --git a/app/media-item.service.ts b/app/media-item.service.ts new file mode 100755 index 0000000..bcc6919 --- /dev/null +++ b/app/media-item.service.ts @@ -0,0 +1,61 @@ +export class MediaItemService { + get() { + return this.mediaItems; + } + + add(mediaItem) { + this.mediaItems.push(mediaItem); + } + + delete(mediaItem) { + var index = this.mediaItems.indexOf(mediaItem); + if (index >= 0) { + this.mediaItems.splice(index, 1); + } + } + + mediaItems = [ + { + id: 1, + name: "Firebug", + medium: "Series", + category: "Science Fiction", + year: 2010, + watchedOn: 1294166565384, + isFavorite: false + }, + { + id: 2, + name: "The Small Tall", + medium: "Movies", + category: "Comedy", + year: 2015, + watchedOn: null, + isFavorite: true + }, { + id: 3, + name: "The Redemption", + medium: "Movies", + category: "Action", + year: 2016, + watchedOn: null, + isFavorite: false + }, { + id: 4, + name: "Hoopers", + medium: "Series", + category: "Drama", + year: null, + watchedOn: null, + isFavorite: true + }, { + id: 5, + name: "Happy Joe: Cheery Road", + medium: "Movies", + category: "Action", + year: 2015, + watchedOn: 1457166565384, + isFavorite: false + } + ]; +} \ No newline at end of file From 4aa2ccbe2e566a0a693884e73934e3215443ae6e Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:16:08 -0700 Subject: [PATCH 26/79] end of video commit --- app/main.ts | 11 ++++++++++- app/media-item-form.component.ts | 1 - app/media-item-list.component.ts | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/main.ts b/app/main.ts index c772c66..515dfde 100755 --- a/app/main.ts +++ b/app/main.ts @@ -1,4 +1,13 @@ import {bootstrap} from 'angular2/platform/browser'; import {AppComponent} from './app.component'; +import {MediaItemService} from './media-item.service'; +import {provide} from 'angular2/core'; -bootstrap(AppComponent); \ No newline at end of file +var lookupLists = { + mediums: ['Movies', 'Series'] +}; + +bootstrap(AppComponent, [ + MediaItemService, + provide('LOOKUP_LISTS', { useValue: lookupLists }) + ]); \ No newline at end of file diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index c72938a..4b14f29 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -4,7 +4,6 @@ import {MediaItemService} from './media-item.service'; @Component({ selector: 'media-item-form', - providers: [MediaItemService], templateUrl: 'app/media-item-form.component.html', styleUrls: ['app/media-item-form.component.css'] }) diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index e0aef0b..9b41ff0 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -7,7 +7,6 @@ import {MediaItemService} from './media-item.service'; selector: 'media-item-list', directives: [MediaItemComponent], pipes: [CategoryListPipe], - providers: [MediaItemService], templateUrl: 'app/media-item-list.component.html', styleUrls: ['app/media-item-list.component.css'] }) From 71ba8169371189123d3325c6bf92e1bbfc1ed676 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:17:06 -0700 Subject: [PATCH 27/79] end of video commit --- app/media-item-form.component.html | 3 +-- app/media-item-form.component.ts | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/media-item-form.component.html b/app/media-item-form.component.html index 5eff419..df27462 100755 --- a/app/media-item-form.component.html +++ b/app/media-item-form.component.html @@ -7,8 +7,7 @@

    Add Media to Watch

  • diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 4b14f29..e9d2414 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -1,4 +1,4 @@ -import {Component} from 'angular2/core'; +import {Component, Inject} from 'angular2/core'; import {Control, Validators, FormBuilder} from 'angular2/common'; import {MediaItemService} from './media-item.service'; @@ -11,7 +11,8 @@ export class MediaItemFormComponent { form; constructor(private formBuilder: FormBuilder, - private mediaItemService: MediaItemService) {} + private mediaItemService: MediaItemService, + @Inject('LOOKUP_LISTS') public lookupLists) {} ngOnInit() { this.form = this.formBuilder.group({ From abc514bd96ed51e2f0275f2f14655297a330bf68 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:19:15 -0700 Subject: [PATCH 28/79] end of video commit --- app/main.ts | 7 +- app/media-item-form.component.ts | 3 +- app/mock-xhr-backend.ts | 125 +++++++++++++++++++++++++++++++ app/providers.ts | 7 ++ media/01.png | Bin 0 -> 34383 bytes media/02.png | Bin 0 -> 34383 bytes media/03.png | Bin 0 -> 34383 bytes media/04.png | Bin 0 -> 34383 bytes 8 files changed, 136 insertions(+), 6 deletions(-) create mode 100755 app/mock-xhr-backend.ts create mode 100755 app/providers.ts create mode 100755 media/01.png create mode 100755 media/02.png create mode 100755 media/03.png create mode 100755 media/04.png diff --git a/app/main.ts b/app/main.ts index 515dfde..6281915 100755 --- a/app/main.ts +++ b/app/main.ts @@ -2,12 +2,9 @@ import {bootstrap} from 'angular2/platform/browser'; import {AppComponent} from './app.component'; import {MediaItemService} from './media-item.service'; import {provide} from 'angular2/core'; - -var lookupLists = { - mediums: ['Movies', 'Series'] -}; +import {LOOKUP_LISTS, lookupLists} from './providers'; bootstrap(AppComponent, [ MediaItemService, - provide('LOOKUP_LISTS', { useValue: lookupLists }) + provide(LOOKUP_LISTS, { useValue: lookupLists }) ]); \ No newline at end of file diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index e9d2414..8408e96 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -1,6 +1,7 @@ import {Component, Inject} from 'angular2/core'; import {Control, Validators, FormBuilder} from 'angular2/common'; import {MediaItemService} from './media-item.service'; +import {LOOKUP_LISTS} from './providers'; @Component({ selector: 'media-item-form', @@ -12,7 +13,7 @@ export class MediaItemFormComponent { constructor(private formBuilder: FormBuilder, private mediaItemService: MediaItemService, - @Inject('LOOKUP_LISTS') public lookupLists) {} + @Inject(LOOKUP_LISTS) public lookupLists) {} ngOnInit() { this.form = this.formBuilder.group({ diff --git a/app/mock-xhr-backend.ts b/app/mock-xhr-backend.ts new file mode 100755 index 0000000..b63b534 --- /dev/null +++ b/app/mock-xhr-backend.ts @@ -0,0 +1,125 @@ +import {Request, Response, ResponseOptions, RequestMethod} from 'angular2/http'; +import {Observable} from 'rxjs/Observable'; +import {Observer} from 'rxjs/Observer'; + +export class MockXHRBackend { + constructor() { + } + + createConnection(request: Request) { + var response = new Observable((responseObserver: Observer) => { + var responseData; + var responseOptions; + switch (request.method) { + case RequestMethod.Get: + if (request.url.indexOf('mediaitems?medium=') >= 0 || request.url === 'mediaitems') { + var medium; + if (request.url.indexOf('?') >= 0) { + medium = request.url.split('=')[1]; + if (medium === 'undefined') medium = ''; + } + var mediaItems; + if (medium) { + mediaItems = this._mediaItems.filter(mediaItem => mediaItem.medium === medium); + if (mediaItems.length === 0) { + responseOptions = new ResponseOptions({ + body: JSON.stringify({error: 'medium is not valid'}), + status: 404} + ); + responseObserver.error(new Response(responseOptions)); + } + } else { + mediaItems = this._mediaItems; + } + responseOptions = new ResponseOptions({ + body: { mediaItems: JSON.parse(JSON.stringify(mediaItems)) }, + status: 200 + }); + } else { + var id = parseInt(request.url.split('/')[1]); + mediaItems = this._mediaItems.filter(mediaItem => mediaItem.id === id); + responseOptions = new ResponseOptions({ + body: JSON.parse(JSON.stringify(mediaItems[0])), + status: 200 + }); + } + break; + case RequestMethod.Post: + var mediaItem = JSON.parse(request.text().toString()); + mediaItem.id = this._getNewId(); + this._mediaItems.push(mediaItem); + responseOptions = new ResponseOptions({ status: 201 }); + break; + case RequestMethod.Delete: + var id = parseInt(request.url.split('/')[1]); + this._deleteMediaItem(id); + responseOptions = new ResponseOptions({ status: 200 }); + } + + var responseObject = new Response(responseOptions); + responseObserver.next(responseObject); + responseObserver.complete(); + return () => { }; + }); + return { response }; + } + + _deleteMediaItem(id) { + var mediaItem = this._mediaItems.find(mediaItem => mediaItem.id === id); + var index = this._mediaItems.indexOf(mediaItem); + if (index >= 0) { + this._mediaItems.splice(index, 1); + } + } + + _getNewId() { + if (this._mediaItems.length > 0) { + return Math.max.apply(Math, this._mediaItems.map(mediaItem => mediaItem.id)) + 1; + } + } + + _mediaItems = [ + { + id: 1, + name: "Firebug", + medium: "Series", + category: "Science Fiction", + year: 2010, + watchedOn: 1294166565384, + isFavorite: false + }, + { + id: 2, + name: "The Small Tall", + medium: "Movies", + category: "Comedy", + year: 2015, + watchedOn: null, + isFavorite: true + }, { + id: 3, + name: "The Redemption", + medium: "Movies", + category: "Action", + year: 2016, + watchedOn: null, + isFavorite: false + }, { + id: 4, + name: "Hoopers", + medium: "Series", + category: "Drama", + year: null, + watchedOn: null, + isFavorite: true + }, { + id: 5, + name: "Happy Joe: Cheery Road", + medium: "Movies", + category: "Action", + year: 2015, + watchedOn: 1457166565384, + isFavorite: false + } + ]; +} \ No newline at end of file diff --git a/app/providers.ts b/app/providers.ts new file mode 100755 index 0000000..99d921a --- /dev/null +++ b/app/providers.ts @@ -0,0 +1,7 @@ +import {OpaqueToken} from 'angular2/core'; + +export var lookupLists = { + mediums: ['Movies', 'Series'] +}; + +export var LOOKUP_LISTS = new OpaqueToken('LookupLists'); \ No newline at end of file diff --git a/media/01.png b/media/01.png new file mode 100755 index 0000000000000000000000000000000000000000..ae2671bb532a10403f2baa14f467ba92801d3361 GIT binary patch literal 34383 zcmeHQ2UwHI(_f@_M6e+mz>0({FX^_D{jDY`h@ zkB6r-uV3LcS9Vs}3 z2E<+k`yDCC${XktUS(OpXwRU8wk2~Mh z!9haf%J${rYt}@pRv)LQuu|@!be`7EHH&sFUwN(S`Mh2J_fslf-mE?Gz_Q?AY3#8~ z=~NkoEzXAHj3X5G+xG4HY*BjJ<>z_&){%1kgOQ5NF>kHV8XYlIxxn0fsCKIKStJ&I zS6&9Cy2hkZ`z)(deq+0Bide*Au~hE*VIyTC)R6VuHMV<@wWC->?AC#9XuAZOex2!+ zi^h`C^g+MAyo(}YE4R%PLz6dYsf%r2k4W8E%k7chaC9*9rfXH~57IjU@Z z0&Rc&$fGnEW8<)6U2;}deqP?g5oxxQ8P`1K*ZN+Vmg-Rx@M(d0bw&BJvoHEb8cdCJ zlBj%k;YQi0-F-4Q$S(GJ{Bo^R^-1}La^M3JEuS(qVsWCb{!%}SCdh))hO!1E+2dQ{+Q(sgdRC1bg{;$C@;t_s}o@a*D zy|b!u+CBh9__%DCiO|pX{q^0i9kWW8LCAi4r0!uGjk5DS^-`t!oR@rjUcP#|$zt37 zX%}o&Y~{Qo`h-j$a&V#T;H5VYYwAv?{AI0alse9D>Be9s{R+exJ3lxj zQdYv|icB|#)}!TOUMoFy*2whOwxm+)yt9Prs{W*_%hkqdk6dr;OdG$_oixE&v&15# z3w_xX$5ZQvUqJ>7tCyxY(KbaM9cS^E!U?KJA*;V>$K(^BLF08^>+O#*a_+6O@#-UQ z|D)3MO?srESC-_(=3UG)%+tuzDw!-7>t#Ljk4m=}gU4T+F``$#O1@FP6l<%2&4gXi z<8$`yaPMloc9Lzvj->I2#x2{|&1hCM{pOHuDh?@|FhftM8^q+Zn^tq|Jrh3 zLVWDlLN^UJ-~Ge)EsOWv$8op%W5L9l6;cx~j=DI;?vHWXk4(!=xlEF0_Bs}>r{%AB zVCk$#4{a5N;c^u22B~{ zhzU!Xj z{~VQ9voBA{?VlTXIq>qXfl>pt299)n<60a&-Zgp8kUhgk4Ih<$^Ty4cH}7vVj?W z(u&Knln!W4(p(UFJVedxC$lHf8NU@<&A(K(B-3Tsf0Bf?Gaw>hrmG%41`W#at-bmwl+%q?ld2?D6k6 zjD8;yH_|csrR^ z&oF;vddldO)n$F3i8t4J^#g&=zf2ziy^&yq4?6 zB;Pl_FMVcTKge2gwDwZas*{wyo29S%A6s`&aw1tS$#%~x_ep~v=t>{;WqJ6VySd^T zeanHkp*M?e9J`ji&h)o;zt~T0=+d90 z4x0bDGD$b^-k1YL9#M%4&J3LE>L2;@`D+W$pAhpel%F7%zhr*l;|E1k$9PgEK0U$s zyfjwBQhmkBM78W5QR=@w9Q-&uUt<~P+PQ6yHyz)9AT8ND)8~%Q>z7Z+ag&v{#7Di1 zQVLScdURaz=}*Ut%0D_}Q=)DT&OW^;$u4=oW?eYtqVEZ|FuPbDq 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 literal 0 HcmV?d00001 diff --git a/media/02.png b/media/02.png new file mode 100755 index 0000000000000000000000000000000000000000..7ab30baab3c7ea15bffed5298a1caba85f5d7d9d GIT binary patch literal 34383 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 literal 0 HcmV?d00001 diff --git a/media/03.png b/media/03.png new file mode 100755 index 0000000000000000000000000000000000000000..2c9af84fcfe3bd33c2522c9ffc297e10b925219f GIT binary patch literal 34383 zcmeHQ2UwHI(_cjCh$3J?yZ}}-B%vo#l%gP@(hlr~5FiQ!Aqwc}fxVp#6%_F-XIJz@ zQAAIySiy2OP*DL9J@5n-q<*u37vd}AXx{1n%RJ9y-`&}n-Tm$EYMrNH+Szr~ys~Yn^r}^nE7e_wC@oibD4VOjW7UG4OP61(cs^(6^!ukvU*4=f{=hQ- zU`c#phHR>w(nfnj7vo5!eb#-tK3kA>@$&Or{b5lGeS=XKxkMlB&?;RiR5s7te6UWc z>>o%f{H~%LN_CD)rT1P^qw?B%(?qGrg;J@4wPucTk!onz>{Zsg(XbIxk@2zp-O#p< zXzF#2cMcj$MNo^L4z) zL=UNm?%?TbkB*!`sp(x5k0LoGM0Z)bXb|c+2Ti@As~e6MZbE7!iapKW4NmBiuLnqN zI%=NWmuVL@L5?~@*3(nJ&%ktt?t|4#*d5rLhv}b>*woV?%1Gr|$qj_ItyPECmQ;nO zcTPx8H(8a`c?$LQS(zFgZ||Jyyo>|E&~eWN^KMrUp(XZ;94ZqTSiPfPQAhvDirZ$E zuJApoGVD0oR*>mg5{$92+rB3G(WAWF+=rtsT2EkK^PF4lcYaE$XH~$bdFGX+AD;d3 zqHmPJq^OY{%buOT@!n}y?~HZw3%wt|Ts^Y#gknvl)?J;84&KRLdTKc?sxwyEZeCep zuuEr|^}0cq`rWDVd67M&LfSIh7#*2rDK%#;b?+pO^hd`5UAzRTFG>+APT`;XbD*4b zr2m5F8DTYVt*SxUwJ9oEf2XtHfzefMjLR%vnw*=~!{J2G7J{ka}PQe}Fd>-6}X zV&znmh1Pv9p11B|t>6>cJ7nshgY&HiF1~q0OK&Re&tY0dsV@GDqk}u^pZ7S~*&_Z3(U)>{shW$9<62{ThU;>7 ziif>cu|-G+=8}mcPOTk!1sTk*Tzq;YV|~<77mGiYj@u;fHSM)<#16$tDWL{kz!^`Do7d-*pZu9k|@<$d3o5 zQv>hacxwkNqBc3HBwo6*e8%$o}|92|EY+OgqoFaPfTrM$zh z1gE+_+0bWn%q`D5*9%6zig_jdK1@k@vHF6vrG5i@#`Tcx;ny>)$KhC~-97KF=$YnD zH)Xtu&EKT5iSOa1m!$WT`r2y>8%AyDzd=)v=Du(L?)^{qD|(c8Tz6l+Z?fCmgb^Nw zZaMqp|J-=MV}JbEH*T74e*1>*U9#VAFW=qjw|V2LmdT8};B;Y(&2KK-exH(a`Z7h4 z(=#!Ai1u{l1B+)y8DH%G`^`r`&C*MWtFYi5|hn>TLm zxOsn*ahwI?fkA#;e%yn&>=RSRhmRkUv^VJ_*WqaH_}$}*l1>LL8qXZJ%gbZ@q{I=2 z;t%z^pK>T=PuD%kqoYS3*m~dZ!jX4LSCjUg=y@dXp-fgnQee_twx4%*zY~`dE)+$d ziJp6E?k`mqvdT*ybv~dqUTa?Hu@E)ZkF2Mg)3+2^&As$~V*$<2E2B%sL&Kb;Zr2B0 zvX z*QWD2FB&`V)%{zt?3e5n7v?DqShQr3=VGf>!Are*-DboXhuwZ`6Pj&XZoAR;X`CNp z4D&E`l(C-We*J0YnWm?VPFY>n_Z@fRo>#n=Lx5v%roLW+Nl?Ha*_DMQOJ2mkP|TUr zJ(hN5QgFof^z-i*?a|n$uR4UaahTK6(Pr!a9^OT7ug1!L#ofaCtx||MuXWx}hj!cK z_R@zo6ZQIxF1FWmp1tm`wWp0E`d%{JH6$;2;edT>PCF?(J&9v&)!00X5@=w-I>T77 zZta>G*88=cqm%qz`@Qs?b^RcB(b4KlK`Tzs`fQNBIz4gC!A|3-3Q5+xU%8JT_&`tg zs2|tU_w3DO*O(g*Y#n^F@J8abtTm=v-u_xssCr)Y`MRWCiyb|wT3#>D9Gu2HYCa<( zOCd+S)8NHF${aL5xjacP@ZOjMg`P19^Un02?L0kd^0{mC&mEVV{zlP5A#c&#H;*3_ zP8#Dy8<%~YUA{P8(^7re@&vW4?lI~=KOFctJWq28|JvD2kJlgDci>{OPloRu--4G< zsaq#>-nc*JWlZNFUK_gko@O8tveR(uB-14elxOj+7EwJ$G;7uDw`;K{Iccp z3*BJbh}?ow`Rvj@%B;*;E9V@1E_?TfSz3Ntv}x9xi#LymbK6`o!F$4~F*hu4-+%pd zcIC*dA5^v&nU9MYRpNe?msv3XZnR%<#>)5&@pI?te|kJMYe&+Yd`^1yG!_2aQ(Xkl z@7UF>$RB!oX!^wBlY-)-S$W+&PkL@X%$gGTTJYMuI{NOIw3IC=n-h{JPERhHedhQa z-_iojt)}Tu-k*thr%`kN-d3i?lQSi=`K6aiKV)k>nHMskD*bxOqp$%*hfa?~td z!r_l>o-Da%HKF?P!?%xro|YQ6t>pIOk)<+=7GzYf{jgfarqk+8tFJFsUi@aOnI)6? z!YZVypmL8*hEGQSt=+44R9{c%u0fkucJIxD^xLtwx5pI6M4t`(X;;<6u*Uz>?;qT5?Wu_F8692IQ98Dyl4D5C zLTG3op1YU8%h`#=;RouoefZv7{qVqG*oY!zZWSKP=1k`bDBfH@UXX>(+my396rPWT zj;FCR-8tBX>(8^F9l~{+J=&c!dpd{dqhn>MU>?o_1A$xtn-U%v5ERM^x6l#VWx+E} zrs+_GSp?H9bcW*sDPGQFDK`8NF2z{igvwzs7!*^cKEv3|(7<>I#emK*rqP)+2AxW0 zuo!ff0i9AuI+hCXWFF$<%W}0HQCA$qEOh(@f?yVn78Vw!A7-e}5AmZhm`o;(Za_0I zph6C6Xhe{J9Zn4j)vYx`*s%@6-#J_x<>?aX|CK*{>%^#*KQUxMYplm3wXW_o%5L` zENQat+;CnKYFJXMCL9X2J!B4TW!Z#q*#druJD(q5Sv$%a&QEZB!lQ~Z(32PB!w(A` zWKJWiH1v0aHLfjNz_kQT6Dr-1N;h?9n6V7aSac&Q9X{zIMrw1CY&i3Mc)k&28wN0- zOXO-!f;`V3JsBKbt@2uCc-At+S9 z4&rbfY%L){pU3lIu}ut2OngiYsJ>#z5`qAp(9;F8LqfTD9$V-T6S>|s)_Xpz zBlHI>HV6AiOAel9Tpx4VXQ>U2gTzhKT2sPYO&ba2 z`wGI?A>849FhZK+L29jju0}R*PQz4$90UgeU^_UwHYUvxo52Ubz zg9CURHtts1tRSDd1+9KIPy~F6h{LFDu856)v8|!(S#29~&GR5_7;Ul?_6UcRC3yTV(i%#x&F_UhPryu} zXECG;3HE(Jb-JQ*vhKKl&=r-FbsJPYf_MT;aO%RUl9ENV@V=vVQFMbXG8Z?FoJ7t& zmKV+q@UrE>iW7=Gr-@OW4q4Es;<%<1MFe$8R05ZHd`MCWTqHom zM8R05ZHd`MCWTqHomM8R05ZHd`MCWTqHomN5#UW(C|mE z+#vW%*D&~#))J?|9`NU|6pp>CGeWcbAr!d)p-(js79cc}j?n9=2(e-j>ds#`<cpXU|I2)Iiq%$J7zG-OzU8*MvY7jGF?(&%7WCunDjda8q;z1RsGf z0Y3u11^m@|NeBQG(B7m821fzA0hpn1SUCVC;WdL@fmXFK2kJTeYZ^e=qZ9C~9R(ifah~xbb+X z^=U}~|3O~(sXlbHx#cz&06fHSR2^z}RKr@1^ks_85d6M5L+k zp8&uP?-cO&)_9`5cz=Rdt0w8605}7h-I~dOgAJKZ9g&iv0&2x=R(~+=2z;Cont|SEwt*WX*Z{L-m&dQ3YOJ^mdq1F{uR#vsR9BJteLOl#%D=7-}ngoE~N~2Ax z)i%Bw<-K}?9PP}}^^E&yil-Cuo$QL<6~7niDJaOHP8}QiqN=JIz5jr3#o+g;l@w8j z4huzt?kbuVwhVRa+8IepOAGV0;KLB|4g$t!8YJoi)FF;XK)Vsq_y?I!k>6xD zv}M&#sJgluz5c5ReJZa&Dlif-nN>Cn>@LubSq#YR6EIH3ob*~0150endt$c@l#7`KjAB>L7Md)4`wl6}%b}9jh3Ij1ZhbL@MSr8h%q&!1QHe^jpP_;`h4r$h&vMbr zI}cD%(K}R@n}bS9J|NYuD)sVKKKuZBc$0U906-NYLtAO=Gc}^;A7(y7Q$-q&GvVQk z9ij11Lo{~OuzEdRN^j_WJEYZ11LfuSLxTsv56{<;73A#zQ$ih_X2F{xq@k_~zN3T? zwVumB5V{0ZbybwIObNHF$44M;mKAwu_g2%^n))VB#56__i3FUhNfsCz(z{ zM~K&Wyf?thV|jVGuqvHk&ByZ{%kc1@=rIcQ>Vf@rn~4e*dJ_QjYl}Hy(D_ObyrhGC;v!8$5SrB>z?Mn@WGp&67UD+rgYT1SNBHkw=hu?^3w?b zFdD5U+>>~2M+CFc+z_88?Wn*e2rp$_RFshlaKq}}q)NR21Ms|4CnPH?1EZr&OCVtr zZy;0&0Mv-o)`WN-%ES7c{X7rNTNW$aqT} zAx~}ux_Ipt>Y?8BMbbCYc--cSHf^T})Ceaivwysn;71OP2Q zQhjF)ZK}Gm1OUxnkef2~eWs@oPVg$!zfG^V@if4MkGeT83*flgu3zL3F0F;RuY}8} z=-q*^(AIwx5&$$DzglSw-}qoMGo-?;j}qz%8=ZC~*a*EEs0+7A%Jr8eZM2V1RJjBI z_uFU;z5iG$G_f+W_P;o^)t)&0BsdJU17(7Z8w3D&3bcu2>oz`@uHA-haWU#B-4TXu zH5zVijO1YZTJruQI)5b{E;Ks{4?6fv&ot5(mYMZ52i>`!DZKu|`TFbjLDWHgg|hTJ z4^eLZYos7Ai%LsBA!`d`q}HuVo9bGpd;`J~0)Rgug1>a6Q73G1ATRuXatO_uzYbka z%RtIqlo7t(x^ZeJqU!ZU>2Rsx-ZZsJ)K0Gt*J98L(E8{&fxz6_baGVaTFu%cTm@^O}sk<)R(P01h~AHLL7RfIQ1 z&8?$IKJ4p$BjUuJAQ4xBha%uF&$2|0Mnb$XDS;Omxv&BHHwfP+Xu+`>Pq9|K9>d=k zsK1jZj{y9t<`>`=jRN5d3s~y#{QS3wxKC_FdC{UeqN@Orz7QT-{?d-n{0d7TtGNJRI~ast|H9!>R;I?@K z&%_VkDB+teW8lZltzSz4z;;&x&os^uK^#06zl8Yx-9uxQ(l+VeZblf6U27c%S89H`+GAdg}cD17vS#-v9sr literal 0 HcmV?d00001 diff --git a/media/04.png b/media/04.png new file mode 100755 index 0000000000000000000000000000000000000000..7b4493776ec53c31e5ac042b10433463cd7d7806 GIT binary patch literal 34383 zcmeHP2|SeB`#&Q4R-r|@gH|=h*hh8>mCDkk?ba}ZDU6sR-CSC=+)65ybXB*#v?wJl zTD8)?sZ>bn(k+Uz{hu=$jn{ZDse6C=&-3{_-uImIJkL4L_dVx1&wFOZqR}Irl;nHJ zBZQP(oE_caYKvJ`8vgF$OnU+sxe({EVF>B#VwQ;5YBK{N`B5APhtZ=0xIAuH05^o< z;^06D3FZ260@(;fJWTTN_w*>%u&Q`cZa+LWdev~QySgmJ-F`{5T3lZ}Z8_CpvD%v+ zsJor+G-QaB=EdY#$z{u;m#VuBQd}&5U#38N^Rl^HVi#YodNymz)Vs$kURcoH^Q z@)cj7d^DPhCina8#Vr(_RJm@J1RB3eTU{bK4pF+WV;xbzV6-Ra=fy*iw*gY~8-9*~ z?o*M0i

    +J6LPW~(Y3M6!y=z%6$E03YtgpuDfB3vC7l3s|Y2>se`v=H4)j$ zDcRYk%hHr5QD2>suG8`H$*(QU*&PB8?inxYM(rS4YLDo_($PV+oBNbX1^l9rJiTIx z-$51I!zj7G>{|ablQO+(0zXDsR#&`#dh&Vi z7{iG%PEwUm&s;4Zv9)K;O1XJHk6tWysy?DnSFLqR=bVdAy0@NMzFX&M%N*A)Ei>Gz zv&eqsfb)HB*0G-F4XTo~&ND&#r&vqOilgqB=qveQct2HdUgq-(gx+OvPv7n@D;XUy z_gPMO-5Z-4r{q2;+RtU>G=zR}?5*#4In^dh79q#v7`^>=n&qdv4a$`6dAj4H(+bs- zP3PJ7K6l1m)n1+z-7|FZfIV~U`!Be*UrTQ??Y6C!ai&|qg7^?+{WD{ZDqDr9d}7LO zJl+3zjGUC+McFP)?T4`vK8w9|m&tZrH@{N*w6j#_CA}$^V%6MqhR2yW)7=+)QpPxI zy|W7Kz*sn8=&`uL7m?wd>IKK0=&NE5x>?;;JnWFZ!>q@=p_>)1vv~CN%Qcb{uZJG$ zVYSqBQ_=O^0V)rdTRUVKWWMYsV{|UiK>xy7`vc~KnR2F5;r0|}FFR-N5#A&3JMW}}lXp`4kVQOcD_0EX0W?%@t~cF#?C!- z<1amAO+6^XST%?;@Z$V}q=K^rMg^J$+V958C;8Y;`?J#Hd4KoIQ-*afR4p_vlxD9r zv>UT!z5C-Gn>;(2EFWjTcT<}CKDUKCx)@Ji&$u>M!)5r^y_;9x>JiX2pn|jSCGS|L z$E$mdOt|iK^GdPP%Y>Jb<>87-3)JUk#rpT}p4d&Mn}7H4Zu{1b*w+2llI~fa24?iv zYm3&YtmBUH)=Sg-RXy&q{OVz=`>xj1qj~P!wQbjvT?%8$#$54SzVjE4*(pQE7}?rXXx)kRhDutOvvw@A9Nw;!j`_$eYN`zcYWnry58M2ecOO-gGUS=k#+6rwawS= zt}{urqTe$tN-RpemzZ~C^0)d-}-uk-InE^*_7+ZQ7-@okzOwFT5|Eo01lkHk;}1)7AgT`INJz@h9SE zADjJqjg^ej!UxK`wZ>^hg&hi2v-sKK$@=UKr8cwAm#-W_U zlrDVq$5rD$25cN_6n6dWMTe(ug*R*z{#b1=HE&PUD2Guo{)dZnX}+{Luf6y7AK4nd ztAhEatMv!#&_D96^DWJu7(N+0>8e@gk&8#Jj5^ERIB9;K!*9BEth&g$8)$oU9|?cS zMKN|U<2zJUM*gaOYMG5iF8jm52PJk(lhf_g?Uv8kJE!pUUhRO3f34W7T~V|)J1(1} zJb!f5%e&WQm@k-1&PFNro4;_r*8-bmA+g>)ZqO4F}99q%M>m%!mY8TxuDron+H^QueA7CujUu8=>g>ss2y zi6JvLWuGaZzg=Uee&<0JYivivjx=BOx1Flq4vnRK-gOD@vrK;G8Lcz^I!8B)dHr^-I6gvY#N$MZjT-A`P=XAtEKbnpu8dnT z&3>1*YkZpjEB_aMGp_7m&p%juK6uFyTCdeIm!_t!*wb+=RX)vr+e^=J{qO0?9Q0>< z`JKA9=rUu??u`Slm0V4|oV&to!<#?qN;;qE{A^{~)&;}8s9N4HPVAY&IA}R-X0Cj` zddGnaewN;2d314_UeKLUyGy(hQld`ujdYzF^ULYWb50+YnEF~_jC|qz*{>hnE15XT zn>IG@F!R%bBu#7eMT=9^a=Rv||8~FsqliMyh1|=h);(HvXy@*8>8u>Tn|{SFo=`WA zS6;I#;YEUSu+oEvhm`VuK2-Al!;oBB!nOXn8FSMd(zl$lJbIkH{ZjU|!8V?MdX{^B z@-!{I`S>vNUS;r&Qq5V%KN$aYCwKhuiW=)nCv(S0jB&l=cZXf&Qk7a^ld@=6apjt- zpox1&22Cr;lDsKdBcrRFb}#+*9j%*Ip6<)<4t(vTob}Vm+N3w(R3%fTF~4uP@LV^< zab`hrgwk38C z93C&cV>7F4KoQooA(^gF9-V&wd4kG;|ak_8B`s zkru%Wq0#jXXrh!@z70Ad(?bLKLu2{U*n#XIb}%mt^ynh>LIlZwgLJ;YGCF`H@7e{w=giK8o*xzAtUvY1RJhg7RPTU(S{*R zXmbmCBO5}JL>sVvSWF(XMOK7mh3v3=E&RBlK}?=CCy43KriBFiThhK%3Q0E1Dhmg0 zAU70-#kMxGq=~8)sRi$;qw8N&t;5`%>?tlo98Bp9Q&Xy;K3&+1kerYm{*1M72@c~i zgMHa9j@D42&*88v*amEKV^g{r)!dM6N;NVy_N6im7z`@ikLhD%#xkRu`$oXRj|unde0={`)R zp`arnV@*0570QA5$qW>d!M?DtFUBTxmXQyG%3_%sQ_UIRi@6EgkjgYNptF5^%uJ2V z0jhc^M3`yPl`|&{X8lZ|)c|XPA0a*1(;C+b8Ui`|NEgBk4P)bVY^5Vu$PJ;fA@X4z zemt;X`r;UA?TeQgn`KFBRQqLE4Vs_TI3gZriy)}CFQndlAK?M)V6tUeZ;CI~ypb@j zA1|C4%C_@|8PbvnQg5}f8qvHZ4eu#|obT}S8Q;rzb|GO#oWySgi zFoXTsENhxzu?i|$_T=j4ZsRB-h)hkRjwRmEEg)jS>fui*YY1aa>b~?`FYk>bPvCTZ zWHB<}6XbnBpLK=XiMnI|L07n)sQX2AOfZLM4MCkhR6@0o7S22BH$@Lfk=fWeVii$( zG$(=`=ZK%iesBo6l(aaSpT4e5?Ow zZ+Y{@qi<=IU`yNy0TA+{7%p;r2(4nc2!N0m#c+}1LueJlMF51nD29t1A401bE&?Fr zMKN6D_z+sfa1j6@FN)zJ$A{1=hKm3Qc~J}(IX;9|FSbtzx(cfRGo(aFOFfXcfan0EE0KhKn2@LaP`q0wCl?F5da}Cis2&1htMj9ivS3DQ4AM3K7>{=Tm(SKi(N_q@}d|na(oD_Vz>x^kQc>pk>f*X6~jdUguEz*iyR+9s~9cgquB|1n8n-;Eq6d`}2EgK;xp_%|!0v`vi2L5KmUjpB72H^jk z1poR7IRbwVa9@DkWZ*d9SHNwi4sEtjZ(t%^?g8%wb_V_)&VyOh12_^G{zCwo53B~< zCTc4HgP`}Lz?*^lw`nA;Q&t9X48&95slZ=NZ2^D>z1{+L`s&`>u83pHD&Q<&*zsCV zUju+Vbdw3Zr1jl>Hw|;JoCA#GPphc40O0KmuXUSN_44ltuZOOdwx+w*0DzsxQ>|BP zI`|J{;a~NkgDvg1r2yb5hMkvasp0=v4zl8wfzT2F48hn1;P&FY0DBC=Wpua2 z1Ku&<_U636U!0%d-KtsoCjd@>W|wBQ+eZW5t*o0HDj5KwpoG`{k3c)Y36Zn7IRLal z;rAcG^UpqXgDc)5n^1EAY;Gdi{wrAE0)8`XM4|w|Z*)xr8)>!QLK1Q4L;!GkHBsmX zD)$9nh70>c1OUI-;Pvt&Q;e{4L;$$LjX&tU5%@Jg;G6Klg*sH?8PF<{l9WWHf4@WJ z??0dp9f)`$R9jn%RFsvFs zf`Pt#Rf39Nm%^YWk^aEGNI_l}Rae(E>JB@J`FY_>^!8mDQc_SrmZmf$0ia?Kg-H@X z|M=+>dX`@VZ8ai+7nT=s?*Vm902n7ikhBUviGml!C^CeJyxp3gJijMwLBB0p2Oz1S z4J)FMk$&@sN8>raqMiFQkdvJ`+PNXN+5YpM6{6weLip*8oUBZTjF#k%GT7tH2plqKUGx`n;VreNH~_@D;cn#nu#NgjFA`c5t@tu00z12 z57|luuX+jq=<`FmNbVH=@Wwy@07m2g8%cu0odp1V^#=@9)zwH=_R0_hzRK2W3gnd(70~T_k5P|q z>LLe&qx9pa1&|0SAvsxDbnem(^yY0D1bWfC!QYSrbb_3sqOuZQ%DxRCKr%rT#rZ-( z5$f1clAk9C#_|g3g_E35IALl6 zKz(MYqN0doWuy^~@_eB1Xo#|46K9};nb(F{uthKfTIIB`u#{v60N?{EDg9fxy3u{N zu4?>LxEhwgo4?EWX>%h1K>-|7RFvbVxi}Sm^%tbVge*`XDhtU^Csp`_48S2y5P?if zu5AY3b;;kz*`9&)`sp-%Qg{ULV6WudMVGGKMtIPZyhp%tfsi9&)Hu00bnGll@0X}6 ztnsKY7Lx8LdWiV_BQ^ajo?!fV(Gq7x$VdpRxDzvu+|cp*x!?#;^Hyz>a1K7Wl5XhiVjX64FZ*6luU0!d1BKyt7gzLFXeAra4` zWhQadE-8IWD*X0cIg*j?$X~ZFieHn;R@YRcjv$M(K(e)+5APs2K(-+j#^cBmY=f6b zNA)i@3dcJ#0KU!OTk|ZP3@oRShe8zSP_bEt)@x3iDzY-T(O8AN4t*t)4 z7oi0JXaGnWYMuEnL-@?^eFeOFh}d{BSiLm6A!Q{6RQ{m?J$?Q{Bv7~)oG$V*p4s&xcml~d_H5T_D}e`L>sUhf*2rhX|3Sq2fpH1_ou)=A^`ZyhvbKL0?qb& z-2_8#c>N~=P!5g1w_o2{H1c?1DIx&4Z60vrPc4Ks+V_1V3_oAk1yKOJ2Z2Cgp&#TP zA6P6T`XUMdEQ5m~P8EM7nkdSd<^aI5{7+6qDYe78%`oOeqQ*@IKrSdSMJctjx;z-~ zq~^v<1_0Jc23~=0+9}~Z-4c>|Jzgt9pdGv3!L(`owo%5L7y3LgTGYno14Ioj3o0=y0(Sw%fXD*lUvP-(I|u6j0)7ts h02uG--<2frVKncusg`c6?@zcVmmwn^Q|u?t`9HvN!odIl literal 0 HcmV?d00001 From 244482538cc9ea1fb5872e3ba67f3cbddb6f1423 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:21:48 -0700 Subject: [PATCH 29/79] end of video commit --- app/main.ts | 6 +++++- app/mock-xhr-backend.ts | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/main.ts b/app/main.ts index 6281915..ace3402 100755 --- a/app/main.ts +++ b/app/main.ts @@ -3,8 +3,12 @@ import {AppComponent} from './app.component'; import {MediaItemService} from './media-item.service'; import {provide} from 'angular2/core'; import {LOOKUP_LISTS, lookupLists} from './providers'; +import {HTTP_PROVIDERS, XHRBackend} from 'angular2/http'; +import {MockXHRBackend} from './mock-xhr-backend'; bootstrap(AppComponent, [ MediaItemService, - provide(LOOKUP_LISTS, { useValue: lookupLists }) + provide(LOOKUP_LISTS, { useValue: lookupLists }), + HTTP_PROVIDERS, + provide(XHRBackend, { useClass: MockXHRBackend }) ]); \ No newline at end of file diff --git a/app/mock-xhr-backend.ts b/app/mock-xhr-backend.ts index b63b534..e478c7c 100755 --- a/app/mock-xhr-backend.ts +++ b/app/mock-xhr-backend.ts @@ -12,12 +12,8 @@ export class MockXHRBackend { var responseOptions; switch (request.method) { case RequestMethod.Get: - if (request.url.indexOf('mediaitems?medium=') >= 0 || request.url === 'mediaitems') { - var medium; - if (request.url.indexOf('?') >= 0) { - medium = request.url.split('=')[1]; - if (medium === 'undefined') medium = ''; - } + if (request.url.indexOf('mediaitems?medium=') >= 0) { + var medium = request.url.split('=')[1]; var mediaItems; if (medium) { mediaItems = this._mediaItems.filter(mediaItem => mediaItem.medium === medium); From 27d7fd2519c01e1bf744a546cae00117a6babd9c Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:28:11 -0700 Subject: [PATCH 30/79] fix xhr backend get method --- app/mock-xhr-backend.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/mock-xhr-backend.ts b/app/mock-xhr-backend.ts index e478c7c..b63b534 100755 --- a/app/mock-xhr-backend.ts +++ b/app/mock-xhr-backend.ts @@ -12,8 +12,12 @@ export class MockXHRBackend { var responseOptions; switch (request.method) { case RequestMethod.Get: - if (request.url.indexOf('mediaitems?medium=') >= 0) { - var medium = request.url.split('=')[1]; + if (request.url.indexOf('mediaitems?medium=') >= 0 || request.url === 'mediaitems') { + var medium; + if (request.url.indexOf('?') >= 0) { + medium = request.url.split('=')[1]; + if (medium === 'undefined') medium = ''; + } var mediaItems; if (medium) { mediaItems = this._mediaItems.filter(mediaItem => mediaItem.medium === medium); From e1021d68a3b7dd8c1961fc9ad5266058b1fdef6e Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:35:44 -0700 Subject: [PATCH 31/79] end of video commit --- app/media-item-list.component.html | 15 ++++++++++++++- app/media-item-list.component.ts | 13 +++++++++++-- app/media-item.service.ts | 12 +++++++++++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html index 4b4335a..ca45bac 100755 --- a/app/media-item-list.component.html +++ b/app/media-item-list.component.html @@ -1,4 +1,17 @@ -
    + +
    +

    {{medium}}

    {{ mediaItems | categoryList }}
    diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index 9b41ff0..0881fd4 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -11,15 +11,24 @@ import {MediaItemService} from './media-item.service'; styleUrls: ['app/media-item-list.component.css'] }) export class MediaItemListComponent { + medium = ''; + mediaItems = []; + constructor(private mediaItemService: MediaItemService) {} ngOnInit() { - this.mediaItems = this.mediaItemService.get(); + this.getMediaItems(this.medium); } onMediaItemDeleted(mediaItem) { this.mediaItemService.delete(mediaItem); } - mediaItems; + getMediaItems(medium) { + this.medium = medium; + this.mediaItemService.get() + .subscribe(mediaItems => { + this.mediaItems = mediaItems; + }); + } } \ No newline at end of file diff --git a/app/media-item.service.ts b/app/media-item.service.ts index bcc6919..2cc2877 100755 --- a/app/media-item.service.ts +++ b/app/media-item.service.ts @@ -1,6 +1,16 @@ +import {Injectable} from 'angular2/core'; +import {Http} from 'angular2/http'; +import 'rxjs/add/operator/map'; + +@Injectable() export class MediaItemService { + constructor(private http: Http) {} + get() { - return this.mediaItems; + return this.http.get('mediaitems') + .map(response => { + return response.json().mediaItems; + }); } add(mediaItem) { From 6c7799327434fffe29c8b9e233e9af03e8d5708c Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:38:18 -0700 Subject: [PATCH 32/79] end of video commit --- app/media-item-list.component.ts | 2 +- app/media-item.service.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index 0881fd4..f3745e8 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -26,7 +26,7 @@ export class MediaItemListComponent { getMediaItems(medium) { this.medium = medium; - this.mediaItemService.get() + this.mediaItemService.get(medium) .subscribe(mediaItems => { this.mediaItems = mediaItems; }); diff --git a/app/media-item.service.ts b/app/media-item.service.ts index 2cc2877..074fb1b 100755 --- a/app/media-item.service.ts +++ b/app/media-item.service.ts @@ -1,13 +1,15 @@ import {Injectable} from 'angular2/core'; -import {Http} from 'angular2/http'; +import {Http, URLSearchParams} from 'angular2/http'; import 'rxjs/add/operator/map'; @Injectable() export class MediaItemService { constructor(private http: Http) {} - get() { - return this.http.get('mediaitems') + get(medium) { + var searchParams = new URLSearchParams(); + searchParams.append('medium', medium); + return this.http.get('mediaitems', {search: searchParams}) .map(response => { return response.json().mediaItems; }); From bce1981a1c2a5febb37893c41dd9f70b88333744 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:44:56 -0700 Subject: [PATCH 33/79] end of video commit --- app/media-item-form.component.ts | 3 ++- app/media-item-list.component.ts | 5 ++++- app/media-item.service.ts | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 8408e96..9e58273 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -37,6 +37,7 @@ export class MediaItemFormComponent { } onSubmit(mediaItem) { - this.mediaItemService.add(mediaItem); + this.mediaItemService.add(mediaItem) + .subscribe(); } } \ No newline at end of file diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index f3745e8..d7adaf4 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -21,7 +21,10 @@ export class MediaItemListComponent { } onMediaItemDeleted(mediaItem) { - this.mediaItemService.delete(mediaItem); + this.mediaItemService.delete(mediaItem) + .subscribe(() => { + this.getMediaItems(this.medium); + }); } getMediaItems(medium) { diff --git a/app/media-item.service.ts b/app/media-item.service.ts index 074fb1b..f2b7139 100755 --- a/app/media-item.service.ts +++ b/app/media-item.service.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/core'; -import {Http, URLSearchParams} from 'angular2/http'; +import {Http, URLSearchParams, Headers} from 'angular2/http'; import 'rxjs/add/operator/map'; @Injectable() @@ -16,14 +16,14 @@ export class MediaItemService { } add(mediaItem) { - this.mediaItems.push(mediaItem); + var headers = new Headers({ 'Content-Type': 'application/json' }); + return this.http.post('mediaitems', JSON.stringify(mediaItem), { headers: headers }) + .map(response => {}); } delete(mediaItem) { - var index = this.mediaItems.indexOf(mediaItem); - if (index >= 0) { - this.mediaItems.splice(index, 1); - } + return this.http.delete(`mediaitems/${mediaItem.id}`) + .map(response => {}); } mediaItems = [ From 548a14e1bc53676df87401bac0d16fff29c63753 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:46:07 -0700 Subject: [PATCH 34/79] end of video commit --- app/main.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/main.ts b/app/main.ts index ace3402..eee0a41 100755 --- a/app/main.ts +++ b/app/main.ts @@ -5,10 +5,12 @@ import {provide} from 'angular2/core'; import {LOOKUP_LISTS, lookupLists} from './providers'; import {HTTP_PROVIDERS, XHRBackend} from 'angular2/http'; import {MockXHRBackend} from './mock-xhr-backend'; +import {ROUTER_PROVIDERS} from 'angular2/router'; bootstrap(AppComponent, [ MediaItemService, provide(LOOKUP_LISTS, { useValue: lookupLists }), HTTP_PROVIDERS, - provide(XHRBackend, { useClass: MockXHRBackend }) + provide(XHRBackend, { useClass: MockXHRBackend }), + ROUTER_PROVIDERS ]); \ No newline at end of file From a33513da89066a2f616d0eb949296e3a2f1ea85d Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:47:54 -0700 Subject: [PATCH 35/79] end of video commit --- app/app.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/app.component.ts b/app/app.component.ts index 9940f64..c8038b0 100755 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,7 +1,12 @@ import {Component} from 'angular2/core'; import {MediaItemListComponent} from './media-item-list.component'; import {MediaItemFormComponent} from './media-item-form.component'; +import {RouteConfig} from 'angular2/router'; +@RouteConfig([ + { path: '/:medium', component: MediaItemListComponent, name: 'List' }, + { path: '/add', component: MediaItemFormComponent, name: 'AddMediaItem' } +]) @Component({ selector: 'media-tracker-app', directives: [MediaItemListComponent, MediaItemFormComponent], From 4c7f8335d7003975ea234c26f95f34084b444758 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:49:18 -0700 Subject: [PATCH 36/79] end of video commit --- app/app.component.css | 12 ++++++++++++ app/app.component.html | 14 ++++++++++++-- app/app.component.ts | 4 ++-- app/media-item-list.component.html | 18 ++++++------------ 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/app/app.component.css b/app/app.component.css index 93654a0..6d985c9 100755 --- a/app/app.component.css +++ b/app/app.component.css @@ -2,6 +2,18 @@ display: flex; font-family: Arial, Helvetica, sans-serif; } +nav { + display: flex; + flex-direction: column; + width: 68px; + height: 100vh; + background-color: #53ace4; +} +nav .icon { + width: 48px; + height: 48px; + margin: 10px; +} section { width: 100%; background-color: #32435b; diff --git a/app/app.component.html b/app/app.component.html index 451928a..1e0eec2 100755 --- a/app/app.component.html +++ b/app/app.component.html @@ -1,8 +1,18 @@ +

    Media Watch List

    Keeping track of the media I want to watch.

    - - +
    \ No newline at end of file diff --git a/app/app.component.ts b/app/app.component.ts index c8038b0..f61196e 100755 --- a/app/app.component.ts +++ b/app/app.component.ts @@ -1,7 +1,7 @@ import {Component} from 'angular2/core'; import {MediaItemListComponent} from './media-item-list.component'; import {MediaItemFormComponent} from './media-item-form.component'; -import {RouteConfig} from 'angular2/router'; +import {RouteConfig, ROUTER_DIRECTIVES} from 'angular2/router'; @RouteConfig([ { path: '/:medium', component: MediaItemListComponent, name: 'List' }, @@ -9,7 +9,7 @@ import {RouteConfig} from 'angular2/router'; ]) @Component({ selector: 'media-tracker-app', - directives: [MediaItemListComponent, MediaItemFormComponent], + directives: [ROUTER_DIRECTIVES], templateUrl: 'app/app.component.html', styleUrls: ['app/app.component.css'] }) diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html index ca45bac..ebb19f1 100755 --- a/app/media-item-list.component.html +++ b/app/media-item-list.component.html @@ -1,14 +1,3 @@ -

    {{medium}}

    @@ -19,4 +8,9 @@

    {{medium}}

    [mediaItemToWatch]="mediaItem" (deleted)="onMediaItemDeleted($event)" [ngClass]="{'medium-movies': mediaItem.medium === 'Movies', 'medium-series': mediaItem.medium === 'Series'}"> -
    \ No newline at end of file +

    • + \ No newline at end of file From cc9d90cc10d09d9b797c71e931e04b63bd323760 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 10:51:17 -0700 Subject: [PATCH 37/79] end of video commit --- app/app.component.html | 6 +++--- app/media-item-form.component.ts | 4 +++- app/media-item-list.component.html | 2 +- app/media-item-list.component.ts | 7 +++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/app.component.html b/app/app.component.html index 1e0eec2..7a4aee9 100755 --- a/app/app.component.html +++ b/app/app.component.html @@ -1,11 +1,11 @@ diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index 9e58273..c933b08 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -38,6 +38,8 @@ export class MediaItemFormComponent { onSubmit(mediaItem) { this.mediaItemService.add(mediaItem) - .subscribe(); + .subscribe(() => { + + }); } } \ No newline at end of file diff --git a/app/media-item-list.component.html b/app/media-item-list.component.html index ebb19f1..86e05dc 100755 --- a/app/media-item-list.component.html +++ b/app/media-item-list.component.html @@ -10,7 +10,7 @@

    {{medium}}

    [ngClass]="{'medium-movies': mediaItem.medium === 'Movies', 'medium-series': mediaItem.medium === 'Series'}"> \ No newline at end of file diff --git a/app/media-item-list.component.ts b/app/media-item-list.component.ts index d7adaf4..6c557cc 100755 --- a/app/media-item-list.component.ts +++ b/app/media-item-list.component.ts @@ -2,10 +2,11 @@ import {Component} from 'angular2/core'; import {MediaItemComponent} from './media-item.component'; import {CategoryListPipe} from './category-list.pipe'; import {MediaItemService} from './media-item.service'; +import {RouteParams, ROUTER_DIRECTIVES} from 'angular2/router'; @Component({ selector: 'media-item-list', - directives: [MediaItemComponent], + directives: [MediaItemComponent, ROUTER_DIRECTIVES], pipes: [CategoryListPipe], templateUrl: 'app/media-item-list.component.html', styleUrls: ['app/media-item-list.component.css'] @@ -14,9 +15,11 @@ export class MediaItemListComponent { medium = ''; mediaItems = []; - constructor(private mediaItemService: MediaItemService) {} + constructor(private mediaItemService: MediaItemService, + private routeParams: RouteParams) {} ngOnInit() { + this.medium = this.routeParams.get('medium'); this.getMediaItems(this.medium); } From 918c7f397bed3453fd709f0bdb8194df3d64d196 Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 11:09:00 -0700 Subject: [PATCH 38/79] end of video commit --- app/media-item-form.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/media-item-form.component.ts b/app/media-item-form.component.ts index c933b08..4665fa0 100755 --- a/app/media-item-form.component.ts +++ b/app/media-item-form.component.ts @@ -2,6 +2,7 @@ import {Component, Inject} from 'angular2/core'; import {Control, Validators, FormBuilder} from 'angular2/common'; import {MediaItemService} from './media-item.service'; import {LOOKUP_LISTS} from './providers'; +import {Router} from 'angular2/router'; @Component({ selector: 'media-item-form', @@ -13,7 +14,8 @@ export class MediaItemFormComponent { constructor(private formBuilder: FormBuilder, private mediaItemService: MediaItemService, - @Inject(LOOKUP_LISTS) public lookupLists) {} + @Inject(LOOKUP_LISTS) public lookupLists, + private router: Router) {} ngOnInit() { this.form = this.formBuilder.group({ @@ -39,7 +41,7 @@ export class MediaItemFormComponent { onSubmit(mediaItem) { this.mediaItemService.add(mediaItem) .subscribe(() => { - + this.router.navigate(['../List', { medium: mediaItem.medium }]); }); } } \ No newline at end of file From 37edbc1bb32bfae6a46bfda0e7cc50cca02b034e Mon Sep 17 00:00:00 2001 From: Justin Schwartzenberger Date: Sat, 16 Jul 2016 11:11:34 -0700 Subject: [PATCH 39/79] add missing http script tag --- index.html | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 index.html diff --git a/index.html b/index.html old mode 100644 new mode 100755 index 249ee45..c0bb8ba --- a/index.html +++ b/index.html @@ -8,6 +8,7 @@ +