From 295bc21b4b2646a596197f5d24ac9d090ddb5eaf Mon Sep 17 00:00:00 2001 From: "sofia.baltzi" Date: Wed, 7 Mar 2018 11:07:19 +0000 Subject: [PATCH] Add connect/community and results directories, Move community.service, communityInfo and resultInfo in openaireLibrary git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51075 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.ts | 2 +- src/app/app.module.ts | 2 +- src/app/communities/communities.service.ts | 2 +- src/app/community/community.component.ts | 2 +- src/app/community/community.module.ts | 2 +- src/app/searchEntries/results/resultInfo.ts | 9 -- .../results/results.component.ts | 4 +- .../searchEntries/searchEntries.service.ts | 4 +- src/app/statistics/statistics.component.ts | 2 +- src/app/statistics/statistics.module.ts | 2 +- src/app/utils/communityInfo.ts | 11 -- src/app/utils/services/community.service.ts | 108 ------------------ 12 files changed, 11 insertions(+), 139 deletions(-) delete mode 100644 src/app/searchEntries/results/resultInfo.ts delete mode 100644 src/app/utils/communityInfo.ts delete mode 100644 src/app/utils/services/community.service.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 41a585c..34954d3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,7 @@ import {ActivatedRoute} from '@angular/router'; import { EnvProperties} from './openaireLibrary/utils/properties/env-properties'; import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; -import {CommunityService} from "./utils/services/community.service"; +import {CommunityService} from "./openaireLibrary/connect/community/community.service"; @Component({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 115a12c..3c4d3cf 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -21,7 +21,7 @@ import { ErrorModule} from './openaireLibrary/error/error.module'; import { OpenaireErrorPageComponent } from './error/errorPage.component'; import { AppRoutingModule } from './app-routing.module'; -import { CommunityService } from './utils/services/community.service'; +import { CommunityService } from './openaireLibrary/connect/community/community.service'; import { CommunitiesService } from './communities/communities.service'; //import { LibSearchProjectsModule } from './searchPages/simple/searchProjects.module'; diff --git a/src/app/communities/communities.service.ts b/src/app/communities/communities.service.ts index 470e8da..6e7fb9b 100644 --- a/src/app/communities/communities.service.ts +++ b/src/app/communities/communities.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Http, Response, Headers, RequestOptions } from '@angular/http'; import { Observable } from 'rxjs/Rx'; -import { CommunityInfo } from '../utils/communityInfo'; +import { CommunityInfo } from '../openaireLibrary/connect/community/communityInfo'; @Injectable() export class CommunitiesService { diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index 74c2b8c..9c0dd34 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -7,7 +7,7 @@ import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; import {Properties} from '../utils/properties'; -import {CommunityService} from "../utils/services/community.service"; +import {CommunityService} from "../openaireLibrary/connect/community/community.service"; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {Meta} from '../openaireLibrary/sharedComponents/metaService'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index 7e3444a..cbff2ec 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -11,7 +11,7 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {Meta} from '../openaireLibrary/sharedComponents/metaService'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import {SearchEntriesService} from '../searchEntries/searchEntries.service'; -import { CommunityService } from '../utils/services/community.service'; +import { CommunityService } from '../openaireLibrary/connect/community/community.service'; import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; diff --git a/src/app/searchEntries/results/resultInfo.ts b/src/app/searchEntries/results/resultInfo.ts deleted file mode 100644 index cbead40..0000000 --- a/src/app/searchEntries/results/resultInfo.ts +++ /dev/null @@ -1,9 +0,0 @@ -export class ResultInfo { - title: string; - id: string; - accessRights: string; - authors: string[]; - year: string; - description: string; - type: string; -} diff --git a/src/app/searchEntries/results/results.component.ts b/src/app/searchEntries/results/results.component.ts index 529ba88..35a726b 100644 --- a/src/app/searchEntries/results/results.component.ts +++ b/src/app/searchEntries/results/results.component.ts @@ -1,6 +1,6 @@ import {Component, Input} from '@angular/core'; -import { ResultInfo } from './resultInfo'; -import { CommunityInfo } from '../../utils/communityInfo'; +import { ResultInfo } from '../../openaireLibrary/connect/results/resultInfo'; +import { CommunityInfo } from '../../openaireLibrary/connect/community/communityInfo'; @Component({ selector: 'results-comp', diff --git a/src/app/searchEntries/searchEntries.service.ts b/src/app/searchEntries/searchEntries.service.ts index a7db82b..1dbad19 100644 --- a/src/app/searchEntries/searchEntries.service.ts +++ b/src/app/searchEntries/searchEntries.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { Http, Response, Headers, RequestOptions } from '@angular/http'; import { Observable } from 'rxjs/Rx'; -import { ResultInfo } from './results/resultInfo'; -import { CommunityInfo } from '../utils/communityInfo'; +import { ResultInfo } from '../openaireLibrary/connect/results/resultInfo'; +import { CommunityInfo } from '../openaireLibrary/connect/community/communityInfo'; @Injectable() export class SearchEntriesService { diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts index b0b73c5..34e6558 100644 --- a/src/app/statistics/statistics.component.ts +++ b/src/app/statistics/statistics.component.ts @@ -8,7 +8,7 @@ import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; import {Properties} from '../utils/properties'; -import {CommunityService} from "../utils/services/community.service"; +import {CommunityService} from "../openaireLibrary/connect/community/community.service"; import {CommunitiesService} from "../communities/communities.service"; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {Meta} from '../openaireLibrary/sharedComponents/metaService'; diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts index 924f9fb..85598b2 100644 --- a/src/app/statistics/statistics.module.ts +++ b/src/app/statistics/statistics.module.ts @@ -6,7 +6,7 @@ import { RouterModule } from '@angular/router'; import{StatisticsRoutingModule} from './statistics-routing.module'; import{StatisticsComponent} from './statistics.component'; import { StatisticsService } from '../utils/services/statistics.service'; -import { CommunityService } from '../utils/services/community.service'; +import { CommunityService } from '../openaireLibrary/connect/community/community.service'; import { CommunitiesService } from '../communities/communities.service'; import {IFrameModule} from '../openaireLibrary/utils/iframe.module'; diff --git a/src/app/utils/communityInfo.ts b/src/app/utils/communityInfo.ts deleted file mode 100644 index f2f745a..0000000 --- a/src/app/utils/communityInfo.ts +++ /dev/null @@ -1,11 +0,0 @@ -export class CommunityInfo { - title: string; - shortTitle:string; - communityId: string; - queryId: string; - logoUrl: string; - description: string; - managers: string[]; - date:Date; - subjects: string[]; -} diff --git a/src/app/utils/services/community.service.ts b/src/app/utils/services/community.service.ts deleted file mode 100644 index 1ecc33e..0000000 --- a/src/app/utils/services/community.service.ts +++ /dev/null @@ -1,108 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Http, Response, Headers, RequestOptions } from '@angular/http'; -import { Observable } from 'rxjs/Rx'; - -import { ResultInfo } from '../../searchEntries/results/resultInfo'; -import { CommunityInfo } from '../communityInfo'; - -@Injectable() -export class CommunityService { - - constructor(private http:Http) { - } - - getCommunity(url: string) { - return this.http.get(url).map(res => res.json()).map(res => this.parseCommunity(res)); - } - - parseCommunity(data:any): CommunityInfo { - - let length = Array.isArray(data) ? data.length :1; - - for (let i=0; i(); - } - - let managers = resData[0].managers; - let length = Array.isArray(managers) ? managers.length : 1; - - for(let i=0; i(); - } - - let subjects = resData[0].subjects; - let length = Array.isArray(subjects) ? subjects.length : 1; - - for(let i=0; i(); - } - - let managers = resData.managers; - let length = Array.isArray(managers) ? managers.length : 1; - - for(let i=0; i(); - } - - let subjects = resData.subjects; - let length = Array.isArray(subjects) ? subjects.length : 1; - - for(let i=0; i