Compare commits

..

No commits in common. "0ea1edff4ded12137a93d7fca59dbfbdab098546" and "f42f2086e7211a5a87c36c41e8035759be098585" have entirely different histories.

7 changed files with 14 additions and 9 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "kdb-web", "name": "kdb-web",
"version": "1.0.dev217", "version": "1.0.dev134",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"update-version": "ts-node-esm update-version.ts", "update-version": "ts-node-esm update-version.ts",

View File

@ -5,6 +5,7 @@ import { catchError } from "rxjs/operators";
import { Appsettings } from "src/app/models/config/appsettings"; import { Appsettings } from "src/app/models/config/appsettings";
import { SoftwareVersion } from "src/app/models/config/software-version"; import { SoftwareVersion } from "src/app/models/config/software-version";
import { Theme } from "src/app/models/view/theme"; import { Theme } from "src/app/models/view/theme";
import { environment } from "../../../environments/environment";
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -30,11 +31,11 @@ export class SettingsService {
} }
public getApiURL(): string { public getApiURL(): string {
if (!this.appsettings || !this.appsettings.Themes) { if (!environment || !environment.apiURL) {
console.error('ApiUrl is not set!'); console.error('ApiURL is not set!');
return ""; return '';
} }
return this.appsettings.ApiURL; return environment.apiURL;
} }
public getWebVersion(): SoftwareVersion | null { public getWebVersion(): SoftwareVersion | null {

View File

@ -1,9 +1,9 @@
{ {
"ApiURL": "http://localhost:8044", "ApiURL": "http://localhost:5000",
"WebVersion": { "WebVersion": {
"Major": "1", "Major": "1",
"Minor": "0", "Minor": "0",
"Micro": "dev217" "Micro": "dev134"
}, },
"Themes": [ "Themes": [
{ {
@ -23,4 +23,4 @@
"Name": "sh-edraft-dark-theme" "Name": "sh-edraft-dark-theme"
} }
] ]
} }

View File

@ -4,6 +4,7 @@
export const environment = { export const environment = {
production: false, production: false,
apiURL: "http://localhost:8044",
}; };
/* /*

View File

@ -1,3 +1,4 @@
export const environment = { export const environment = {
production: true, production: true,
apiURL: "https://kdb.keksdose-gaming.de",
}; };

View File

@ -1,3 +1,4 @@
export const environment = { export const environment = {
production: true, production: true,
apiURL: "https://kdb-test.keksdose-gaming.de",
}; };

View File

@ -3,7 +3,8 @@
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
production: false production: false,
apiURL: "http://localhost:5000",
}; };
/* /*