Merge pull request 'Removed api url from env #217' (#226) from #217 into 1.0.0

Reviewed-on: sh-edraft.de/kd_discord_bot#226
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #217

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",

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 {

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"
         }
     ]
-}
+}

kdb-web/src/environments/environment.development.ts

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

kdb-web/src/environments/environment.prod.ts

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

kdb-web/src/environments/environment.staging.ts

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

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
 };
 
 /*