diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d918833..fba5bf9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; - -import {EnvironmentSpecificResolver, EnvironmentSpecificService} from 'ng-openaire-library'; -import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule} from 'ng-openaire-library'; +import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver'; +import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; import { OpenaireErrorPageComponent } from './error/errorPage.component'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a9ac663..2ea65fa 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,7 +2,9 @@ import { Component, Directive, ElementRef, Renderer, ChangeDetectionStrategy, Vi import {Observable} from 'rxjs/Observable'; import {ActivatedRoute} from '@angular/router'; -import {MenuItem, RootMenuItem, EnvironmentSpecificService, EnvProperties} from 'ng-openaire-library'; +import { EnvProperties} from './openaireLibrary/utils/properties/env-properties'; +import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; +import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; @Component({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 26b5f2c..8aa84ba 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,7 +8,15 @@ import { HttpModule } from '@angular/http'; import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; -import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule, EnvironmentSpecificResolver} from 'ng-openaire-library'; + +import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module'; +import { CookieLawModule } from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module'; + +import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module'; +import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module'; +import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver'; + +import { ErrorModule} from './openaireLibrary/error/error.module'; import { OpenaireErrorPageComponent } from './error/errorPage.component'; import { AppRoutingModule } from './app-routing.module'; diff --git a/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts index ed7b539..e798cec 100644 --- a/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts +++ b/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; -import{ PreviousRouteRecorder, IsRouteEnabled ,AdminLoginGuard} from 'ng-openaire-library'; +import{ AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/src/app/claims/claimsAdmin/claimsAdmin.module.ts index 44aafc9..d4a4380 100644 --- a/src/app/claims/claimsAdmin/claimsAdmin.module.ts +++ b/src/app/claims/claimsAdmin/claimsAdmin.module.ts @@ -3,7 +3,11 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module'; -import{ClaimsAdminModule, PreviousRouteRecorder, IsRouteEnabled ,AdminLoginGuard} from 'ng-openaire-library'; +import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module'; +import {AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; + @NgModule({ imports: [ diff --git a/src/app/claims/claimsByToken/claimsByToken-routing.module.ts b/src/app/claims/claimsByToken/claimsByToken-routing.module.ts index 2a0698a..49376c5 100644 --- a/src/app/claims/claimsByToken/claimsByToken-routing.module.ts +++ b/src/app/claims/claimsByToken/claimsByToken-routing.module.ts @@ -1,7 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireClaimsByTokenComponent } from './claimsByToken.component'; -import{ PreviousRouteRecorder, IsRouteEnabled ,LoginGuard} from 'ng-openaire-library'; + +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; + import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/claims/claimsByToken/claimsByToken.module.ts b/src/app/claims/claimsByToken/claimsByToken.module.ts index f2260f7..77faa3b 100644 --- a/src/app/claims/claimsByToken/claimsByToken.module.ts +++ b/src/app/claims/claimsByToken/claimsByToken.module.ts @@ -3,7 +3,9 @@ import { RouterModule } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; import { OpenaireClaimsByTokenComponent } from './claimsByToken.component'; //ClaimsByTokenModule, -import{ PreviousRouteRecorder, IsRouteEnabled ,LoginGuard} from 'ng-openaire-library'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; diff --git a/src/app/claims/directLinking/directLinking-routing.module.ts b/src/app/claims/directLinking/directLinking-routing.module.ts index 1aec2fe..c3b60e0 100644 --- a/src/app/claims/directLinking/directLinking-routing.module.ts +++ b/src/app/claims/directLinking/directLinking-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDirectLinkingComponent } from './directLinking.component'; -import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/claims/directLinking/directLinking.module.ts b/src/app/claims/directLinking/directLinking.module.ts index d5178a4..34e279d 100644 --- a/src/app/claims/directLinking/directLinking.module.ts +++ b/src/app/claims/directLinking/directLinking.module.ts @@ -2,8 +2,11 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { OpenaireDirectLinkingComponent } from './directLinking.component'; -import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard, DirectLinkingModule} from 'ng-openaire-library'; +import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module'; import {DirectLinkingRoutingModule} from './directLinking-routing.module'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ diff --git a/src/app/claims/linking/linking-routing.module.ts b/src/app/claims/linking/linking-routing.module.ts index 70cfe73..e0c904e 100644 --- a/src/app/claims/linking/linking-routing.module.ts +++ b/src/app/claims/linking/linking-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireLinkingComponent } from './linkingGeneric.component'; -import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/claims/linking/linkingGeneric.module.ts b/src/app/claims/linking/linkingGeneric.module.ts index a25deb3..95ae3ed 100644 --- a/src/app/claims/linking/linkingGeneric.module.ts +++ b/src/app/claims/linking/linkingGeneric.module.ts @@ -3,7 +3,10 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import {OpenaireLinkingComponent} from './linkingGeneric.component'; import {LinkingRoutingModule} from './linking-routing.module'; -import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard, LinkingGenericModule} from 'ng-openaire-library'; +import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ diff --git a/src/app/claims/myClaims/myClaims-routing.module.ts b/src/app/claims/myClaims/myClaims-routing.module.ts index 9a2c678..1574648 100644 --- a/src/app/claims/myClaims/myClaims-routing.module.ts +++ b/src/app/claims/myClaims/myClaims-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireMyClaimsComponent } from './myClaims.component'; -import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/claims/myClaims/myClaims.module.ts b/src/app/claims/myClaims/myClaims.module.ts index b3e793f..8402be1 100644 --- a/src/app/claims/myClaims/myClaims.module.ts +++ b/src/app/claims/myClaims/myClaims.module.ts @@ -3,7 +3,10 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { OpenaireMyClaimsComponent } from './myClaims.component'; import { MyClaimsRoutingModule } from './myClaims-routing.module'; -import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard, MyClaimsModule} from 'ng-openaire-library'; +import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module'; +import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ diff --git a/src/app/communities/communities-routing.module.ts b/src/app/communities/communities-routing.module.ts index 39867b7..4c792f3 100644 --- a/src/app/communities/communities-routing.module.ts +++ b/src/app/communities/communities-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{CommunitiesComponent} from './communities.component'; -import {FreeGuard,PreviousRouteRecorder} from 'ng-openaire-library'; + +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index 2659669..7f297a7 100644 --- a/src/app/communities/communities.component.ts +++ b/src/app/communities/communities.component.ts @@ -3,10 +3,12 @@ import {Observable} from 'rxjs/Observable'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; import "rxjs/add/observable/zip"; -import { Meta, MetaDefinition, ConfigurationService, EnvProperties} from 'ng-openaire-library'; - -import { ErrorCodes, RouterHelper, PiwikService} from 'ng-openaire-library'; +import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; +import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; import {Properties} from '../utils/properties'; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import {Meta} from '../openaireLibrary/sharedComponents/metaService'; +import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; @Component({ @@ -48,7 +50,7 @@ properties:EnvProperties; var url = data.envSpecific.baseLink+this._router.url this._meta.updateProperty("og:url", url); if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe(); + this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe(); } }); diff --git a/src/app/communities/communities.module.ts b/src/app/communities/communities.module.ts index fe45693..cde8c86 100644 --- a/src/app/communities/communities.module.ts +++ b/src/app/communities/communities.module.ts @@ -5,11 +5,14 @@ import { RouterModule } from '@angular/router'; import{CommunitiesRoutingModule} from './communities-routing.module'; import{CommunitiesComponent} from './communities.component'; -import {PiwikService} from 'ng-openaire-library'; + +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -import {Meta, ConfigurationService, FreeGuard, PreviousRouteRecorder,} from 'ng-openaire-library'; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import {Meta} from '../openaireLibrary/sharedComponents/metaService'; +import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, diff --git a/src/app/community/community-routing.module.ts b/src/app/community/community-routing.module.ts index 65a6310..a3f8003 100644 --- a/src/app/community/community-routing.module.ts +++ b/src/app/community/community-routing.module.ts @@ -2,7 +2,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{CommunityComponent} from './community.component'; -import {FreeGuard,PreviousRouteRecorder} from 'ng-openaire-library'; +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index f9da344..c1bd1dd 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -3,11 +3,14 @@ import {Observable} from 'rxjs/Observable'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; import "rxjs/add/observable/zip"; -import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library'; +import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; +import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; -import { ErrorCodes, RouterHelper, PiwikService, EnvProperties} from 'ng-openaire-library'; import {Properties} from '../utils/properties'; import {CommunityService} from "./community.service"; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import {Meta} from '../openaireLibrary/sharedComponents/metaService'; +import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; //import { PublicationInfo } from '../../publicationInfo'; @@ -21,9 +24,9 @@ export class CommunityComponent { public pageTitle = "OpenAIRE" - public publications=[]; - public reasearchData=[]; - public software=[]; + public publications; + public reasearchData; + public software; public publicationsInfo=[]; public researchDataInfo=[]; public softwareInfo=[]; @@ -60,7 +63,7 @@ export class CommunityComponent { var url = data.envSpecific.baseLink+this._router.url this._meta.updateProperty("og:url", url); if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe(); + this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe(); } }); diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index 4ab8e2c..698873a 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -5,10 +5,13 @@ import { RouterModule } from '@angular/router'; import{CommunityRoutingModule} from './community-routing.module'; import{CommunityComponent} from './community.component'; -import {PiwikService} from 'ng-openaire-library'; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import {Meta} from '../openaireLibrary/sharedComponents/metaService'; +import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {Meta, ConfigurationService, FreeGuard, PreviousRouteRecorder,} from 'ng-openaire-library'; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, diff --git a/src/app/deposit/datasets/depositBySubject.component.ts b/src/app/deposit/datasets/depositBySubject.component.ts deleted file mode 100644 index ba744b5..0000000 --- a/src/app/deposit/datasets/depositBySubject.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import { Router } from '@angular/router'; - - - -@Component({ - selector: 'openaire-deposit-by-subject', - template: ` - - - ` -}) - -export class OpenaireDepositBySubjectComponent { - -} diff --git a/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts b/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts index 1009d1e..d49a204 100644 --- a/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts +++ b/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component'; -import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/deposit/datasets/depositBySubjectResults.module.ts b/src/app/deposit/datasets/depositBySubjectResults.module.ts index d4aa85f..63815f7 100644 --- a/src/app/deposit/datasets/depositBySubjectResults.module.ts +++ b/src/app/deposit/datasets/depositBySubjectResults.module.ts @@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms'; import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component'; import {DepositBySubjectResultsRoutingModule} from './depositBySubjectResult-routing.module'; -import {DepositBySubjectResultsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled } from 'ng-openaire-library'; - +import {DepositBySubjectResultsModule } from '../../openaireLibrary/deposit/datasets/depositBySubjectResults.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/deposit/datasets/depositDatasets-routing.module.ts b/src/app/deposit/datasets/depositDatasets-routing.module.ts index 70d0080..21d12c2 100644 --- a/src/app/deposit/datasets/depositDatasets-routing.module.ts +++ b/src/app/deposit/datasets/depositDatasets-routing.module.ts @@ -2,8 +2,10 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDepositDatasetsComponent } from './depositDatasets.component'; -import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; import {Properties} from '../../utils/properties'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ RouterModule.forChild([ diff --git a/src/app/deposit/datasets/depositDatasets.module.ts b/src/app/deposit/datasets/depositDatasets.module.ts index 98f0504..257a1e3 100644 --- a/src/app/deposit/datasets/depositDatasets.module.ts +++ b/src/app/deposit/datasets/depositDatasets.module.ts @@ -4,8 +4,10 @@ import { FormsModule } from '@angular/forms'; import { OpenaireDepositDatasetsComponent } from './depositDatasets.component'; import {DepositDatasetsRoutingModule} from './depositDatasets-routing.module'; -import {DepositDatasetsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; - +import {DepositDatasetsModule} from '../../openaireLibrary/deposit/datasets/depositDatasets.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ CommonModule, FormsModule, diff --git a/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts b/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts index b40575d..1cb81c5 100644 --- a/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts +++ b/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component'; -import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/deposit/datasets/depositDatasetsResults.module.ts b/src/app/deposit/datasets/depositDatasetsResults.module.ts index 35ba3ce..1843d32 100644 --- a/src/app/deposit/datasets/depositDatasetsResults.module.ts +++ b/src/app/deposit/datasets/depositDatasetsResults.module.ts @@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms'; import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component'; import {DepositDatasetsResultsRoutingModule} from './depositDatasetsResults-routing.module'; -import {DepositDatasetsResultsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; - +import {DepositDatasetsResultsModule} from '../../openaireLibrary/deposit/datasets/depositDatasetsResults.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/deposit/publications/depositPublications-routing.module.ts b/src/app/deposit/publications/depositPublications-routing.module.ts index 58607fc..238af31 100644 --- a/src/app/deposit/publications/depositPublications-routing.module.ts +++ b/src/app/deposit/publications/depositPublications-routing.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDepositPublicationsComponent } from './depositPublications.component'; -import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/deposit/publications/depositPublications.module.ts b/src/app/deposit/publications/depositPublications.module.ts index 9e0868d..b019607 100644 --- a/src/app/deposit/publications/depositPublications.module.ts +++ b/src/app/deposit/publications/depositPublications.module.ts @@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms'; import { OpenaireDepositPublicationsComponent } from './depositPublications.component'; import {DepositPublicationsRoutingModule} from './depositPublications-routing.module'; -import {DepositPublicationsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; - +import {DepositPublicationsModule} from '../../openaireLibrary/deposit/publications/depositPublications.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ CommonModule, FormsModule, diff --git a/src/app/deposit/publications/depositPublicationsResult-routing.module.ts b/src/app/deposit/publications/depositPublicationsResult-routing.module.ts index b049907..9e3e938 100644 --- a/src/app/deposit/publications/depositPublicationsResult-routing.module.ts +++ b/src/app/deposit/publications/depositPublicationsResult-routing.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component'; -import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/deposit/publications/depositPublicationsResults.module.ts b/src/app/deposit/publications/depositPublicationsResults.module.ts index 3433697..b8411c8 100644 --- a/src/app/deposit/publications/depositPublicationsResults.module.ts +++ b/src/app/deposit/publications/depositPublicationsResults.module.ts @@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms'; import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component'; import {DepositPublicationsResultRoutingModule} from './depositPublicationsResult-routing.module'; -import {DepositPublicationsResultsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library'; - +import {DepositPublicationsResultsModule} from '../../openaireLibrary/deposit/publications/depositPublicationsResults.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ CommonModule, FormsModule, diff --git a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts index 35e5c52..aff7e6f 100644 --- a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDataProviderComponent } from './dataProvider.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/landingPages/dataProvider/libDataProvider.module.ts b/src/app/landingPages/dataProvider/libDataProvider.module.ts index 1a8b3fb..e1b3819 100644 --- a/src/app/landingPages/dataProvider/libDataProvider.module.ts +++ b/src/app/landingPages/dataProvider/libDataProvider.module.ts @@ -2,11 +2,12 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { DataProviderModule } from 'ng-openaire-library'; +import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; import { OpenaireDataProviderComponent } from './dataProvider.component'; import {DataProviderRoutingModule} from './dataProvider-routing.module'; -import { FreeGuard, PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; - +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [DataProviderModule, DataProviderRoutingModule], diff --git a/src/app/landingPages/dataset/dataset-routing.module.ts b/src/app/landingPages/dataset/dataset-routing.module.ts index 449665b..be4ecd6 100644 --- a/src/app/landingPages/dataset/dataset-routing.module.ts +++ b/src/app/landingPages/dataset/dataset-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDatasetComponent } from './dataset.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/landingPages/dataset/libDataset.module.ts b/src/app/landingPages/dataset/libDataset.module.ts index 5806e24..f167d67 100644 --- a/src/app/landingPages/dataset/libDataset.module.ts +++ b/src/app/landingPages/dataset/libDataset.module.ts @@ -4,9 +4,11 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import { DatasetModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library'; +import { DatasetModule } from '../../openaireLibrary/landingPages/dataset/dataset.module'; import { OpenaireDatasetComponent } from './dataset.component'; - +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {DatasetRoutingModule} from './dataset-routing.module'; @NgModule({ imports: [DatasetModule, DatasetRoutingModule], diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts index fab0839..544468f 100644 --- a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts +++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ RouterModule.forChild([ diff --git a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts index 8868670..769370d 100644 --- a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts @@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import { HtmlProjectReportModule , FreeGuard, PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; - +import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; diff --git a/src/app/landingPages/organization/libOrganization.module.ts b/src/app/landingPages/organization/libOrganization.module.ts index f1d7032..4fc9dfb 100644 --- a/src/app/landingPages/organization/libOrganization.module.ts +++ b/src/app/landingPages/organization/libOrganization.module.ts @@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import { OrganizationModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; - +import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireOrganizationComponent } from './organization.component'; import {OrganizationRoutingModule} from './organization-routing.module'; diff --git a/src/app/landingPages/organization/organization-routing.module.ts b/src/app/landingPages/organization/organization-routing.module.ts index b43b4f4..d0e8f99 100644 --- a/src/app/landingPages/organization/organization-routing.module.ts +++ b/src/app/landingPages/organization/organization-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireOrganizationComponent } from './organization.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/landingPages/project/libProject.module.ts b/src/app/landingPages/project/libProject.module.ts index 7951c8d..8e2dbd9 100644 --- a/src/app/landingPages/project/libProject.module.ts +++ b/src/app/landingPages/project/libProject.module.ts @@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import { ProjectModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library'; - +import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireProjectComponent } from './project.component'; import {ProjectRoutingModule} from './project-routing.module'; diff --git a/src/app/landingPages/project/project-routing.module.ts b/src/app/landingPages/project/project-routing.module.ts index af145a2..8c0cd4f 100644 --- a/src/app/landingPages/project/project-routing.module.ts +++ b/src/app/landingPages/project/project-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireProjectComponent } from './project.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/landingPages/publication/libPublication.module.ts b/src/app/landingPages/publication/libPublication.module.ts index 0cbfcbb..8a8eae2 100644 --- a/src/app/landingPages/publication/libPublication.module.ts +++ b/src/app/landingPages/publication/libPublication.module.ts @@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import { PublicationModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library'; - +import { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenairePublicationComponent } from './publication.component'; import {PublicationRoutingModule} from './publication-routing.module'; diff --git a/src/app/landingPages/publication/publication-routing.module.ts b/src/app/landingPages/publication/publication-routing.module.ts index 421db29..6899ccc 100644 --- a/src/app/landingPages/publication/publication-routing.module.ts +++ b/src/app/landingPages/publication/publication-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenairePublicationComponent } from './publication.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/landingPages/software/libSoftware.module.ts b/src/app/landingPages/software/libSoftware.module.ts index 7003941..2d11fad 100644 --- a/src/app/landingPages/software/libSoftware.module.ts +++ b/src/app/landingPages/software/libSoftware.module.ts @@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { SoftwareModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library'; - +import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireSoftwareComponent } from './software.component'; import {SoftwareRoutingModule} from './software-routing.module'; @NgModule({ diff --git a/src/app/landingPages/software/software-routing.module.ts b/src/app/landingPages/software/software-routing.module.ts index bf1956d..50f6a3e 100644 --- a/src/app/landingPages/software/software-routing.module.ts +++ b/src/app/landingPages/software/software-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireSoftwareComponent } from './software.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; @NgModule({ imports: [ diff --git a/src/app/login/libUser.module.ts b/src/app/login/libUser.module.ts index 8e543b5..b1040ce 100644 --- a/src/app/login/libUser.module.ts +++ b/src/app/login/libUser.module.ts @@ -4,7 +4,9 @@ import { FormsModule } from '@angular/forms'; import {OpenaireUserComponent } from './user.component'; import { UserRoutingModule } from './user-routing.module'; -import {PreviousRouteRecorder, UserModule} from 'ng-openaire-library'; +import { UserModule} from '../openaireLibrary/login/user.module'; + +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ diff --git a/src/app/login/user-routing.module.ts b/src/app/login/user-routing.module.ts index 3d58ea3..1a8ad90 100644 --- a/src/app/login/user-routing.module.ts +++ b/src/app/login/user-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireUserComponent } from './user.component'; -import {PreviousRouteRecorder} from 'ng-openaire-library'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ diff --git a/src/app/my-communities/communities-routing.module.ts b/src/app/my-communities/communities-routing.module.ts index 39867b7..9b25a97 100644 --- a/src/app/my-communities/communities-routing.module.ts +++ b/src/app/my-communities/communities-routing.module.ts @@ -2,7 +2,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{CommunitiesComponent} from './communities.component'; -import {FreeGuard,PreviousRouteRecorder} from 'ng-openaire-library'; +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ diff --git a/src/app/my-communities/communities.component.ts b/src/app/my-communities/communities.component.ts index 853d0b0..7d62931 100644 --- a/src/app/my-communities/communities.component.ts +++ b/src/app/my-communities/communities.component.ts @@ -3,10 +3,13 @@ import {Observable} from 'rxjs/Observable'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; import "rxjs/add/observable/zip"; -import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library'; +import {Meta} from '../openaireLibrary/sharedComponents/metaService'; +import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; -import { ErrorCodes, RouterHelper, PiwikService, EnvProperties} from 'ng-openaire-library'; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {Properties} from '../utils/properties'; +import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; +import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; @Component({ @@ -29,9 +32,9 @@ properties:EnvProperties; ) { - var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects "; + var description = "open access, research, research community, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects "; - var title = "OpenAIRE"; + var title = "OpenAIRE Connect"; this._meta.setTitle(title); this._meta.updateMeta("description", description); @@ -49,7 +52,7 @@ properties:EnvProperties; var url = data.envSpecific.baseLink+this._router.url this._meta.updateProperty("og:url", url); if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe(); + this.piwiksub = this._piwikService.trackView(this.properties,"OpenAIRE").subscribe(); } }); diff --git a/src/app/my-communities/communities.module.ts b/src/app/my-communities/communities.module.ts index fe45693..07da9f7 100644 --- a/src/app/my-communities/communities.module.ts +++ b/src/app/my-communities/communities.module.ts @@ -5,11 +5,13 @@ import { RouterModule } from '@angular/router'; import{CommunitiesRoutingModule} from './communities-routing.module'; import{CommunitiesComponent} from './communities.component'; -import {PiwikService} from 'ng-openaire-library'; +import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; +import {Meta} from '../openaireLibrary/sharedComponents/metaService'; +import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; - -import {Meta, ConfigurationService, FreeGuard, PreviousRouteRecorder,} from 'ng-openaire-library'; +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, diff --git a/src/app/reload/libReload.module.ts b/src/app/reload/libReload.module.ts index 9586b0e..d982aaa 100644 --- a/src/app/reload/libReload.module.ts +++ b/src/app/reload/libReload.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; - import{ReloadModule} from 'ng-openaire-library'; + import{ReloadModule} from '../openaireLibrary/reload/reload.module'; @NgModule({ diff --git a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts index b4c1bc7..410c00b 100644 --- a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts @@ -2,9 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; + +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + @NgModule({ imports: [ RouterModule.forChild([ diff --git a/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets.module.ts index f91d6b4..3df2c85 100644 --- a/src/app/searchPages/advanced/advancedSearchDatasets.module.ts +++ b/src/app/searchPages/advanced/advancedSearchDatasets.module.ts @@ -6,7 +6,10 @@ import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-rout import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; - import {AdvancedSearchDatasetsModule,FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; + import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module'; + import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; + import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts index 2c1e39c..b33722d 100644 --- a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/src/app/searchPages/advanced/advancedSearchPublications.module.ts index 166d8d2..3b92f3d 100644 --- a/src/app/searchPages/advanced/advancedSearchPublications.module.ts +++ b/src/app/searchPages/advanced/advancedSearchPublications.module.ts @@ -6,7 +6,10 @@ import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublicati import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; - import {AdvancedSearchPublicationsModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; + import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module'; + import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; + import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts index 529a16d..e352163 100644 --- a/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts +++ b/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/src/app/searchPages/advanced/advancedSearchSoftware.module.ts index 649b1b1..f379f3d 100644 --- a/src/app/searchPages/advanced/advancedSearchSoftware.module.ts +++ b/src/app/searchPages/advanced/advancedSearchSoftware.module.ts @@ -6,7 +6,10 @@ import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-rout import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; - import {AdvancedSearchSoftwareModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; + import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module'; + import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; + import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/searchPages/find/libSearch.module.ts b/src/app/searchPages/find/libSearch.module.ts index efbe777..84fef82 100644 --- a/src/app/searchPages/find/libSearch.module.ts +++ b/src/app/searchPages/find/libSearch.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import {MainSearchModule} from 'ng-openaire-library'; +import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module'; import { OpenaireSearchComponent } from './search.component'; import { MainSearchRoutingModule } from './mainSearch-routing.module'; diff --git a/src/app/searchPages/searchUtils/searchPageTableView.component.html b/src/app/searchPages/searchUtils/searchPageTableView.component.html deleted file mode 100644 index 9acf3b1..0000000 --- a/src/app/searchPages/searchUtils/searchPageTableView.component.html +++ /dev/null @@ -1,186 +0,0 @@ -
-
-
-
-
-
- -
-
-
- Keywords: {{searchUtils.keyword}} - - - {{filter.title}}: - {{value.name}} - , - - - - - - Clear All - -
-
-
-
-
- -
- -
- - -
-
- -
Filter By:
- -
-
- -
-
- -
-
- - -
- -
-
-
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - - - -
-
- -
-

- - - - - -

-
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
Name - - Type - - Country - - Institution - Compatibility -
- - - - - [no title available] - - - - {{dataprovider.type}} - - - - {{country}}{{(i < ( dataprovider['countries'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['countries'].slice(0,5).length-1 && dataprovider['countries'].length > 5)?"...":""}} - - - - - {{org.name}}{{org.name}}{{(i < ( dataprovider['organizations'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['organizations'].slice(0,5).length-1 && dataprovider['organizations'].length > 5)?"...":""}} - - - - - {{dataprovider.compatibility}} - - -
-
- -
-
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - - - -
-
- - - -
- -
-

- - - - - -

- - -
-
- - -
- -
-
-
diff --git a/src/app/searchPages/searchUtils/searchPageTableView.component.ts b/src/app/searchPages/searchUtils/searchPageTableView.component.ts deleted file mode 100644 index 131cec0..0000000 --- a/src/app/searchPages/searchUtils/searchPageTableView.component.ts +++ /dev/null @@ -1,452 +0,0 @@ -import {Component, Input, ViewChild, Output, EventEmitter, ViewEncapsulation, OnInit, AfterViewInit} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -import {Location} from '@angular/common'; -import { DataTableDirective } from 'angular-datatables'; - -import {SearchFields, DOI, StringUtils,ModalLoading,ErrorCodes,OpenaireProperties,PiwikService, SearchDataprovidersService} from 'ng-openaire-library'; -import {Meta, SearchUtilsClass, Filter, Value, SearchFilterComponent, SearchFilterModalComponent } from 'ng-openaire-library'; - -@Component({ - selector: 'search-page-table', - templateUrl:'searchPageTableView.component.html', - styles: [` - #dpTable_info, #dpTable_paginate, #dpTable_length, #dpTable_filter{ - display: none; - } - - `], - encapsulation: ViewEncapsulation.None // this used in order styles to work - - }) -export class SearchPageTableViewComponent implements OnInit, AfterViewInit { - @Input() pageTitle = ""; - @Input() results; - @Input() filters = []; - @Input() type:string = ""; - @Input() entityType: string = ""; - @Input() searchUtils:SearchUtilsClass;// = new SearchUtilsClass(); - //@Output() downloadClick = new EventEmitter(); - @Input() showResultCount:boolean = true; - @Input() showRefine:boolean = true; - @Input() refineFields = []; - //@Input() csvParams: string; - //@Input() csvPath: string; - @Input() searchViewLink: string; - @Input() disableForms: boolean = false; - @Input() searchFormClass: string = "searchForm"; -@Input() formPlaceholderText = "Type Keywords..."; - @ViewChild (ModalLoading) loading : ModalLoading ; - private searchFieldsHelper:SearchFields = new SearchFields(); - private queryParameters: Map = new Map(); - public countFilters= 0; - public parameterNames:string[] =[]; - public parameterValues:string[] =[]; - - public rowsOnPage:number = 10; - - @ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ; - public currentFilter: Filter; - public errorCodes:ErrorCodes = new ErrorCodes(); - piwiksub: any; - dtOptions: DataTables.Settings = {}; - showTable = false; filteringAdded = false; - @ViewChild(DataTableDirective) datatableElement: DataTableDirective; - dtTrigger: Subject = new Subject(); //necessary - constructor (private location: Location , private _meta: Meta, private _piwikService:PiwikService, private _searchDataprovidersService: SearchDataprovidersService ) { } - - ngOnInit() { - this.dtOptions = { - "paging": true, - "searching": false, - "lengthChange": false, - "pageLength": this.rowsOnPage - }; - this.updateTitle(this.pageTitle); - this.updateDescription("Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle); - if(typeof window !== 'undefined') { - this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname); - } - if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe(); - } - } - ngOnDestroy() { - if(this.piwiksub){ - this.piwiksub.unsubscribe(); - } - - } - ngAfterViewInit(): void { - $.fn['dataTable'].ext.search.push((settings, data, dataIndex) => { - - if (this.filterData(data, this.searchUtils.keyword, this.filters)) { - return true; - } - return false; - }); - - - } - - - totalPages(): number { - let totalPages:any = this.searchUtils.totalResults/(this.rowsOnPage); - if(!(Number.isInteger(totalPages))) { - totalPages = (parseInt(totalPages, 10) + 1); - } - return totalPages; - } - - toggleModal($event) { - this.currentFilter = $event.value; - this.searchFilterModal.open(); - - } - - updateDescription(description:string){ - this._meta.updateMeta("description", description); - this._meta.updateProperty("og:description", description); - } - updateTitle(title:string){ - var _prefix ="OpenAIRE | "; - var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title); - this._meta.setTitle(_title ); - this._meta.updateProperty("og:title",_title); - } - updateUrl(url:string){ - this._meta.updateProperty("og:url", url); - } - -public getParametersFromUrl(params) { - for(var i=0; i< this.refineFields.length ; i++) { - var filterId = this.refineFields[i]; - if(params[filterId] != undefined) { - if(this.queryParameters == undefined){ - this.queryParameters = new Map(); - } - this.queryParameters[filterId]=decodeURIComponent(params[filterId]); - } - } -} - /* - * Mark as check the new filters that are selected, when you get them from search - */ - public checkSelectedFilters(filters:Filter[]){ - - this.filters = filters; - for(var i=0; i< filters.length ; i++){ - var filter:Filter = filters[i]; - filter.countSelectedValues = 0; - - if(this.queryParameters[filter.filterId] != undefined) { - let values = (decodeURIComponent(this.queryParameters[filter.filterId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/,-1); - for(let filterValue of filter.values) { - if(values.indexOf(StringUtils.quote(filterValue.id)) > -1) { - filterValue.selected = true; - filter.countSelectedValues++; - }else{ - filterValue.selected = false; - } - } - }else{ - for(let filterValue of filter.values) { - filterValue.selected = false; - } - } - } - - return filters; - } - - /* - * - */ - private createUrlParameters(filters:Filter[], includePage:boolean){ - var allLimits="";//location.search.slice(1); - this.parameterNames.splice(0,this.parameterNames.length); - this.parameterValues.splice(0,this.parameterValues.length); - - for (let filter of filters){ - var filterLimits=""; - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - filterLimits+=((filterLimits.length == 0)?'':',') +'"'+ StringUtils.URIEncode(value.id)+'"'; - } - } - this.queryParameters[filter.filterId]=filterLimits; - if(filterLimits.length > 0){ - this.parameterNames.push(filter.filterId); - this.parameterValues.push(filterLimits); - } - allLimits+=(allLimits.length==0?"?":"&")+((filterLimits.length == 0 )?'':filter.filterId + '='+ filterLimits) ; - } - } - if(this.searchUtils.keyword.length > 0 ){ - allLimits+=(allLimits.length==0?"?":"&")+'keyword=' + this.searchUtils.keyword; - this.parameterNames.push("keyword"); - this.parameterValues.push(this.searchUtils.keyword); - } - - - return allLimits; - } - - public isFiltered(){ - var filtered=false; - for (let filter of this.filters){ - if(filter.countSelectedValues > 0){ - filtered = true; - break; - } - } - if(this.searchUtils.keyword.length > 0 ){ - filtered = true; - } - return filtered; - } - private clearKeywords(){ - if(this.searchUtils.keyword.length > 0 ){ - this.searchUtils.keyword =''; - } - this.goTo(1); - } - private clearFilters(){ - for (var i =0 ; i < this.filters.length; i++) { - for (var j=0; j < this.filters[i].values.length; j++) { - if(this.filters[i].values[j].selected) { - this.filters[i].values[j].selected = false; - } - } - this.filters[i].countSelectedValues = 0; - } - this.clearKeywords(); - } - - private removeFilter(value:Value,filter:Filter){ - filter.countSelectedValues--; - if(value.selected == true){ - value.selected = false; - } - this.goTo(1); - } - goTo(page:number = 1){ - - this.searchUtils.page=page; - var table = $('#dpTable').DataTable(); - table.page( page - 1 ).draw( false ); - // Object { page: 0, pages: 3, start: 0, end: 10, length: 10, recordsTotal: 28, recordsDisplay: 21, serverSide: false } - var info = table.page.info(); - this.searchUtils.totalResults = info.recordsDisplay; - - var urlParameters = this.createUrlParameters(this.filters,true); - this.location.go(location.pathname,urlParameters); - - } - - filterChanged($event){ - this.goTo(1); - } - keywordChanged($event) { - this.searchUtils.keyword = $event.value; - this.goTo(1); - } -/* - downloadClicked($event) { - if($event.value == true) { - var queryParameters = this.createSearchQueryParameters(this.filters); - - this.downloadClick.emit({ - value: queryParameters - }); - } - } -*/ - - - getSelectedValues(filter):any{ - var selected = []; - if(filter.countSelectedValues >0){ - for (var i=0; i < filter.values.length; i++){ - if(filter.values[i].selected){ - selected.push(filter.values[i]); - } - } - } - return selected; - - } - /* - Trigger a table draw in order to get the initial filtering - */ - triggerInitialLoad(){ - setTimeout(function(){ - var table = $('#dpTable').DataTable(); - table.page( 0 ).draw( false ); - - }, 500); - } - -/* -Transform initial - not filtered results to get the filtered number -*/ - transform(results): any { - if(results.length > 0) { - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.LOADING; - - var result = results.filter(row=>this.filterAll(row, this.searchUtils.keyword.toLowerCase(),this.filters)); - - let oldTotal = this.searchUtils.totalResults; - console.log(" Length: "+result.length); - this.searchUtils.totalResults = result.length; - - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - this.searchUtils.status = errorCodes.NONE; - } - - // if(oldTotal != this.searchUtils.totalResults) { - // args[3].detectChanges(); - // } - return result; - } - return []; - } - - filterAll(row: any, query: string, filters:Filter[]) { - // console.log(row); - let returnValue: boolean = false; - - if(query) { - if(row.title.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.type.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.countries && row.countries.length > 0) { - for(let country of row.countries) { - if(country.toLowerCase().indexOf(query) > -1) { - returnValue = true; - break; - } - } - } - - if(row.compatibility && row.compatibility.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.organizations && row.organizations.length > 0) { - for(let organization of row.organizations) { - if(organization.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - break; - } - } - } - - if(!returnValue) { - return false; - } - } - - for (let filter of filters){ - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - - // make it generic in future commit - let field:string = ""; - if(filter.title == "Type") { - field = "type"; - } else if(filter.title == "Compatibility Level") { - field = "compatibility"; - } - - if(row[field] == value.name) { - returnValue = true; - if(filter.filterOperator == "or") { - break; - } - } else { - if(filter.filterOperator == "and") { - return false; - } - returnValue = false; - } - } - } - if(!returnValue) { - return false; - } - } - } - - return true; - } - filterQuery(data, query){ - if(data.toLowerCase().indexOf(query.toLowerCase()) > -1){ - return true; - }else{ - return false; - } - } - filterData(row: any, query: string, filters:Filter[]) { - - - let returnValue: boolean = false; - - if(query) { - for(var i=0; i <5; i++){ - var r= this.filterQuery(row[i], query); - // console.log(query+" "+ row+" "+r); - if(r) { - returnValue = true; - break; - } - } - - if(!returnValue) { - return false; - } - } - - for (let filter of filters){ - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - let field = 1; - if(filter.title == "Type") { - field = 1; - } else if(filter.title == "Compatibility Level") { - field = 4; - } - r= this.filterQuery(row[field], value.name); - if(r) { - returnValue = true; - if(filter.filterOperator == "or") { - break; - } - } else { - if(filter.filterOperator == "and") { - return false; - } - returnValue = false; - } - } - } - if(!returnValue) { - return false; - } - } - } - - return true; - } -} diff --git a/src/app/searchPages/searchUtils/searchPageTableView.module.ts b/src/app/searchPages/searchUtils/searchPageTableView.module.ts deleted file mode 100644 index 3cb24ff..0000000 --- a/src/app/searchPages/searchUtils/searchPageTableView.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import{SearchPageTableViewComponent} from './searchPageTableView.component'; - -import{LoadingModalModule, ReportsServiceModule, ModalModule, PagingModule, HelperModule, ErrorMessagesModule} from 'ng-openaire-library'; -import{PiwikServiceModule } from 'ng-openaire-library'; - -import {DataTablesModule} from 'angular-datatables'; - - -import {Meta, PreviousRouteRecorder, SearchFormModule, SearchResultsModule, SearchPagingModule, SearchDownloadModule, SearchFilterModule} from 'ng-openaire-library'; - -@NgModule({ - imports: [ - CommonModule, FormsModule,RouterModule, SearchFormModule, SearchResultsModule, LoadingModalModule, - ReportsServiceModule, SearchPagingModule, SearchDownloadModule, ModalModule, PagingModule, - DataTablesModule, SearchFilterModule, PiwikServiceModule, HelperModule, ErrorMessagesModule - ], - declarations: [ - SearchPageTableViewComponent -], - - providers:[ - PreviousRouteRecorder, Meta - ], - exports: [ - SearchPageTableViewComponent - ] -}) -export class SearchPageTableViewModule { } diff --git a/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/src/app/searchPages/simple/searchDataProviders-routing.module.ts index 9e9e418..1dbfccc 100644 --- a/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/searchPages/simple/searchDataProviders.module.ts b/src/app/searchPages/simple/searchDataProviders.module.ts index 3cc4c94..fbfaf1e 100644 --- a/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/src/app/searchPages/simple/searchDataProviders.module.ts @@ -3,8 +3,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; -import {SearchDataProvidersModule} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' +import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module'; @NgModule({ imports: [ CommonModule, FormsModule, diff --git a/src/app/searchPages/simple/searchDatasets-routing.module.ts b/src/app/searchPages/simple/searchDatasets-routing.module.ts index 262e30f..36aa3d9 100644 --- a/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ b/src/app/searchPages/simple/searchDatasets-routing.module.ts @@ -2,7 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, EnvironmentSpecificResolver} from 'ng-openaire-library'; +import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; + +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' + import {Properties} from '../../utils/properties'; @NgModule({ imports: [ diff --git a/src/app/searchPages/simple/searchDatasets.module.ts b/src/app/searchPages/simple/searchDatasets.module.ts index bad0671..3116a59 100644 --- a/src/app/searchPages/simple/searchDatasets.module.ts +++ b/src/app/searchPages/simple/searchDatasets.module.ts @@ -5,7 +5,10 @@ import { FormsModule } from '@angular/forms'; import{ SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import {SearchDatasetsModule, PreviousRouteRecorder, FreeGuard, IsRouteEnabled} from 'ng-openaire-library'; +import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ diff --git a/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 37e6935..0c05fcb 100644 --- a/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/searchPages/simple/searchOrganizations.module.ts b/src/app/searchPages/simple/searchOrganizations.module.ts index 095adf7..f56c7c4 100644 --- a/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/src/app/searchPages/simple/searchOrganizations.module.ts @@ -5,8 +5,11 @@ import { FormsModule } from '@angular/forms'; import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchOrganizationsModule} from 'ng-openaire-library'; +import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module'; @NgModule({ imports: [ diff --git a/src/app/searchPages/simple/searchProjects-routing.module.ts b/src/app/searchPages/simple/searchProjects-routing.module.ts index 6e70d0d..8b02689 100644 --- a/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/searchPages/simple/searchProjects.module.ts b/src/app/searchPages/simple/searchProjects.module.ts index a54eff6..b526ef9 100644 --- a/src/app/searchPages/simple/searchProjects.module.ts +++ b/src/app/searchPages/simple/searchProjects.module.ts @@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms'; import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled,SearchProjectsModule} from 'ng-openaire-library'; - +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' +import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module'; @NgModule({ imports: [ CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule diff --git a/src/app/searchPages/simple/searchPublications-routing.module.ts b/src/app/searchPages/simple/searchPublications-routing.module.ts index 31e7d59..6756ff3 100644 --- a/src/app/searchPages/simple/searchPublications-routing.module.ts +++ b/src/app/searchPages/simple/searchPublications-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/searchPages/simple/searchPublications.module.ts b/src/app/searchPages/simple/searchPublications.module.ts index b66a44e..0209c7c 100644 --- a/src/app/searchPages/simple/searchPublications.module.ts +++ b/src/app/searchPages/simple/searchPublications.module.ts @@ -5,7 +5,10 @@ import { FormsModule } from '@angular/forms'; import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module'; import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchPublicationsModule} from 'ng-openaire-library'; +import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ imports: [ diff --git a/src/app/searchPages/simple/searchSoftware-routing.module.ts b/src/app/searchPages/simple/searchSoftware-routing.module.ts index 9e7e7a3..5dc3838 100644 --- a/src/app/searchPages/simple/searchSoftware-routing.module.ts +++ b/src/app/searchPages/simple/searchSoftware-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireSearchSoftwareComponent} from './searchSoftware.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {Properties} from '../../utils/properties'; @NgModule({ diff --git a/src/app/searchPages/simple/searchSoftware.module.ts b/src/app/searchPages/simple/searchSoftware.module.ts index 166ec32..aef096f 100644 --- a/src/app/searchPages/simple/searchSoftware.module.ts +++ b/src/app/searchPages/simple/searchSoftware.module.ts @@ -4,9 +4,12 @@ import { FormsModule } from '@angular/forms'; import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module'; import{OpenaireSearchSoftwareComponent} from './searchSoftware.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchSoftwareModule} from 'ng-openaire-library'; +import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module'; @NgModule({ imports: [