diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f6e927f..5184ffa 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f6e927f4c2e9fee5518182d3b770548ccd2c8d37 +Subproject commit 5184ffad194e23864411f989f9403cd984afb4a3 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9e58421..d1b2d5e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 7a546b8..fe967b9 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", @@ -119,3 +120,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 2403203..ab0ff8b 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", @@ -125,3 +126,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 2b26d4a..2949356 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: "eosc", dashboard: "eosc", @@ -147,3 +148,7 @@ export let properties: EnvProperties = { } ] }; + +export let properties: EnvProperties = { + ...props, ...common, ...commonDev +} \ No newline at end of file