From d5358ad685a9163edfa1fa82edcb6361920beda6 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 2 Sep 2019 00:41:21 +0200 Subject: [PATCH] Implementing seasons inside the web app. Implementing episodes inside the API. --- Kyoo/ClientApp/src/app/app.module.ts | 7 +++- .../src/app/browse/browse.component.ts | 1 + .../app/services/library-resolver.service.ts | 1 + .../src/app/services/show-resolver.service.ts | 1 + .../show-details/show-details.component.html | 16 ++++++++ .../show-details/show-details.component.scss | 4 +- .../show-details/show-details.component.ts | 35 +++++++++++++++- Kyoo/ClientApp/src/models/episode.ts | 9 ++++ Kyoo/ClientApp/src/models/season.js | 3 ++ Kyoo/ClientApp/src/models/season.js.map | 1 + Kyoo/ClientApp/src/models/season.ts | 9 ++++ Kyoo/ClientApp/src/models/show.js | 2 + Kyoo/ClientApp/src/models/show.ts | 6 ++- Kyoo/ClientApp/src/styles.scss | 2 +- Kyoo/Controllers/EpisodesController.cs | 30 +++++++++++++- Kyoo/Controllers/ShowsController.cs | 1 - .../LibraryManager/ILibraryManager.cs | 2 + .../LibraryManager/LibraryManager.cs | 41 ++++++++++++++++++- .../TheTvDB/ProviderTheTvDB.cs | 2 +- Kyoo/Models/Episode.cs | 25 +++++++++-- 20 files changed, 183 insertions(+), 15 deletions(-) create mode 100644 Kyoo/ClientApp/src/models/episode.ts create mode 100644 Kyoo/ClientApp/src/models/season.js create mode 100644 Kyoo/ClientApp/src/models/season.js.map create mode 100644 Kyoo/ClientApp/src/models/season.ts diff --git a/Kyoo/ClientApp/src/app/app.module.ts b/Kyoo/ClientApp/src/app/app.module.ts index eb565883..65c3b96c 100644 --- a/Kyoo/ClientApp/src/app/app.module.ts +++ b/Kyoo/ClientApp/src/app/app.module.ts @@ -11,7 +11,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; +import { MatIconModule } from '@angular/material/icon'; +import { MatSelectModule } from '@angular/material/select'; + @NgModule({ declarations: [ @@ -28,7 +30,8 @@ import { MatIconModule } from '@angular/material/icon'; MatSnackBarModule, MatProgressBarModule, MatButtonModule, - MatIconModule + MatIconModule, + MatSelectModule ], providers: [], bootstrap: [AppComponent] diff --git a/Kyoo/ClientApp/src/app/browse/browse.component.ts b/Kyoo/ClientApp/src/app/browse/browse.component.ts index c878befc..20ea9314 100644 --- a/Kyoo/ClientApp/src/app/browse/browse.component.ts +++ b/Kyoo/ClientApp/src/app/browse/browse.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { DomSanitizer } from '@angular/platform-browser'; +import { Show } from "../../models/show"; @Component({ selector: 'app-browse', diff --git a/Kyoo/ClientApp/src/app/services/library-resolver.service.ts b/Kyoo/ClientApp/src/app/services/library-resolver.service.ts index 209886aa..0ea41cb7 100644 --- a/Kyoo/ClientApp/src/app/services/library-resolver.service.ts +++ b/Kyoo/ClientApp/src/app/services/library-resolver.service.ts @@ -3,6 +3,7 @@ import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/r import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Observable, EMPTY } from 'rxjs'; import { catchError } from 'rxjs/operators'; +import { Show } from "../../models/show"; import { MatSnackBar } from '@angular/material/snack-bar'; diff --git a/Kyoo/ClientApp/src/app/services/show-resolver.service.ts b/Kyoo/ClientApp/src/app/services/show-resolver.service.ts index 9774924a..0f1a2302 100644 --- a/Kyoo/ClientApp/src/app/services/show-resolver.service.ts +++ b/Kyoo/ClientApp/src/app/services/show-resolver.service.ts @@ -3,6 +3,7 @@ import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/r import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Observable, EMPTY } from 'rxjs'; import { catchError } from 'rxjs/operators'; +import { Show } from "../../models/show"; import { MatSnackBar } from '@angular/material/snack-bar'; diff --git a/Kyoo/ClientApp/src/app/show-details/show-details.component.html b/Kyoo/ClientApp/src/app/show-details/show-details.component.html index e033809d..291309c5 100644 --- a/Kyoo/ClientApp/src/app/show-details/show-details.component.html +++ b/Kyoo/ClientApp/src/app/show-details/show-details.component.html @@ -13,6 +13,9 @@ + @@ -58,6 +61,19 @@ + + +
+ + Season + + {{season.title}} + + + +

You selected: {{season}}

+
+