From 10875b78873a46d857b74bdea681438615dfba2d Mon Sep 17 00:00:00 2001 From: "sofia.baltzi" Date: Tue, 27 Feb 2018 10:25:34 +0000 Subject: [PATCH] Add communities.service and communityInfo git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@50940 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../communities/communities.component.html | 67 ++++++----------- src/app/communities/communities.component.ts | 34 +++++++-- src/app/communities/communities.module.ts | 3 +- src/app/communities/communities.service.ts | 73 +++++++++++++++++++ src/app/communities/communityInfo.ts | 7 ++ 5 files changed, 131 insertions(+), 53 deletions(-) create mode 100644 src/app/communities/communities.service.ts create mode 100644 src/app/communities/communityInfo.ts diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index a233010..2c5705c 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -20,53 +20,30 @@ -
-
- -
-
-
- A logo goes here -
-
-

- EGI Federation

-

EGI is a federated e-Infrastructure set up to provide advanced computing services for research and innovation. - -The EGI e-infrastructure is publicly-funded and comprises hundreds of data centres and cloud providers spread across Europe and worldwide.

- Subscribe -
+
+
+
+
+
+ +
+ A logo goes here
-
- - -
-
-
- A logo goes here -
-
-

Environment and Economy Research Community

-

the national/EU node of the United Nations Sustainable Development Solutions Network sets out to build an infrastructure to gather all publications, data (in repositories and in Public Sector Information portals), and link them to EU and national funding

- Subscribe -
+ +
+ -
- -
-
-
- A logo goes here -
-
-

Marine environmental science

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. -

- Subscribe -
+ +

{{item.description}}

+ Subscribe +
- +
+
-
+
diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index 7f297a7..0ce8bde 100644 --- a/src/app/communities/communities.component.ts +++ b/src/app/communities/communities.component.ts @@ -10,6 +10,7 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {Meta} from '../openaireLibrary/sharedComponents/metaService'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; +import {CommunitiesService} from './communities.service'; @Component({ selector: 'communities', @@ -22,11 +23,13 @@ export class CommunitiesComponent { public pageTitle = "OpenAIRE" properties:EnvProperties; + public communitiesResults = null; + constructor ( private route: ActivatedRoute, private _router: Router, - private location: Location, private _meta: Meta,private _piwikService:PiwikService, + private location: Location, private _meta: Meta,private _piwikService:PiwikService, private _communitiesService:CommunitiesService, private config: ConfigurationService ) { @@ -54,13 +57,30 @@ properties:EnvProperties; } }); - } - public ngOnDestroy() { - if(this.piwiksub){ - this.piwiksub.unsubscribe(); - } + + // waiting... for response from Claudio + // this._communitiesService.getResults('https://dev-openaire.d4science.org/openaire/community/communities').subscribe( + // communitiesResults => { + // this.communitiesResults = communitiesResults; + // console.log(communitiesResults); + // }); + + // this is a draft + this._communitiesService.getResults('http://rudie.di.uoa.gr:8080/uoa-admin-tools/mock/communities/').subscribe( + communitiesResults => { + this.communitiesResults = communitiesResults; + console.log(communitiesResults); + }); + + } - } + public ngOnDestroy() { + if(this.piwiksub){ + this.piwiksub.unsubscribe(); + } + + + } } diff --git a/src/app/communities/communities.module.ts b/src/app/communities/communities.module.ts index cde8c86..980613b 100644 --- a/src/app/communities/communities.module.ts +++ b/src/app/communities/communities.module.ts @@ -9,6 +9,7 @@ import{CommunitiesComponent} from './communities.component'; import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {CommunitiesService} from './communities.service'; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {Meta} from '../openaireLibrary/sharedComponents/metaService'; @@ -22,7 +23,7 @@ import {ConfigurationService} from '../openaireLibrary/utils/configuration/confi CommunitiesComponent ], providers:[ - FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta, PiwikService + FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta, PiwikService, CommunitiesService ], exports: [ CommunitiesComponent diff --git a/src/app/communities/communities.service.ts b/src/app/communities/communities.service.ts new file mode 100644 index 0000000..6781b08 --- /dev/null +++ b/src/app/communities/communities.service.ts @@ -0,0 +1,73 @@ +import { Injectable } from '@angular/core'; +import { Http, Response, Headers, RequestOptions } from '@angular/http'; +import { Observable } from 'rxjs/Rx'; + +import { CommunityInfo } from './communityInfo'; + +@Injectable() +export class CommunitiesService { + + constructor(private http:Http) { + } + + getResults(url: string) { + return this.http.get(url).map(res => res.json()).map(res => this.parseResults(res)); + } + + // this is for https://dev-openaire.d4science.org/openaire/community/communities + // parseResults(data: any): CommunityInfo[] { + // let communities: CommunityInfo[] = []; + // + // let length = Array.isArray(data) ? data.length :1; + // + // for (let i=0; i