Removed api url from env #217
This commit is contained in:
parent
f42f2086e7
commit
70775111c5
@ -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",
|
||||||
|
@ -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 {
|
||||||
|
@ -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": [
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
export const environment = {
|
export const environment = {
|
||||||
production: false,
|
production: false,
|
||||||
apiURL: "http://localhost:8044",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
apiURL: "https://kdb.keksdose-gaming.de",
|
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
apiURL: "https://kdb-test.keksdose-gaming.de",
|
|
||||||
};
|
};
|
||||||
|
@ -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",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user