fixed merge !wip

src/Ombi/ClientApp/src/app/app.component.ts

@@ -4,7 +4,7 @@ import { NavigationStart, Router } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 import { AuthService } from "./auth/auth.service";
 import { ILocalUser } from "./auth/IUserLogin";
-import { IdentityService, NotificationService } from "./services";
+import { IdentityService, NotificationService, CustomPageService } from "./services";
 import { JobService, SettingsService } from "./services";
 
 import { ICustomizationSettings, ICustomPage } from "./interfaces";
@@ -35,7 +35,7 @@ export class AppComponent implements OnInit {
         private readonly jobService: JobService,
         public readonly translate: TranslateService,
         private readonly identityService: IdentityService,
-        private readonly platformLocation: PlatformLocation) {
+        private readonly customPageService: CustomPageService) {
 
         // const base = this.platformLocation.getBaseHrefFromDOM();
         // if (base.length > 1) {
@@ -57,7 +57,7 @@ export class AppComponent implements OnInit {
         this.settingsService.getCustomization().subscribe(x => {
             this.customizationSettings = x;
             if (this.customizationSettings.useCustomPage) {
-                this.settingsService.getCustomPage().subscribe(c => {
+                this.customPageService.getCustomPage().subscribe(c => {
                     this.customPageSettings = c;
                     if (!this.customPageSettings.title) {
                         this.customPageSettings.title = "Custom Page";

src/Ombi/ClientApp/src/app/app.module.ts

@@ -42,7 +42,7 @@ import { TokenResetPasswordComponent } from "./login/tokenresetpassword.componen
 // Services
 import { AuthGuard } from "./auth/auth.guard";
 import { AuthService } from "./auth/auth.service";
-import { ImageService, SettingsService } from "./services";
+import { ImageService, SettingsService, CustomPageService } from "./services";
 import { LandingPageService } from "./services";
 import { NotificationService } from "./services";
 import { IssuesService, JobService, PlexTvService, StatusService, SearchService, IdentityService } from "./services";
@@ -165,6 +165,7 @@ export function JwtTokenGetter() {
         LandingPageService,
         ConfirmationService,
         ImageService,
+        CustomPageService,
         CookieService,
         JobService,
         IssuesService,