From 8c05672c6ba89d31d47f3d888200c74f20692f70 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 13 Mar 2018 08:40:19 +0000 Subject: [PATCH] Experimental, set the Webpack base root to the ombi base path if we have it. This should hopefully fix the reverse proxy issues --- src/Ombi/ClientApp/app/app.component.ts | 12 ++++++++++-- src/Ombi/ClientApp/main.ts | 6 ------ src/Ombi/typings/globals/globals.d.ts | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Ombi/ClientApp/app/app.component.ts b/src/Ombi/ClientApp/app/app.component.ts index fff816537..28672c789 100644 --- a/src/Ombi/ClientApp/app/app.component.ts +++ b/src/Ombi/ClientApp/app/app.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from "@angular/core"; +import { PlatformLocation } from "@angular/common"; +import { Component, OnInit } from "@angular/core"; import { NavigationStart, Router } from "@angular/router"; import { TranslateService } from "@ngx-translate/core"; import { AuthService } from "./auth/auth.service"; @@ -32,7 +33,14 @@ export class AppComponent implements OnInit { private readonly settingsService: SettingsService, private readonly jobService: JobService, public readonly translate: TranslateService, - private readonly identityService: IdentityService) { + private readonly identityService: IdentityService, + private readonly platformLocation: PlatformLocation) { + + const base = this.platformLocation.getBaseHrefFromDOM(); + if (base.length > 1) { + __webpack_public_path__ = base + "/dist/"; + } + this.translate.addLangs(["en", "de", "fr","da","es","it","nl","sv","no"]); // this language will be used as a fallback when a translation isn't found in the current language this.translate.setDefaultLang("en"); diff --git a/src/Ombi/ClientApp/main.ts b/src/Ombi/ClientApp/main.ts index cf56ceb3a..69914b644 100644 --- a/src/Ombi/ClientApp/main.ts +++ b/src/Ombi/ClientApp/main.ts @@ -18,12 +18,6 @@ import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; import { AppModule } from "./app/app.module"; declare var module: any; -declare var __webpack_public_path__: any; -__webpack_public_path__ = "Test/"; - -if(__webpack_public_path__) { - // -} if (module.hot) { module.hot.accept(); diff --git a/src/Ombi/typings/globals/globals.d.ts b/src/Ombi/typings/globals/globals.d.ts index 7fd31b87a..84ca1bc2d 100644 --- a/src/Ombi/typings/globals/globals.d.ts +++ b/src/Ombi/typings/globals/globals.d.ts @@ -5,6 +5,8 @@ declare var require: any; declare var localStorage: any; declare var introJs: any; +declare var __webpack_public_path__: any; + declare module "pace-progress"; declare module "webpack-bundle-analyzer"; declare module "uglifyjs-webpack-plugin"; \ No newline at end of file