diff --git a/explore/angular.json b/explore/angular.json
index 37a07f8c..e897eca7 100644
--- a/explore/angular.json
+++ b/explore/angular.json
@@ -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": [
diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts
index 9c2750d2..14de045d 100644
--- a/explore/src/app/app.component.ts
+++ b/explore/src/app/app.component.ts
@@ -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",
diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
index f5cc238b..5e9a494d 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@@ -4,8 +4,8 @@ import {Component, Input, ViewChild} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-dataprovider',
template: `
-
-
+
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
index 03ab04be..94a260d7 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
@@ -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: [
diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
index cc9339ef..6666a77f 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@@ -4,8 +4,8 @@ import {Component, Input, ViewChild} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-organizations',
template: `
-
-
+
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
index 6bccbcce..eb04c28c 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
@@ -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
],
diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts
index 50bf7e49..4790614d 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@@ -2,8 +2,8 @@ import {Component, Input, ViewChild} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-projects',
template: `
-
-
+
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts
index 4949aa83..9ff82ed6 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts
@@ -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 {
+}
diff --git a/explore/src/app/searchPages/advanced/searchResearchResults.component.ts b/explore/src/app/searchPages/advanced/searchResearchResults.component.ts
index abac4593..c46c6717 100644
--- a/explore/src/app/searchPages/advanced/searchResearchResults.component.ts
+++ b/explore/src/app/searchPages/advanced/searchResearchResults.component.ts
@@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
@Component({
selector: 'openaire-search-results',
template: `
-
+
`
})
diff --git a/explore/src/app/searchPages/simple/searchDataProviders.module.ts b/explore/src/app/searchPages/simple/searchDataProviders.module.ts
index fbfaf1ea..22cf3ede 100644
--- a/explore/src/app/searchPages/simple/searchDataProviders.module.ts
+++ b/explore/src/app/searchPages/simple/searchDataProviders.module.ts
@@ -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,
diff --git a/explore/src/app/searchPages/simple/searchDataproviders.component.ts b/explore/src/app/searchPages/simple/searchDataproviders.component.ts
index d71593a9..1420df85 100644
--- a/explore/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/explore/src/app/searchPages/simple/searchDataproviders.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-dataproviders',
diff --git a/explore/src/app/searchPages/simple/searchOrganizations.module.ts b/explore/src/app/searchPages/simple/searchOrganizations.module.ts
index f56c7c43..e9749434 100644
--- a/explore/src/app/searchPages/simple/searchOrganizations.module.ts
+++ b/explore/src/app/searchPages/simple/searchOrganizations.module.ts
@@ -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: [
diff --git a/explore/src/app/searchPages/simple/searchProjects.module.ts b/explore/src/app/searchPages/simple/searchProjects.module.ts
index b526ef9d..6624f7c5 100644
--- a/explore/src/app/searchPages/simple/searchProjects.module.ts
+++ b/explore/src/app/searchPages/simple/searchProjects.module.ts
@@ -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
diff --git a/explore/src/app/searchPages/simple/searchResearchResults.component.ts b/explore/src/app/searchPages/simple/searchResearchResults.component.ts
index d230cefa..917ff644 100644
--- a/explore/src/app/searchPages/simple/searchResearchResults.component.ts
+++ b/explore/src/app/searchPages/simple/searchResearchResults.component.ts
@@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
@Component({
selector: 'openaire-search-results',
template: `
-
+
`
})
diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json
index ccdf0c37..14dc0e15 100644
--- a/explore/src/assets/env-properties.json
+++ b/explore/src/assets/env-properties.json
@@ -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/",
diff --git a/explore/src/material.scss b/explore/src/material.scss
new file mode 100644
index 00000000..50525afc
--- /dev/null
+++ b/explore/src/material.scss
@@ -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);
+