From 2ffec6b1e65de46df4bb18f2ab7d3bb72c51b702 Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Sun, 10 Jan 2021 11:47:08 +0000 Subject: [PATCH] minor code cleanuo --- .../card/discover-card.component.html | 4 +- .../search-results.component.html | 2 +- .../search-results.component.ts | 35 ----------------- .../src/app/my-nav/nav-search.component.html | 39 +------------------ .../src/app/my-nav/nav-search.component.ts | 38 ++---------------- src/Ombi/wwwroot/translations/en.json | 3 +- 6 files changed, 9 insertions(+), 112 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html index 57581bb32..9bbe868ee 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html @@ -1,9 +1,9 @@
- +
{{getAvailbilityStatus()}}
- + {{result.title}} diff --git a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html index 0dc51b46c..965017163 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html +++ b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html @@ -9,7 +9,7 @@
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts index 32ea9199a..995389b2e 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts @@ -85,44 +85,9 @@ export class DiscoverSearchResultsComponent implements OnInit { available: false, tvMovieDb: mediaType === RequestType.tvShow ? true : false }); - - // switch (mediaType) { - // case RequestType.movie: - // this.searchService.getFullMovieDetails(+m.id) - // .subscribe(x => { - // const index = this.discoverResults.findIndex((obj => obj.id === +m.id)); - // this.discoverResults[index].available = x.available; - // this.discoverResults[index].requested = x.requested; - // this.discoverResults[index].requested = x.requested; - // this.discoverResults[index].requested = x.requested; - // this.discoverResults[index].requested = x.requested; - // this.discoverResults[index].requested = x.requested; - // }); - // } }); } - // private createModel() { - // this.finishLoading(); - // this.collection.collection.forEach(m => { - // this.discoverResults.push({ - // available: m.available, - // posterPath: `https://image.tmdb.org/t/p/w300/${m.posterPath}`, - // requested: m.requested, - // title: m.title, - // type: RequestType.movie, - // id: m.id, - // url: `http://www.imdb.com/title/${m.imdbId}/`, - // rating: 0, - // overview: m.overview, - // approved: m.approved, - // imdbid: m.imdbId, - // denied:false, - // background: "" - // }); - // }); - // } - private loading() { this.loadingFlag = true; } diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html index ccf574725..da8fa5d96 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html @@ -1,42 +1,5 @@ - -
- + - - - - - - - - - -   - {{result.title}} - - -   - - {{result.title}} - - - -   - - {{result.title}} - - - -   - {{result.title}} - - - -
\ No newline at end of file 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 4474aee4e..4d4573cd7 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 @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from "@angular/core"; +import { Component, OnInit } from "@angular/core"; import { debounceTime, switchMap, @@ -7,12 +7,8 @@ import { } from "rxjs/operators"; import { empty} from "rxjs"; -import { IMultiSearchResult } from "../interfaces"; import { Router } from "@angular/router"; import { FormGroup, FormBuilder } from "@angular/forms"; -import { MatAutocompleteSelectedEvent } from "@angular/material/autocomplete"; -import { SearchFilter } from "./SearchFilter"; -import { FilterService } from "../discover/services/filter-service"; @Component({ selector: "app-nav-search", @@ -20,9 +16,6 @@ import { FilterService } from "../discover/services/filter-service"; styleUrls: ["./nav-search.component.scss"], }) export class NavSearchComponent implements OnInit { - public selectedItem: string; - public results: IMultiSearchResult[]; - public searching = false; public searchForm: FormGroup; @@ -40,38 +33,13 @@ export class NavSearchComponent implements OnInit { .get("input") .valueChanges.pipe( debounceTime(1300), - tap(() => (this.searching = true)), switchMap((value: string) => { if (value) { this.router.navigate([`discover`, value]); - // return this.searchService - // .multiSearch(value, this.filter) - // .pipe(finalize(() => (this.searching = false))); } - return empty().pipe(finalize(() => (this.searching = false))); + return empty();; }) ) - .subscribe((r) => (this.results = r)); - } - - public selected(event: MatAutocompleteSelectedEvent) { - this.searchForm.controls.input.setValue(null); - const val = event.option.value as IMultiSearchResult; - if (val.mediaType == "movie") { - this.router.navigate([`details/movie/${val.id}`]); - return; - } else if (val.mediaType == "tv") { - this.router.navigate([`details/tv/${val.id}/true`]); - return; - } else if (val.mediaType == "person") { - this.router.navigate([`discover/actor/${val.id}`]); - return; - } else if (val.mediaType == "Artist") { - this.router.navigate([`details/artist/${val.id}`]); - return; - } - } - displayFn(result: IMultiSearchResult) { - if (result) { return result.title; } + .subscribe(); } } diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json index 4ae2ade0b..60ac07f73 100644 --- a/src/Ombi/wwwroot/translations/en.json +++ b/src/Ombi/wwwroot/translations/en.json @@ -296,7 +296,8 @@ "FirstAired": "First Aired", "Writer": "Writer", "ExecProducer": "Exec Producer" - } + }, + "NoSearch":"Sorry, nothing matches your search!" }, "UserPreferences": { "Welcome": "Welcome {{username}}!",