From b7f74d9f966f4f02fb4e65b966acfdef499c341f Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Fri, 8 Mar 2019 10:32:21 +0000 Subject: [PATCH] more refactoring around the details pages !wip --- .../src/app/media-details/components/index.ts | 4 + .../movie/movie-details.component.html | 326 ++++++++---------- .../cast-carousel.component.html | 24 ++ .../cast-carousel/cast-carousel.component.ts | 10 + .../media-poster/media-poster.component.html | 10 + .../media-poster/media-poster.component.ts | 10 + .../social-icons/social-icons.component.ts | 4 +- .../components/tv/tv-details.component.html | 151 ++++---- 8 files changed, 267 insertions(+), 272 deletions(-) create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.html create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.ts diff --git a/src/Ombi/ClientApp/src/app/media-details/components/index.ts b/src/Ombi/ClientApp/src/app/media-details/components/index.ts index 7346ac6c0..0e149c06c 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/index.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/index.ts @@ -5,6 +5,8 @@ import { MovieInformationPanelComponent } from "./movie/panels/movie-information import { TvInformationPanelComponent } from "./tv/panels/tv-information-panel.component"; import { TopBannerComponent } from "./shared/top-banner/top-banner.component"; import { SocialIconsComponent } from "./shared/social-icons/social-icons.component"; +import { MediaPosterComponent } from "./shared/media-poster/media-poster.component"; +import { CastCarouselComponent } from "./shared/cast-carousel/cast-carousel.component"; export const components: any[] = [ MovieDetailsComponent, @@ -14,4 +16,6 @@ export const components: any[] = [ TvInformationPanelComponent, TopBannerComponent, SocialIconsComponent, + MediaPosterComponent, + CastCarouselComponent, ]; diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html index a8ffa8657..5ce3fe39d 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html @@ -1,204 +1,170 @@
- + - -
-
-
-
@@ -207,4 +173,4 @@ -
\ No newline at end of file + diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html new file mode 100644 index 000000000..310c710ea --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html @@ -0,0 +1,24 @@ + + Cast + + + +
+
+ + + +
+
+ Character: {{item.character}} + Character: {{item.character.name}} +
+
+ Actor: {{item.name}} + Actor: {{item.person.name}} +
+
+
+
+
+
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts new file mode 100644 index 000000000..203841250 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.ts @@ -0,0 +1,10 @@ +import { Component, Input } from "@angular/core"; + +@Component({ + selector: "cast-carousel", + templateUrl: "./cast-carousel.component.html", +}) +export class CastCarouselComponent { + + @Input() cast: any[]; +} diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.html new file mode 100644 index 000000000..74fd2a4c6 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.html @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.ts new file mode 100644 index 000000000..8e7a3b2b4 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/media-poster/media-poster.component.ts @@ -0,0 +1,10 @@ +import { Component, Inject, Input, Output, EventEmitter } from "@angular/core"; + +@Component({ + selector: "media-poster", + templateUrl: "./media-poster.component.html", +}) +export class MediaPosterComponent { + + @Input() posterPath: string; +} diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts index c21bc10cc..25897b9a1 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts @@ -18,10 +18,10 @@ export class SocialIconsComponent { @Input() plexUrl: string; @Input() embyUrl: string; - @Output() openTrailer: EventEmitter; + @Output() openTrailer: EventEmitter = new EventEmitter(); public openDialog() { - this.openTrailer.emit; + this.openTrailer.emit(); } } diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html index 1de945890..b6ae8644a 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html @@ -1,106 +1,77 @@
- + -
-
-
- +
+
+
- -
+ - - -
+ +
-
+ - +
- -
+
+ + + + +
+
+ +
+
+ + + + + + + +
+ + +
+
+
+ + + {{tv.overview}} + + +
+
+
-
-
+
- - - - - - -
+
-
-
-
- - - {{tv.overview}} - - -
-
- - Cast - - - -
-
- - -
-
- Character: {{item.character.name}} -
-
- Actor: {{item.person.name}} -
-
-
-
-
-
-
- -
- -
+
-
+
-
+
+
+
+
+
-
- -
-
-
-
- - -
-
+
+
-
-
-
+
+
+ @@ -184,4 +155,4 @@ -
\ No newline at end of file +