From 5806a3e5a33e04df9a8982aee6098dde5b9c764d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 24 Sep 2024 09:56:42 +0300 Subject: [PATCH 1/2] Update libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index b054a82..2c609d3 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b054a823daf43cfdbcbf2bdd727a3a7d3704b3ac +Subproject commit 2c609d3bd0bd65664b854641e3c0b7a421e16aba diff --git a/src/assets/common-assets b/src/assets/common-assets index e48bf94..038684a 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit e48bf941bcdc567a3d09826b5686e70d43fafd46 +Subproject commit 038684a0dca02700164e467abd390bbd865df3d9 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index fe10d2e..b4d09b7 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fe10d2e9195fdebf3d906f28abbb072f3617c4ee +Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13 From 53dc90c9777cec48918e0bb81e5a3d06d4194184 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 11 Oct 2024 21:19:31 +0300 Subject: [PATCH 2/2] Change developers api in dev and add / in all environments. --- src/app/services/apis.service.ts | 12 ++++++------ src/app/services/personal.service.ts | 4 ++-- src/environments/environment.beta.ts | 2 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/services/apis.service.ts b/src/app/services/apis.service.ts index e313d7d..18a59e8 100644 --- a/src/app/services/apis.service.ts +++ b/src/app/services/apis.service.ts @@ -80,30 +80,30 @@ export class ApisService { } public getAll(): Observable { - return this.http.get(properties.developersApiUrl + "/apis/all", CustomOptions.registryOptions()); + return this.http.get(properties.developersApiUrl + "apis/all", CustomOptions.registryOptions()); } public copyServices(copyServices: any): Observable { - return this.http.post(properties.developersApiUrl + "/apis/copy", copyServices, CustomOptions.registryOptions()); + return this.http.post(properties.developersApiUrl + "apis/copy", copyServices, CustomOptions.registryOptions()); } public getMyServices(): Observable { - return this.http.get(properties.developersApiUrl + "/apis/my-services", CustomOptions.registryOptions()) + return this.http.get(properties.developersApiUrl + "apis/my-services", CustomOptions.registryOptions()) .pipe(map(apis => apis.map(api => this.setInvalid(api)))); } public create(form: any): Observable { - return this.http.post(properties.developersApiUrl + "/apis/save/new", form, CustomOptions.registryOptions()) + return this.http.post(properties.developersApiUrl + "apis/save/new", form, CustomOptions.registryOptions()) .pipe(map(api => this.setInvalid(api))); } public save(id: number, form: any): Observable { - return this.http.post(properties.developersApiUrl + "/apis/save/" + id, form, CustomOptions.registryOptions()) + return this.http.post(properties.developersApiUrl + "apis/save/" + id, form, CustomOptions.registryOptions()) .pipe(map(api => this.setInvalid(api))); } public delete(id: number): Observable { - return this.http.delete(properties.developersApiUrl + "/apis/delete/" + id, CustomOptions.registryOptions()); + return this.http.delete(properties.developersApiUrl + "apis/delete/" + id, CustomOptions.registryOptions()); } private setInvalid(api: API) { diff --git a/src/app/services/personal.service.ts b/src/app/services/personal.service.ts index 11919d8..8ad176f 100644 --- a/src/app/services/personal.service.ts +++ b/src/app/services/personal.service.ts @@ -25,10 +25,10 @@ export class PersonalService { } public getPersonalInfo() { - return this.http.get(properties.developersApiUrl + '/personal/my-info', CustomOptions.registryOptions()); + return this.http.get(properties.developersApiUrl + 'personal/my-info', CustomOptions.registryOptions()); } public savePersonalInfo(personalInfo: PersonalInfo) { - return this.http.post(properties.developersApiUrl + '/personal/save', personalInfo, CustomOptions.registryOptions()); + return this.http.post(properties.developersApiUrl + 'personal/save', personalInfo, CustomOptions.registryOptions()); } } diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 5981458..bef5a21 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -6,7 +6,7 @@ export let properties: EnvProperties = { useCache: false, adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", loginServiceURL: "https://beta.services.openaire.eu/developers-api/", - developersApiUrl: "https://beta.services.openaire.eu/developers-api", + developersApiUrl: "https://beta.services.openaire.eu/developers-api/", domain: 'https://beta.develop.openaire.eu', errorLink: '/error', baseLink: '', diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 06b9513..60c781d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -6,7 +6,7 @@ export let properties: EnvProperties = { useCache: false, adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", loginServiceURL: "https://services.openaire.eu/developers-api/", - developersApiUrl: "https://services.openaire.eu/developers-api", + developersApiUrl: "https://services.openaire.eu/developers-api/", domain: 'https://develop.openaire.eu', errorLink: '/error', baseLink: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 29ca181..182d5cb 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -10,8 +10,8 @@ export let properties: EnvProperties = { dashboard: 'developers', useCache: false, adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/", - loginServiceURL: "http://mpagasas.di.uoa.gr:19580/developers-api/", - developersApiUrl: "http://mpagasas.di.uoa.gr:19580/developers-api", + loginServiceURL: "http://dl170.madgik.di.uoa.gr:19580/developers-api/", + developersApiUrl: "http://dl170.madgik.di.uoa.gr:19580/developers-api/", domain: 'http://mpagasas.di.uoa.gr:5001', errorLink: '/error', baseLink: '',