[Aggregator| Trunk]
update the aggregator according to the changes made in library components: result landing component result search & advance search page user info from API - not cookie remove isRouteenabled clean up modules git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@57127 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
c30611f3a7
commit
15daa488f8
86
angular.json
86
angular.json
|
@ -19,50 +19,11 @@
|
||||||
"assets": [
|
"assets": [
|
||||||
"src/assets",
|
"src/assets",
|
||||||
"src/robots.txt",
|
"src/robots.txt",
|
||||||
|
"src/sitemap.xml",
|
||||||
{
|
{
|
||||||
"glob": "sitemap.xml",
|
"glob": "**/*",
|
||||||
"input": "src/sitemaps",
|
"input": "src/sitemaps",
|
||||||
"output": "/"
|
"output": "/"
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "sitemap.xml",
|
|
||||||
"input": "src/sitemaps",
|
|
||||||
"output": "/assets"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/publication",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/dataset",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/software",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/other",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/project",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/organization",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/dataprovider",
|
|
||||||
"output": "/"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
|
@ -129,50 +90,11 @@
|
||||||
"assets": [
|
"assets": [
|
||||||
"src/assets",
|
"src/assets",
|
||||||
"src/robots.txt",
|
"src/robots.txt",
|
||||||
|
"src/sitemap.xml",
|
||||||
{
|
{
|
||||||
"glob": "sitemap.xml",
|
"glob": "**/*",
|
||||||
"input": "src/sitemaps",
|
"input": "src/sitemaps",
|
||||||
"output": "/"
|
"output": "/"
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "sitemap.xml",
|
|
||||||
"input": "src/sitemaps",
|
|
||||||
"output": "/assets"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/publication",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/dataset",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/software",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/other",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/project",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/organization",
|
|
||||||
"output": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "src/sitemaps/dataprovider",
|
|
||||||
"output": "/"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,8 @@ import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
|
||||||
import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
|
import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
|
||||||
import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
|
import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
|
||||||
import {FilterInfo, PortalAggregators} from "./utils/aggregators";
|
import {FilterInfo, PortalAggregators} from "./utils/aggregators";
|
||||||
|
import {UserManagementService} from "./openaireLibrary/services/user-management.service";
|
||||||
|
import {User} from "./openaireLibrary/login/utils/helper.class";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
//changeDetection: ChangeDetectionStrategy.Default,
|
//changeDetection: ChangeDetectionStrategy.Default,
|
||||||
|
@ -15,8 +17,8 @@ import {FilterInfo, PortalAggregators} from "./utils/aggregators";
|
||||||
`],
|
`],
|
||||||
template: `
|
template: `
|
||||||
|
|
||||||
<navbar *ngIf="properties" portal="aggregator" [properties]=properties [onlyTop]=false
|
<navbar *ngIf="properties && loginCheck" portal="aggregator" [properties]=properties [onlyTop]=false [user]="user"
|
||||||
[communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
|
[communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
|
||||||
[userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
|
[userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
|
||||||
<div class="custom-main-content">
|
<div class="custom-main-content">
|
||||||
<main>
|
<main>
|
||||||
|
@ -43,7 +45,7 @@ export class AppComponent {
|
||||||
menuItems: RootMenuItem [] = [
|
menuItems: RootMenuItem [] = [
|
||||||
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
||||||
{
|
{
|
||||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], [], {}),
|
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], null, {}),
|
||||||
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, [], [], {}),
|
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, [], [], {}),
|
||||||
new MenuItem("", "Research Data", "", "/search/find/datasets", false, [], [], {}),
|
new MenuItem("", "Research Data", "", "/search/find/datasets", false, [], [], {}),
|
||||||
new MenuItem("", "Software", "", "/search/find/software", false, [], [], {}),
|
new MenuItem("", "Software", "", "/search/find/software", false, [], [], {}),
|
||||||
|
@ -58,9 +60,10 @@ export class AppComponent {
|
||||||
|
|
||||||
|
|
||||||
properties: EnvProperties;
|
properties: EnvProperties;
|
||||||
|
user: User;
|
||||||
|
loginCheck: boolean = false;
|
||||||
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
|
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
|
||||||
private router: Router) {
|
private router: Router, private userManagementService: UserManagementService) {
|
||||||
|
|
||||||
router.events.forEach((event) => {
|
router.events.forEach((event) => {
|
||||||
|
|
||||||
|
@ -91,6 +94,11 @@ export class AppComponent {
|
||||||
.then(es => {
|
.then(es => {
|
||||||
this.propertiesService.setEnvProperties(es);
|
this.propertiesService.setEnvProperties(es);
|
||||||
this.properties = this.propertiesService.envSpecific;
|
this.properties = this.propertiesService.envSpecific;
|
||||||
|
this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
|
||||||
|
this.user = user;
|
||||||
|
this.loginCheck = true;
|
||||||
|
console.log(this.user)
|
||||||
|
});
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log("App couldn't fetch properties");
|
console.log("App couldn't fetch properties");
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
</span>
|
</span>
|
||||||
<span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||
|
<span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||
|
||||||
showDataProviders"
|
showDataProviders"
|
||||||
class="uk-text-large"> linked together for an integrated research search </span>
|
class="uk-text-large"> linked together for an integrated discovery of scientific output </span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -4,11 +4,9 @@ import {Location} from '@angular/common';
|
||||||
import "rxjs/add/observable/zip";
|
import "rxjs/add/observable/zip";
|
||||||
import {Meta, Title} from '@angular/platform-browser';
|
import {Meta, Title} from '@angular/platform-browser';
|
||||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||||
import {SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
|
|
||||||
import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
|
import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
|
||||||
import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
|
import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
|
||||||
import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
|
import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
|
||||||
import {SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
|
|
||||||
import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
|
import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
|
||||||
import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
|
import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
|
||||||
import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
|
import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
|
||||||
|
@ -21,8 +19,8 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||||
import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
|
import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
|
||||||
import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
|
import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
|
||||||
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
||||||
import {SearchSoftwareService} from "../openaireLibrary/services/searchSoftware.service";
|
import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
|
||||||
import {SearchOrpsService} from "../openaireLibrary/services/searchOrps.service";
|
|
||||||
import {FilterInfo, PortalAggregators} from "../utils/aggregators";
|
import {FilterInfo, PortalAggregators} from "../utils/aggregators";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@ -71,12 +69,9 @@ export class HomeComponent {
|
||||||
constructor(
|
constructor(
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private _router: Router,
|
private _router: Router,
|
||||||
private _searchPublicationsService: SearchPublicationsService,
|
private _searchResearchResultsService: SearchResearchResultsService,
|
||||||
private _searchDataprovidersService: SearchDataprovidersService,
|
private _searchDataprovidersService: SearchDataprovidersService,
|
||||||
private _searchProjectsService: SearchProjectsService,
|
private _searchProjectsService: SearchProjectsService,
|
||||||
private _searchDatasetsService: SearchDatasetsService,
|
|
||||||
private _searchSoftwareService: SearchSoftwareService,
|
|
||||||
private _searchOrpsService: SearchOrpsService,
|
|
||||||
private _searchOrganizationsService: SearchOrganizationsService,
|
private _searchOrganizationsService: SearchOrganizationsService,
|
||||||
private _refineFieldResultsService: RefineFieldResultsService,
|
private _refineFieldResultsService: RefineFieldResultsService,
|
||||||
private location: Location, private _piwikService: PiwikService,
|
private location: Location, private _piwikService: PiwikService,
|
||||||
|
@ -179,7 +174,7 @@ export class HomeComponent {
|
||||||
refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId )));
|
refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId )));
|
||||||
}
|
}
|
||||||
if (this.showPublications) {
|
if (this.showPublications) {
|
||||||
this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties,refineQuery).subscribe(
|
this.subPub = this._searchResearchResultsService.numOfSearchResults("publication","", this.properties,refineQuery).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data && data > 0) {
|
if (data && data > 0) {
|
||||||
this.publicationsSize = NumberUtils.roundNumber(data);
|
this.publicationsSize = NumberUtils.roundNumber(data);
|
||||||
|
@ -193,7 +188,7 @@ export class HomeComponent {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (this.showDatasets) {
|
if (this.showDatasets) {
|
||||||
this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties,refineQuery).subscribe(
|
this.subData = this._searchResearchResultsService.numOfSearchResults("dataset","", this.properties,refineQuery).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data && data > 0) {
|
if (data && data > 0) {
|
||||||
this.datasetsSize = NumberUtils.roundNumber(data);
|
this.datasetsSize = NumberUtils.roundNumber(data);
|
||||||
|
@ -207,7 +202,7 @@ export class HomeComponent {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (this.showSoftware) {
|
if (this.showSoftware) {
|
||||||
this.subSoft = this._searchSoftwareService.numOfSearchSoftware("", this.properties,refineQuery).subscribe(
|
this.subSoft = this._searchResearchResultsService.numOfSearchResults("software","", this.properties,refineQuery).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data && data > 0) {
|
if (data && data > 0) {
|
||||||
this.softwareSize = NumberUtils.roundNumber(data);
|
this.softwareSize = NumberUtils.roundNumber(data);
|
||||||
|
@ -221,7 +216,7 @@ export class HomeComponent {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (this.showOrp) {
|
if (this.showOrp) {
|
||||||
this.subOrp = this._searchOrpsService.numOfSearchOrps("", this.properties,refineQuery).subscribe(
|
this.subOrp = this._searchResearchResultsService.numOfSearchResults("other","", this.properties,refineQuery).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data && data > 0) {
|
if (data && data > 0) {
|
||||||
this.otherSize = NumberUtils.roundNumber(data);
|
this.otherSize = NumberUtils.roundNumber(data);
|
||||||
|
|
|
@ -7,9 +7,9 @@ import{HomeRoutingModule} from './home-routing.module';
|
||||||
import{HomeComponent} from './home.component';
|
import{HomeComponent} from './home.component';
|
||||||
|
|
||||||
import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
|
import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
|
||||||
import { DatasetsServiceModule} from '../openaireLibrary/services/datasetsService.module';
|
import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module';
|
||||||
import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
|
import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
|
||||||
import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
|
// import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
|
||||||
import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
|
import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
|
||||||
import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
|
import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
|
||||||
import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
|
import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
|
||||||
|
@ -24,17 +24,16 @@ import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2js
|
||||||
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
|
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
|
||||||
|
|
||||||
import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
|
import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
|
||||||
import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
|
// import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
|
||||||
import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
|
// import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
|
||||||
// import {AggregatorNavBarComponent} from "../utils/aggregatorNavBar.component";
|
// import {AggregatorNavBarComponent} from "../utils/aggregatorNavBar.component";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule, RouterModule,
|
CommonModule, FormsModule, RouterModule,
|
||||||
RefineFieldResultsServiceModule,
|
RefineFieldResultsServiceModule,
|
||||||
DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
|
DataProvidersServiceModule, SearchResearchResultsServiceModule, ProjectsServiceModule,
|
||||||
PublicationsServiceModule,
|
OrganizationsServiceModule,
|
||||||
OrganizationsServiceModule, SoftwareServiceModule, OrpsServiceModule,
|
|
||||||
SearchFormModule,
|
SearchFormModule,
|
||||||
PiwikServiceModule,
|
PiwikServiceModule,
|
||||||
HomeRoutingModule,
|
HomeRoutingModule,
|
||||||
|
|
|
@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
|
||||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,18 +1,14 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
|
||||||
import { NgModule} from '@angular/core';
|
import { NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
|
import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
|
||||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
||||||
import {DataProviderRoutingModule} from './dataProvider-routing.module';
|
import {DataProviderRoutingModule} from './dataProvider-routing.module';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [DataProviderModule, DataProviderRoutingModule],
|
imports: [DataProviderModule, DataProviderRoutingModule],
|
||||||
declarations:[OpenaireDataProviderComponent],
|
declarations:[OpenaireDataProviderComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireDataProviderComponent]
|
exports:[OpenaireDataProviderComponent]
|
||||||
})
|
})
|
||||||
export class LibDataProviderModule { }
|
export class LibDataProviderModule { }
|
||||||
|
|
|
@ -4,13 +4,12 @@ import { RouterModule } from '@angular/router';
|
||||||
import { OpenaireDatasetComponent } from './dataset.component';
|
import { OpenaireDatasetComponent } from './dataset.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
|
|
|
@ -2,7 +2,7 @@ import {Component} from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-dataset',
|
selector: 'openaire-dataset',
|
||||||
template: `<dataset></dataset>`,
|
template: `<result-landing type="dataset" [activeTab]="'References'"></result-landing>`,
|
||||||
})
|
})
|
||||||
export class OpenaireDatasetComponent{
|
export class OpenaireDatasetComponent{
|
||||||
constructor ( ) {
|
constructor ( ) {
|
||||||
|
|
|
@ -1,19 +1,13 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
|
||||||
import { NgModule} from '@angular/core';
|
import { NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { SharedModule } from '../../shared/shared.module';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import { DatasetModule } from '../../openaireLibrary/landingPages/dataset/dataset.module';
|
|
||||||
import { OpenaireDatasetComponent } from './dataset.component';
|
import { OpenaireDatasetComponent } from './dataset.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
import {DatasetRoutingModule} from './dataset-routing.module';
|
import {DatasetRoutingModule} from './dataset-routing.module';
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [DatasetModule, DatasetRoutingModule],
|
imports: [ResultLandingModule, DatasetRoutingModule],
|
||||||
declarations:[OpenaireDatasetComponent],
|
declarations:[OpenaireDatasetComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireDatasetComponent]
|
exports:[OpenaireDatasetComponent]
|
||||||
})
|
})
|
||||||
export class LibDatasetModule { }
|
export class LibDatasetModule { }
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
|
import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]}
|
{ path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]}
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,20 +1,14 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
import { NgModule} from '@angular/core';
|
import {HtmlProjectReportModule} from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
|
||||||
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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component';
|
||||||
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
|
|
||||||
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
|
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
|
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
|
||||||
declarations:[OpenaireHtmlProjectReportComponent],
|
declarations:[OpenaireHtmlProjectReportComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireHtmlProjectReportComponent]
|
exports:[OpenaireHtmlProjectReportComponent]
|
||||||
})
|
})
|
||||||
export class LibHtmlProjectReportModule { }
|
export class LibHtmlProjectReportModule { }
|
||||||
|
|
|
@ -1,20 +1,14 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
import { NgModule} from '@angular/core';
|
import {OrganizationModule} from '../../openaireLibrary/landingPages/organization/organization.module';
|
||||||
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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
import {OpenaireOrganizationComponent} from './organization.component';
|
||||||
import { OpenaireOrganizationComponent } from './organization.component';
|
|
||||||
import {OrganizationRoutingModule} from './organization-routing.module';
|
import {OrganizationRoutingModule} from './organization-routing.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [OrganizationModule, OrganizationRoutingModule],
|
imports: [OrganizationModule, OrganizationRoutingModule],
|
||||||
declarations:[OpenaireOrganizationComponent],
|
declarations:[OpenaireOrganizationComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireOrganizationComponent]
|
exports:[OpenaireOrganizationComponent]
|
||||||
})
|
})
|
||||||
export class LibOrganizationModule { }
|
export class LibOrganizationModule { }
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import { OpenaireOrganizationComponent } from './organization.component';
|
import {OpenaireOrganizationComponent} from './organization.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,19 +1,14 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
import { NgModule} from '@angular/core';
|
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||||
import { CommonModule } from '@angular/common';
|
import {OpenaireOrpComponent} from './orp.component';
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { SharedModule } from '../../shared/shared.module';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import { OrpModule } from '../../openaireLibrary/landingPages/orp/orp.module';
|
|
||||||
import { OpenaireOrpComponent } from './orp.component';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
import {OrpRoutingModule} from './orp-routing.module';
|
import {OrpRoutingModule} from './orp-routing.module';
|
||||||
@NgModule({
|
|
||||||
imports: [OrpModule, OrpRoutingModule],
|
@NgModule({
|
||||||
|
imports: [ResultLandingModule, OrpRoutingModule],
|
||||||
declarations:[OpenaireOrpComponent],
|
declarations:[OpenaireOrpComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireOrpComponent]
|
exports:[OpenaireOrpComponent]
|
||||||
})
|
})
|
||||||
export class LibOrpModule { }
|
export class LibOrpModule { }
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
import {OpenaireOrpComponent} from './orp.component';
|
||||||
import { OpenaireOrpComponent } from './orp.component';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
|
|
|
@ -2,7 +2,7 @@ import {Component} from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-orp',
|
selector: 'openaire-orp',
|
||||||
template: `<orp></orp>`,
|
template: `<result-landing type="orp" [activeTab]="'References'"></result-landing>`,
|
||||||
})
|
})
|
||||||
export class OpenaireOrpComponent{
|
export class OpenaireOrpComponent{
|
||||||
constructor ( ) {
|
constructor ( ) {
|
||||||
|
|
|
@ -1,20 +1,14 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
import { NgModule} from '@angular/core';
|
import {ProjectModule} from '../../openaireLibrary/landingPages/project/project.module';
|
||||||
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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
import {OpenaireProjectComponent} from './project.component';
|
||||||
import { OpenaireProjectComponent } from './project.component';
|
|
||||||
import {ProjectRoutingModule} from './project-routing.module';
|
import {ProjectRoutingModule} from './project-routing.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [ProjectModule, ProjectRoutingModule],
|
imports: [ProjectModule, ProjectRoutingModule],
|
||||||
declarations:[OpenaireProjectComponent],
|
declarations:[OpenaireProjectComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireProjectComponent]
|
exports:[OpenaireProjectComponent]
|
||||||
})
|
})
|
||||||
export class LibProjectModule { }
|
export class LibProjectModule { }
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import { OpenaireProjectComponent } from './project.component';
|
import {OpenaireProjectComponent} from './project.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,20 +1,14 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
import { NgModule} from '@angular/core';
|
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { SharedModule } from '../../shared/shared.module';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
import {OpenairePublicationComponent} from './publication.component';
|
||||||
import { OpenairePublicationComponent } from './publication.component';
|
|
||||||
import {PublicationRoutingModule} from './publication-routing.module';
|
import {PublicationRoutingModule} from './publication-routing.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [PublicationModule, PublicationRoutingModule],
|
imports: [ResultLandingModule, PublicationRoutingModule],
|
||||||
declarations:[OpenairePublicationComponent],
|
declarations:[OpenairePublicationComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenairePublicationComponent]
|
exports:[OpenairePublicationComponent]
|
||||||
})
|
})
|
||||||
export class LibPublicationModule { }
|
export class LibPublicationModule { }
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import {OpenairePublicationComponent } from './publication.component';
|
import {OpenairePublicationComponent} from './publication.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
|
|
|
@ -3,7 +3,7 @@ import {Component} from '@angular/core';
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-publication',
|
selector: 'openaire-publication',
|
||||||
template: `
|
template: `
|
||||||
<publication></publication>`,
|
<result-landing type="publication" [activeTab]="'References'"></result-landing>`,
|
||||||
})
|
})
|
||||||
export class OpenairePublicationComponent {
|
export class OpenairePublicationComponent {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
|
|
@ -1,19 +1,15 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
import { NgModule} from '@angular/core';
|
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
import {OpenaireSoftwareComponent} from './software.component';
|
||||||
import { OpenaireSoftwareComponent } from './software.component';
|
|
||||||
import {SoftwareRoutingModule} from './software-routing.module';
|
import {SoftwareRoutingModule} from './software-routing.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [SoftwareModule, SoftwareRoutingModule],
|
imports: [ResultLandingModule, SoftwareRoutingModule],
|
||||||
declarations:[OpenaireSoftwareComponent],
|
declarations:[OpenaireSoftwareComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[OpenaireSoftwareComponent]
|
exports:[OpenaireSoftwareComponent]
|
||||||
})
|
})
|
||||||
export class LibSoftwareModule { }
|
export class LibSoftwareModule { }
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import {OpenaireSoftwareComponent } from './software.component';
|
import {OpenaireSoftwareComponent} from './software.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder] }
|
{ path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
|
@ -2,7 +2,7 @@ import {Component} from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-software',
|
selector: 'openaire-software',
|
||||||
template: `<software></software>`,
|
template: `<result-landing type="software" [activeTab]="'Related Research Results'"></result-landing>`,
|
||||||
})
|
})
|
||||||
export class OpenaireSoftwareComponent{
|
export class OpenaireSoftwareComponent{
|
||||||
constructor ( ) {
|
constructor ( ) {
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
|
import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
|
||||||
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
||||||
import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
|
import {AdvancedSearchDataProvidersModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -20,7 +18,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireAdvancedSearchDataProvidersComponent
|
OpenaireAdvancedSearchDataProvidersComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard, IsRouteEnabled],
|
providers:[FreeGuard],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireAdvancedSearchDataProvidersComponent
|
OpenaireAdvancedSearchDataProvidersComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
|
import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,8 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-advanced-search-datasets',
|
selector: 'openaire-advanced-search-datasets',
|
||||||
template: `
|
template: `
|
||||||
<advanced-search-datasets [customFilter]="customFilter">
|
<advanced-search-research-results [customFilter]="customFilter" resultType="dataset"></advanced-search-research-results>
|
||||||
</advanced-search-datasets>
|
|
||||||
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,27 +1,22 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
|
||||||
import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
|
import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
|
||||||
import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
|
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
|
||||||
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
|
|
||||||
import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
AdvancedSearchDatasetsModule,
|
AdvancedSearchResearchResultsModule,
|
||||||
AdvancedSearchDatasetsRoutingModule
|
AdvancedSearchDatasetsRoutingModule
|
||||||
|
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireAdvancedSearchDatasetsComponent
|
OpenaireAdvancedSearchDatasetsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard, IsRouteEnabled],
|
providers:[FreeGuard],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireAdvancedSearchDatasetsComponent
|
OpenaireAdvancedSearchDatasetsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder]}
|
},canDeactivate: [PreviousRouteRecorder]}
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
|
||||||
import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
|
import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
||||||
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
|
|
||||||
import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -21,7 +16,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireAdvancedSearchOrganizationsComponent
|
OpenaireAdvancedSearchOrganizationsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard, IsRouteEnabled],
|
providers:[FreeGuard],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireAdvancedSearchOrganizationsComponent
|
OpenaireAdvancedSearchOrganizationsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
|
import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-advanced-search-orps',
|
selector: 'openaire-advanced-search-orps',
|
||||||
template: `
|
template: `
|
||||||
<advanced-search-orps [customFilter]="customFilter">
|
<advanced-search-research-results [customFilter]="customFilter" resultType="other"></advanced-search-research-results>
|
||||||
</advanced-search-orps>
|
|
||||||
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,27 +1,22 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module';
|
||||||
import { AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module';
|
import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
|
||||||
import { OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
|
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
|
||||||
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
|
|
||||||
import {AdvancedSearchOrpsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchOrps.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
AdvancedSearchOrpsModule,
|
AdvancedSearchResearchResultsModule,
|
||||||
AdvancedSearchOrpsRoutingModule
|
AdvancedSearchOrpsRoutingModule
|
||||||
|
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireAdvancedSearchOrpsComponent
|
OpenaireAdvancedSearchOrpsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard, IsRouteEnabled],
|
providers:[FreeGuard],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireAdvancedSearchOrpsComponent
|
OpenaireAdvancedSearchOrpsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -4,13 +4,11 @@ import { RouterModule } from '@angular/router';
|
||||||
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
|
||||||
import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
|
import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
||||||
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
import {AdvancedSearchProjectsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
|
||||||
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
|
|
||||||
import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -21,7 +16,7 @@ import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.c
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireAdvancedSearchProjectsComponent
|
OpenaireAdvancedSearchProjectsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard, IsRouteEnabled],
|
providers:[FreeGuard],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireAdvancedSearchProjectsComponent
|
OpenaireAdvancedSearchProjectsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
|
||||||
import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-advanced-search-publications',
|
selector: 'openaire-advanced-search-publications',
|
||||||
template: `
|
template: `
|
||||||
<advanced-search-publications [customFilter]="customFilter">
|
<advanced-search-research-results [customFilter]="customFilter" resultType="publication"></advanced-search-research-results>
|
||||||
</advanced-search-publications>
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,27 +1,25 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
|
import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
|
||||||
import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
|
import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
|
||||||
|
|
||||||
|
|
||||||
import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module';
|
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
AdvancedSearchPublicationsModule,
|
AdvancedSearchResearchResultsModule,
|
||||||
AdvancedSearchPublicationsRoutingModule
|
AdvancedSearchPublicationsRoutingModule
|
||||||
|
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireAdvancedSearchPublicationsComponent
|
OpenaireAdvancedSearchPublicationsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard, IsRouteEnabled],
|
providers:[FreeGuard],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireAdvancedSearchPublicationsComponent
|
OpenaireAdvancedSearchPublicationsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -6,8 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-advanced-search-software',
|
selector: 'openaire-advanced-search-software',
|
||||||
template: `
|
template: `
|
||||||
<advanced-search-software [customFilter]="customFilter">
|
<advanced-search-research-results [customFilter]="customFilter" resultType="software"></advanced-search-research-results>
|
||||||
</advanced-search-software>
|
|
||||||
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,20 +1,17 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
|
import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
|
||||||
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
|
import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
|
||||||
|
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
|
||||||
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
|
|
||||||
|
|
||||||
import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
AdvancedSearchSoftwareModule,
|
AdvancedSearchResearchResultsModule,
|
||||||
AdvancedSearchSoftwareRoutingModule
|
AdvancedSearchSoftwareRoutingModule
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
//import {MaterialModule} from '@angular/material';
|
import {NgModule} from '@angular/core';
|
||||||
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 {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module';
|
import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module';
|
||||||
|
|
||||||
import { OpenaireSearchComponent } from './search.component';
|
import {OpenaireSearchComponent} from './search.component';
|
||||||
import { MainSearchRoutingModule } from './mainSearch-routing.module';
|
import {MainSearchRoutingModule} from './mainSearch-routing.module';
|
||||||
|
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
|
||||||
|
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [ MainSearchRoutingModule, MainSearchModule],
|
imports: [ MainSearchRoutingModule, MainSearchModule],
|
||||||
declarations:[OpenaireSearchComponent],
|
declarations:[OpenaireSearchComponent],
|
||||||
exports:[OpenaireSearchComponent]
|
exports:[OpenaireSearchComponent],
|
||||||
|
providers: [FreeGuard, PreviousRouteRecorder]
|
||||||
})
|
})
|
||||||
export class LibMainSearchModule { }
|
export class LibMainSearchModule { }
|
||||||
|
|
|
@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireSearchComponent} from './search.component';
|
import{OpenaireSearchComponent} from './search.component';
|
||||||
// import {FreeGuard} from'../../login/freeGuard.guard';
|
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
|
||||||
// import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchComponent }
|
{ path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
|
||||||
// { path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
|
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
|
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
|
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
|
||||||
import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
|
import {SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module';
|
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
|
@ -16,7 +16,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchDataprovidersComponent
|
OpenaireSearchDataprovidersComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard,PreviousRouteRecorder],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchDataprovidersComponent
|
OpenaireSearchDataprovidersComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,19 +1,17 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireSearchDatasetsComponent} from './searchDatasets.component';
|
import {OpenaireSearchDatasetsComponent} from './searchDatasets.component';
|
||||||
import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
|
import {EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-search-datasets',
|
selector: 'openaire-search-datasets',
|
||||||
template: `
|
template: `
|
||||||
|
<search-research-results resultType="dataset" [customFilter]="customFilter"></search-research-results>
|
||||||
<search-datasets [customFilter]="customFilter">
|
|
||||||
</search-datasets>
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,26 +1,25 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ SearchDatasetsRoutingModule} from './searchDatasets-routing.module';
|
import {SearchDatasetsRoutingModule} from './searchDatasets-routing.module';
|
||||||
import{OpenaireSearchDatasetsComponent} from './searchDatasets.component';
|
import {OpenaireSearchDatasetsComponent} from './searchDatasets.component';
|
||||||
|
|
||||||
import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module';
|
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
SearchDatasetsModule , SearchDatasetsRoutingModule
|
SearchResearchResultsModule , SearchDatasetsRoutingModule
|
||||||
|
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchDatasetsComponent
|
OpenaireSearchDatasetsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard,PreviousRouteRecorder],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchDatasetsComponent
|
OpenaireSearchDatasetsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,18 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
import {OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
|
||||||
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
|
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
|
import {SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
|
||||||
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
|
import {OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
|
import {SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -20,7 +19,7 @@ import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simp
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchOrganizationsComponent
|
OpenaireSearchOrganizationsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard,PreviousRouteRecorder],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchOrganizationsComponent
|
OpenaireSearchOrganizationsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,19 +1,17 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireSearchOrpsComponent} from './searchOrps.component';
|
import {OpenaireSearchOrpsComponent} from './searchOrps.component';
|
||||||
import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
|
import {EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-search-orps',
|
selector: 'openaire-search-orps',
|
||||||
template: `
|
template: `
|
||||||
|
<search-research-results resultType="other" [customFilter]="customFilter"></search-research-results>
|
||||||
<search-orps [customFilter]="customFilter">
|
|
||||||
</search-orps>
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,26 +1,23 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
import {SearchOrpsRoutingModule} from './searchOrps-routing.module';
|
||||||
import{ SearchOrpsRoutingModule} from './searchOrps-routing.module';
|
import {OpenaireSearchOrpsComponent} from './searchOrps.component';
|
||||||
import{OpenaireSearchOrpsComponent} from './searchOrps.component';
|
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
|
||||||
|
|
||||||
import {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module';
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
SearchOrpsModule , SearchOrpsRoutingModule
|
SearchResearchResultsModule , SearchOrpsRoutingModule
|
||||||
|
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchOrpsComponent
|
OpenaireSearchOrpsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard,PreviousRouteRecorder],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchOrpsComponent
|
OpenaireSearchOrpsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireSearchProjectsComponent} from './searchProjects.component';
|
import {OpenaireSearchProjectsComponent} from './searchProjects.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ SearchProjectsRoutingModule} from './searchProjects-routing.module';
|
import {SearchProjectsRoutingModule} from './searchProjects-routing.module';
|
||||||
import{OpenaireSearchProjectsComponent} from './searchProjects.component';
|
import {OpenaireSearchProjectsComponent} from './searchProjects.component';
|
||||||
|
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
import {SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module';
|
||||||
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module';
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule
|
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule
|
||||||
|
@ -17,7 +17,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/se
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchProjectsComponent
|
OpenaireSearchProjectsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard,PreviousRouteRecorder],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchProjectsComponent
|
OpenaireSearchProjectsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import{OpenaireSearchPublicationsComponent} from './searchPublications.component';
|
import {OpenaireSearchPublicationsComponent} from './searchPublications.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard], data: {
|
||||||
redirect: '/error'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
|
|
|
@ -5,10 +5,8 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-search-publications',
|
selector: 'openaire-search-publications',
|
||||||
template: `
|
template: `
|
||||||
<search-publications [customFilter]="customFilter">
|
<search-research-results resultType="publication" [customFilter]="customFilter"></search-research-results>
|
||||||
</search-publications>
|
|
||||||
|
|
||||||
`
|
`
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,18 +1,17 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module';
|
import {SearchPublicationsRoutingModule} from './searchPublications-routing.module';
|
||||||
import{OpenaireSearchPublicationsComponent} from './searchPublications.component';
|
import {OpenaireSearchPublicationsComponent} from './searchPublications.component';
|
||||||
|
|
||||||
import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module';
|
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule, SearchPublicationsModule,
|
CommonModule, FormsModule, SearchResearchResultsModule,
|
||||||
|
|
||||||
SearchPublicationsRoutingModule
|
SearchPublicationsRoutingModule
|
||||||
|
|
||||||
|
@ -20,7 +19,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchPublicationsComponent
|
OpenaireSearchPublicationsComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard,PreviousRouteRecorder],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchPublicationsComponent
|
OpenaireSearchPublicationsComponent
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
import { NgModule } from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import {RouterModule} from '@angular/router';
|
||||||
|
|
||||||
import {OpenaireSearchSoftwareComponent} from './searchSoftware.component';
|
import {OpenaireSearchSoftwareComponent} from './searchSoftware.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
|
{ path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -6,9 +6,7 @@ import {ActivatedRoute} from "@angular/router";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-search-software',
|
selector: 'openaire-search-software',
|
||||||
template: `
|
template: `
|
||||||
|
<search-research-results resultType="software" [customFilter]="customFilter"></search-research-results>
|
||||||
<search-software [customFilter]="customFilter">
|
|
||||||
</search-software>
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,21 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
|
|
||||||
import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module';
|
import {SearchSoftwareRoutingModule} from './searchSoftware-routing.module';
|
||||||
import{OpenaireSearchSoftwareComponent} from './searchSoftware.component';
|
import {OpenaireSearchSoftwareComponent} from './searchSoftware.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
|
||||||
|
|
||||||
|
|
||||||
import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module';
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule, SearchSoftwareModule, SearchSoftwareRoutingModule
|
CommonModule, FormsModule, SearchResearchResultsModule, SearchSoftwareRoutingModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
OpenaireSearchSoftwareComponent
|
OpenaireSearchSoftwareComponent
|
||||||
],
|
],
|
||||||
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled
|
providers:[FreeGuard,PreviousRouteRecorder
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
OpenaireSearchSoftwareComponent
|
OpenaireSearchSoftwareComponent
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
"searchDataciteAPIURL" : "https://api.datacite.org/works",
|
"searchDataciteAPIURL" : "https://api.datacite.org/works",
|
||||||
|
|
||||||
"searchOrcidURL" : "https://pub.orcid.org/v2.1/",
|
"searchOrcidURL" : "https://pub.orcid.org/v2.1/",
|
||||||
|
"orcidURL" : "https://orcid.org/",
|
||||||
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
|
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
|
||||||
"doiURL" : "https://dx.doi.org/",
|
"doiURL" : "https://dx.doi.org/",
|
||||||
"cordisURL" : "http://cordis.europa.eu/projects/",
|
"cordisURL" : "http://cordis.europa.eu/projects/",
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
"piwikSiteId" : "6",
|
"piwikSiteId" : "6",
|
||||||
|
|
||||||
"loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
|
"loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
|
||||||
|
"userInfoUrl" : "http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
|
||||||
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||||
|
|
||||||
"cookieDomain" :".di.uoa.gr",
|
"cookieDomain" :".di.uoa.gr",
|
||||||
|
|
Loading…
Reference in New Issue