MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

Merge from develop

This commit is contained in:
Konstantinos Triantafyllou 2024-10-07 15:40:19 +03:00
parent c3fc0cfb14 0b5a6dfd7b
commit 2b88cc5df3
10 changed files with 118 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

4
src/app/app-routing.module.ts
View File

@ -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),

3
src/app/app.component.ts
View File

@ -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")
);

2
src/app/home/home.component.ts
View File

@ -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;

2
src/app/my-stakeholders/my-stakeholders.component.ts
View File

@ -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);

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 9b1e662f4b64d4f4c6eb7a4d82657a0fe3ea8391
Subproject commit 59cb69736c4efdbdffa790e8da7a0c31171737a6

2
src/app/search-stakeholders/search-stakeholders.component.ts
View File

@ -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);

82
src/app/subscriptions/subscriptions.component.ts Normal file
View File

@ -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: `
<div>
<div class="uk-position-relative">
<div class="uk-background-muted">
<div class="uk-container uk-container-large uk-section uk-section-small">
<div class="uk-padding-small uk-padding-remove-horizontal">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
<div class="uk-flex uk-flex-column uk-flex-center uk-margin-bottom"
uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-fade; delay: 250">
<h1 class="uk-margin-medium-top" uk-scrollspy-class>Subscriptions<span
class="uk-text-primary">.</span></h1>
<div uk-scrollspy-class>
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.
</div>
</div>
</div>
</div>
</div>
<helper *ngIf="divContents" [texts]="divContents.plans"></helper>
</div>
`
})
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;
}));
}
}

23
src/app/subscriptions/subscriptions.module.ts Normal file
View File

@ -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 {}

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b