From 3d7cba5343b32ba891e443d2d9a3979cee159147 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:30:30 +0300 Subject: [PATCH 01/25] Update typescript to version 4.9.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc15ceb..47bff12 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,6 @@ "karma-jasmine-html-reporter": "^1.6.0", "protractor": "~7.0.0", "ts-node": "~7.0.0", - "typescript": "~4.6.4" + "typescript": "~4.9.5" } } From 0d0c71b03d0aefbe88dd6cf3a0888fa18f736760 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:32:54 +0300 Subject: [PATCH 02/25] Migrate angular core and cli to version 15 and update dependencies to be compatible with the newer version. --- angular.json | 3 ++- package.json | 34 +++++++++++++++++----------------- src/main.server.ts | 2 +- src/test.ts | 6 ------ src/tsconfig.server.json | 1 - tsconfig.json | 5 +++-- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/angular.json b/angular.json index 2e88879..cb3eb7e 100644 --- a/angular.json +++ b/angular.json @@ -218,7 +218,8 @@ "development": { "outputHashing": "media", "sourceMap": false, - "optimization": true + "optimization": true, + "vendorChunk": true }, "beta": { "outputHashing": "media", diff --git a/package.json b/package.json index 47bff12..79ad5cb 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,19 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.2.3", + "@angular/animations": "^15.2.9", "@angular/cdk": "^14.2.2", - "@angular/common": "^14.2.3", - "@angular/compiler": "^14.2.3", - "@angular/core": "^14.2.3", - "@angular/forms": "^14.2.3", - "@angular/localize": "^14.2.3", + "@angular/common": "^15.2.9", + "@angular/compiler": "^15.2.9", + "@angular/core": "^15.2.9", + "@angular/forms": "^15.2.9", + "@angular/localize": "^15.2.9", "@angular/material": "^14.2.2", - "@angular/platform-browser": "^14.2.3", - "@angular/platform-browser-dynamic": "^14.2.3", - "@angular/platform-server": "^14.2.3", - "@angular/router": "^14.2.3", - "@nguniversal/express-engine": "^14.2.0", + "@angular/platform-browser": "^15.2.9", + "@angular/platform-browser-dynamic": "^15.2.9", + "@angular/platform-server": "^15.2.9", + "@angular/router": "^15.2.9", + "@nguniversal/express-engine": "^15.2.1", "@node-minify/clean-css": "^6.2.0", "@node-minify/core": "^6.2.0", "axios": "^0.27.2", @@ -41,7 +41,7 @@ "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^10.0.0", + "ng-recaptcha": "^11.0.0", "ng2-ckeditor": "1.3.7", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", @@ -50,11 +50,11 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.3", - "@angular/cli": "^14.2.3", - "@angular/compiler-cli": "^14.2.3", - "@angular/language-service": "^14.2.3", - "@nguniversal/builders": "^14.2.0", + "@angular-devkit/build-angular": "^15.2.9", + "@angular/cli": "^15.2.9", + "@angular/compiler-cli": "^15.2.9", + "@angular/language-service": "^15.2.9", + "@nguniversal/builders": "^15.2.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", diff --git a/src/main.server.ts b/src/main.server.ts index d8775d6..0930b37 100644 --- a/src/main.server.ts +++ b/src/main.server.ts @@ -12,4 +12,4 @@ if (properties.environment !== "development") { } export { AppServerModule } from './app/app.server.module'; -export { renderModule } from '@angular/platform-server'; + diff --git a/src/test.ts b/src/test.ts index 6b03dbe..ae25f27 100644 --- a/src/test.ts +++ b/src/test.ts @@ -7,8 +7,6 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require: any; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, @@ -16,7 +14,3 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json index 39f85aa..5601502 100644 --- a/src/tsconfig.server.json +++ b/src/tsconfig.server.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "../out-tsc/app-server", - "target": "es2016", "types": [ "node" ] diff --git a/tsconfig.json b/tsconfig.json index fc8b4c1..668d981 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,13 +10,14 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false } } From 16e7a9ff0aa7957dce26cbb144fdce12d51328a0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:35:48 +0300 Subject: [PATCH 03/25] Update material to angular 15. --- package.json | 6 +++--- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 79ad5cb..7fbb5f4 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "^15.2.9", - "@angular/cdk": "^14.2.2", + "@angular/cdk": "^15.2.9", "@angular/common": "^15.2.9", "@angular/compiler": "^15.2.9", "@angular/core": "^15.2.9", "@angular/forms": "^15.2.9", "@angular/localize": "^15.2.9", - "@angular/material": "^14.2.2", + "@angular/material": "^15.2.9", "@angular/platform-browser": "^15.2.9", "@angular/platform-browser-dynamic": "^15.2.9", "@angular/platform-server": "^15.2.9", @@ -73,4 +73,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a53c4e9..3b6822c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..9cb1f83 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d From b1a7906892ea464517ba651f6e949706667292e6 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:36:29 +0300 Subject: [PATCH 04/25] Update Zone to 0.13.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7fbb5f4..f99d9ad 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "ts-md5": "^1.2.0", "tslib": "^2.0.0", "uikit": "3.13.10", - "zone.js": "~0.11.4" + "zone.js": "~0.13.1" }, "devDependencies": { "@angular-devkit/build-angular": "^15.2.9", @@ -73,4 +73,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} From e503f70782da28d271981734d958d940263c8253 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:40:26 +0300 Subject: [PATCH 05/25] Update angular to version 16 --- angular.json | 12 ++++++++---- package.json | 34 +++++++++++++++++----------------- src/app/app.component.ts | 3 ++- src/app/app.module.ts | 8 ++++---- src/app/openaireLibrary | 2 +- 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/angular.json b/angular.json index cb3eb7e..4f72345 100644 --- a/angular.json +++ b/angular.json @@ -212,14 +212,16 @@ "main": "server.ts", "tsConfig": "src/tsconfig.server.json", "sourceMap": true, - "optimization": false + "optimization": false, + "buildOptimizer": false }, "configurations": { "development": { "outputHashing": "media", "sourceMap": false, "optimization": true, - "vendorChunk": true + "vendorChunk": true, + "buildOptimizer": true }, "beta": { "outputHashing": "media", @@ -230,7 +232,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -241,7 +244,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" diff --git a/package.json b/package.json index f99d9ad..8804fe3 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,19 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.9", + "@angular/animations": "^16.1.8", "@angular/cdk": "^15.2.9", - "@angular/common": "^15.2.9", - "@angular/compiler": "^15.2.9", - "@angular/core": "^15.2.9", - "@angular/forms": "^15.2.9", - "@angular/localize": "^15.2.9", + "@angular/common": "^16.1.8", + "@angular/compiler": "^16.1.8", + "@angular/core": "^16.1.8", + "@angular/forms": "^16.1.8", + "@angular/localize": "^16.1.8", "@angular/material": "^15.2.9", - "@angular/platform-browser": "^15.2.9", - "@angular/platform-browser-dynamic": "^15.2.9", - "@angular/platform-server": "^15.2.9", - "@angular/router": "^15.2.9", - "@nguniversal/express-engine": "^15.2.1", + "@angular/platform-browser": "^16.1.8", + "@angular/platform-browser-dynamic": "^16.1.8", + "@angular/platform-server": "^16.1.8", + "@angular/router": "^16.1.8", + "@nguniversal/express-engine": "^16.1.1", "@node-minify/clean-css": "^6.2.0", "@node-minify/core": "^6.2.0", "axios": "^0.27.2", @@ -41,7 +41,7 @@ "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^11.0.0", + "ng-recaptcha": "^12.0.2", "ng2-ckeditor": "1.3.7", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", @@ -50,11 +50,11 @@ "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.2.9", - "@angular/cli": "^15.2.9", - "@angular/compiler-cli": "^15.2.9", - "@angular/language-service": "^15.2.9", - "@nguniversal/builders": "^15.2.1", + "@angular-devkit/build-angular": "^16.1.7", + "@angular/cli": "^16.1.7", + "@angular/compiler-cli": "^16.1.8", + "@angular/language-service": "^16.1.8", + "@nguniversal/builders": "^16.1.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ef485d0..630a5fb 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,7 +28,7 @@ import {LoginErrorCodes} from "./openaireLibrary/login/utils/guardHelper.class"; import {Layout} from "./openaireLibrary/connect/community/CustomizationOptions"; import {CustomizationService} from "./openaireLibrary/services/customization.service"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; -import {makeStateKey, Meta, StateKey, TransferState} from "@angular/platform-browser"; +import {makeStateKey, StateKey, TransferState} from "@angular/core"; import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo"; import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; @@ -42,6 +42,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields" import {DOCUMENT, isPlatformServer} from "@angular/common"; import {AdvancedAsyncSubject} from "./openaireLibrary/utils/AdvancedAsyncSubject"; import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {Meta} from "@angular/platform-browser"; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 363c148..4913b10 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,8 +1,8 @@ -import {NgModule} from '@angular/core'; +import {APP_ID, NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {CommonModule} from '@angular/common'; import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http"; -import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser'; +import {BrowserModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {AppComponent} from './app.component'; @@ -41,9 +41,8 @@ import {CustomizationService} from "./openaireLibrary/services/customization.ser BottomModule, CookieLawModule, SubscribeModule.forRoot(), InviteBasicModule, - BrowserModule.withServerTransition({appId: 'serverApp'}), + BrowserModule, AppRoutingModule, - BrowserTransferStateModule, BrowserAnimationsModule, PageURLResolverModule, Schema2jsonldModule, RoleVerificationModule, QuickContactModule, AlertModalModule ], @@ -51,6 +50,7 @@ import {CustomizationService} from "./openaireLibrary/services/customization.ser exports: [AppComponent], providers: [ CommunitiesService, CustomizationService, IsCommunity, SubscribeService, + {provide: APP_ID, useValue: 'serverApp'}, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptorService, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3b6822c..e742988 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 From 3accce265c3d51d3f64e9e70b2008e212c809da2 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:41:12 +0300 Subject: [PATCH 06/25] Update material to angular 16. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8804fe3..7778f3f 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "^16.1.8", - "@angular/cdk": "^15.2.9", + "@angular/cdk": "^16.1.7", "@angular/common": "^16.1.8", "@angular/compiler": "^16.1.8", "@angular/core": "^16.1.8", "@angular/forms": "^16.1.8", "@angular/localize": "^16.1.8", - "@angular/material": "^15.2.9", + "@angular/material": "^16.1.7", "@angular/platform-browser": "^16.1.8", "@angular/platform-browser-dynamic": "^16.1.8", "@angular/platform-server": "^16.1.8", @@ -73,4 +73,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file From f4b62d391ad7587c83c8773d963d1bc85810aaab Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 15:51:14 +0300 Subject: [PATCH 07/25] Delete ServerTranferStateModule --- src/app/app.server.module.ts | 3 +-- src/app/openaireLibrary | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts index cc86a55..9c8c71e 100644 --- a/src/app/app.server.module.ts +++ b/src/app/app.server.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import {ServerModule, ServerTransferStateModule} from '@angular/platform-server'; +import {ServerModule} from '@angular/platform-server'; import { AppModule } from './app.module'; import { AppComponent } from './app.component'; @@ -8,7 +8,6 @@ import { AppComponent } from './app.component'; imports: [ AppModule, ServerModule, - ServerTransferStateModule ], bootstrap: [AppComponent], }) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e742988..758f2f1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 +Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f From 0cc7d8ba10859fbe1b94384a5fdba29774058c0c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 16:19:12 +0300 Subject: [PATCH 08/25] Update uikit to version 3.16.24 --- package.json | 4 ++-- src/app/communities/communities.component.html | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7778f3f..68eb03f 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.13.10", + "uikit": "3.16.24", "zone.js": "~0.13.1" }, "devDependencies": { @@ -73,4 +73,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 4a04861..1506997 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -73,7 +73,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
ipad Date: Wed, 30 Aug 2023 12:36:29 +0300 Subject: [PATCH 09/25] Fix get-started button in mobile and add hasStickyHeaderInMobile for home and about pages. --- src/app/app-routing.module.ts | 7 ++++--- src/app/app.component.ts | 10 ++++------ src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 258233c..6fc032e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -20,11 +20,12 @@ const routes: Routes = [ /** Other Pages */ { path: '', - loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule) + loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule), + data: {hasStickyHeaderOnMobile: true} }, {path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'}, - {path: 'about/learn-how', loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule)}, - {path: 'about/faq', loadChildren: () => import('./learn-how/faqs/faqs.module').then(m => m.FaqsModule)}, + {path: 'about/learn-how', loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule), data: {hasStickyHeaderOnMobile: true}}, + {path: 'about/faq', loadChildren: () => import('./learn-how/faqs/faqs.module').then(m => m.FaqsModule), data: {hasStickyHeaderOnMobile: true}}, {path: 'get-started', loadChildren: () => import('./get-started/get-started.module').then(m => m.GetStartedModule)}, { path: 'contact-us', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 630a5fb..8224092 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -49,14 +49,12 @@ import {Meta} from "@angular/platform-browser"; template: `
- - +
+ Get Started +
Get Started diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index befbfd0..f2a2c52 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit befbfd071b96dec562ac39b0d4b65e869fd094ce +Subproject commit f2a2c52d435629bad2c9af68240d76dfefe4dfd9 diff --git a/src/assets/common-assets b/src/assets/common-assets index ae7e623..a7e2f98 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 +Subproject commit a7e2f9882fc3cbb9f14ced3e0600d15bf2ffb887 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index d52e929..5feca2d 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit d52e92929799a1626aff66ad413c6db2be521555 +Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b From 77b080ca9dd3bbb70786ecc77e174dcd55af728c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 26 Sep 2023 11:53:49 +0300 Subject: [PATCH 10/25] Update types/node to version 16 --- package.json | 2 +- src/app/openaireLibrary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 68eb03f..3e8abc1 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", - "@types/node": "^12.11.1", + "@types/node": "^16.18.50", "@types/ckeditor": "^4.9.10", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 2102dfb..6d7f6ec 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2102dfb0d70ccbb773ff659342661054155a4c39 +Subproject commit 6d7f6eca720d18fe694f13e380c1ede1f46303a8 From 48f04f313daac1796490b226ca78b9623a00cf98 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 5 Oct 2023 17:06:54 +0300 Subject: [PATCH 11/25] Change scroll section with slider in home page of connect. --- .../communities/communities.component.html | 553 +++++++++--------- src/app/communities/communities.module.ts | 6 +- src/app/learn-how/learn-how.module.ts | 3 +- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 275 insertions(+), 291 deletions(-) diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 1506997..299bcc2 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -1,302 +1,287 @@
-
-
-
-
-
-

- Build a Gateway - for your Community. -

-
-
Turn Open Science into Practice.
-
It takes your open and linked {{entities.RESULTS | lowercase}}.
-
A service customized to your needs.
-
-
- Learn More -
-
-
-
- - -
-
-
-
-
-
- - -
-

- Find a repository to deposit - your {{entities.RESULT | lowercase}} - . -

-
-
-

- Link your {{entities.RESULT | lowercase}} - with your community, funding, and other {{entities.RESULTS | lowercase}} - . -

-
-
-

- View community's - overview at a glance. -

-
-
-

- Search & browse - your community's {{entities.RESULTS | lowercase}} - . -

-
- - -
-
-
- Benefits. -

- Find the best for your community. -

-
-
-
-
-
-
-
- ipad - ipad - ipad - ipad - ipad -
-
-
-
-
-
- -
-
-
-
-
-
-
-
- ipad - ipad - ipad - ipad - ipad +
+
+
+
+
+

+ Build a Gateway + for your Community. +

+
+
Turn Open Science into Practice.
+
It takes your open and linked {{entities.RESULTS | lowercase}}.
+
A service customized to your needs.
+
+
+ Learn + More +
+
+
+
+ + +
+
+
-
- -
-
-
-
-
+
+
+
+
+ Benefits. +

+ Find the best for your community. +

+
+ + + + ipad + + + ipad + + + ipad + + + ipad + + + ipad + + + + +
+ Find a repository + to deposit your {{entities.RESULT | lowercase}} + . +
+ + +
+ Link your {{entities.RESULT | lowercase}} + with your community, funding, and other {{entities.RESULTS | lowercase}} + . +
+ + +
+ View community's + overview at a glance. +
+ + +
+ Search & browse + your community's {{entities.RESULTS | lowercase}} + . +
+ + + +
+
-
-
-

- Our mission for an Open and FAIR science. -

-
-
-
-
-
+
+

+ Our mission for an Open and FAIR science. +

+
+
+
+
+
-
- A Virtual Research Environment -
-
-
-
-

A Virtual Research Environment

-
An overlay platform making it easy to share, link, disseminate and monitor all your {{entities.PUBLICATIONS | lowercase}}, - {{entities.DATASETS | lowercase}}, {{entities.SOFTWARE | lowercase}}, methods. In one place. -
-
-
-
-
    -
  • - - Access to OpenAIRE research graph -
    • -
  • - - Moderated, front-end linking -
    • -
  • - - Cross-platform search -
    • -
-
-
-
-
-
-
-
+
+
+
+
+

A Virtual Research + Environment

+
An overlay platform making it easy to share, link, disseminate and monitor all + your {{entities.PUBLICATIONS | lowercase}}, + {{entities.DATASETS | lowercase}}, {{entities.SOFTWARE | lowercase}}, methods. + In one place. +
+
+
+
+
    +
  • + + Access to OpenAIRE research graph +
    • +
  • + + Moderated, front-end linking +
    • +
  • + + Cross-platform search +
    • +
+
+
+
+
+
+
+
-
- Open science in action -
-
-
-
-

Open Science in action

-
A time-saving bundle of services for researchers to effortlessly practice open science. An integral - part of the European Open Science Cloud. -
-
-
-
-
    -
  • - - Use of OpenAIRE Guidelines -
    • -
  • - - Publish and get DOIs with Zenodo -
    • -
  • - - EOSC Single Sign-On -
    • -
-
-
-
-
-
-
-
+
+
+
+
+

Open Science in action

+
A time-saving bundle of services for researchers to effortlessly practice open + science. An integral + part of the European Open Science Cloud. +
+
+
+
+
    +
  • + + Use of OpenAIRE Guidelines +
    • +
  • + + Publish and get DOIs with Zenodo +
    • +
  • + + EOSC Single Sign-On +
    • +
+
+
+
+
+
+
+
-
- Customized to your needs -
-
-
-
-

Customized to your needs

-
A Gateway with your own brand, rules for aggregation, text & data mining, and presentation. Run - by you via a simple, yet powerful backend administration tool. -
-
-
-
-
    -
  • - - Access control -
    • - -
  • - - Look & feel to match your brand -
    • -
-
-
-
-
-
-
-
-
+
+ Customized to your needs +
+
+
+
+

Customized to your needs

+
A Gateway with your own brand, rules for aggregation, text & data mining, + and presentation. Run + by you via a simple, yet powerful backend administration tool. +
+
+
+
+
    +
  • + + Access control +
    • + +
  • + + Look & feel to match your brand +
    • +
+
+
+
+
+
+
+
+
-
- -
-
-

Community Gateways already in action.

-
-
-
-
-
- -
-
-
-
- +
+ +
+
+

Community Gateways already in action.

+
+
+
+
+
+ +
+
+
+
+ View All - -
-
+ +
+
-
-
-
-
- -
-
-
-
- +
+
+
+
+ +
+
+
+
+ View All - -
-
-
-
+ +
+
+
+
-
-

-
Let us Help you Develop a Collaborative Science Gateway.
-
It is fast. It is reliable.
-

- Contact us -
+
+

+
Let us Help you Develop a Collaborative Science Gateway.
+
It is fast. It is reliable. +
+

+ Contact + us +
diff --git a/src/app/communities/communities.module.ts b/src/app/communities/communities.module.ts index 7807f63..0e66899 100644 --- a/src/app/communities/communities.module.ts +++ b/src/app/communities/communities.module.ts @@ -14,19 +14,19 @@ import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.m import {SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module'; import {BrowseCommunityModule} from './browseCommunity/browse-community.module'; import {HelperModule} from "../openaireLibrary/utils/helper/helper.module"; -import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.module"; import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; import {SectionScrollModule} from "../openaireLibrary/utils/section-scroll/section-scroll.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; +import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-utils/slider-utils.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ManageModule, ErrorMessagesModule, - SearchFormModule, BrowseCommunityModule, GifSliderModule, OtherPortalsModule, - HelperModule, SEOServiceModule, SectionScrollModule, IconsModule + SearchFormModule, BrowseCommunityModule, OtherPortalsModule, + HelperModule, SEOServiceModule, SectionScrollModule, IconsModule, SliderUtilsModule ], declarations: [ CommunitiesComponent diff --git a/src/app/learn-how/learn-how.module.ts b/src/app/learn-how/learn-how.module.ts index cebc5d5..5196eb8 100644 --- a/src/app/learn-how/learn-how.module.ts +++ b/src/app/learn-how/learn-how.module.ts @@ -7,7 +7,6 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.servic import {LearnHowComponent} from "./learn-how.component"; import {LearnHowRoutingModule} from "./learn-how-routing.module"; -import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.module"; import {HelperModule} from "../openaireLibrary/utils/helper/helper.module"; import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; @@ -20,7 +19,7 @@ import {TabsModule} from '../openaireLibrary/utils/tabs/tabs.module'; @NgModule({ imports: [ - CommonModule, RouterModule, LearnHowRoutingModule, GifSliderModule, HelperModule, + CommonModule, RouterModule, LearnHowRoutingModule, HelperModule, Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, HtmlPagesModule, IconsModule, TabsModule ], declarations: [ diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6d7f6ec..cfdd7b2 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6d7f6eca720d18fe694f13e380c1ede1f46303a8 +Subproject commit cfdd7b2e55e26bdde855d1eb0ba2980918e37771 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5feca2d..51ac1b2 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b +Subproject commit 51ac1b254b39b3c2d9124f191091fc926f9535fe From 414cc8af1914c842fb173c24d1c69583799cc332 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 10:14:53 +0300 Subject: [PATCH 12/25] Add connect logo in background of slider section in home page. Update theme. --- src/app/communities/communities.component.html | 4 ++-- src/app/communities/communities.component.less | 6 +++--- src/assets/openaire-theme | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 299bcc2..7c6e6c7 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -30,8 +30,8 @@
-
-
+
+
Benefits.

diff --git a/src/app/communities/communities.component.less b/src/app/communities/communities.component.less index 3600bb2..2007652 100644 --- a/src/app/communities/communities.component.less +++ b/src/app/communities/communities.component.less @@ -7,7 +7,7 @@ .connect-dark-logo-background { background-image: url("~src/assets/connect-assets/home/connect-dark-logo.svg"); background-repeat: no-repeat; - background-position: left 95%; - background-size: 65%; + background-position: -5% 100%; + background-size: 35%; } -} \ No newline at end of file +} diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 51ac1b2..540b397 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 51ac1b254b39b3c2d9124f191091fc926f9535fe +Subproject commit 540b3970611802a614ea61fd90686dbeafc43484 From e9cfa28d5b2babb14f9f17811c6316cc7ecd9664 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 14:51:06 +0300 Subject: [PATCH 13/25] Update theme and library --- src/app/communities/communities.component.less | 2 +- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/communities/communities.component.less b/src/app/communities/communities.component.less index 2007652..e6dd2a8 100644 --- a/src/app/communities/communities.component.less +++ b/src/app/communities/communities.component.less @@ -7,7 +7,7 @@ .connect-dark-logo-background { background-image: url("~src/assets/connect-assets/home/connect-dark-logo.svg"); background-repeat: no-repeat; - background-position: -5% 100%; + background-position: -5% 102%; background-size: 35%; } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index cfdd7b2..5a92373 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit cfdd7b2e55e26bdde855d1eb0ba2980918e37771 +Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 540b397..fd101a6 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 540b3970611802a614ea61fd90686dbeafc43484 +Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df From 630bce44c9c7b2f55fb0fd6b36f08ec2039ce7cd Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 19:48:45 +0300 Subject: [PATCH 14/25] Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5a92373..f4d7582 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb +Subproject commit f4d758276471c23792972beda012e3a8f91fe85c From c61927fa23cb1769bb728142fc9e0c19eeb37d60 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 19:50:52 +0300 Subject: [PATCH 15/25] Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f4d7582..9f22bec 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f4d758276471c23792972beda012e3a8f91fe85c +Subproject commit 9f22bec5cfac67f146a7df8d44b0c3fe10f0d92c From d900650016f89113eba6c2400aeb14042a1b8b02 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 10 Oct 2023 17:33:27 +0300 Subject: [PATCH 16/25] Change slider nav items, period and infinite --- .../communities/communities.component.html | 20 +++++++++---------- .../communities/communities.component.less | 4 ++++ src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 7c6e6c7..95a0a94 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -38,7 +38,7 @@ Find the best for your community.

