sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

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

Browse Source 
Reviewed-on: sh-edraft.de/kd_discord_bot#226
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #217
This commit is contained in:
Sven Heidemann 2023-02-21 11:34:09 +01:00
commit 0ea1edff4d
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kdb-web/package.json
View File

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

9
kdb-web/src/app/services/settings/settings.service.ts
View File

@ -5,7 +5,6 @@ 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'
@ -31,11 +30,11 @@ export class SettingsService {
} }
public getApiURL(): string { public getApiURL(): string {
if (!environment || !environment.apiURL) { if (!this.appsettings || !this.appsettings.Themes) {
console.error('ApiURL is not set!'); console.error('ApiUrl is not set!');
return ''; return "";
} }
return environment.apiURL; return this.appsettings.ApiURL;
} }
public getWebVersion(): SoftwareVersion | null { public getWebVersion(): SoftwareVersion | null {

6
kdb-web/src/assets/config.json
View File

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

1
kdb-web/src/environments/environment.development.ts
View File

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

1
kdb-web/src/environments/environment.prod.ts
View File

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

1
kdb-web/src/environments/environment.staging.ts
View File

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

3
kdb-web/src/environments/environment.ts
View File

@ -3,8 +3,7 @@
// 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",
}; };
/* /*