diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index fed98ca6c..833636801 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -30,7 +30,7 @@ "@ngx-translate/http-loader": "^4.0.0", "@types/jquery": "^3.3.29", "@yellowspot/ng-truncate": "^1.4.0", - "angular-bootstrap-md": "^7.3.0", + "angular-bootstrap-md": "^7.5.4", "angular-router-loader": "^0.8.5", "angular2-template-loader": "^0.6.2", "aspnet-prerendering": "^3.0.1", diff --git a/src/Ombi/ClientApp/src/app/app.component.ts b/src/Ombi/ClientApp/src/app/app.component.ts index 456cc42e8..918b0aa86 100644 --- a/src/Ombi/ClientApp/src/app/app.component.ts +++ b/src/Ombi/ClientApp/src/app/app.component.ts @@ -54,10 +54,10 @@ export class AppComponent implements OnInit { private signalrNotification: SignalRNotificationService, private readonly snackBar: MatSnackBar) { - // const base = this.platformLocation.getBaseHrefFromDOM(); - // if (base.length > 1) { - // __webpack_public_path__ = base + "/dist/"; - // } + const base = '/' + (window.location.pathname.split('/')[1] || ''); + if (base.length > 1) { + __webpack_public_path__ = base + "/dist/"; + } this.translate.addLangs(["en", "de", "fr", "da", "es", "it", "nl", "sv", "no", "pl", "pt"]); diff --git a/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.scss b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.scss index 728ff23c5..8e05d0955 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.scss @@ -16,4 +16,8 @@ .loading-spinner { margin: 10%; -} \ No newline at end of file +} +#scroller { + height: 100vh; + overflow: scroll; + } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts index 6ea9d677c..4cebae814 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts @@ -15,7 +15,7 @@ export class DiscoverActorComponent implements AfterViewInit { public loadingFlag: boolean; public discoverResults: IDiscoverCardResult[] = []; - + constructor(private searchService: SearchV2Service, private route: ActivatedRoute) { this.route.params.subscribe((params: any) => { @@ -29,15 +29,15 @@ export class DiscoverActorComponent implements AfterViewInit { } public async ngAfterViewInit() { - this.discoverResults.forEach((result) => { - this.searchService.getFullMovieDetails(result.id).subscribe(x => { - result.available = x.available; - result.approved = x.approved; - result.rating = x.voteAverage; - result.requested = x.requested; - result.url = x.homepage; - }); - }); + // this.discoverResults.forEach((result) => { + // this.searchService.getFullMovieDetails(result.id).subscribe(x => { + // result.available = x.available; + // result.approved = x.approved; + // result.rating = x.voteAverage; + // result.requested = x.requested; + // result.url = x.homepage; + // }); + // }); } private createModel() { diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html index 3806e7979..1a20ab95c 100644 --- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html +++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html @@ -1,10 +1,10 @@  - +
Customization -
+
@@ -47,14 +47,14 @@
- + + +
-
- - - + -
+ + diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html index c9750656c..48a5d8883 100644 --- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html +++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html @@ -3,6 +3,7 @@
Ombi Configuration +
diff --git a/src/Ombi/ClientApp/src/index.html b/src/Ombi/ClientApp/src/index.html index 98ca6e151..12a966d0a 100644 --- a/src/Ombi/ClientApp/src/index.html +++ b/src/Ombi/ClientApp/src/index.html @@ -5,7 +5,7 @@ diff --git a/src/Ombi/ClientApp/yarn.lock b/src/Ombi/ClientApp/yarn.lock index e2c60fde5..942e57d99 100644 --- a/src/Ombi/ClientApp/yarn.lock +++ b/src/Ombi/ClientApp/yarn.lock @@ -645,9 +645,12 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" -angular-bootstrap-md@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/angular-bootstrap-md/-/angular-bootstrap-md-7.3.0.tgz#cc0db9035553ffe0168049bfac9de92cfe5ee268" +angular-bootstrap-md@^7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/angular-bootstrap-md/-/angular-bootstrap-md-7.5.4.tgz#1e6c482729380b98aea7dec9b4d7a4f4e187e08c" + integrity sha512-LBVqSswd49hJ3YNTkXzwM0Cn1+9SQ2kVYQxX36ZjxaKNeDQKaUk3V2Rb/y8krhDJrPJh37pDzRmlCDObg37EIA== + dependencies: + tslib "^1.9.0" angular-router-loader@^0.8.5: version "0.8.5"