diff --git a/kdb-web/package.json b/kdb-web/package.json index 3f58bd6d..80c20063 100644 --- a/kdb-web/package.json +++ b/kdb-web/package.json @@ -1,6 +1,6 @@ { "name": "kdb-web", - "version": "1.0.dev134", + "version": "1.0.dev217", "scripts": { "ng": "ng", "update-version": "ts-node-esm update-version.ts", diff --git a/kdb-web/src/app/services/settings/settings.service.ts b/kdb-web/src/app/services/settings/settings.service.ts index f594861c..52b8238b 100644 --- a/kdb-web/src/app/services/settings/settings.service.ts +++ b/kdb-web/src/app/services/settings/settings.service.ts @@ -5,7 +5,6 @@ import { catchError } from "rxjs/operators"; import { Appsettings } from "src/app/models/config/appsettings"; import { SoftwareVersion } from "src/app/models/config/software-version"; import { Theme } from "src/app/models/view/theme"; -import { environment } from "../../../environments/environment"; @Injectable({ providedIn: 'root' @@ -31,11 +30,11 @@ export class SettingsService { } public getApiURL(): string { - if (!environment || !environment.apiURL) { - console.error('ApiURL is not set!'); - return ''; + if (!this.appsettings || !this.appsettings.Themes) { + console.error('ApiUrl is not set!'); + return ""; } - return environment.apiURL; + return this.appsettings.ApiURL; } public getWebVersion(): SoftwareVersion | null { diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json index d4110a8a..e129a65a 100644 --- a/kdb-web/src/assets/config.json +++ b/kdb-web/src/assets/config.json @@ -1,9 +1,9 @@ { - "ApiURL": "http://localhost:5000", + "ApiURL": "http://localhost:8044", "WebVersion": { "Major": "1", "Minor": "0", - "Micro": "dev134" + "Micro": "dev217" }, "Themes": [ { @@ -23,4 +23,4 @@ "Name": "sh-edraft-dark-theme" } ] -} \ No newline at end of file +} diff --git a/kdb-web/src/environments/environment.development.ts b/kdb-web/src/environments/environment.development.ts index f5bb9730..66998ae9 100644 --- a/kdb-web/src/environments/environment.development.ts +++ b/kdb-web/src/environments/environment.development.ts @@ -4,7 +4,6 @@ export const environment = { production: false, - apiURL: "http://localhost:8044", }; /* diff --git a/kdb-web/src/environments/environment.prod.ts b/kdb-web/src/environments/environment.prod.ts index ffb05978..c9669790 100644 --- a/kdb-web/src/environments/environment.prod.ts +++ b/kdb-web/src/environments/environment.prod.ts @@ -1,4 +1,3 @@ export const environment = { production: true, - apiURL: "https://kdb.keksdose-gaming.de", }; diff --git a/kdb-web/src/environments/environment.staging.ts b/kdb-web/src/environments/environment.staging.ts index a0504876..c9669790 100644 --- a/kdb-web/src/environments/environment.staging.ts +++ b/kdb-web/src/environments/environment.staging.ts @@ -1,4 +1,3 @@ export const environment = { production: true, - apiURL: "https://kdb-test.keksdose-gaming.de", }; diff --git a/kdb-web/src/environments/environment.ts b/kdb-web/src/environments/environment.ts index 1b1a28e3..f56ff470 100644 --- a/kdb-web/src/environments/environment.ts +++ b/kdb-web/src/environments/environment.ts @@ -3,8 +3,7 @@ // The list of file replacements can be found in `angular.json`. export const environment = { - production: false, - apiURL: "http://localhost:5000", + production: false }; /*