github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-14 01:02:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge !wip

Browse source
This commit is contained in:
tidusjar 2019-02-09 22:34:22 +00:00
parent 41ae641732
commit 8230980e88
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi/ClientApp/src/app/app.component.ts
View file

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

3
src/Ombi/ClientApp/src/app/app.module.ts
View file

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

0
src/Ombi/ClientApp/app/services/custompage.service.ts → src/Ombi/ClientApp/src/app/services/custompage.service.ts
View file