diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index 725a7144..f617c0ac 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -10,6 +10,7 @@ import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class"; import {UserManagementService} from "./openaireLibrary/services/user-management.service"; import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; +import {Subscriber} from "rxjs"; @Component({ //changeDetection: ChangeDetectionStrategy.Default, @@ -56,20 +57,20 @@ export class AppComponent { user: User; header: Header; logoPath: string = 'assets/common-assets/'; + subscriptions = []; constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private router: Router, private userManagementService: UserManagementService, private configurationService: ConfigurationService) { - router.events.forEach((event) => { + this.subscriptions.push(router.events.forEach((event) => { if (event instanceof NavigationStart) { // console.log(event.url); HelperFunctions.scroll(); } - }); + })); } ngOnInit() { - if (typeof document !== 'undefined') { try { this.isClient = true; @@ -78,13 +79,13 @@ export class AppComponent { } } - this.propertiesService.loadEnvironment() + this.subscriptions.push(this.propertiesService.loadEnvironment() .then(es => { this.propertiesService.setEnvProperties(es); this.properties = this.propertiesService.envSpecific; this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity); this.feedbackmail = this.properties.feedbackmail; - this.userManagementService.getUserInfo().subscribe(user => { + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.buildMenu(); this.header = { @@ -96,15 +97,23 @@ export class AppComponent { position:'left', badge:true }; - }); + })); //console.log(this.properties.loginUrl); }, error => { console.log("App couldn't fetch properties"); console.log(error); - }); + })); + } + ngOnDestroy() { + this.subscriptions.forEach(subscription => { + if (subscription instanceof Subscriber) { + subscription.unsubscribe(); + } + }); + this.configurationService.clearSubscriptions(); + this.userManagementService.clearSubscriptions(); } - buildMenu() { //TODO add check for research results route this.menuItems = [ diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts index bf621ced..0d856839 100755 --- a/explore/src/app/app.module.ts +++ b/explore/src/app/app.module.ts @@ -22,7 +22,6 @@ import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jso import {CacheInterceptorService} from "./openaireLibrary/cache-interceptor.service"; import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service"; -//import { EnvironmentSpecificService, REQUEST_TOKEN} from './openaireLibrary/utils/properties/environment-specific.service'; @NgModule({ @@ -57,7 +56,7 @@ import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-int useClass: HttpInterceptorService, multi: true }, - [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }], + [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }], [{ provide: DEFAULT_TIMEOUT, useValue: 30000 }] ], bootstrap: [AppComponent] diff --git a/explore/src/app/claims/claim.module.ts b/explore/src/app/claims/claim.module.ts deleted file mode 100644 index 113e8597..00000000 --- a/explore/src/app/claims/claim.module.ts +++ /dev/null @@ -1,68 +0,0 @@ -// import { NgModule} from '@angular/core'; -// import { CommonModule } from '@angular/common'; -// import { FormsModule } from '@angular/forms'; -// // -// import {UtilsModule} from '../utils/utils.module'; -// import {ServicesModule} from '../services/services.module'; -// -// import { ClaimsService} from '../services/claims.service'; -// //main -// import {ClaimComponent} from './claim/claim.component'; -// import {ClaimsAdminComponent} from './claims/claimsAdmin.component'; -// import {MyClaimsComponent} from './myClaims/myClaims.component'; -// import {LinkingHomeComponent} from './linking/linkingHome.component'; -// import {LinkingComponent} from './linking/linking.component'; -// import { BulkLinkingComponent } from './linking/bulkLinking.component'; -// -// import {BulkClaimComponent} from './linking/bulkClaim/bulkClaim.component'; -// import {ClaimsComponent} from './claim-utils/claims.component'; -// -// import {ClaimContextComponent} from './claim-utils/claimContext.component'; -// import {ClaimProjectsComponent} from './claim-utils/claimProject.component'; -// import {ClaimResultComponent} from './claim-utils/claimResult.component'; -// import {ClaimPublicationComponent} from './claim-utils/claimPublication.component'; -// import {ClaimDatasetComponent} from './claim-utils/claimDataset.component'; -// -// import {ClaimInsertComponent} from './linking/insertClaim/insertClaim.component'; -// -// import {ClaimSelectedContextsComponent} from './linking/selected/selectedContexts.component'; -// import {ClaimSelectedComponent} from './linking/selected/selected.component'; -// import {ClaimSelectedDatasetsComponent} from './linking/selected/selectedDatasets.component'; -// import {ClaimSelectedResultsComponent} from './linking/selected/selectedResults.component'; -// import {ClaimSelectedProjectsComponent} from './linking/selected/selectedProjects.component'; -// import {ClaimSelectedPublicationsComponent} from './linking/selected/selectedPublications.component'; -// -// import {LinkingGenericComponent} from './linking/linkingGeneric.component'; -// -// import {InlineClaimContextComponent} from './inlineClaims/inlineClaimContext.component'; -// import {InlineClaimProjectComponent} from './inlineClaims/inlineClaimProject.component'; -// import {InlineClaimResultComponent} from './inlineClaims/inlineClaimResult.component'; -// import {ClaimEntityFormatter} from '../utils/claimEntityFormatter.component'; -// -// import { Claim } from '../utils/entities/claim'; -// //helpers -// -// import { ClaimRoutingModule } from './claim-routing.module'; -// @NgModule({ -// imports: [ -// CommonModule, FormsModule, -// UtilsModule, -// ServicesModule, -// ClaimRoutingModule -// -// ], -// declarations: [ -// ClaimsAdminComponent, MyClaimsComponent, ClaimComponent, ClaimsComponent, -// BulkLinkingComponent, LinkingComponent, LinkingHomeComponent, LinkingGenericComponent, -// InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent, ClaimSelectedComponent, -// ClaimContextComponent, ClaimSelectedContextsComponent, ClaimInsertComponent, ClaimProjectsComponent, ClaimSelectedProjectsComponent, -// ClaimResultComponent, ClaimSelectedPublicationsComponent, ClaimSelectedDatasetsComponent, ClaimSelectedResultsComponent, ClaimPublicationComponent, -// ClaimDatasetComponent, BulkClaimComponent, -// ClaimEntityFormatter -// ], -// providers: [ ClaimsService ], -// exports: [ -// InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent -// ] -// }) -// export class ClaimModule { } diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts index a56b2c25..6aa9589d 100644 --- a/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ b/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts @@ -1,8 +1,7 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs'; +import {Component} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; +import {Subscriber} from "rxjs"; @Component({ selector: 'openaire-claims-admin', @@ -17,12 +16,17 @@ export class OpenaireClaimsAdminComponent { claimsInfoURL:string; userInfoURL: string; - + sub; constructor (private route: ActivatedRoute) { - } + ngOnDestroy() { + if (this.sub instanceof Subscriber) { + this.sub.unsubscribe(); + } + } + public ngOnInit() { - this.route.data + this.sub = this.route.data .subscribe((data: { envSpecific: EnvProperties }) => { this.claimsInfoURL = data.envSpecific.claimsInformationLink; this.userInfoURL = data.envSpecific.userInfoUrl; diff --git a/explore/src/app/claims/linking/linkingGeneric.component.ts b/explore/src/app/claims/linking/linkingGeneric.component.ts index 8a7588ab..edfeb872 100644 --- a/explore/src/app/claims/linking/linkingGeneric.component.ts +++ b/explore/src/app/claims/linking/linkingGeneric.component.ts @@ -1,6 +1,4 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs'; -import {ActivatedRoute, Router} from '@angular/router'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-linking-generic', diff --git a/explore/src/app/claims/myClaims/myClaims.component.ts b/explore/src/app/claims/myClaims/myClaims.component.ts index 9cebe68e..ec94692c 100644 --- a/explore/src/app/claims/myClaims/myClaims.component.ts +++ b/explore/src/app/claims/myClaims/myClaims.component.ts @@ -1,7 +1,7 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs'; +import {Component} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; +import {Subscriber} from "rxjs"; @@ -16,12 +16,16 @@ import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properti export class OpenaireMyClaimsComponent { claimsInfoURL:string; userInfoURL: string; - + sub; constructor (private route: ActivatedRoute) { - - } + } + ngOnDestroy() { + if (this.sub instanceof Subscriber) { + this.sub.unsubscribe(); + } + } public ngOnInit() { - this.route.data + this.sub = this.route.data .subscribe((data: { envSpecific: EnvProperties }) => { this.claimsInfoURL = data.envSpecific.claimsInformationLink; this.userInfoURL = data.envSpecific.userInfoUrl; diff --git a/explore/src/app/deposit/deposit-routing.module.ts b/explore/src/app/deposit/deposit-routing.module.ts index 69340f3b..13517799 100644 --- a/explore/src/app/deposit/deposit-routing.module.ts +++ b/explore/src/app/deposit/deposit-routing.module.ts @@ -1,14 +1,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDepositComponent } from './deposit.component'; -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([ - { path: '', component: OpenaireDepositComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireDepositComponent, canActivate: [IsRouteEnabled], data: { redirect: '/error' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/deposit/deposit.component.ts b/explore/src/app/deposit/deposit.component.ts index a086df6b..2d4ff8bb 100644 --- a/explore/src/app/deposit/deposit.component.ts +++ b/explore/src/app/deposit/deposit.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; -//import {ZenodoInformationClass} from "../openaireLibrary/deposit/utils/zenodoInformation.class"; @Component({ selector: 'openaire-deposit', @@ -9,7 +8,6 @@ import {Component} from '@angular/core'; }) export class OpenaireDepositComponent { - //public zenodoInformation: ZenodoInformationClass = new ZenodoInformationClass(); constructor() { } diff --git a/explore/src/app/deposit/deposit.module.ts b/explore/src/app/deposit/deposit.module.ts index c1634aa2..e32cbaa0 100644 --- a/explore/src/app/deposit/deposit.module.ts +++ b/explore/src/app/deposit/deposit.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'; @@ -26,7 +25,7 @@ import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoC exports: [ OpenaireDepositComponent, ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled, + providers: [PreviousRouteRecorder, IsRouteEnabled, ZenodoCommunitiesService, CommunityService, SearchZenodoCommunitiesService] }) export class LibDepositModule { } diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts b/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts index a51787ce..46c8b761 100644 --- a/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts +++ b/explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts @@ -1,14 +1,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovidersToDeposit.component'; -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([ - { path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [IsRouteEnabled], data: { redirect: '/error' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts b/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts index c963b778..51ae3385 100644 --- a/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts +++ b/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; -//import {ZenodoInformationClass} from '../openaireLibrary/deposit/utils/zenodoInformation.class'; @Component({ selector: 'openaire-search-deposit', @@ -9,7 +8,6 @@ import {Component} from '@angular/core'; }) export class OpenaireSearchDataprovidersToDepositComponent { - //public zenodoInformation: ZenodoInformationClass = new ZenodoInformationClass(); constructor() {} diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts b/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts index 317d86d8..2e76ce7f 100644 --- a/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts +++ b/explore/src/app/deposit/searchDataprovidersToDeposit.module.ts @@ -6,7 +6,6 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module'; import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module'; -import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'; import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; @@ -27,6 +26,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s exports: [ OpenaireSearchDataprovidersToDepositComponent, ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled, CommunityService] + providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService] }) export class LibSearchDataprovidersToDepositModule { } diff --git a/explore/src/app/error/errorPage.component.ts b/explore/src/app/error/errorPage.component.ts index e96d3dcb..52073bcc 100644 --- a/explore/src/app/error/errorPage.component.ts +++ b/explore/src/app/error/errorPage.component.ts @@ -1,6 +1,5 @@ -import { Component, Input } from '@angular/core'; -import { Location } from '@angular/common'; - +import { Component } from '@angular/core'; + @Component({ selector: 'openaire-error', template: ` diff --git a/explore/src/app/home/home-routing.module.ts b/explore/src/app/home/home-routing.module.ts index e372e73f..db77f796 100644 --- a/explore/src/app/home/home-routing.module.ts +++ b/explore/src/app/home/home-routing.module.ts @@ -2,12 +2,11 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{HomeComponent} from './home.component'; -import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: HomeComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } + { path: '', component: HomeComponent, canDeactivate: [PreviousRouteRecorder] } ]) ] diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts index 93d1a890..a830b9af 100644 --- a/explore/src/app/home/home.component.ts +++ b/explore/src/app/home/home.component.ts @@ -1,11 +1,10 @@ -import {Component, Input} from '@angular/core'; +import {Component} from '@angular/core'; import {Subscription} from 'rxjs'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; import "rxjs/add/observable/zip"; import {Title, Meta} from '@angular/platform-browser'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; -import { FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class'; import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service'; @@ -126,7 +125,6 @@ export class HomeComponent { public datasourcesSize:any = null; private numResults: number = 2; - public fetchDataproviders : FetchDataproviders; showPublications:boolean= false; showDatasets:boolean= false; @@ -174,7 +172,6 @@ export class HomeComponent { this._meta.updateTag({content:title},"property='og:title'"); - //this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); } private getPageContents() { @@ -241,9 +238,6 @@ export class HomeComponent { this.resultTypes.values.push({name: "Other research products" , id:"other",selected:true, number:0}); } this.getNumbers(); - // if(this.showDataProviders) { - // this.fetchDataproviders.getResultsForHome(this.numResults, this.properties); - // } } }, error => { diff --git a/explore/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts index 2fedc86e..2fa18a46 100644 --- a/explore/src/app/home/home.module.ts +++ b/explore/src/app/home/home.module.ts @@ -16,7 +16,6 @@ import { PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.m import {HelperModule} from '../openaireLibrary/utils/helper/helper.module'; import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module'; -import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; @@ -45,7 +44,7 @@ import {arrow_right} from "../openaireLibrary/utils/icons/icons"; HomeComponent ], providers:[ - FreeGuard, PreviousRouteRecorder + PreviousRouteRecorder ], exports: [ HomeComponent diff --git a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts index 4399ff01..c93f988a 100644 --- a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireDataProviderComponent } from './dataProvider.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireDataProviderComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/dataProvider/dataProvider.component.ts b/explore/src/app/landingPages/dataProvider/dataProvider.component.ts index b9d6af79..70fdcd58 100644 --- a/explore/src/app/landingPages/dataProvider/dataProvider.component.ts +++ b/explore/src/app/landingPages/dataProvider/dataProvider.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-dataprovider', diff --git a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts index 2f08f120..3cefefe1 100644 --- a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts +++ b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts @@ -1,17 +1,13 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; import { OpenaireDataProviderComponent } from './dataProvider.component'; import {DataProviderRoutingModule} from './dataProvider-routing.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [DataProviderModule, DataProviderRoutingModule], declarations:[OpenaireDataProviderComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[ PreviousRouteRecorder], exports:[OpenaireDataProviderComponent] }) export class LibDataProviderModule { } diff --git a/explore/src/app/landingPages/dataset/dataset-routing.module.ts b/explore/src/app/landingPages/dataset/dataset-routing.module.ts index adf08896..b987e556 100644 --- a/explore/src/app/landingPages/dataset/dataset-routing.module.ts +++ b/explore/src/app/landingPages/dataset/dataset-routing.module.ts @@ -1,15 +1,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; - import { OpenaireDatasetComponent } from './dataset.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireDatasetComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/dataset/libDataset.module.ts b/explore/src/app/landingPages/dataset/libDataset.module.ts index 661e425a..e29bae2b 100644 --- a/explore/src/app/landingPages/dataset/libDataset.module.ts +++ b/explore/src/app/landingPages/dataset/libDataset.module.ts @@ -1,18 +1,12 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; import { OpenaireDatasetComponent } from './dataset.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {DatasetRoutingModule} from './dataset-routing.module'; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [DatasetRoutingModule, ResultLandingModule], declarations:[OpenaireDatasetComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports:[OpenaireDatasetComponent] }) export class LibDatasetModule { } diff --git a/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts index 0ae291f2..f8ce0c54 100644 --- a/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts +++ b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts @@ -1,13 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; - import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]} + { path: '', component: OpenaireHtmlProjectReportComponent ,canDeactivate: [PreviousRouteRecorder]} ]) ] }) diff --git a/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts index e834441e..d253f588 100644 --- a/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-htmlProjectReport', diff --git a/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts index b7e07733..557b898f 100644 --- a/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ b/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts @@ -1,11 +1,5 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; @@ -13,7 +7,7 @@ import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module @NgModule({ imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], declarations:[OpenaireHtmlProjectReportComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[ PreviousRouteRecorder], exports:[OpenaireHtmlProjectReportComponent] }) export class LibHtmlProjectReportModule { } diff --git a/explore/src/app/landingPages/organization/libOrganization.module.ts b/explore/src/app/landingPages/organization/libOrganization.module.ts index 53e969a9..ed43d01e 100644 --- a/explore/src/app/landingPages/organization/libOrganization.module.ts +++ b/explore/src/app/landingPages/organization/libOrganization.module.ts @@ -1,11 +1,5 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { OpenaireOrganizationComponent } from './organization.component'; import {OrganizationRoutingModule} from './organization-routing.module'; @@ -13,7 +7,7 @@ import {OrganizationRoutingModule} from './organization-routing.module'; @NgModule({ imports: [OrganizationModule, OrganizationRoutingModule], declarations:[OpenaireOrganizationComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[ PreviousRouteRecorder], exports:[OpenaireOrganizationComponent] }) export class LibOrganizationModule { } diff --git a/explore/src/app/landingPages/organization/organization-routing.module.ts b/explore/src/app/landingPages/organization/organization-routing.module.ts index 22aac9b0..8e18f9db 100644 --- a/explore/src/app/landingPages/organization/organization-routing.module.ts +++ b/explore/src/app/landingPages/organization/organization-routing.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireOrganizationComponent } from './organization.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @@ -10,7 +9,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireOrganizationComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/organization/organization.component.ts b/explore/src/app/landingPages/organization/organization.component.ts index f3df57b7..467b895e 100644 --- a/explore/src/app/landingPages/organization/organization.component.ts +++ b/explore/src/app/landingPages/organization/organization.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-organization', diff --git a/explore/src/app/landingPages/orp/libOrp.module.ts b/explore/src/app/landingPages/orp/libOrp.module.ts index 69a1b09f..02c5ef75 100644 --- a/explore/src/app/landingPages/orp/libOrp.module.ts +++ b/explore/src/app/landingPages/orp/libOrp.module.ts @@ -1,18 +1,12 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; import { OpenaireOrpComponent } from './orp.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {OrpRoutingModule} from './orp-routing.module'; import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [OrpRoutingModule, ResultLandingModule], declarations:[OpenaireOrpComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[ PreviousRouteRecorder], exports:[OpenaireOrpComponent] }) export class LibOrpModule { } diff --git a/explore/src/app/landingPages/orp/orp-routing.module.ts b/explore/src/app/landingPages/orp/orp-routing.module.ts index c29ca7cb..c45bd396 100644 --- a/explore/src/app/landingPages/orp/orp-routing.module.ts +++ b/explore/src/app/landingPages/orp/orp-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireOrpComponent } from './orp.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireOrpComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/project/libProject.module.ts b/explore/src/app/landingPages/project/libProject.module.ts index c2a0ba22..f68204c5 100644 --- a/explore/src/app/landingPages/project/libProject.module.ts +++ b/explore/src/app/landingPages/project/libProject.module.ts @@ -1,11 +1,5 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { OpenaireProjectComponent } from './project.component'; import {ProjectRoutingModule} from './project-routing.module'; @@ -13,7 +7,7 @@ import {ProjectRoutingModule} from './project-routing.module'; @NgModule({ imports: [ProjectModule, ProjectRoutingModule], declarations:[OpenaireProjectComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[ PreviousRouteRecorder], exports:[OpenaireProjectComponent] }) export class LibProjectModule { } diff --git a/explore/src/app/landingPages/project/project-routing.module.ts b/explore/src/app/landingPages/project/project-routing.module.ts index fddcba0e..0611d881 100644 --- a/explore/src/app/landingPages/project/project-routing.module.ts +++ b/explore/src/app/landingPages/project/project-routing.module.ts @@ -2,13 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { OpenaireProjectComponent } from './project.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireProjectComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/project/project.component.ts b/explore/src/app/landingPages/project/project.component.ts index f4876bab..a3964dae 100644 --- a/explore/src/app/landingPages/project/project.component.ts +++ b/explore/src/app/landingPages/project/project.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-project', diff --git a/explore/src/app/landingPages/publication/libPublication.module.ts b/explore/src/app/landingPages/publication/libPublication.module.ts index 7e510e2f..b94b9adf 100644 --- a/explore/src/app/landingPages/publication/libPublication.module.ts +++ b/explore/src/app/landingPages/publication/libPublication.module.ts @@ -1,10 +1,4 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { OpenairePublicationComponent } from './publication.component'; import {PublicationRoutingModule} from './publication-routing.module'; @@ -13,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res @NgModule({ imports: [PublicationRoutingModule, ResultLandingModule], declarations:[OpenairePublicationComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[ PreviousRouteRecorder], exports:[OpenairePublicationComponent] }) export class LibPublicationModule { } diff --git a/explore/src/app/landingPages/publication/publication-routing.module.ts b/explore/src/app/landingPages/publication/publication-routing.module.ts index 147ceb00..a8796544 100644 --- a/explore/src/app/landingPages/publication/publication-routing.module.ts +++ b/explore/src/app/landingPages/publication/publication-routing.module.ts @@ -2,13 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenairePublicationComponent } from './publication.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenairePublicationComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/result/libResult.module.ts b/explore/src/app/landingPages/result/libResult.module.ts index fd55523b..39be4780 100644 --- a/explore/src/app/landingPages/result/libResult.module.ts +++ b/explore/src/app/landingPages/result/libResult.module.ts @@ -1,5 +1,4 @@ import {NgModule} from '@angular/core'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {OpenaireResultComponent} from './result.component'; import {ResultRoutingModule} from './result-routing.module'; @@ -8,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res @NgModule({ imports: [ResultRoutingModule, ResultLandingModule], declarations:[OpenaireResultComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports:[OpenaireResultComponent] }) export class LibResultModule { } diff --git a/explore/src/app/landingPages/result/result-routing.module.ts b/explore/src/app/landingPages/result/result-routing.module.ts index 48737fd7..9b72a94f 100644 --- a/explore/src/app/landingPages/result/result-routing.module.ts +++ b/explore/src/app/landingPages/result/result-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireResultComponent } from './result.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireResultComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireResultComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder] } ]) diff --git a/explore/src/app/landingPages/software/libSoftware.module.ts b/explore/src/app/landingPages/software/libSoftware.module.ts index 7065214b..04a89717 100644 --- a/explore/src/app/landingPages/software/libSoftware.module.ts +++ b/explore/src/app/landingPages/software/libSoftware.module.ts @@ -1,10 +1,5 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { OpenaireSoftwareComponent } from './software.component'; import {SoftwareRoutingModule} from './software-routing.module'; @@ -12,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res @NgModule({ imports: [SoftwareRoutingModule, ResultLandingModule], declarations:[OpenaireSoftwareComponent], - providers:[FreeGuard, PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports:[OpenaireSoftwareComponent] }) export class LibSoftwareModule { } diff --git a/explore/src/app/landingPages/software/software-routing.module.ts b/explore/src/app/landingPages/software/software-routing.module.ts index f7ad55b8..daa33916 100644 --- a/explore/src/app/landingPages/software/software-routing.module.ts +++ b/explore/src/app/landingPages/software/software-routing.module.ts @@ -2,13 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireSoftwareComponent } from './software.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] } + { path: '', component: OpenaireSoftwareComponent, canDeactivate: [PreviousRouteRecorder] } ]) ] }) diff --git a/explore/src/app/login/user.component.ts b/explore/src/app/login/user.component.ts index 76d70388..4e9f00d0 100644 --- a/explore/src/app/login/user.component.ts +++ b/explore/src/app/login/user.component.ts @@ -1,5 +1,4 @@ -import {Component, ElementRef} from '@angular/core'; -import {Observable} from 'rxjs'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-user', diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts index 2db1252c..751e2072 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @@ -9,7 +8,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireAdvancedSearchDataProvidersComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index 5e9a494d..e6925d70 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, ViewChild} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts index a9760ce4..cae770e6 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts @@ -5,7 +5,6 @@ import {FormsModule} from '@angular/forms'; import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module'; import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ @@ -18,7 +17,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireAdvancedSearchDataProvidersComponent ], - providers:[FreeGuard], + providers:[], exports: [ OpenaireAdvancedSearchDataProvidersComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts deleted file mode 100644 index 14fb032c..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchDatasetsRoutingModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts deleted file mode 100644 index 0572122c..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-datasets', - template: ` - - ` - }) - -export class OpenaireAdvancedSearchDatasetsComponent { - - -} diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts deleted file mode 100644 index d6bb45c0..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module'; -import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchDatasetsRoutingModule, AdvancedSearchResearchResultsModule - - ], - declarations: [ - OpenaireAdvancedSearchDatasetsComponent - ], - providers:[FreeGuard], - exports: [ - OpenaireAdvancedSearchDatasetsComponent - ] -}) -export class LibAdvancedSearchDatasetsModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts index deb98e89..dd489d45 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard], data: { + { path: '', component: OpenaireAdvancedSearchOrganizationsComponent, data: { redirect: '/error', community : 'openaire' },canDeactivate: [PreviousRouteRecorder]} diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts index 6666a77f..34805b28 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, ViewChild} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts index a9eabc41..b14b2c53 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts @@ -5,7 +5,6 @@ import {FormsModule} from '@angular/forms'; import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module'; import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; @NgModule({ @@ -18,7 +17,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireAdvancedSearchOrganizationsComponent ], - providers:[FreeGuard], + providers:[], exports: [ OpenaireAdvancedSearchOrganizationsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts deleted file mode 100644 index 02396cd2..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchOrpsRoutingModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts deleted file mode 100644 index c4b53c93..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-orps', - template: ` - - ` - }) - -export class OpenaireAdvancedSearchOrpsComponent { - - -} diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts deleted file mode 100644 index b4b2d608..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module'; -import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; -import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchOrpsRoutingModule, SearchResearchResultsModule, AdvancedSearchResearchResultsModule - - ], - declarations: [ - OpenaireAdvancedSearchOrpsComponent - ], - providers:[FreeGuard], - exports: [ - OpenaireAdvancedSearchOrpsComponent - ] -}) -export class LibAdvancedSearchOrpsModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts index 791d46c7..9e51ebf4 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireAdvancedSearchProjectsComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts index 4790614d..33ec812c 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, ViewChild} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-advanced-search-projects', template: ` diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts index a8c9edc1..aad0d692 100644 --- a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts +++ b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts @@ -4,7 +4,6 @@ import {FormsModule} from '@angular/forms'; import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module"; @NgModule({ @@ -17,7 +16,7 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj declarations: [ OpenaireAdvancedSearchProjectsComponent ], - providers: [FreeGuard], + providers: [], exports: [ OpenaireAdvancedSearchProjectsComponent ] diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts deleted file mode 100644 index 84736bd5..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchPublicationsRoutingModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts deleted file mode 100644 index 23e43a86..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-publications', - template: ` - - ` - }) - -export class OpenaireAdvancedSearchPublicationsComponent { -} diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts deleted file mode 100644 index 0d2f393b..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module'; -import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchPublicationsRoutingModule, AdvancedSearchResearchResultsModule - - ], - declarations: [ - OpenaireAdvancedSearchPublicationsComponent - ], - providers:[FreeGuard], - exports: [ - OpenaireAdvancedSearchPublicationsComponent - ] -}) -export class LibAdvancedSearchPublicationsModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts deleted file mode 100644 index 738fac81..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchSoftwareRoutingModule { } diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts deleted file mode 100644 index 1667bed7..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-advanced-search-software', - template: ` - - ` - }) - -export class OpenaireAdvancedSearchSoftwareComponent { - - -} diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts deleted file mode 100644 index 89dee8c9..00000000 --- a/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module'; -import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchSoftwareRoutingModule, AdvancedSearchResearchResultsModule - - ], - declarations: [ - OpenaireAdvancedSearchSoftwareComponent - ], - providers:[FreeGuard], - exports: [ - OpenaireAdvancedSearchSoftwareComponent - ] -}) -export class LibAdvancedSearchSoftwareModule { } diff --git a/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts index 35745adc..de0ce513 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchResearchResultsComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchResearchResultsComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts index 795c61fa..9462486c 100644 --- a/explore/src/app/searchPages/advanced/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/advanced/searchResearchResults.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @@ -18,7 +17,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[FreeGuard,PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts index 764e8905..c9b098f1 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts index aa00b948..65383dea 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts @@ -1,12 +1,9 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-search-content-providers', template: ` - - - + diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts index f2886521..6232991c 100644 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts +++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts @@ -5,23 +5,20 @@ import { FormsModule } from '@angular/forms'; import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module'; import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ imports: [ CommonModule, FormsModule, - CompatibleDataProvidersModule, CompatibleDataProvidersRoutingModule, SearchDataProvidersModule ], declarations: [ OpenaireSearchCompatibleDataprovidersComponent ], - providers:[FreeGuard], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchCompatibleDataprovidersComponent ] diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts deleted file mode 100644 index 4475308a..00000000 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class CompatibleDataProvidersTableRoutingModule { } diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts deleted file mode 100644 index eb8908f5..00000000 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-search-content-providers-table', - template: ` - - - - ` - -}) -export class OpenaireSearchCompatibleDataprovidersTableComponent { -} diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts deleted file mode 100644 index 249a8ec9..00000000 --- a/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; -import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - CompatibleDataProvidersTableModule, - CompatibleDataProvidersTableRoutingModule - - ], providers:[FreeGuard], - declarations: [ - OpenaireSearchCompatibleDataprovidersTableComponent - ], - exports: [ - OpenaireSearchCompatibleDataprovidersTableComponent - ] -}) -export class LibCompatibleDataProvidersTableModule { } diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts index 6219d879..2b51d889 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts @@ -2,13 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchEntityRegistriesComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts index a7e69561..f45d25a5 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts @@ -1,12 +1,9 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-search-entity-registries', template: ` - ` diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts index 3b0f1f0a..2fa4b58c 100644 --- a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts +++ b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts @@ -4,22 +4,20 @@ import { FormsModule } from '@angular/forms'; import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ imports: [ CommonModule, FormsModule, - EntityRegistriesModule, EntityRegistriesRoutingModule, SearchDataProvidersModule + EntityRegistriesRoutingModule, SearchDataProvidersModule ], declarations: [ OpenaireSearchEntityRegistriesComponent ], - providers:[FreeGuard], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchEntityRegistriesComponent ] diff --git a/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts deleted file mode 100644 index 04198eb4..00000000 --- a/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class EntityRegistriesTableRoutingModule { } diff --git a/explore/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts deleted file mode 100644 index 108c28d0..00000000 --- a/explore/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component} from '@angular/core'; - - -@Component({ - selector: 'openaire-search-entity-registries-table', - template: ` - - - - - ` - -}) -export class OpenaireSearchEntityRegistriesTableComponent { - -} diff --git a/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts deleted file mode 100644 index fa3a15c9..00000000 --- a/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; - import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module'; -import { EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/dataProviders/entityRegistriesTable.module'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - EntityRegistriesTableRoutingModule, - EntityRegistriesTableModule - - ], providers:[FreeGuard], - declarations: [ - OpenaireSearchEntityRegistriesTableComponent - ], - exports: [ - OpenaireSearchEntityRegistriesTableComponent - ] -}) -export class LibEntityRegistriesTableModule { } diff --git a/explore/src/app/searchPages/dataProviders/journals-routing.module.ts b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts index 53556ba4..bb35eac4 100644 --- a/explore/src/app/searchPages/dataProviders/journals-routing.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchJournalsComponent} from './journals.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchJournalsComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/dataProviders/journals.component.ts b/explore/src/app/searchPages/dataProviders/journals.component.ts index 87a5bbb7..4ef8fded 100644 --- a/explore/src/app/searchPages/dataProviders/journals.component.ts +++ b/explore/src/app/searchPages/dataProviders/journals.component.ts @@ -1,12 +1,9 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; +import {Component} from '@angular/core'; + @Component({ selector: 'openaire-search-journals', - template: ` - - + template: ` ` diff --git a/explore/src/app/searchPages/dataProviders/journals.module.ts b/explore/src/app/searchPages/dataProviders/journals.module.ts index 42ae46d5..072aacf8 100644 --- a/explore/src/app/searchPages/dataProviders/journals.module.ts +++ b/explore/src/app/searchPages/dataProviders/journals.module.ts @@ -4,19 +4,17 @@ import { FormsModule } from '@angular/forms'; import{ JournalsRoutingModule} from './journals-routing.module'; import{OpenaireSearchJournalsComponent} from './journals.component'; -import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module"; @NgModule({ imports: [ - CommonModule, FormsModule, JournalsRoutingModule, JournalsModule, SearchDataProvidersModule + CommonModule, FormsModule, JournalsRoutingModule, SearchDataProvidersModule ], declarations: [ OpenaireSearchJournalsComponent ], - providers:[FreeGuard], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchJournalsComponent ] diff --git a/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts deleted file mode 100644 index 2991cf0b..00000000 --- a/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - } , canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class JournalsTableRoutingModule { } diff --git a/explore/src/app/searchPages/dataProviders/journalsTable.component.ts b/explore/src/app/searchPages/dataProviders/journalsTable.component.ts deleted file mode 100644 index 7d4f066f..00000000 --- a/explore/src/app/searchPages/dataProviders/journalsTable.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component } from '@angular/core'; - - -@Component({ - selector: 'openaire-search-journals-table', - template: ` - - - - ` - -}) -export class OpenaireSearchJournalsTableComponent { - -} diff --git a/explore/src/app/searchPages/dataProviders/journalsTable.module.ts b/explore/src/app/searchPages/dataProviders/journalsTable.module.ts deleted file mode 100644 index d96f37d6..00000000 --- a/explore/src/app/searchPages/dataProviders/journalsTable.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; - -import {JournalsTableRoutingModule} from './journalsTable-routing.module'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - JournalsTableModule, JournalsTableRoutingModule - - ], providers:[FreeGuard], - declarations: [ - OpenaireSearchJournalsTableComponent - ], - exports: [ - OpenaireSearchJournalsTableComponent - ] -}) -export class LibJournalsTableModule { } diff --git a/explore/src/app/searchPages/find/search.component.ts b/explore/src/app/searchPages/find/search.component.ts index 71f5ff55..7638fb1b 100644 --- a/explore/src/app/searchPages/find/search.component.ts +++ b/explore/src/app/searchPages/find/search.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-search-find', diff --git a/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts index 35f05137..2e2beb73 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchDataprovidersComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchDataProviders.module.ts b/explore/src/app/searchPages/simple/searchDataProviders.module.ts index f3902ea9..b27cf5af 100644 --- a/explore/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/explore/src/app/searchPages/simple/searchDataProviders.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module'; @NgModule({ @@ -15,7 +14,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule declarations: [ OpenaireSearchDataprovidersComponent ], - providers:[FreeGuard,PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchDataprovidersComponent ] diff --git a/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts b/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts deleted file mode 100644 index 29b1b288..00000000 --- a/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, - - ]) - ] -}) -export class SearchDatasetsRoutingModule { } diff --git a/explore/src/app/searchPages/simple/searchDatasets.component.ts b/explore/src/app/searchPages/simple/searchDatasets.component.ts deleted file mode 100644 index 0180d0e6..00000000 --- a/explore/src/app/searchPages/simple/searchDatasets.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-search-datasets', - template: ` - - ` -}) - -export class OpenaireSearchDatasetsComponent { - -} diff --git a/explore/src/app/searchPages/simple/searchDatasets.module.ts b/explore/src/app/searchPages/simple/searchDatasets.module.ts deleted file mode 100644 index 466e71ac..00000000 --- a/explore/src/app/searchPages/simple/searchDatasets.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; -import {OpenaireSearchDatasetsComponent} from './searchDatasets.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; - - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchDatasetsRoutingModule, SearchResearchResultsModule - - ], - declarations: [ - OpenaireSearchDatasetsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder], - exports: [ - OpenaireSearchDatasetsComponent - ] -}) -export class LibSearchDatasetsModule { } diff --git a/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 8942d63f..7aeb2240 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -3,7 +3,6 @@ import { RouterModule } from '@angular/router'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @@ -11,7 +10,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchOrganizationsComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchOrganizations.component.ts b/explore/src/app/searchPages/simple/searchOrganizations.component.ts index a61a20d9..d8e64a27 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, ViewChild} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-search-organizations', diff --git a/explore/src/app/searchPages/simple/searchOrganizations.module.ts b/explore/src/app/searchPages/simple/searchOrganizations.module.ts index 2b07d596..9218a4ab 100644 --- a/explore/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/explore/src/app/searchPages/simple/searchOrganizations.module.ts @@ -5,7 +5,6 @@ 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 {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module"; @@ -19,7 +18,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc declarations: [ OpenaireSearchOrganizationsComponent ], - providers:[FreeGuard,PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchOrganizationsComponent ] diff --git a/explore/src/app/searchPages/simple/searchOrps-routing.module.ts b/explore/src/app/searchPages/simple/searchOrps-routing.module.ts deleted file mode 100644 index 0d050398..00000000 --- a/explore/src/app/searchPages/simple/searchOrps-routing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchOrpsComponent} from './searchOrps.component'; -import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, - - ]) - ] -}) -export class SearchOrpsRoutingModule { } diff --git a/explore/src/app/searchPages/simple/searchOrps.component.ts b/explore/src/app/searchPages/simple/searchOrps.component.ts deleted file mode 100644 index d5201e69..00000000 --- a/explore/src/app/searchPages/simple/searchOrps.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-search-orps', - template: ` - - ` -}) - -export class OpenaireSearchOrpsComponent { - -} diff --git a/explore/src/app/searchPages/simple/searchOrps.module.ts b/explore/src/app/searchPages/simple/searchOrps.module.ts deleted file mode 100644 index 7b891e03..00000000 --- a/explore/src/app/searchPages/simple/searchOrps.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchOrpsRoutingModule} from './searchOrps-routing.module'; -import{OpenaireSearchOrpsComponent} from './searchOrps.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; - - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchOrpsRoutingModule, SearchResearchResultsModule - - ], - declarations: [ - OpenaireSearchOrpsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder], - exports: [ - OpenaireSearchOrpsComponent - ] -}) -export class LibSearchOrpsModule { } diff --git a/explore/src/app/searchPages/simple/searchProjects-routing.module.ts b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts index 98844efb..e829a2b0 100644 --- a/explore/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchProjectsComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchProjects.component.ts b/explore/src/app/searchPages/simple/searchProjects.component.ts index 3617885e..5dc521d8 100644 --- a/explore/src/app/searchPages/simple/searchProjects.component.ts +++ b/explore/src/app/searchPages/simple/searchProjects.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, ViewChild} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-search-projects', diff --git a/explore/src/app/searchPages/simple/searchProjects.module.ts b/explore/src/app/searchPages/simple/searchProjects.module.ts index d07e3e05..8b746aa4 100644 --- a/explore/src/app/searchPages/simple/searchProjects.module.ts +++ b/explore/src/app/searchPages/simple/searchProjects.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module'; @NgModule({ @@ -16,7 +15,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro declarations: [ OpenaireSearchProjectsComponent ], - providers:[FreeGuard,PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchProjectsComponent ] diff --git a/explore/src/app/searchPages/simple/searchPublications-routing.module.ts b/explore/src/app/searchPages/simple/searchPublications-routing.module.ts deleted file mode 100644 index 661f1aff..00000000 --- a/explore/src/app/searchPages/simple/searchPublications-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchPublicationsRoutingModule { } diff --git a/explore/src/app/searchPages/simple/searchPublications.component.ts b/explore/src/app/searchPages/simple/searchPublications.component.ts deleted file mode 100644 index 6331b2d5..00000000 --- a/explore/src/app/searchPages/simple/searchPublications.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-search-publications', - template: ` - - ` - -}) -export class OpenaireSearchPublicationsComponent { - - -} diff --git a/explore/src/app/searchPages/simple/searchPublications.module.ts b/explore/src/app/searchPages/simple/searchPublications.module.ts deleted file mode 100644 index 12e07a31..00000000 --- a/explore/src/app/searchPages/simple/searchPublications.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module'; -import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchPublicationsRoutingModule, SearchResearchResultsModule - - ], - declarations: [ - OpenaireSearchPublicationsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder], - exports: [ - OpenaireSearchPublicationsComponent - ] -}) -export class LibSearchPublicationsModule { } diff --git a/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts b/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts index 35745adc..bac0a53a 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts @@ -2,14 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchResearchResultsComponent, canActivate: [FreeGuard], data: { + { path: '', component: OpenaireSearchResearchResultsComponent, data: { redirect: '/error', community : 'openaire' }, canDeactivate: [PreviousRouteRecorder] } diff --git a/explore/src/app/searchPages/simple/searchResearchResults.module.ts b/explore/src/app/searchPages/simple/searchResearchResults.module.ts index e50f83ad..b1d52c78 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults.module.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms'; import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module'; import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module"; @@ -18,7 +17,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea declarations: [ OpenaireSearchResearchResultsComponent ], - providers:[FreeGuard,PreviousRouteRecorder], + providers:[PreviousRouteRecorder], exports: [ OpenaireSearchResearchResultsComponent ] diff --git a/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts b/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts deleted file mode 100644 index b090b130..00000000 --- a/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireSearchSoftwareComponent} from './searchSoftware.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchSoftwareRoutingModule { } diff --git a/explore/src/app/searchPages/simple/searchSoftware.component.ts b/explore/src/app/searchPages/simple/searchSoftware.component.ts deleted file mode 100644 index a33cb66b..00000000 --- a/explore/src/app/searchPages/simple/searchSoftware.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-search-software', - template: ` - - ` -}) - -export class OpenaireSearchSoftwareComponent { - -} diff --git a/explore/src/app/searchPages/simple/searchSoftware.module.ts b/explore/src/app/searchPages/simple/searchSoftware.module.ts deleted file mode 100644 index 7ac9a01d..00000000 --- a/explore/src/app/searchPages/simple/searchSoftware.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -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 {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, SearchSoftwareRoutingModule, SearchResearchResultsModule - ], - declarations: [ - OpenaireSearchSoftwareComponent - ], - providers:[FreeGuard,PreviousRouteRecorder], - exports: [ - OpenaireSearchSoftwareComponent - ] -}) -export class LibSearchSoftwareModule { } diff --git a/explore/src/app/userEmailPreferences/mailPrefs.component.ts b/explore/src/app/userEmailPreferences/mailPrefs.component.ts index 243303e3..795c77aa 100644 --- a/explore/src/app/userEmailPreferences/mailPrefs.component.ts +++ b/explore/src/app/userEmailPreferences/mailPrefs.component.ts @@ -1,5 +1,4 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs'; +import {Component} from '@angular/core'; @Component({ diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index a7d72a71..b624f316 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -10,7 +10,7 @@ export let properties: EnvProperties = { adminToolsPortalType: "explore", dashboard: "explore", enablePiwikTrack: false, - useCache: false, + useCache: true, useLongCache: true, showAddThis: true, metricsAPIURL: "https://beta.services.openaire.eu/usagestats/", diff --git a/explore/src/robots.prod.txt b/explore/src/robots.prod.txt index 4395fa3c..540dfe5f 100644 --- a/explore/src/robots.prod.txt +++ b/explore/src/robots.prod.txt @@ -7,6 +7,6 @@ Disallow: /myclaims Disallow: /myclaims?* Disallow: /claims Disallow: /claims?* - +Crawl-delay: 30 Sitemap: https://explore.openaire.eu/sitemap.xml