From d25fcc6c0476c85ade65996adf2863607127cf81 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 13 Jul 2023 12:22:07 +0300 Subject: [PATCH 01/20] Change piwik base on the new dynamic piwik. --- src/app/about/about.component.ts | 4 +--- src/app/app.component.ts | 3 +++ src/app/contact/contact.component.ts | 4 +--- src/app/get-started/get-started.component.ts | 4 +--- src/app/home/home.component.ts | 4 +--- src/app/my-stakeholders/my-stakeholders.component.ts | 4 +--- src/app/openaireLibrary | 2 +- src/app/search-stakeholders/search-stakeholders.component.ts | 4 +--- src/app/support/support.component.ts | 4 +--- 9 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 7a34ec3..fbd2f8c 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -612,9 +612,7 @@ export class AboutComponent { } ngOnInit() { - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe()); - } + this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe()); this.url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(this.url); this.updateUrl(this.url); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f1f6ed9..857501a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -22,6 +22,7 @@ import {AlertModal} from "./openaireLibrary/utils/modal/alert"; import {StakeholderEntities} from './openaireLibrary/monitor/entities/stakeholder'; import {ResourcesService} from "./openaireLibrary/monitor/services/resources.service"; import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; @Component({ selector: 'app-root', @@ -101,6 +102,7 @@ export class AppComponent { public stakeholderEntities = StakeholderEntities; constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, + private configurationService: ConfigurationService, private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll, private userManagementService: UserManagementService, private quickContactService: QuickContactService, @@ -118,6 +120,7 @@ export class AppComponent { } ngOnInit() { + this.configurationService.initPortal(this.properties, "monitor"); this.userManagementService.fixRedirectURL = properties.afterLoginRedirectLink; this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index f1ff45d..5802f6e 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -57,9 +57,7 @@ export class ContactComponent implements OnInit { } ngOnInit() { - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe()); - } + this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe()); this.url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(this.url); this.updateUrl(this.url); diff --git a/src/app/get-started/get-started.component.ts b/src/app/get-started/get-started.component.ts index 855fe27..4b6f8da 100644 --- a/src/app/get-started/get-started.component.ts +++ b/src/app/get-started/get-started.component.ts @@ -60,9 +60,7 @@ export class GetStartedComponent implements OnInit { } ngOnInit() { - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe()); - } + this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe()); this.url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(this.url); this.updateUrl(this.url); diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 281b04a..131fbf5 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -107,9 +107,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv let url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(url, false); this._meta.updateTag({content: url}, "property='og:url'"); - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Monitor", this.properties.piwikSiteId).subscribe()); - } + this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Monitor").subscribe()); this.getNumbers(); this.subscriptions.push(this.localStorageService.get().subscribe(value => { this.directLink = value; diff --git a/src/app/my-stakeholders/my-stakeholders.component.ts b/src/app/my-stakeholders/my-stakeholders.component.ts index 30195bb..25b7a7e 100644 --- a/src/app/my-stakeholders/my-stakeholders.component.ts +++ b/src/app/my-stakeholders/my-stakeholders.component.ts @@ -64,9 +64,7 @@ export class MyStakeholdersComponent { var url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(url, false); this._meta.updateTag({content: url}, "property='og:url'"); - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Connect", this.properties.piwikSiteId).subscribe()); - } + this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Connect").subscribe()); this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; if (this.user) { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1785da3..46b3e93 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1785da3c45eab2438f014f6e5149c1e995bd7bff +Subproject commit 46b3e937bf7b01cd0593cb256c574fb7d21255f7 diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts index 5a3161a..6a82e17 100644 --- a/src/app/search-stakeholders/search-stakeholders.component.ts +++ b/src/app/search-stakeholders/search-stakeholders.component.ts @@ -22,7 +22,7 @@ import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sideb selector: 'search-stakeholders', template: ` { this.searchPage.resultsPerPage = 10; diff --git a/src/app/support/support.component.ts b/src/app/support/support.component.ts index 2842108..0f22fac 100644 --- a/src/app/support/support.component.ts +++ b/src/app/support/support.component.ts @@ -36,9 +36,7 @@ export class SupportComponent { } public ngOnInit() { - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe()); - } + this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe()); this.url = this.properties.domain + this.properties.baseLink + this._router.url; this.seoService.createLinkForCanonicalURL(this.url); this.updateUrl(this.url); From 85d5f7ba0f05670ef1dbb722bd1a64d50e931a6c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 13 Jul 2023 14:45:21 +0300 Subject: [PATCH 02/20] Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 46b3e93..2f98910 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 46b3e937bf7b01cd0593cb256c574fb7d21255f7 +Subproject commit 2f989107123ae674aba4907b113e4498a8f87786 From 8fe46184d3d301495024ec9919b6620b7edc6934 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:36:10 +0300 Subject: [PATCH 03/20] 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 2f98910..a53c4e9 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2f989107123ae674aba4907b113e4498a8f87786 +Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 diff --git a/src/assets/common-assets b/src/assets/common-assets index 63c54c7..2fd5784 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 63c54c7db30bd6fbad6867656a8cb12e319e2f66 +Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2fffe0f..5268f27 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 +Subproject commit 5268f277246347aad42349a06eecb915a452841b From 21f170b13c654fee5b8f987012a502fbf2875227 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:37:25 +0300 Subject: [PATCH 04/20] 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 fb63651..e3c69c8 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,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 ca488b54592b1a0e5507a1a1c5242361008b4446 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:38:45 +0300 Subject: [PATCH 05/20] 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 2d96dab..bd4b94f 100644 --- a/angular.json +++ b/angular.json @@ -216,7 +216,8 @@ "development": { "outputHashing": "media", "sourceMap": false, - "optimization": true + "optimization": true, + "vendorChunk": true }, "beta": { "outputHashing": "media", diff --git a/package.json b/package.json index e3c69c8..a13c14e 100644 --- a/package.json +++ b/package.json @@ -21,24 +21,24 @@ }, "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", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^10.0.0", + "ng-recaptcha": "^11.0.0", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", @@ -46,11 +46,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 d1bea73..94c76c3 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 0e0fe849dba7fd4c574934add91980cc93ae0fd0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:40:22 +0300 Subject: [PATCH 06/20] 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 a13c14e..14044ff 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", @@ -68,4 +68,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 cead11a42f776af04de3af8f2c8ec92e3c8f1322 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:40:55 +0300 Subject: [PATCH 07/20] 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 14044ff..b83c8a0 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,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", @@ -68,4 +68,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} From cd4f8a10fe3cb6c0c1ff767d5e70cb949159e76c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:45:56 +0300 Subject: [PATCH 08/20] Update angular to version 16 --- angular.json | 12 ++++++++---- package.json | 34 +++++++++++++++++----------------- src/app/app.module.ts | 8 ++++---- src/app/app.server.module.ts | 5 ++--- src/app/openaireLibrary | 2 +- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/angular.json b/angular.json index bd4b94f..be7cf09 100644 --- a/angular.json +++ b/angular.json @@ -210,14 +210,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", @@ -228,7 +230,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -239,7 +242,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" diff --git a/package.json b/package.json index b83c8a0..9e06d8c 100644 --- a/package.json +++ b/package.json @@ -21,24 +21,24 @@ }, "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", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^11.0.0", + "ng-recaptcha": "^12.0.2", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", @@ -46,11 +46,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.module.ts b/src/app/app.module.ts index c22d5a0..a0e591a 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'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; @@ -34,8 +34,7 @@ import {isDevelopmentGuard} from './openaireLibrary/error/isDevelopmentGuard.gua QuickContactModule, BottomModule, CookieLawModule, - BrowserTransferStateModule, - BrowserModule.withServerTransition({appId: 'monitor'}), + BrowserModule, AppRoutingModule, Schema2jsonldModule, AlertModalModule @@ -44,6 +43,7 @@ import {isDevelopmentGuard} from './openaireLibrary/error/isDevelopmentGuard.gua exports: [AppComponent], providers: [ isDevelopmentGuard, + {provide: APP_ID, useValue: 'monitor'}, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptorService, diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts index cc86a55..561695a 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'; @@ -7,8 +7,7 @@ import { AppComponent } from './app.component'; @NgModule({ imports: [ AppModule, - ServerModule, - ServerTransferStateModule + ServerModule ], bootstrap: [AppComponent], }) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3b6822c..758f2f1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f From 94d5b1ed1c4f15ef109ea779ce4c9c0e02941eab Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 14:46:43 +0300 Subject: [PATCH 09/20] Update material to angular 16. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9e06d8c..43f2e9e 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", @@ -68,4 +68,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file From 6784297127d85bf4824b79a157e829d92884c07b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 15:37:03 +0300 Subject: [PATCH 10/20] Update uikit to version 3.16.24 --- package.json | 4 ++-- src/app/about/you-we.component.ts | 4 ++-- src/app/home/home.component.html | 8 ++++---- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 43f2e9e..b165f6f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,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": { @@ -68,4 +68,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} diff --git a/src/app/about/you-we.component.ts b/src/app/about/you-we.component.ts index 5ae209f..89a3ca5 100644 --- a/src/app/about/you-we.component.ts +++ b/src/app/about/you-we.component.ts @@ -20,8 +20,8 @@ declare var UIkit; class="uk-text-primary">{{type}}?
+ uk-sticky="animation: uk-animation-slide-bottom" [attr.end]="'#' + id" + [attr.start]="'100vh -' + height + 'px'" [attr.offset]="offset">
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index eb03210..40607a0 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,5 +1,5 @@ -
+

Monitor, discover and understand.

@@ -51,7 +51,7 @@

Simplify research monitoring & evaluation.

-
+
@@ -306,7 +306,7 @@

Simplify research monitoring & evaluation.

-
+
@@ -328,7 +328,7 @@
-
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 758f2f1..befbfd0 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 758f2f10ffe6623fb55606ca2e9c29abf89b9b4f +Subproject commit befbfd071b96dec562ac39b0d4b65e869fd094ce diff --git a/src/assets/common-assets b/src/assets/common-assets index 9cb1f83..ae7e623 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d +Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5268f27..d52e929 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit d52e92929799a1626aff66ad413c6db2be521555 From b62adbb0dfa612bd5b5f7d98e28d95708441146e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 30 Aug 2023 12:29:02 +0300 Subject: [PATCH 11/20] Add hasStickyHeader in Mobile for home page and support. Fix missing asset in get-started. Close canvas on click of get-started button. --- src/app/app-routing.module.ts | 5 +- src/app/app.component.ts | 4 +- .../get-started/get-started.component.html | 4 +- src/app/openaireLibrary | 2 +- .../monitor-assets/get-started/steps.svg | 159 ++++++++++++++++++ src/assets/openaire-theme | 2 +- 6 files changed, 168 insertions(+), 8 deletions(-) create mode 100644 src/assets/monitor-assets/get-started/steps.svg diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 482faad..05f050b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,7 +3,7 @@ import {RouterModule, Routes} from '@angular/router'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; const routes: Routes = [ - {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)}, + {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}}, {path: 'about/learn-how', redirectTo: 'about', pathMatch: 'full'}, { path: 'about', @@ -11,7 +11,8 @@ const routes: Routes = [ }, { path: 'support', - loadChildren: () => import('./support/support.module').then(m => m.SupportModule) + loadChildren: () => import('./support/support.module').then(m => m.SupportModule), + data: {hasStickyHeaderOnMobile: true} }, { path: 'methodology', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 857501a..999ed5a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -29,11 +29,11 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config template: `
-
- Get Started + Get Started
Get Started diff --git a/src/app/get-started/get-started.component.html b/src/app/get-started/get-started.component.html index c19e56d..1a5d67e 100644 --- a/src/app/get-started/get-started.component.html +++ b/src/app/get-started/get-started.component.html @@ -62,7 +62,7 @@
- +
@@ -114,7 +114,7 @@ Learn More - +
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/monitor-assets/get-started/steps.svg b/src/assets/monitor-assets/get-started/steps.svg new file mode 100644 index 0000000..1b539a0 --- /dev/null +++ b/src/assets/monitor-assets/get-started/steps.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index d52e929..9807799 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit d52e92929799a1626aff66ad413c6db2be521555 +Subproject commit 98077993a6eba7998b18fbfdee223409f0829ae6 From db14d732e47385487edcdb85232029b42bdbc0c9 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 15 Sep 2023 13:18:04 +0300 Subject: [PATCH 12/20] Update types/node to version 16 --- package.json | 2 +- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index b165f6f..3ffbf9f 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,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", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f2a2c52..11d0be4 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f2a2c52d435629bad2c9af68240d76dfefe4dfd9 +Subproject commit 11d0be4ffd6649189f87c91aed1c2d47c5d9b2c8 diff --git a/src/assets/common-assets b/src/assets/common-assets index ae7e623..9e58421 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 +Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 9807799..3a4aa92 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 98077993a6eba7998b18fbfdee223409f0829ae6 +Subproject commit 3a4aa92c441467994a45a2c6a4f0c21202945404 From cf47c65341b64a64ec074470aeee4bf66948d506 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 15 Sep 2023 14:40:06 +0300 Subject: [PATCH 13/20] Change tablet section with new mocks --- src/app/home/home.component.html | 1053 ++++++++++++++++-------------- src/app/home/home.component.less | 15 +- 2 files changed, 556 insertions(+), 512 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 40607a0..6c3b5f4 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,558 +1,595 @@ - -
-

- Monitor, discover and understand. -

-

Track your organization’s research output in a comprehensive manner. Identify research pathways across key dimensions with granular and timely indicators.

-
-
-

- Enhance open science uptake. -

-

Work with the Open Science expert community for open and transparent metrics. Discover Open Science costs and trends for your organization. See how you fare in the European Open Science Cloud.

-
-
-

- Turn data into actionable insights. -

-

See what works and what not, reveal hidden potential. Measure research impact, discover trends, connections and collaborations to improve and optimize your future actions.

-
+ +
+
+ Monitor, discover and understand. +
+
Track your organization’s research output in a comprehensive manner. Identify research pathways across key + dimensions with granular and timely indicators.
+
+
+
+ Enhance open science uptake. +
+
Work with the Open Science expert community for open and transparent metrics. Discover Open Science costs and + trends for your organization. See how you fare in the European Open Science Cloud.
+
+
+
+ Turn data into actionable insights. +
+
See what works and what not, reveal hidden potential. Measure research impact, discover trends, connections + and collaborations to improve and optimize your future actions.
+
-
-
-
-
-

- A new era of monitoring research. -

-
-
Discover, track and understand trends and impact
-
pathways for your organization.
-
Make informed decisions.
-
-
- Get Started -
-
-
-
- - -
-
-
-
-
-
-
-
- Funders. Research Institutions. Research Initiatives. -

Simplify research monitoring & evaluation.

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

+ A new era of monitoring research. +

+
+
Discover, track and understand trends and impact
+
pathways for your organization.
+
Make informed decisions.
+
+
+ Get + Started +
-
-
-
-
-
- +
+
+ + +
-
-
-
-
-
-
-
-

- Tap into the OpenAIRE Graph. -

-
- The OpenAIRE Graph is one of the largest open scholarly record collections - worldwide, key in fostering Open Science and establishing its practices in the daily - research activities. Conceived as a public and transparent good, populated out of data - sources trusted by scientists, the Graph aims at bringing discovery, monitoring, and - assessment of science back in the hands of the scientific community. +
+
+
+ Funders. Research Institutions. Research Initiatives. +

Simplify research
monitoring & evaluation.

+
+
+
+ ipad +
+
+
+ +
+
+
-
-
-
- - -
-
-
{{(numberSize.number|number) + numberSize.size}}
-
{{name}}
-
-
- - -
- +
+
+

+ Tap into the OpenAIRE Graph. +

+
+ The OpenAIRE Graph is one of the largest open scholarly record collections + worldwide, key in fostering Open Science and establishing its practices in the daily + research activities. Conceived as a public and transparent good, populated out of data + sources trusted by scientists, the Graph aims at bringing discovery, monitoring, and + assessment of science back in the hands of the scientific community. +
+
+
+
+ + +
+
+
{{(numberSize.number|number) + numberSize.size}}
+
{{name}}
+
+
+ + +
+ - -
-
- + - -
-
- + - -
-
- + - -
-
- + - -
-
-
-
-
-
-
-
-

Openness. Usability. Replicability. Trust.

-
Learn and work with a thriving community behind you.
- + +
+
+
+
+
+
+
+
+

Openness. Usability. Replicability. Trust.

+
Learn and work with a thriving community behind you.
+ Learn More - -
-
-
-
-
- +
-
Comprehensive outlook
-
- Monitor is built on the OpenAIRE Graph. A global linked research graph, a shared data resource from open initiatives around the world. Our indicators cover a wide range of themes from input to impact. +
+
+
+
+ +
+
Comprehensive outlook
+
+ Monitor is built on the OpenAIRE Graph. A global linked research + graph, a shared data resource from open initiatives around the world. Our indicators cover a + wide range of themes from input to impact. +
+
+
+
+ +
+
Showcasing, monitoring, analysis
+
+ Customize your dashboard by choosing from a variety of pre-defined metrics and select which + ones to show publicly, which to invited team members, and which are still work in progress + (private). +
+
+
+
+ +
+
Transparent methodology
+
+ We base our service on Open Science principles. We rely on open data sources, and document + our algorithms for every metric and indicator we publish. +
+
+
+
+ +
+
Minimum effort to join
+
+ You only share some information with us to include in our backend aggregating and data + mining, and we deliver a view of your world. +
+
+
+
+ +
+
Tailor-made monitoring, responsive to your needs
+
+ Our experts work with you on demand in one-on-one sessions to provide additional indicators + and curate your data. +
+
+
-
-
-
- -
-
Showcasing, monitoring, analysis
-
- Customize your dashboard by choosing from a variety of pre-defined metrics and select which ones to show publicly, which to invited team members, and which are still work in progress (private).
-
-
-
- -
-
Transparent methodology
-
- We base our service on Open Science principles. We rely on open data sources, and document our algorithms for every metric and indicator we publish. -
-
-
-
- -
-
Minimum effort to join
-
- You only share some information with us to include in our backend aggregating and data mining, and we deliver a view of your world. -
-
-
-
- -
-
Tailor-made monitoring, responsive to your needs
-
- Our experts work with you on demand in one-on-one sessions to provide additional indicators and curate your data.
-
-
-
-
-
-

{{stakeholderEntities.STAKEHOLDERS}} in action.

-
- View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you. -
-
- +
+
+

{{stakeholderEntities.STAKEHOLDERS}} in action.

+
+ View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a + preview on how they work and how our service can be customized to serve you. +
+
+ Browse - -
-
- -
- -
- - - - - - -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
- - - -
-
    - -
  • -
    -
    - -
    - -
    -     - -
    - -
    -     + +
    +
    + +
    + +
    + + + + + +
    -
    -
    • -
-
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    + + + +
    +
      + +
    • +
      +
      + +
      + +
      +       + +
      + +
      +       +
      +
      +
      • +
    +
      +
      +       +
      +
      +
      + + + + +
      +

      + Need more information or a demo? Get in touch and let us show you in practice how you can apply OpenAIRE + Monitor to your needs. +

      + Contact us
      -
      -
      -
      - - - - -
      -

      - Need more information or a demo? Get in touch and let us show you in practice how you can apply OpenAIRE Monitor to your needs. -

      - Contact us -
      -
      -
      -
      -
      -

      - A new era of monitoring research. -

      -
      -
      Discover, track and understand trends and impact pathways for your organization.
      -
      Make informed decisions.
      -
      -
      -
      -
      - - - -
      -
      -
      -
      -
      - Funders. Research Institutions. Research Initiatives. -

      Simplify research monitoring & evaluation.

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

      + A new era of monitoring research. +

      +
      +
      Discover, track and understand trends and impact pathways for your organization.
      +
      Make informed decisions.
      -
      -
      -
      -
      - -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      - ipad -
      -
      - -
      +
      + + + -
      -
      -
      -
      - OpenAIRE Graph - OpenAIRE Graph -
      -
      -

      - Tap into the OpenAIRE Research Graph. -

      -
      - The OpenAIRE Graph is one of the largest open scholarly record collections - worldwide, key in fostering Open Science and establishing its practices in the daily - research activities. Conceived as a public and transparent good, populated out of data - sources trusted by scientists, the Graph aims at bringing discovery, monitoring, and - assessment of science back in the hands of the scientific community. -
      -
      -
      -
      - OpenAIRE Graph -
      -
      - - -
      -
      -
      {{(numberSize.number|number) + numberSize.size}}
      -
      {{name}}
      -
      -
      -       -       -
      - +
      +
      + Funders. Research Institutions. Research Initiatives. +

      Simplify research
      monitoring & evaluation.

      +
      +
      +
      + ipad +
      +
      + ipad +
      +
      +
      + +
      +
      +
      +
      +
      +
      + OpenAIRE Graph + OpenAIRE Graph +
      +
      +

      + Tap into the OpenAIRE Research Graph. +

      +
      + The OpenAIRE Graph is one of the largest open scholarly record collections + worldwide, key in fostering Open Science and establishing its practices in the daily + research activities. Conceived as a public and transparent good, populated out of data + sources trusted by scientists, the Graph aims at bringing discovery, monitoring, and + assessment of science back in the hands of the scientific community. +
      +
      +
      +
      + OpenAIRE Graph +
      +
      + + +
      +
      +
      {{(numberSize.number|number) + numberSize.size}}
      +
      {{name}}
      +
      +
      +       +       +
      + - -
      -
      - + - -
      -
      - + - -
      -
      - + - -
      -
      - + - -
      -
      -
      -
      -
      -
      -
      -
      -

      Openness.

      -

      Usability.

      -

      Replicability.

      -

      Trust.

      -
      Learn and work with a thriving community behind you.
      - + +
      +
      +
      +
      +
      +
      +
      + -
      -
      -
      -
      - +
      -
      Comprehensive outlook
      -
      - Monitor is built on the OpenAIRE Graph. A global linked research graph, a shared data resource from open initiatives around the world. Our indicators cover a wide range of themes from input to impact. +
      +
      +
      +
      + +
      +
      Comprehensive outlook
      +
      + Monitor is built on the OpenAIRE Graph. A global linked research + graph, a shared data resource from open initiatives around the world. Our indicators cover a + wide range of themes from input to impact. +
      +
      +
      +
      + +
      +
      Showcasing, monitoring, analysis
      +
      + Customize your dashboard by choosing from a variety of pre-defined metrics and select which + ones to show publicly, which to invited team members, and which are still work in progress + (private). +
      +
      +
      +
      + +
      +
      Transparent methodology
      +
      + We base our service on Open Science principles. We rely on open data sources, and document + our algorithms for every metric and indicator we publish. +
      +
      +
      +
      + +
      +
      Minimum effort to join
      +
      + You only share some information with us to include in our backend aggregating and data + mining, and we deliver a view of your world. +
      +
      +
      +
      + +
      +
      Tailor-made monitoring, responsive to your needs
      +
      + Our experts work with you on demand in one-on-one sessions to provide additional indicators + and curate your data. +
      +
      +
      -
      -
      -
      - -
      -
      Showcasing, monitoring, analysis
      -
      - Customize your dashboard by choosing from a variety of pre-defined metrics and select which ones to show publicly, which to invited team members, and which are still work in progress (private).
      -
      -
      -
      - -
      -
      Transparent methodology
      -
      - We base our service on Open Science principles. We rely on open data sources, and document our algorithms for every metric and indicator we publish. -
      -
      -
      -
      - -
      -
      Minimum effort to join
      -
      - You only share some information with us to include in our backend aggregating and data mining, and we deliver a view of your world. -
      -
      -
      -
      - -
      -
      Tailor-made monitoring, responsive to your needs
      -
      - Our experts work with you on demand in one-on-one sessions to provide additional indicators and curate your data.
      -
      -
      -
      -
      -
      -

      {{stakeholderEntities.STAKEHOLDERS}} in action.

      -
      - View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you. -
      -
      - +
      +
      +

      {{stakeholderEntities.STAKEHOLDERS}} in action.

      +
      + View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a + preview on how they work and how our service can be customized to serve you. +
      +
      +       Browse - -
      -
      -
      - -
      - -
      - - - - - - -
      -
        -
      • -
        -
        -
        - -
        -
        -
        -
        • -
      • -
        -
        -
        - -
        -
        -
        -
        • -
      • -
        -
        -
        - -
        -
        -
        -
        • -
      • -
        -
        -
        - -
        -
        -
        -
        • -
      -       -
      -
      -
      -

      - Need more information or a demo? -

      -
      - Get in touch and let us show you in practice how you can apply OpenAIRE Monitor to your needs. -
      - Contact us -
      -
      + +
      +
      +
      + +
      + +
      + + + + + + +
      +
        +
      • +
        +
        +
        + +
        +
        +
        +
        • +
      • +
        +
        +
        + +
        +
        +
        +
        • +
      • +
        +
        +
        + +
        +
        +
        +
        • +
      • +
        +
        +
        + +
        +
        +
        +
        • +
      +       +
      +
      +
      +

      + Need more information or a demo? +

      +
      + Get in touch and let us show you in practice how you can apply OpenAIRE Monitor to your needs. +
      + Contact us +
      +
      diff --git a/src/app/home/home.component.less b/src/app/home/home.component.less index b78d67a..05b6538 100644 --- a/src/app/home/home.component.less +++ b/src/app/home/home.component.less @@ -6,12 +6,19 @@ background-color: @global-inverse-color; } +.tablet-section { + background-image:linear-gradient(180deg, @global-inverse-color 0%, @global-muted-background 100%); + background-repeat: no-repeat; + background-position: top; + background-size: cover; +} + @media only screen and (min-width: @breakpoint-medium) { - .monitor-dark-logo-background { - background-image: url("~src/assets/monitor-assets/home/monitor-dark-logo.svg"); + .tablet-section { + background-image:url("~src/assets/monitor-assets/home/monitor-dark-logo.svg"), linear-gradient(180deg, @global-inverse-color 0%, @global-muted-background 100%); background-repeat: no-repeat; - background-position: left 95%; - background-size: 65%; + background-position: -5% 95%, top; + background-size: 60%, cover; } } From a8faaf98ad27ab5cdb22e8a5ae0b705bb7f0cb92 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 15 Sep 2023 14:43:17 +0300 Subject: [PATCH 14/20] Update readme with angular version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b48bac9..7fc7da7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Monitor -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 16.2.4. ## Install packages From 4827140fd48918ef08589c76a15411b239ad34f4 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 15 Sep 2023 15:20:48 +0300 Subject: [PATCH 15/20] Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 11d0be4..a2f52cf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 11d0be4ffd6649189f87c91aed1c2d47c5d9b2c8 +Subproject commit a2f52cf40ee28cb950dd789cd100fdbba16eb4c0 From f31e1ce23c73f5b8dd20771fe2e5a2266483046d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 16 Oct 2023 20:21:12 +0300 Subject: [PATCH 16/20] Update libraries before beta deplooy --- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a2f52cf..8d65222 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a2f52cf40ee28cb950dd789cd100fdbba16eb4c0 +Subproject commit 8d6522270c26451c7474630fc71e7fa3e31c5c0e diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 3a4aa92..2dadcf8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 3a4aa92c441467994a45a2c6a4f0c21202945404 +Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 From 37aff3ed4d7daa04ba405014f2755212d1d49af1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 30 Oct 2023 12:17:16 +0200 Subject: [PATCH 17/20] [develp]: 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 8d65222..aaf970f 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 8d6522270c26451c7474630fc71e7fa3e31c5c0e +Subproject commit aaf970fae4014b0d546fdbf677c6c8a9b56c3e83 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9e58421..6bb1e61 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2dadcf8..5e8c1ad 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 +Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 From 5a36ee219e03e647d4929ec5363196827f2a283f Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 30 Oct 2023 16:57:54 +0200 Subject: [PATCH 18/20] [develop | DONE | CHANGED]: Revert version of UIkit to version 3.16.14 because of parallax. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ffbf9f..7afb7cb 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.16.24", + "uikit": "3.16.14", "zone.js": "~0.13.1" }, "devDependencies": { From 7e9c42eff43de16627bc7dc5511f0d3070eeeedf Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 8 Nov 2023 13:49:54 +0200 Subject: [PATCH 19/20] [develop | DONE]: Removed deleted properties. Update libraries. Revert version of UIKit to version 3.16.24 --- package.json | 2 +- src/app/openaireLibrary | 2 +- src/environments/environment.beta.ts | 6 ------ src/environments/environment.prod.ts | 6 ------ src/environments/environment.ts | 6 ------ 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 7afb7cb..3ffbf9f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.16.14", + "uikit": "3.16.24", "zone.js": "~0.13.1" }, "devDependencies": { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index aaf970f..3aff9ee 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit aaf970fae4014b0d546fdbf677c6c8a9b56c3e83 +Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index d2ff8b9..d486b5e 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -5,7 +5,6 @@ export let properties: EnvProperties = { enablePiwikTrack: true, useCache: true, showContent: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", @@ -28,11 +27,6 @@ export let properties: EnvProperties = { r3DataURL: "http://service.re3data.org/repository/", 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", utilsService: "https://demo.openaire.eu/utils-service", vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 6865ba8..87e21bc 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -5,7 +5,6 @@ export let properties: EnvProperties = { enablePiwikTrack: true, useCache: true, showContent: true, - framesAPIURL: "https://www.openaire.eu/stats3/", statisticsAPIURL: "https://services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "", @@ -28,11 +27,6 @@ export let properties: EnvProperties = { r3DataURL: "http://service.re3data.org/repository/", 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", utilsService: "https://explore.openaire.eu/utils-service", vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1e35bb3..88e3d67 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,7 +5,6 @@ export let properties: EnvProperties = { enablePiwikTrack: false, useCache: false, showContent: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "http://88.197.53.71:8080/stats-api/", @@ -28,11 +27,6 @@ export let properties: EnvProperties = { r3DataURL: "http://service.re3data.org/repository/", 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", utilsService: "http://mpagasas.di.uoa.gr:8000", vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", From 37046a25fcb0b5f8faf8248f7c08351eed7004d7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 8 Nov 2023 13:50:39 +0200 Subject: [PATCH 20/20] [develop | TEMP]: Remove uk-parallax from home page until is fixed from browsers. --- src/app/home/home.component.html | 10 +++++----- src/app/home/home.component.ts | 22 ---------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 6c3b5f4..f2e4218 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -43,7 +43,7 @@
      - +
      @@ -72,10 +72,10 @@
      -

      +

      Tap into the OpenAIRE Graph.

      -
      +
      The OpenAIRE Graph is one of the largest open scholarly record collections worldwide, key in fostering Open Science and establishing its practices in the daily research activities. Conceived as a public and transparent good, populated out of data @@ -83,7 +83,7 @@ assessment of science back in the hands of the scientific community.
      -
      +
      @@ -315,7 +315,7 @@
      + src="assets/monitor-assets/home/monitor.jpg">
      diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 131fbf5..a1ad4bc 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -70,13 +70,11 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv private subscriptions = []; private mutationObserver: MutationObserver; private user: User; - @ViewChildren('scrolling_element') elements: QueryList; @ViewChild('contact') contact: ElementRef; isMobile: boolean = false; isServer: boolean; constructor( - private route: ActivatedRoute, private _router: Router, private _meta: Meta, private _title: Title, @@ -165,26 +163,6 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv if(this.contact) { intersectionObserver.observe(this.contact.nativeElement); } - this.mutationObserver = new MutationObserver(entries => { - entries.forEach(entry => { - if (entry.attributeName === 'style') { - let opacities: number[] = this.elements.map(element => +element.nativeElement.style.opacity); - let active: number = opacities.indexOf(Math.max(...opacities)); - this.elements.forEach((element, index) => { - if (index === active) { - element.nativeElement.classList.remove('uk-disabled'); - } else { - element.nativeElement.classList.add('uk-disabled'); - } - }) - } - }) - }); - this.elements.changes.subscribe(() => { - this.elements.forEach(element => { - this.mutationObserver.observe(element.nativeElement, {attributes: true}); - }); - }); this.subscriptions.push(intersectionObserver); }