- + ipad - + -
+
Find a repository to deposit your {{entities.RESULT | lowercase}} . -
+ -
+
Link your {{entities.RESULT | lowercase}} with your community, funding, and other {{entities.RESULTS | lowercase}} . -
+ -
+
View community's overview at a glance. -
+ -
+
Search & browse your community's {{entities.RESULTS | lowercase}} . -
+ diff --git a/src/app/communities/communities.component.less b/src/app/communities/communities.component.less index e6dd2a8..8f5fcd4 100644 --- a/src/app/communities/communities.component.less +++ b/src/app/communities/communities.component.less @@ -10,4 +10,8 @@ background-position: -5% 102%; background-size: 35%; } + + .slider-nav { + max-width: 650px; + } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 9f22bec..2a51657 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 9f22bec5cfac67f146a7df8d44b0c3fe10f0d92c +Subproject commit 2a51657e5862bea5690d65bd664c6cb2e92f02f9 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index fd101a6..fe7394e 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df +Subproject commit fe7394ea9ed4319a3234a00b0c8ce09023f50799 From 7841e84ca1da3d2657dd27bbf5bc6a3e64cb4ac7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 10 Oct 2023 22:40:55 +0300 Subject: [PATCH 17/25] Hide invite and join buttons in case of byInvitation membership. --- src/app/app.component.ts | 4 ++-- src/app/openaireLibrary | 2 +- src/app/utils/subscribe/invite/invite-routing.module.ts | 4 ++-- src/app/utils/subscribe/invite/invite.component.ts | 3 --- src/app/utils/subscribe/invite/invite.module.ts | 9 ++++----- src/assets/openaire-theme | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b1db9f0..c3ef039 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -88,8 +88,8 @@ import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sideba
- - + +
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5e4aaab..ff4411d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 +Subproject commit ff4411d69587e012a274dbd0451ca770d1afb969 diff --git a/src/app/utils/subscribe/invite/invite-routing.module.ts b/src/app/utils/subscribe/invite/invite-routing.module.ts index c23d9d3..01cf3cc 100644 --- a/src/app/utils/subscribe/invite/invite-routing.module.ts +++ b/src/app/utils/subscribe/invite/invite-routing.module.ts @@ -2,13 +2,13 @@ import {NgModule} from '@angular/core'; import {RouterModule} from '@angular/router'; import {InviteComponent} from './invite.component'; -import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard"; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: InviteComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder] } + { path: '', component: InviteComponent, canActivate: [ConnectAdminLoginGuard], canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts index de4d80c..935715f 100644 --- a/src/app/utils/subscribe/invite/invite.component.ts +++ b/src/app/utils/subscribe/invite/invite.component.ts @@ -31,13 +31,11 @@ export class InviteComponent implements OnInit { private subs: Subscription[] = []; constructor( - private route: ActivatedRoute, private _router: Router, private _meta: Meta, private helper: HelperService, private _title: Title, private seoService: SEOService, - private _piwikService: PiwikService, private userManageService: UserManagementService) { } @@ -93,6 +91,5 @@ export class InviteComponent implements OnInit { close(element) { UIkit.dropdown(element).hide(); - this } } diff --git a/src/app/utils/subscribe/invite/invite.module.ts b/src/app/utils/subscribe/invite/invite.module.ts index ebb20e0..f947a41 100644 --- a/src/app/utils/subscribe/invite/invite.module.ts +++ b/src/app/utils/subscribe/invite/invite.module.ts @@ -1,13 +1,12 @@ -import {NgModule} from '@angular/core'; +import {NgModule} from '@angular/core'; -import {InviteRoutingModule} from './invite-routing.module'; - -import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard'; +import {InviteRoutingModule} from './invite-routing.module'; import {InviteBasicModule} from "./inviteBasic.module"; +import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard"; @NgModule({ imports: [InviteBasicModule, InviteRoutingModule], - providers: [LoginGuard] + providers: [ConnectAdminLoginGuard] }) export class InviteModule { } diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index ac458b5..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From cc5d3cbdb343690afeb99d8ae52adc1f903cd7b1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 11 Oct 2023 12:55:11 +0300 Subject: [PATCH 18/25] Enable invite button for byInvitation commmunities with a link to admin portal. --- src/app/app.component.ts | 2 +- src/app/utils/subscribe/invite/invite.component.html | 6 +++++- src/app/utils/subscribe/invite/invite.component.ts | 9 +++++++-- src/assets/community.less | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c3ef039..dbdd84b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -89,7 +89,7 @@ import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sideba
- +
diff --git a/src/app/utils/subscribe/invite/invite.component.html b/src/app/utils/subscribe/invite/invite.component.html index e9bb6dd..c9632b2 100644 --- a/src/app/utils/subscribe/invite/invite.component.html +++ b/src/app/utils/subscribe/invite/invite.component.html @@ -30,8 +30,12 @@
- + Invite users + + + Invite members +
diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts index 935715f..c27780e 100644 --- a/src/app/utils/subscribe/invite/invite.component.ts +++ b/src/app/utils/subscribe/invite/invite.component.ts @@ -21,6 +21,7 @@ declare var UIkit; export class InviteComponent implements OnInit { @Input() longView: boolean = true; @Input() communityId = null; + @Input() isOpen: boolean = true; public properties: EnvProperties = properties; public pageTitle: string = "Invite"; public user: User; @@ -44,9 +45,9 @@ export class InviteComponent implements OnInit { user => { this.user = user; })); - this.getPageContents(); - this.url = this.properties.domain + this._router.url; if(this.longView) { + this.url = this.properties.domain + this._router.url; + this.getPageContents(); this.seoService.createLinkForCanonicalURL(this.url); this.updateUrl(this.url); this.updateTitle(this.pageTitle); @@ -88,6 +89,10 @@ export class InviteComponent implements OnInit { private updateUrl(url: string) { this._meta.updateTag({content: url}, "property='og:url'"); } + + get adminInviteURL() { + return this.properties.adminPortalURL + '/' + this.communityId + '/users/member'; + } close(element) { UIkit.dropdown(element).hide(); diff --git a/src/assets/community.less b/src/assets/community.less index 5a6b8da..adebe47 100644 --- a/src/assets/community.less +++ b/src/assets/community.less @@ -20,7 +20,7 @@ #joinAndInviteBtn #join, #joinAndInviteBtn #member, #joinAndInviteBtn #invite { - width: 140px; + width: 160px; line-height: 60px; height: 60px; padding: 0 20px; From 3427707d7fa5e8735add7fc2458e828f63650a2e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 12 Oct 2023 14:07:24 +0300 Subject: [PATCH 19/25] Remove opacity from search-from background for connect --- src/app/openaireLibrary | 2 +- src/assets/connect.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 69bbccd..dbbd7ec 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 69bbccd0097df2aec4771c101be3e559e6c3d505 +Subproject commit dbbd7ec541d96a5062a769dea2255ad9ccb36b13 diff --git a/src/assets/connect.less b/src/assets/connect.less index 9587453..b796fe1 100644 --- a/src/assets/connect.less +++ b/src/assets/connect.less @@ -30,4 +30,4 @@ @inverse-text-primary-color: @connect-color; /* General */ -@general-search-form-background: fade(@global-secondary-background, 20%); +@general-search-form-background: lighten(@global-secondary-background, 33%); From 62de83cf5a78c16aa3c84c4f7664ae7a6fa240e9 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 13 Oct 2023 13:25:29 +0300 Subject: [PATCH 20/25] fix issue with enermaps feature tab --- src/app/community/community.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 5a60ce9..a26f9e8 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -738,7 +738,7 @@
Here are listed some of the most important energy datasets as selected by energy experts.
From 9e5505c2978591d4c6628f2a0b274d05570d12e0 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 16 Oct 2023 12:13:42 +0300 Subject: [PATCH 21/25] fix issue with enermaps tab: use search-results instead of search-tab --- src/app/community/community.component.html | 20 +++++++++++++------- src/app/community/community.component.ts | 3 ++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 5a60ce9..46f3a18 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -737,9 +737,11 @@ *ngIf="activeTab == 'enermaps' && communityId == 'enermaps' && fetchFeaturedDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')">
- +
+
+ Featured Datasets +
+
Here are listed some of the most important energy datasets as selected by energy experts.
@@ -747,12 +749,16 @@ using only well-known datasets which you can trust.
- + [page]="fetchFeaturedDatasets.searchUtils.page" [pageSize]="size" + [totalResults]="fetchFeaturedDatasets.searchUtils.totalResults" > - + +
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index 8cba6db..6db3098 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -386,7 +386,6 @@ export class CommunityComponent { ) ) { this.fetchFeaturedDatasets.getAllResultsForCommunity("dataset", this.communityId, page, size, this.properties, "enermaps::selection"); - // console.log(this.fetchFeaturedDatasets); } this.reloadFeaturedDatasets = false; } @@ -663,5 +662,7 @@ export class CommunityComponent { public updatePage(event) { this.page = event.value; + this.fetchFeaturedDatasets.searchUtils.page = event.value; + this.fetchFeaturedDatasets.results = this.fetchFeaturedDatasets.allResults.slice((this.page - 1) * this.searchNumber, this.page * this.searchNumber) ; } } From d55480d830076f13d8d324475a4f7adea8dadc2c Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 17 Oct 2023 09:17:58 +0300 Subject: [PATCH 22/25] change claims api to new --- src/environments/environment.beta.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 15a3979..be983ee 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -16,7 +16,7 @@ export let properties: EnvProperties = { useNewStatistisTool: true, enermapsURL:"https://lab.idiap.ch/enermaps", impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", - claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", + claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", From 39ce7a76564be770abee0d7435858d471b00dec1 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 23 Oct 2023 14:33:41 +0300 Subject: [PATCH 23/25] [angular-16-update-zenodo-api | DONE] : update zenodo community API - update method signature --- src/app/community/community.component.ts | 2 +- src/app/deposit/utils/fetchZenodoInformation.class.ts | 2 +- src/app/deposit/zenodo/shareInZenodo.component.html | 4 ++-- src/app/deposit/zenodo/shareInZenodo.component.ts | 4 ++-- src/environments/environment.beta.ts | 2 +- src/environments/environment.prod.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index 6db3098..e692324 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -219,7 +219,7 @@ export class CommunityComponent { this._title.setTitle(community.title); this.subs.push(this._piwikService.trackView(this.properties, community.title).subscribe()); if (this.community.zenodoCommunity) { - this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.properties.zenodoCommunities + this.community.zenodoCommunity).subscribe( + this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.community.zenodoCommunity).subscribe( result => { this.masterZenodoCommunity = result; }, diff --git a/src/app/deposit/utils/fetchZenodoInformation.class.ts b/src/app/deposit/utils/fetchZenodoInformation.class.ts index 6d58826..5dd3b13 100644 --- a/src/app/deposit/utils/fetchZenodoInformation.class.ts +++ b/src/app/deposit/utils/fetchZenodoInformation.class.ts @@ -24,7 +24,7 @@ export class FetchZenodoInformation { }); } public getZenodoCommunityNameAndUrlById(masterZenodoCommunityId: string, properties:EnvProperties, zenodoInformation: ZenodoInformationClass){ - this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(properties, properties.zenodoCommunities+masterZenodoCommunityId).subscribe( + this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(properties, masterZenodoCommunityId).subscribe( result => { console.info("getZenodoCommunityNameAndUrlById", result); var masterZenodoCommunity = result; diff --git a/src/app/deposit/zenodo/shareInZenodo.component.html b/src/app/deposit/zenodo/shareInZenodo.component.html index 707bc41..4bcd642 100644 --- a/src/app/deposit/zenodo/shareInZenodo.component.html +++ b/src/app/deposit/zenodo/shareInZenodo.component.html @@ -19,7 +19,7 @@
{{masterZenodoCommunity.title}} + src="{{masterZenodoCommunity.logoUrl}}" width="80" height="80" alt="">
@@ -108,7 +108,7 @@
{{communities[this.communityIds[i]].title}} + src="{{communities[this.communityIds[i]].logoUrl}}" width="80" height="80" alt="">
diff --git a/src/app/deposit/zenodo/shareInZenodo.component.ts b/src/app/deposit/zenodo/shareInZenodo.component.ts index 25467cc..914758e 100644 --- a/src/app/deposit/zenodo/shareInZenodo.component.ts +++ b/src/app/deposit/zenodo/shareInZenodo.component.ts @@ -82,7 +82,7 @@ export class ShareInZenodoComponent { this.community = community; this.masterZenodoCommunityId = this.community.zenodoCommunity; if (this.masterZenodoCommunityId) { - this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe( + this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.masterZenodoCommunityId).subscribe( result => { this.masterZenodoCommunity = result; @@ -143,7 +143,7 @@ export class ShareInZenodoComponent { } getZenodoCommunityById(zenodoid) { - this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.properties.zenodoCommunities + zenodoid).subscribe( + this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, zenodoid).subscribe( result => { this.communities[zenodoid] = result; this.zenodoCommunitiesLoadedCount++; diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index be983ee..4d24f2c 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -41,7 +41,7 @@ export let properties: EnvProperties = { sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities/", + zenodoCommunities: "https://zenodo.org/api/communities", openAccess: "https://www.openaire.eu/support/faq#article-id-234", openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 40df9fc..ed43186 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -41,7 +41,7 @@ export let properties: EnvProperties = { sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities/", + zenodoCommunities: "https://zenodo.org/api/communities", openAccess: "https://www.openaire.eu/support/faq#article-id-234", openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", From 0c2c02b659f156fc3e43adc288a990bd08ac3e4d Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 26 Oct 2023 16:33:44 +0300 Subject: [PATCH 24/25] [angular-16-community-projects-availableSince | DONE | UPDATE] : for the community projects, check if there is the date added, and when db is loaded to set id to "-1" --- .../searchPages/simple/searchProjects.component.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index 177e87d..483ab32 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -13,6 +13,7 @@ import {Subscriber} from "rxjs"; import {NewSearchPageComponent} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult"; import {StringUtils} from "../../openaireLibrary/utils/string-utils.class"; +import {IndexInfoService} from "../../openaireLibrary/utils/indexInfo.service"; @Component({ selector: 'openaire-search-projects', @@ -72,13 +73,17 @@ export class OpenaireSearchProjectsComponent { public loadPaging: boolean = true; public oldTotalResults: number = 0; keyword; - constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService, private _communityService: CommunityService) { + lastDBLoadDate = null; + constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService, private _communityService: CommunityService, private indexInfoService: IndexInfoService) { this.errorCodes = new ErrorCodes(); this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; } public ngOnInit() { + this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(res => { + this.lastDBLoadDate = res; + })); this.searchUtils.baseUrl = this.properties.searchLinkToProjects; this.subscriptions.push(this._communityService.getCommunityAsObservable().subscribe(community =>{ if(community != null){ @@ -179,7 +184,11 @@ export class OpenaireSearchProjectsComponent { let results:SearchResult[]=[]; for(let result of data){ let sResult:SearchResult = new SearchResult(); - sResult.id = result.openaireId; + if(!result["availableSince"] || !this.lastDBLoadDate || (result["availableSince"] && this.lastDBLoadDate && result["availableSince"] < this.lastDBLoadDate)){ + sResult.id = result.openaireId; + }else{ + sResult.id = "-1"; //not yet in the graph + } sResult.title = {name:"", accessMode: null}; sResult.title.name = result.name?result.name:result.acronym; sResult.acronym = result['acronym']; From 9db0195119ace3785c541f23c0ab7a2901b0cd36 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 1 Nov 2023 16:36:39 +0200 Subject: [PATCH 25/25] [DONE] :update properties - use common properties from library --- src/environments/environment.beta.ts | 128 ++++----------------------- src/environments/environment.prod.ts | 127 +++----------------------- src/environments/environment.ts | 122 +++---------------------- 3 files changed, 41 insertions(+), 336 deletions(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 4d24f2c..3f7b05b 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -1,120 +1,22 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "beta", +let props: EnvProperties = { + + dashboard: 'connect', adminToolsPortalType: "connect", - dashboard: "connect", - enablePiwikTrack: true, + adminToolsCommunity: 'connect', + enablePiwikTrack: false, + piwikSiteId: '80', useCache: false, useLongCache: true, showContent: true, - showAddThis: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - enermapsURL:"https://lab.idiap.ch/enermaps", - impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", - claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", - searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", - searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", - openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", - csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", - searchCrossrefAPIURL: "https://api.crossref.org/works", - searchDataciteAPIURL: "https://api.datacite.org/works", - searchOrcidURL: "https://pub.orcid.org/v2.1/", - orcidURL: "https://orcid.org/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL: "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - doiURL: "https://doi.org/", - pmcURL: "http://europepmc.org/articles/", - pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", - handleURL: "http://hdl.handle.net/", - cordisURL: "http://cordis.europa.eu/projects/", - openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", - r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: "http://sherpa.ac.uk/romeo/issn/", - sherpaURLSuffix: "/", - zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - helpdesk: "https://www.openaire.eu/support/helpdesk", - helpdeskEmail: "helpdesk@openaire.eu", - utilsService: "https://demo.openaire.eu/utils-service", - vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", - piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", - piwikSiteId: "80", - loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", - registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/', - logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - feedbackmail: "feedback@openaire.eu", - cacheUrl: "https://demo.openaire.eu/cache/get?url=", - adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity: "connect", - datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/", - contextsAPI: "https://beta.services.openaire.eu/openaire/context", - communityAPI: "https://beta.services.openaire.eu/openaire/community/", - communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities", - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink:"", - domain:"https://beta.connect.openaire.eu", - afterLoginRedirectLink: "/myCommunities", - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToCommunities: "/search/find/communities", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrps: "/search/find/other", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedOrps: "/search/advanced/other", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - errorLink: '/error', - lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: true, - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", - widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://beta.openaire.eu/linking", - depositLearnHowPage: "/participate/deposit/learn-how", - depositSearchPage: "/participate/deposit/search", - shareInZenodoPage: "/participate/deposit/zenodo", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ["feedback@openaire.eu"], - lastIndexUpdate: "2020-05-06", - indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://beta.admin.connect.openaire.eu", - myOrcidLinksPage: "/my-orcid-links" + showAddThis: false, + domain: 'https://beta.connect.openaire.eu', + baseLink : "", + }; + +export let properties: EnvProperties = { + ...common, ...commonBeta, ...props +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index ed43186..6249155 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,121 +1,22 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "production", +let props: EnvProperties = { + + dashboard: 'connect', adminToolsPortalType: "connect", - dashboard: "connect", - enablePiwikTrack: true, + adminToolsCommunity: 'connect', + enablePiwikTrack: false, + piwikSiteId: '80', useCache: false, useLongCache: true, showContent: true, - showAddThis: true, - framesAPIURL: "https://www.openaire.eu/stats3/", - statisticsAPIURL: "https://services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://www.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - enermapsURL:"https://lab.idiap.ch/enermaps", - impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", - claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", - searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", - searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", - openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", - csvAPIURL: "https://services.openaire.eu/search/v2/api/reports", - searchCrossrefAPIURL: "https://api.crossref.org/works", - searchDataciteAPIURL: "https://api.datacite.org/works", - searchOrcidURL: "https://pub.orcid.org/v2.1/", - orcidURL: "https://orcid.org/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL: "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - doiURL: "https://doi.org/", - pmcURL: "http://europepmc.org/articles/", - pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", - handleURL: "http://hdl.handle.net/", - cordisURL: "http://cordis.europa.eu/projects/", - openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", - r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: "http://sherpa.ac.uk/romeo/issn/", - sherpaURLSuffix: "/", - zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - helpdesk: "https://www.openaire.eu/support/helpdesk", - helpdeskEmail: "helpdesk@openaire.eu", - utilsService: "https://explore.openaire.eu/utils-service", - vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", - piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", - piwikSiteId: "112", - loginUrl: "https://services.openaire.eu/login-service/openid_connect_login", - registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', - userInfoUrl: "https://services.openaire.eu/login-service/userInfo", - logoutUrl: "https://services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - feedbackmail: "feedback@openaire.eu", - cacheUrl: "https://explore.openaire.eu/cache/get?url=", - datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/", - adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity: "connect", - contextsAPI: "https://services.openaire.eu/openaire/context", - communityAPI: "https://services.openaire.eu/openaire/community/", - communitiesAPI: "https://services.openaire.eu/openaire/community/communities", - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink:"", - domain: "https://connect.openaire.eu", - afterLoginRedirectLink: "/myCommunities", - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToCommunities: "/search/find/communities", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrps: "/search/find/other", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedOrps: "/search/advanced/other", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - errorLink: '/error', - lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: true, - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", - widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://www.openaire.eu/linking", - depositLearnHowPage: "/participate/deposit/learn-how", - depositSearchPage: "/participate/deposit/search", - shareInZenodoPage: "/participate/deposit/zenodo", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ["feedback@openaire.eu"], - lastIndexUpdate: "2019-07-24", - indexInfoAPI: "https://services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://admin.connect.openaire.eu", - myOrcidLinksPage: "/my-orcid-links", + showAddThis: false, + domain: 'https://connect.openaire.eu', + baseLink : "", hasMachineCache: true }; + +export let properties: EnvProperties = { + ...common, ...commonProd, ...props +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 34a2835..4a8a496 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,122 +4,24 @@ // The list of which env maps to which file can be found in `.angular.json`. import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: 'development', - adminToolsPortalType: "connect", +let props: EnvProperties = { dashboard: 'connect', + adminToolsPortalType: "connect", + adminToolsCommunity: 'connect', enablePiwikTrack: false, + piwikSiteId: '80', useCache: false, useLongCache: false, showContent: true, showAddThis: false, - framesAPIURL: 'https://beta.openaire.eu/stats3/', - statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', - statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - enermapsURL:"https://lab.idiap.ch/enermaps", - impactFactorsAPIURL: 'https://bip-api.imsi.athenarc.gr/paper/scores/batch/', - claimsAPIURL: 'http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/', - searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/', - searchResourcesAPIURL: 'https://beta.services.openaire.eu/search/v2/api/resources', - openCitationsAPIURL: 'https://services.openaire.eu/opencitations/getCitations?id=', - csvAPIURL: 'https://beta.services.openaire.eu/search/v2/api/reports', - searchCrossrefAPIURL: 'https://api.crossref.org/works', - searchDataciteAPIURL: 'https://api.datacite.org/works', - searchOrcidURL: "https://pub.orcid.org/v2.1/", - orcidURL: "https://orcid.org/", - orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", - orcidTokenURL: "https://sandbox.orcid.org/oauth/authorize?", - orcidClientId: "APP-A5M3KTX6NCN67L91", - doiURL: 'https://doi.org/', - pmcURL: 'http://europepmc.org/articles/', - pmidURL: 'https://www.ncbi.nlm.nih.gov/pubmed/', - handleURL: 'http://hdl.handle.net/', - cordisURL: 'http://cordis.europa.eu/projects/', - openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/', - r3DataURL: 'http://service.re3data.org/repository/', - swhURL: "https://archive.softwareheritage.org/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: 'http://sherpa.ac.uk/romeo/issn/', - sherpaURLSuffix: '/', - zenodo: 'https://zenodo.org/', - zenodoCommunities: 'https://zenodo.org/api/communities/', - openAccess: 'https://www.openaire.eu/support/faq#article-id-234', - openAccessRepo: 'https://www.openaire.eu/support/faq#article-id-310', - fp7Guidlines: 'https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme', - h2020Guidlines: 'https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020', - ercGuidlines: 'http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf', - helpdesk: 'https://www.openaire.eu/support/helpdesk', - helpdeskEmail: 'helpdesk@openaire.eu', - utilsService: 'http://mpagasas.di.uoa.gr:8000', - vocabulariesAPI: 'https://dev-openaire.d4science.org/provision/mvc/vocabularies/', - piwikBaseUrl: 'https://analytics.openaire.eu/piwik.php?idsite=', - piwikSiteId: '80', - registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', - loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", - cookieDomain: '.di.uoa.gr', - feedbackmail: 'openaire.test@gmail.com', - cacheUrl: 'http://dl170.madgik.di.uoa.gr:3000/get?url=', - adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/', - adminToolsCommunity: 'connect', - datasourcesAPI: 'https://beta.services.openaire.eu/openaire/ds/search/', - contextsAPI: 'https://dev-openaire.d4science.org/openaire/context', - communityAPI: 'https://dev-openaire.d4science.org/openaire/community/', - communitiesAPI: 'https://dev-openaire.d4science.org/openaire/community/communities', - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink: "", domain: 'https://beta.connect.openaire.eu', - afterLoginRedirectLink: '/myCommunities', - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: '/search/publication?articleId=', - searchLinkToProject: '/search/project?projectId=', - searchLinkToDataProvider: '/search/dataprovider?datasourceId=', - searchLinkToDataset: '/search/dataset?datasetId=', - searchLinkToSoftwareLanding: '/search/software?softwareId=', - searchLinkToOrganization: '/search/organization?organizationId=', - searchLinkToOrp: '/search/other?orpId=', - searchLinkToCommunities: '/search/find/communities', - searchLinkToPublications: '/search/find/publications', - searchLinkToDataProviders: '/search/find/dataproviders', - searchLinkToProjects: '/search/find/projects', - searchLinkToDatasets: '/search/find/datasets', - searchLinkToSoftware: '/search/find/software', - searchLinkToOrps: '/search/find/other', - searchLinkToOrganizations: '/search/find/organizations', - searchLinkToCompatibleDataProviders: '/search/content-providers', - searchLinkToEntityRegistriesDataProviders: '/search/entity-registries', - searchLinkToJournals: '/search/journals', - searchLinkToResults: '/search/find/research-outcomes', - searchLinkToAdvancedPublications: '/search/advanced/publications', - searchLinkToAdvancedProjects: '/search/advanced/projects', - searchLinkToAdvancedDatasets: '/search/advanced/datasets', - searchLinkToAdvancedSoftware: '/search/advanced/software', - searchLinkToAdvancedOrps: '/search/advanced/other', - searchLinkToAdvancedDataProviders: '/search/advanced/dataproviders', - searchLinkToAdvancedOrganizations: '/search/advanced/organizations', - searchLinkToAdvancedResults: '/search/advanced/research-outcomes', - errorLink: '/error', - lastIndexInformationLink: 'https://beta.openaire.eu/aggregation-and-content-provision-workflows', - showLastIndexInformationLink: true, - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", - widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=', - claimsInformationLink: 'https://beta.openaire.eu/linking', - depositLearnHowPage: '/participate/deposit/learn-how', - depositSearchPage: '/participate/deposit/search', - shareInZenodoPage: '/participate/deposit/zenodo', - reCaptchaSiteKey: '6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu', - admins: ['kostis30fylloy@gmail.com'], - lastIndexUpdate: '2019-11-01', - indexInfoAPI: 'https://dev-openaire.d4science.org/openaire/info/', - altMetricsAPIURL: 'https://api.altmetric.com/v1/doi/', - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: 'https://beta.admin.connect.openaire.eu', - myOrcidLinksPage: "/my-orcid-links" + baseLink : "", + }; + + +export let properties: EnvProperties = { + ...common, ...commonDev, ...props +}