github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

try a different way of the reverse proxy

Browse source
This commit is contained in:
Jamie Rees 2019-04-04 22:21:44 +01:00
commit 91e1db06f2
3 changed files with 48 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/Ombi/.vscode/launch.json vendored
View file

@ -2,40 +2,26 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": ".NET Core Launch", "name": "ng serve",
"type": "coreclr", "type": "chrome",
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "npm: start",
"program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Ombi.dll", "url": "http://localhost:3578/",
"args": [], "webRoot": "${workspaceFolder}"
"cwd": "${workspaceRoot}",
"stopAtEntry": false,
"launchBrowser": {
"enabled": true,
"args": "${auto-detect-url}",
"windows": {
"command": "cmd.exe",
"args": "/C start ${auto-detect-url}"
},
"osx": {
"command": "open"
},
"linux": {
"command": "xdg-open"
}
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceRoot}/Views"
}
}, },
{ {
"name": ".NET Core Attach", "name": "ng test",
"type": "coreclr", "type": "chrome",
"request": "attach", "request": "launch",
"processId": "${command:pickProcess}" "url": "http://localhost:9876/debug.html",
"webRoot": "${workspaceFolder}",
"sourceMaps": true,
"sourceMapPathOverrides": {
"/./*": "${webRoot}/*",
"/src/*": "${webRoot}/*",
"/*": "*",
"/./~/*": "${webRoot}/node_modules/*"
} }
},
] ]
} }

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

@ -79,8 +79,9 @@ const routes: Routes = [
]; ];
// AoT requires an exported function for factories // AoT requires an exported function for factories
export function HttpLoaderFactory(http: HttpClient) { export function HttpLoaderFactory(http: HttpClient, platformLocation: PlatformLocation) {
const base = getBaseLocation(); // const base = getBaseLocation();
const base = platformLocation.getBaseHrefFromDOM();
const version = Math.floor(Math.random() * 999999999); const version = Math.floor(Math.random() * 999999999);
if (base.length > 1) { if (base.length > 1) {
return new TranslateHttpLoader(http, `${base}/translations/`, `.json?v=${version}`); return new TranslateHttpLoader(http, `${base}/translations/`, `.json?v=${version}`);
@ -175,10 +176,11 @@ export function JwtTokenGetter() {
SearchService, SearchService,
SearchV2Service, SearchV2Service,
MessageService, MessageService,
{ { provide: APP_BASE_HREF, useValue: window['_app_base'] || '/' }
provide: APP_BASE_HREF, // {
useFactory: getBaseLocation // provide: APP_BASE_HREF,
} // useFactory: getBaseLocation
// }
], ],
bootstrap: [AppComponent], bootstrap: [AppComponent],
}) })

61
src/Ombi/ClientApp/src/index.html
View file

@ -2,53 +2,26 @@
<html lang="en"> <html lang="en">
<head> <head>
<script>
<!-- <script> // manually sets the <base> tag's href attribute so the app can be located in places other than root
debugger;
const existingBaseUrl = window.localStorage.getItem("baseUrl"); var split = location.pathname.split('/');
if (existingBaseUrl && existingBaseUrl.length === 0) { var base = "";
document.write('<base href="/' + existingBaseUrl + '" />'); for (var i = 0; i < split.length - 1; i++) {
if (existingBaseUrl.length === 0) { base += split[i];
document.write("<link rel=\"stylesheet\" href='/loading.css' />") if(base.length > 1) {
} else { break;
document.write("<link rel=\"stylesheet\" href='" + existingBaseUrl + "/loading.css' />")
} }
} else { if (i < split.length - 2) {
// Work out the base URL base += "/";
// Need to find the baseUrl.txt file
let url = window.location.href;
let hasFile = false;
var xmlhttp = new XMLHttpRequest();
xmlhttp.open("GET", url + "api/v1/Settings/baseurl", false);
xmlhttp.send();
while (xmlhttp.status === 404) {
// try again
url = url.slice(0, url.lastIndexOf("/"));
tryGetBaseUrl(xmlhttp, url);
}
const data = JSON.parse(xmlhttp.responseText);
hasFile = true;
document.write('<base href="/' + data + '" />');
document.write("<link rel=\"stylesheet\" href='" + data + "/loading.css' />")
window.localStorage.setItem("baseUrl", data);
function tryGetBaseUrl(xmlhttp, url) {
if (endsWith(url, "/")) {
xmlhttp.open("GET", url + "api/v1/Settings/baseurl", false);
} else {
xmlhttp.open("GET", url + "/api/v1/Settings/baseurl", false);
}
xmlhttp.send();
}
function endsWith(str, suffix) {
return str.indexOf(suffix, str.length - suffix.length) !== -1;
} }
} }
</script> --> if(base === "") {
base = "./";
}
window['_app_base'] = base;
document.write("<base href='" + base + "' />");
</script>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<meta charset="utf-8" /> <meta charset="utf-8" />