From 47875e7b954ad80d8548b4a233c16a7f32d7c686 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Wed, 24 Jul 2024 12:00:09 +0300 Subject: [PATCH 1/5] [develop | DONE] initial commit before upgrading to angular-17 --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 92f799e..7bb45fe 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 92f799e63b8f2075278faf460852776e5fbe5704 +Subproject commit 7bb45fefa04f7dea80d7679b507030fb22ac7cba From 237d3596c2c6c1f373a2d7f28b976b84abe143a3 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 9 Sep 2024 17:34:13 +0300 Subject: [PATCH 2/5] Updating openaireLibrary & common-assets --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 7bb45fe..49528c9 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 7bb45fefa04f7dea80d7679b507030fb22ac7cba +Subproject commit 49528c98746591fe519c49944119274fbb97efb3 diff --git a/src/assets/common-assets b/src/assets/common-assets index 6bc0212..038684a 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2 +Subproject commit 038684a0dca02700164e467abd390bbd865df3d9 From d6ebeb9223e12d14a8f7102f44185c64c74c9522 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 13 Sep 2024 12:34:42 +0300 Subject: [PATCH 3/5] [develop | DONE | CHANGED] monitorServiceAPIURL property: remove from function parameters (moved to service files directly) --- src/app/home/home.component.ts | 2 +- src/app/my-stakeholders/my-stakeholders.component.ts | 2 +- src/app/openaireLibrary | 2 +- src/app/search-stakeholders/search-stakeholders.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 1e77269..9dcb3c2 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -249,7 +249,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv public getStakeholders() { this.loading = true; this.status = this.errorCodes.LOADING; - this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe( + this.subscriptions.push(this._stakeholderService.getStakeholders().subscribe( stakeholders => { if (!stakeholders || stakeholders.length == 0) { this.status = this.errorCodes.NONE; diff --git a/src/app/my-stakeholders/my-stakeholders.component.ts b/src/app/my-stakeholders/my-stakeholders.component.ts index d6937b6..ff7c788 100644 --- a/src/app/my-stakeholders/my-stakeholders.component.ts +++ b/src/app/my-stakeholders/my-stakeholders.component.ts @@ -101,7 +101,7 @@ export class MyStakeholdersComponent { this.status = this.errorCodes.LOADING; this.subscriberErrorMessage = ""; this.stakeholders = []; - this.subscriptions.push(this.stakeholderService.getMyStakeholders(properties.monitorServiceAPIURL).subscribe( + this.subscriptions.push(this.stakeholderService.getMyStakeholders().subscribe( stakeholders => { this.stakeholders = StakeholderInfo.toStakeholderInfo(stakeholders.standalone.concat(stakeholders.umbrella), this.user); this.sort(this.stakeholders); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 49528c9..1593ea6 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 49528c98746591fe519c49944119274fbb97efb3 +Subproject commit 1593ea6ed9e62931800b62f4d4d4787228043d51 diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts index ec636b8..6fc5740 100644 --- a/src/app/search-stakeholders/search-stakeholders.component.ts +++ b/src/app/search-stakeholders/search-stakeholders.component.ts @@ -136,7 +136,7 @@ export class SearchStakeholdersComponent { this.totalResults = StakeholderInfo.toStakeholderInfo(this.totalResults, this.user); this._getResults(params); } else { - this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe( + this.subscriptions.push(this._stakeholderService.getStakeholders().subscribe( data => { this.totalResults = StakeholderInfo.toStakeholderInfo(data, this.user); this._getResults(params); From e540ab59c882c6d222aeefd44462a29996ecdeda Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 7 Oct 2024 15:27:28 +0300 Subject: [PATCH 4/5] [develop]: Add subscriptions page --- src/app/app-routing.module.ts | 4 + src/app/app.component.ts | 3 + src/app/openaireLibrary | 2 +- .../subscriptions/subscriptions.component.ts | 82 +++++++++++++++++++ src/app/subscriptions/subscriptions.module.ts | 23 ++++++ 5 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 src/app/subscriptions/subscriptions.component.ts create mode 100644 src/app/subscriptions/subscriptions.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 05f050b..1814f0d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -9,6 +9,10 @@ const routes: Routes = [ path: 'about', loadChildren: () => import('./about/about.module').then(m => m.AboutModule) }, + { + path: 'subscriptions', + loadChildren: () => import('./subscriptions/subscriptions.module').then(m => m.SubscriptionsModule) + }, { path: 'support', loadChildren: () => import('./support/support.module').then(m => m.SupportModule), diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 2708dc1..da1f30a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -213,6 +213,9 @@ export class AppComponent { new MenuItem("", "Blog", "https://blogs.openaire.eu/", "", false, [], [], {}), new MenuItem("", "Contact us", "https://beta.openaire.eu/contact-us", "", false, [], [], {}) ]; + this.menuItems.push( + new MenuItem("subscriptions", "Subscriptions", "", "/subscriptions", false, [], null, {}, null, null) + ); this.menuItems.push( new MenuItem("contact-us", "Contact us", "", "/contact-us", false, [], null, {}, null, null, "uk-hidden@m") ); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1593ea6..bef6dda 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1593ea6ed9e62931800b62f4d4d4787228043d51 +Subproject commit bef6dda2c21e5ef4f40352c34ebd2b62d0ad84a6 diff --git a/src/app/subscriptions/subscriptions.component.ts b/src/app/subscriptions/subscriptions.component.ts new file mode 100644 index 0000000..5edda76 --- /dev/null +++ b/src/app/subscriptions/subscriptions.component.ts @@ -0,0 +1,82 @@ +import {Component} from "@angular/core"; +import {Router} from '@angular/router'; +import {Meta, Title} from '@angular/platform-browser'; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; +import {Subscriber} from "rxjs"; +import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; +import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; +import {properties} from "../../environments/environment"; +import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component"; +import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; + +@Component({ + selector: 'subscriptions', + template: ` +
+
+
+
+
+ +
+
+

Subscriptions.

+
+ As demand for our services grows, along with the features included in each of them, + traditional sources of funding may not be sufficient. By introducing subscription fees, we + can ensure their long-term sustainability; by achieving financial stability we can + continue to invest in better resources, technology, and talent, thereby increasing our + capacity to deliver impactful programs and services to all interested parties. + Subscriptions support immediate operational needs, while at the same time enabling us to + scale our efforts and make a greater, more sustainable difference in the communities we + serve. +
+
+
+
+
+ +
+ ` +}) +export class SubscriptionsComponent extends BaseComponent { + public divContents = null; + + public title: string = "OpenAIRE - Monitor | Subscriptions"; + public description: string = "OpenAIRE - Monitor | Subscriptions"; + public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Subscriptions'}]; + public properties: EnvProperties = properties; + subscriptions = []; + + constructor( + protected _router: Router, + protected _meta: Meta, + protected _title: Title, + protected seoService: SEOService, + protected _piwikService: PiwikService, + private helper: HelperService) { + super(); + } + + ngOnInit() { + this.setMetadata(); + this.getDivContents(); + } + + ngOnDestroy() { + this.subscriptions.forEach(subscription => { + if (subscription instanceof Subscriber) { + subscription.unsubscribe(); + } + }); + } + + private getDivContents() { + this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => { + this.divContents = contents; + })); + } +} diff --git a/src/app/subscriptions/subscriptions.module.ts b/src/app/subscriptions/subscriptions.module.ts new file mode 100644 index 0000000..7aad149 --- /dev/null +++ b/src/app/subscriptions/subscriptions.module.ts @@ -0,0 +1,23 @@ +import {CommonModule} from "@angular/common"; +import {NgModule} from "@angular/core"; +import {RouterModule} from "@angular/router"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {SubscriptionsComponent} from "./subscriptions.component"; +import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module"; +import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; +import {SliderTabsModule} from "../openaireLibrary/sharedComponents/tabs/slider-tabs.module"; +import {HelperModule} from "../openaireLibrary/utils/helper/helper.module"; +import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; + +@NgModule({ + declarations: [SubscriptionsComponent], + imports: [CommonModule, RouterModule.forChild([ + { + path: '', + component: SubscriptionsComponent + } + ]), BreadcrumbsModule, SliderTabsModule, HelperModule, IconsModule], + exports: [SubscriptionsComponent], + providers: [PreviousRouteRecorder, PiwikService] +}) +export class SubscriptionsModule {} From 0b5a6dfd7becdefe86f3186e6636124518533595 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 7 Oct 2024 15:30:36 +0300 Subject: [PATCH 5/5] Update version to 1.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3a63672..fb72882 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monitor", - "version": "1.0.3", + "version": "1.0.4", "scripts": { "ng": "ng", "start": " ng serve --port 4500 --disable-host-check --host 0.0.0.0",