1.0.0 #253
| @@ -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", | ||||
|   | ||||
| @@ -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 { | ||||
|   | ||||
| @@ -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" | ||||
|         } | ||||
|     ] | ||||
| } | ||||
| } | ||||
|   | ||||
| @@ -4,7 +4,6 @@ | ||||
|  | ||||
| export const environment = { | ||||
|   production: false, | ||||
|   apiURL: "http://localhost:8044", | ||||
| }; | ||||
|  | ||||
| /* | ||||
|   | ||||
| @@ -1,4 +1,3 @@ | ||||
| export const environment = { | ||||
|   production: true, | ||||
|   apiURL: "https://kdb.keksdose-gaming.de", | ||||
| }; | ||||
|   | ||||
| @@ -1,4 +1,3 @@ | ||||
| export const environment = { | ||||
|   production: true, | ||||
|   apiURL: "https://kdb-test.keksdose-gaming.de", | ||||
| }; | ||||
|   | ||||
| @@ -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 | ||||
| }; | ||||
|  | ||||
| /* | ||||
|   | ||||
		Reference in New Issue
	
	Block a user