From 09144aa080db879d5cc02661131c073b214e5ba9 Mon Sep 17 00:00:00 2001
From: TidusJar <tidusjar@gmail.com>
Date: Thu, 14 Feb 2019 16:28:00 +0000
Subject: [PATCH] !wip

---
 src/Ombi/ClientApp/src/app/app.module.ts |  8 +-------
 src/Ombi/ClientApp/src/index.html        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts
index c03e4391b..76805bfc4 100644
--- a/src/Ombi/ClientApp/src/app/app.module.ts
+++ b/src/Ombi/ClientApp/src/app/app.module.ts
@@ -83,9 +83,6 @@ export function HttpLoaderFactory(http: HttpClient, platformLocation: PlatformLo
     }
     return new TranslateHttpLoader(http, "/translations/", `.json?v=${version}`);
 }
-export function baseurlFact() {
-    return "/" + localStorage.getItem("baseUrl");
-}
 
 export function JwtTokenGetter() {
     const token = localStorage.getItem("id_token");
@@ -171,10 +168,7 @@ export function JwtTokenGetter() {
         PlexTvService,
         SearchService,
         SearchV2Service,
-        {
-            provide: APP_BASE_HREF, 
-            useFactory: baseurlFact           
-        }    ],
+       ],
     bootstrap: [AppComponent],
 })
 export class AppModule { }
diff --git a/src/Ombi/ClientApp/src/index.html b/src/Ombi/ClientApp/src/index.html
index 417f877e6..71efbc4dd 100644
--- a/src/Ombi/ClientApp/src/index.html
+++ b/src/Ombi/ClientApp/src/index.html
@@ -5,17 +5,18 @@
 
   <script>
 
-    // TODO change to fetch and reload page
-    const existingBaseUrl = window.localStorage.getItem("baseUrl");
+const existingBaseUrl = window.localStorage.getItem("baseUrl");
     if (existingBaseUrl) {
       document.write('<base href="/' + existingBaseUrl + '" />');
+      document.write("  <link rel=\"stylesheet\" href='" + existingBaseUrl + "/loading.css'/>")
     } else {
       // Work out the base URL
       // Need to find the baseUrl.txt file
       let url = window.location.href;
+      let hasFile = false;
 
       var xmlhttp = new XMLHttpRequest();
-      debugger;
+
       xmlhttp.open("GET", url + "api/v1/Settings/baseurl", false);
       xmlhttp.send();
       while (xmlhttp.status === 404) {
@@ -24,14 +25,14 @@
         tryGetBaseUrl(xmlhttp, url);
       }
       const data = JSON.parse(xmlhttp.responseText);
+      hasFile = true;
       debugger;
       document.write('<base href="/' + data + '" />');
+      document.write("  <link rel=\"stylesheet\" href=" + data + "/loading.css\"/>")
       window.localStorage.setItem("baseUrl", data);
 
-
-      function tryGetBaseUrl(xmlhttp, url) {      
-        debugger;
-        xmlhttp.open("GET", url + "/api/v1/Settings/baseurl", false);
+      function tryGetBaseUrl(xmlhttp, url) {
+        xmlhttp.open("GET", url + "api/v1/Settings/baseurl", false);
         xmlhttp.send();
       }
     }
@@ -45,7 +46,6 @@
 
 
 
-  <link rel="stylesheet" href="/loading.css" />
   <script src="//maps.google.com/maps/api/js?libraries=visualization&key=AIzaSyBDar8LXU5vbURGTMcNLI0f9AsoSnpiV3I" async
     defer></script>