diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 8c22935d0..63ace623c 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -75,4 +75,4 @@ "ts-node": "~5.0.1", "tslint": "^5.12.0" } -} \ No newline at end of file +} diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts index 11e0d5e60..c1c7e4793 100644 --- a/src/Ombi/ClientApp/src/app/app.module.ts +++ b/src/Ombi/ClientApp/src/app/app.module.ts @@ -72,7 +72,6 @@ const routes: Routes = [ { loadChildren: () => import("./usermanagement/usermanagement.module").then(m => m.UserManagementModule), path: "usermanagement" }, { loadChildren: () => import("./requests/requests.module").then(m => m.RequestsModule), path: "requestsOld" }, { loadChildren: () => import("./requests-list/requests-list.module").then(m => m.RequestsListModule), path: "requests-list" }, - { loadChildren: () => import("./recentlyAdded/recentlyAdded.module").then(m => m.RecentlyAddedModule), path: "recentlyadded" }, { loadChildren: () => import("./vote/vote.module").then(m => m.VoteModule), path: "vote" }, { loadChildren: () => import("./media-details/media-details.module").then(m => m.MediaDetailsModule), path: "details" }, { loadChildren: () => import("./user-preferences/user-preferences.module").then(m => m.UserPreferencesModule), path: "user-preferences" }, diff --git a/src/Ombi/ClientApp/src/app/issues/issues.module.ts b/src/Ombi/ClientApp/src/app/issues/issues.module.ts index cf357d269..1cc236d37 100644 --- a/src/Ombi/ClientApp/src/app/issues/issues.module.ts +++ b/src/Ombi/ClientApp/src/app/issues/issues.module.ts @@ -1,7 +1,6 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; import { OrderModule } from "ngx-order-pipe"; import { PaginatorModule, SharedModule, TabViewModule } from "primeng/primeng"; @@ -28,7 +27,6 @@ const routes: Routes = [ @NgModule({ imports: [ RouterModule.forChild(routes), - NgbModule.forRoot(), SharedModule, OrderModule, PipeModule, diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts index 78045ec57..7f7319801 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts +++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts @@ -12,7 +12,6 @@ import { empty, of } from "rxjs"; import { SearchV2Service } from "../services/searchV2.service"; import { IMultiSearchResult } from "../interfaces"; import { Router } from "@angular/router"; -import { NgbTypeaheadSelectItemEvent } from "@ng-bootstrap/ng-bootstrap"; import { FormGroup, FormBuilder } from "@angular/forms"; import { MatAutocompleteSelectedEvent } from "@angular/material"; diff --git a/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.component.html b/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.component.html deleted file mode 100644 index ee60b7c87..000000000 --- a/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.component.html +++ /dev/null @@ -1,51 +0,0 @@ -

Recently Added

- -
- -
- - - -
- poster -
{{movie.title}}
-
- - - - - - - - - - -
- - - - poster - {{t.title}} -
- Season: {{t.seasonNumber}} -
- Episode: {{t.episodeNumber}} - - - - - diff --git a/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.component.ts b/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.component.ts deleted file mode 100644 index f426a39d1..000000000 --- a/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.component.ts +++ /dev/null @@ -1,131 +0,0 @@ -import { Component, OnInit } from "@angular/core"; -import { NguCarouselConfig } from "@ngu/carousel"; - -import { IRecentlyAddedMovies, IRecentlyAddedTvShows } from "../interfaces"; -import { ImageService, RecentlyAddedService } from "../services"; - -@Component({ - templateUrl: "recentlyAdded.component.html", - styles: [` - .leftRs { - position: absolute; - margin: auto; - top: 0; - bottom: 0; - width: 50px; - height: 50px; - box-shadow: 1px 2px 10px -1px rgba(0, 0, 0, .3); - border-radius: 100%; - left: 0; - background: #df691a; - } - - .rightRs { - position: absolute; - margin: auto; - top: 0; - bottom: 0; - width: 50px; - height: 50px; - box-shadow: 1px 2px 10px -1px rgba(0, 0, 0, .3); - border-radius: 100%; - right: 0; - background: #df691a; - } - `], -}) - -export class RecentlyAddedComponent implements OnInit { - public movies: IRecentlyAddedMovies[]; - public tv: IRecentlyAddedTvShows[]; - public range: Date[]; - - public groupTv: boolean = false; - - // https://github.com/sheikalthaf/ngu-carousel - public carouselTile: NguCarouselConfig; - - constructor(private recentlyAddedService: RecentlyAddedService, - private imageService: ImageService) {} - - public ngOnInit() { - this.getMovies(); - this.getShows(); - - this.carouselTile = { - grid: {xs: 2, sm: 3, md: 3, lg: 5, all: 0}, - slide: 2, - speed: 400, - animation: "lazy", - point: { - visible: true, - }, - load: 2, - touch: true, - easing: "ease", - }; - } - - public close() { - if (this.range.length < 2) { - return; - } - if (!this.range[1]) { - // If we do not have a second date then just set it to now - this.range[1] = new Date(); - } - this.getMovies(); - } - - public change() { - this.getShows(); - } - - private getShows() { - if (this.groupTv) { - this.recentlyAddedService.getRecentlyAddedTvGrouped().subscribe(x => { - this.tv = x; - - this.tv.forEach((t) => { - this.imageService.getTvPoster(t.tvDbId).subscribe(p => { - if (p) { - t.posterPath = p; - } - }); - }); - }); - } else { - this.recentlyAddedService.getRecentlyAddedTv().subscribe(x => { - this.tv = x; - - this.tv.forEach((t) => { - this.imageService.getTvPoster(t.tvDbId).subscribe(p => { - if (p) { - t.posterPath = p; - } - }); - }); - }); - } - } - - private getMovies() { - this.recentlyAddedService.getRecentlyAddedMovies().subscribe(x => { - this.movies = x; - - this.movies.forEach((movie) => { - if (movie.theMovieDbId) { - this.imageService.getMoviePoster(movie.theMovieDbId).subscribe(p => { - movie.posterPath = p; - }); - } else if (movie.imdbId) { - this.imageService.getMoviePoster(movie.imdbId).subscribe(p => { - movie.posterPath = p; - }); - } else { - movie.posterPath = ""; - } - }); - }); - } -} diff --git a/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.module.ts b/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.module.ts deleted file mode 100644 index cf0b423a3..000000000 --- a/src/Ombi/ClientApp/src/app/recentlyAdded/recentlyAdded.module.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule, Routes } from "@angular/router"; - -import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; -import { OrderModule } from "ngx-order-pipe"; -import { CalendarModule, PaginatorModule, SharedModule, TabViewModule } from "primeng/primeng"; - -import { IdentityService, ImageService, RecentlyAddedService } from "../services"; - -import { AuthGuard } from "../auth/auth.guard"; - -import { SharedModule as OmbiShared } from "../shared/shared.module"; - -import { RecentlyAddedComponent } from "./recentlyAdded.component"; - -import { NguCarouselModule } from "@ngu/carousel"; - -const routes: Routes = [ - { path: "", component: RecentlyAddedComponent, canActivate: [AuthGuard] }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - NgbModule.forRoot(), - SharedModule, - OrderModule, - OmbiShared, - PaginatorModule, - TabViewModule, - CalendarModule, - NguCarouselModule, - ], - declarations: [ - RecentlyAddedComponent, - ], - exports: [ - RouterModule, - ], - providers: [ - IdentityService, - RecentlyAddedService, - ImageService, - ], - -}) -export class RecentlyAddedModule { } diff --git a/src/Ombi/ClientApp/src/app/requests/remainingrequests.module.ts b/src/Ombi/ClientApp/src/app/requests/remainingrequests.module.ts index 411a94dfd..dc8ad0126 100644 --- a/src/Ombi/ClientApp/src/app/requests/remainingrequests.module.ts +++ b/src/Ombi/ClientApp/src/app/requests/remainingrequests.module.ts @@ -2,15 +2,12 @@ import { FormsModule } from "@angular/forms"; import { RouterModule } from "@angular/router"; -import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; - import { SidebarModule, TooltipModule, TreeTableModule } from "primeng/primeng"; import { RequestService } from "../services"; @NgModule({ imports: [ FormsModule, - NgbModule.forRoot(), TreeTableModule, SidebarModule, TooltipModule, diff --git a/src/Ombi/ClientApp/src/app/requests/requests.module.ts b/src/Ombi/ClientApp/src/app/requests/requests.module.ts index 63d7117f5..7e445701d 100644 --- a/src/Ombi/ClientApp/src/app/requests/requests.module.ts +++ b/src/Ombi/ClientApp/src/app/requests/requests.module.ts @@ -1,7 +1,5 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; - -import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; import { OrderModule } from "ngx-order-pipe"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; @@ -28,7 +26,6 @@ const routes: Routes = [ @NgModule({ imports: [ RouterModule.forChild(routes), - NgbModule.forRoot(), InfiniteScrollModule, ButtonModule, DialogModule, diff --git a/src/Ombi/ClientApp/src/app/search/search.module.ts b/src/Ombi/ClientApp/src/app/search/search.module.ts index 6490076af..ab63302b6 100644 --- a/src/Ombi/ClientApp/src/app/search/search.module.ts +++ b/src/Ombi/ClientApp/src/app/search/search.module.ts @@ -3,7 +3,6 @@ import { NgModule } from "@angular/core"; import { FormsModule } from "@angular/forms"; import { RouterModule, Routes } from "@angular/router"; -import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; import { MovieSearchComponent } from "./moviesearch.component"; import { MovieSearchGridComponent } from "./moviesearchgrid.component"; @@ -35,7 +34,6 @@ const routes: Routes = [ CommonModule, FormsModule, RouterModule.forChild(routes), - NgbModule.forRoot(), TreeTableModule, SharedModule, SidebarModule,