MaDgIK
/
faircore4eosc-explore
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[main | DONE | ADDED] environments/: Updated how properties are built - use common properties from library.

This commit is contained in:
Konstantina Galouni 2023-10-30 19:01:08 +02:00
parent 8e28fc5f5e
commit 8c8b0f1c6e
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/environments/environment.beta.ts
View File

@ -4,8 +4,9 @@
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. // 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 {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", environment: "beta",
adminToolsPortalType: "eosc", adminToolsPortalType: "eosc",
dashboard: "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"} loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"}
}] }]
}; };
export let properties: EnvProperties = {
...props, ...common, ...commonBeta
}

7
src/environments/environment.prod.ts
View File

@ -4,8 +4,9 @@
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. // 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 {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", environment: "production",
adminToolsPortalType: "eosc", adminToolsPortalType: "eosc",
dashboard: "eosc", dashboard: "eosc",
@ -126,3 +127,7 @@ export let properties: EnvProperties = {
{label : "S3", id: "s3", auth: "keys"} {label : "S3", id: "s3", auth: "keys"}
}] }]
}; };
export let properties: EnvProperties = {
...props, ...common, ...commonProd
}

7
src/environments/environment.ts
View File

@ -4,8 +4,9 @@
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`. // 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 {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", environment: "development",
adminToolsPortalType: "faircore4eosc", adminToolsPortalType: "faircore4eosc",
dashboard: "faircore4eosc", dashboard: "faircore4eosc",
@ -148,3 +149,7 @@ export let properties: EnvProperties = {
} }
] ]
}; };
export let properties: EnvProperties = {
...props, ...common, ...commonDev
}