From 2d8c3ec290338735ffd482454cd9452a1a5988d7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 12 Aug 2020 14:55:01 +0000 Subject: [PATCH] [Explore | Trunk]: Add Previous Route Recorder to all routes. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@59259 d315682c-612b-4755-9ff5-7f18f6832af3 --- explore/src/app/reload/libReload.module.ts | 25 ++++++++----------- .../find/mainSearch-routing.module.ts | 13 ++++------ 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/explore/src/app/reload/libReload.module.ts b/explore/src/app/reload/libReload.module.ts index d982aaa9..d33a6e82 100644 --- a/explore/src/app/reload/libReload.module.ts +++ b/explore/src/app/reload/libReload.module.ts @@ -1,23 +1,18 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {RouterModule} from '@angular/router'; - import{ReloadModule} from '../openaireLibrary/reload/reload.module'; +import {ReloadModule} from '../openaireLibrary/reload/reload.module'; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ReloadModule ], - declarations: [ - - ], - providers:[ - - ], - exports: [ - - ] + declarations: [], + providers: [], + exports: [] }) -export class LibReloadModule { } +export class LibReloadModule { +} diff --git a/explore/src/app/searchPages/find/mainSearch-routing.module.ts b/explore/src/app/searchPages/find/mainSearch-routing.module.ts index 193e0c1f..d029d532 100644 --- a/explore/src/app/searchPages/find/mainSearch-routing.module.ts +++ b/explore/src/app/searchPages/find/mainSearch-routing.module.ts @@ -1,16 +1,13 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import{OpenaireSearchComponent} from './search.component'; -// import {FreeGuard} from'../../login/freeGuard.guard'; -// import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; +import {OpenaireSearchComponent} from './search.component'; +import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireSearchComponent } - // { path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } - + { path: '', component: OpenaireSearchComponent, canDeactivate: [PreviousRouteRecorder] } ]) ] })