[Explore|Trunk]
New Search: use new serach page component for projects, organizations, datasources simple and advanced search pages. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@58074 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
be9e64bdf8
commit
84d7984100
|
@ -27,6 +27,7 @@
|
|||
],
|
||||
"styles": [
|
||||
"src/styles.css",
|
||||
"src/material.scss",
|
||||
"node_modules/datatables.net-dt/css/jquery.dataTables.css"
|
||||
],
|
||||
"scripts": [
|
||||
|
@ -84,6 +85,7 @@
|
|||
],
|
||||
"styles": [
|
||||
"src/styles.css",
|
||||
"src/material.scss",
|
||||
"node_modules/datatables.net-dt/css/jquery.dataTables.css"
|
||||
],
|
||||
"assets": [
|
||||
|
|
|
@ -90,13 +90,12 @@ export class AppComponent {
|
|||
}
|
||||
|
||||
buildMenu() {
|
||||
//TODO add check for research results route
|
||||
this.menuItems = [
|
||||
{
|
||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
||||
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
|
||||
new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
|
||||
new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
|
||||
new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
|
||||
items: [
|
||||
new MenuItem("", "Research Outcomes", "", "/search/find/research-results", false, [], [], {}),
|
||||
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
||||
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
||||
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
|
||||
|
@ -124,9 +123,6 @@ export class AppComponent {
|
|||
new MenuItem("", "Browse all", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {})]
|
||||
}
|
||||
];
|
||||
if(this.properties.environment == "development"){
|
||||
this.menuItems[0].items.push(new MenuItem("", "Research outcomes", "", "/search/find/research-results", false, [], [], {}))
|
||||
}
|
||||
if (Session.isPortalAdministrator(this.user)) {
|
||||
this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
|
||||
this.userMenuItems.push(new MenuItem("", "Manage helptexts",
|
||||
|
|
|
@ -4,8 +4,8 @@ import {Component, Input, ViewChild} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'openaire-advanced-search-dataprovider',
|
||||
template: `
|
||||
<advanced-search-dataprovider>
|
||||
</advanced-search-dataprovider>
|
||||
<search-dataproviders [simpleView]="false">
|
||||
</search-dataproviders>
|
||||
|
||||
`
|
||||
})
|
||||
|
|
|
@ -1,20 +1,19 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
|
||||
import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
|
||||
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
||||
import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
|
||||
import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
|
||||
import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
||||
|
||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
AdvancedSearchDataProvidersRoutingModule,
|
||||
AdvancedSearchDataProvidersModule
|
||||
SearchDataProvidersModule
|
||||
|
||||
],
|
||||
declarations: [
|
||||
|
|
|
@ -4,8 +4,8 @@ import {Component, Input, ViewChild} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'openaire-advanced-search-organizations',
|
||||
template: `
|
||||
<advanced-search-organizations>
|
||||
</advanced-search-organizations>
|
||||
<search-organizations [simpleView]="false">
|
||||
</search-organizations>
|
||||
|
||||
`
|
||||
})
|
||||
|
|
|
@ -1,20 +1,18 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
|
||||
import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
|
||||
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
||||
import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
|
||||
import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
||||
|
||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
|
||||
import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
|
||||
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
AdvancedSearchOrganizationsModule,
|
||||
SearchOrganizationsModule,
|
||||
AdvancedSearchOrganizationsRoutingModule
|
||||
|
||||
],
|
||||
|
|
|
@ -2,8 +2,8 @@ import {Component, Input, ViewChild} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'openaire-advanced-search-projects',
|
||||
template: `
|
||||
<advanced-search-projects>
|
||||
</advanced-search-projects>
|
||||
<search-projects [simpleView]="false">
|
||||
</search-projects>
|
||||
|
||||
`
|
||||
})
|
||||
|
|
|
@ -1,29 +1,27 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
|
||||
import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
|
||||
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
||||
|
||||
|
||||
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';
|
||||
import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
|
||||
import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
AdvancedSearchProjectsModule,
|
||||
AdvancedSearchProjectsRoutingModule
|
||||
SearchProjectsModule,
|
||||
AdvancedSearchProjectsRoutingModule
|
||||
|
||||
],
|
||||
declarations: [
|
||||
OpenaireAdvancedSearchProjectsComponent
|
||||
],
|
||||
providers:[FreeGuard, IsRouteEnabled],
|
||||
],
|
||||
providers: [FreeGuard, IsRouteEnabled],
|
||||
exports: [
|
||||
OpenaireAdvancedSearchProjectsComponent
|
||||
]
|
||||
]
|
||||
})
|
||||
export class LibAdvancedSearchProjectsModule { }
|
||||
export class LibAdvancedSearchProjectsModule {
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'openaire-search-results',
|
||||
template: `
|
||||
<search-research-results resultType="publication" [simpleView]="false"></search-research-results>
|
||||
<search-research-results resultType="result" [simpleView]="false"></search-research-results>
|
||||
`
|
||||
|
||||
})
|
||||
|
|
|
@ -6,7 +6,7 @@ import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.mo
|
|||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module';
|
||||
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module';
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import {Component, Input, ViewChild} from '@angular/core';
|
||||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-dataproviders',
|
||||
|
|
|
@ -8,8 +8,8 @@ import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.compone
|
|||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
|
||||
|
||||
import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
|
@ -8,7 +8,7 @@ import{OpenaireSearchProjectsComponent} from './searchProjects.component';
|
|||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module';
|
||||
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module';
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule
|
||||
|
|
|
@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'openaire-search-results',
|
||||
template: `
|
||||
<search-research-results resultType="publication"></search-research-results>
|
||||
<search-research-results resultType="result"></search-research-results>
|
||||
`
|
||||
|
||||
})
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"environment" : "development",
|
||||
"dashboard" : "explore",
|
||||
"enablePiwikTrack" : false,
|
||||
"useCache" : true,
|
||||
"useCache" : false,
|
||||
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
|
||||
"framesAPIURL" : "https://beta.openaire.eu/stats3/",
|
||||
"statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
@import '~@angular/material/theming';
|
||||
@include mat-core();
|
||||
$my-app-primary: mat-palette($mat-gray, 900);
|
||||
$my-app-accent: mat-palette($mat-light-green, 700);
|
||||
|
||||
$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent);
|
||||
|
||||
@include angular-material-theme($my-app-theme);
|
||||
|
Loading…
Reference in New Issue