From 7946191f872e2b6164a38081437158c1af22e65e Mon Sep 17 00:00:00 2001 From: M-Busk <125284318+M-Busk@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:15:12 +0100 Subject: [PATCH] update environments --- .../{application-dev.yml => application-remote.yml} | 0 frontend/build.gradle.kts | 2 +- frontend/src/environments/environment.dev.ts | 10 ---------- frontend/src/environments/environment.poc.ts | 10 ---------- frontend/src/environments/environment.remote.ts | 3 +++ frontend/src/environments/environment.ts | 2 +- 6 files changed, 5 insertions(+), 22 deletions(-) rename backend/src/main/resources/{application-dev.yml => application-remote.yml} (100%) delete mode 100644 frontend/src/environments/environment.dev.ts delete mode 100644 frontend/src/environments/environment.poc.ts create mode 100644 frontend/src/environments/environment.remote.ts diff --git a/backend/src/main/resources/application-dev.yml b/backend/src/main/resources/application-remote.yml similarity index 100% rename from backend/src/main/resources/application-dev.yml rename to backend/src/main/resources/application-remote.yml diff --git a/frontend/build.gradle.kts b/frontend/build.gradle.kts index b4abb9d..96d2ba0 100644 --- a/frontend/build.gradle.kts +++ b/frontend/build.gradle.kts @@ -42,7 +42,7 @@ tasks { val applicationYaml = file("$rootDir/backend/src/main/resources/$yamlFileName") val config = yaml.load>(applicationYaml.inputStream()) - val backendPort = (config["server"] as? Map<*, *>)?.get("port") ?: "8080" + val backendPort = (config["server"] as? Map<*, *>)?.get("port") ?: "8088" port = "420" + backendPort.toString().last() } diff --git a/frontend/src/environments/environment.dev.ts b/frontend/src/environments/environment.dev.ts deleted file mode 100644 index a07ed65..0000000 --- a/frontend/src/environments/environment.dev.ts +++ /dev/null @@ -1,10 +0,0 @@ -// This file can be replaced during build by using the `fileReplacements` array. -// The list of file replacements can be found in `angular.json`. - -export const environment = { - api_url: window.location.origin, - possible_website_possible_url: "https://www.possible-gaia-x.eu/#possible", - possible_website_url: "https://www.possible-gaia-x.eu/", - possible_website_group_url: "https://www.possible-gaia-x.eu/#verbund", - catalog_url: "https://catalog.dev.possible-x.de/resources/service-offering?locale=en" -}; diff --git a/frontend/src/environments/environment.poc.ts b/frontend/src/environments/environment.poc.ts deleted file mode 100644 index f149736..0000000 --- a/frontend/src/environments/environment.poc.ts +++ /dev/null @@ -1,10 +0,0 @@ -// This file can be replaced during build by using the `fileReplacements` array. -// The list of file replacements can be found in `angular.json`. - -export const environment = { - api_url: window.location.origin, - possible_website_possible_url: "https://www.possible-gaia-x.eu/#possible", - possible_website_url: "https://www.possible-gaia-x.eu/", - possible_website_group_url: "https://www.possible-gaia-x.eu/#verbund", - catalog_url: "https://possible.fokus.fraunhofer.de/resources/service-offering?locale=en" -}; diff --git a/frontend/src/environments/environment.remote.ts b/frontend/src/environments/environment.remote.ts new file mode 100644 index 0000000..0ddaf78 --- /dev/null +++ b/frontend/src/environments/environment.remote.ts @@ -0,0 +1,3 @@ +export const environment = { + api_url: window.location.origin + "/api/" +}; diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index f2c0f94..339b391 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -6,5 +6,5 @@ export const environment = { possible_website_possible_url: "https://www.possible-gaia-x.eu/#possible", possible_website_url: "https://www.possible-gaia-x.eu/", possible_website_group_url: "https://www.possible-gaia-x.eu/#verbund", - catalog_url: "https://possible.fokus.fraunhofer.de/resources/service-offering?locale=en" + catalog_url: "https://catalog.dev.possible-x.de/resources/service-offering?locale=en" };