diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 5c2ff65..8ffad9a 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -4,8 +4,9 @@ // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "beta", adminToolsPortalType: "eosc", dashboard: "eosc", @@ -120,3 +121,7 @@ export let properties: EnvProperties = { loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"} }] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonBeta +} \ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 7b336d9..0d3f02c 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,8 +4,9 @@ // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "production", adminToolsPortalType: "eosc", dashboard: "eosc", @@ -126,3 +127,7 @@ export let properties: EnvProperties = { {label : "S3", id: "s3", auth: "keys"} }] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonProd +} \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 87ee874..eb57d79 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,9 @@ // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { +let props: EnvProperties = { environment: "development", adminToolsPortalType: "faircore4eosc", dashboard: "faircore4eosc", @@ -148,3 +149,7 @@ export let properties: EnvProperties = { } ] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonDev +} \ No newline at end of file