Project

General

Profile

« Previous | Next » 

Revision 59262

Added by Konstantinos Triantafyllou over 3 years ago

[Connect | Trunk]: Add Previous Route Recorder to all routes.

View differences:

modules/uoa-connect-portal/trunk/src/app/subjects/subjects.module.ts
21 21 
  declarations: [
22 22 
    SubjectsComponent
23 23 
  ],
24 
  providers: [],
25 24 
  exports: [
26 25 
    SubjectsComponent
27 26 
  ]
modules/uoa-connect-portal/trunk/src/app/searchPages/find/mainSearch-routing.module.ts
1 
import { NgModule } from '@angular/core';
2 
import { RouterModule } from '@angular/router';
1 
import {NgModule} from '@angular/core';
2 
import {RouterModule} from '@angular/router';
3 3 

  		




  4
  
  
    
import{OpenaireSearchComponent} from './search.component';


  		




  
  4
  
    
import {OpenaireSearchComponent} from './search.component';


  		




  5
  5
  
    
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";


  		




  6
  6
  
    
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";


  		




  7
  7
  
    

  		




  8
  8
  
    
@NgModule({


  		




  9
  9
  
    
  imports: [


  		




  10
  10
  
    
    RouterModule.forChild([


  		




  11
  
  
    
     // { path: '', component: OpenaireSearchComponent }


  		




  12
  
  
    
      	{ path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }


  		




  13
  
  
    

  		




  
  11
  
    
      {path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]}


  		




  14
  12
  
    
    ])


  		




  15
  13
  
    
  ]


  		




  16
  14
  
    
})


  		




  17
  
  
    
export class MainSearchRoutingModule { }


  		




  
  15
  
    
export class MainSearchRoutingModule {


  		




  
  16
  
    
}


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/searchPages/advanced/searchResearchResults.component.ts
    
  





  9
  9
  
    
    template: `


  		




  10
  10
  
    
      <search-research-results resultType="result" [simpleView]="false" [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true"></search-research-results>


  		




  11
  11
  
    
    `


  		




  12
  
  
    

  		




  13
  12
  
    
})


  		




  14
  13
  
    
export class OpenaireSearchResearchResultsComponent {


  		




  15
  14
  
    
    connectCommunityId:string;


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/searchPages/simple/searchResearchResults.component.ts
    
  





  8
  8
  
    
@Component({


  		




  9
  9
  
    
    selector: 'openaire-search-results',


  		




  10
  10
  
    
    template: `


  		




  11
  
  
    
      <search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/publications"


  		




  
  11
  
    
      <search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/research-outcomes"


  		




  12
  12
  
    
                               [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" 


  		




  13
  13
  
    
                               [includeOnlyResultsAndFilter]="false" [showBreadcrumb]="true" [showAdvancedSearchLink]="true"></search-research-results>


  		




  14
  14
  
    
    `


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/statistics/statistics-routing.module.ts
    
  





  1
  
  
    
import { NgModule } from '@angular/core';


  		




  2
  
  
    
import { RouterModule } from '@angular/router';


  		




  
  1
  
    
import {NgModule} from '@angular/core';


  		




  
  2
  
    
import {RouterModule} from '@angular/router';


  		




  3
  3
  
    

  		




  4
  
  
    
import{StatisticsComponent} from './statistics.component';


  		




  
  4
  
    
import {StatisticsComponent} from './statistics.component';


  		




  5
  5
  
    
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';


  		




  6
  6
  
    
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';


  		




  7
  
  
    
// import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'


  		




  8
  7
  
    

  		




  9
  8
  
    
@NgModule({


  		




  10
  9
  
    
  imports: [


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/verification-manager/verification-manager.component.ts
    
  





  
  1
  
    
import {Component} from "@angular/core";


  		




  
  2
  
    

  		




  
  3
  
    
@Component({


  		




  
  4
  
    
  selector: 'verification-manager',


  		




  
  5
  
    
  template: `<div>test</div>`


  		




  
  6
  
    
})


  		




  
  7
  
    
export class VerificationManagerComponent {


  		




  
  8
  
    

  		




  
  9
  
    
}


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/verification-manager/verification-manager.module.ts
    
  





  
  1
  
    
import {NgModule} from "@angular/core";


  		




  
  2
  
    
import {CommonModule} from "@angular/common";


  		




  
  3
  
    
import {VerificationManagerComponent} from "./verification-manager.component";


  		




  
  4
  
    
import {VerificationModule} from "../openaireLibrary/verification/verification.module";


  		




  
  5
  
    
import {VerificationGuard} from "../openaireLibrary/login/verification.guard";


  		




  
  6
  
    
import {VerificationManagerRoutingModule} from "./verification-manager-routing.module";


  		




  
  7
  
    

  		




  
  8
  
    
@NgModule({


  		




  
  9
  
    
  imports: [CommonModule, VerificationModule, VerificationManagerRoutingModule],


  		




  
  10
  
    
  declarations: [VerificationManagerComponent],


  		




  
  11
  
    
  exports: [VerificationManagerComponent],


  		




  
  12
  
    
  providers: [VerificationGuard]


  		




  
  13
  
    
})


  		




  
  14
  
    
export class VerificationManagerModule {}


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/verification-manager/verification-manager-routing.module.ts
    
  





  
  1
  
    
import { NgModule}      from '@angular/core';


  		




  
  2
  
    
import { RouterModule } from '@angular/router';


  		




  
  3
  
    
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";


  		




  
  4
  
    
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";


  		




  
  5
  
    
import {VerificationComponent} from "../openaireLibrary/verification/verification.component";


  		




  
  6
  
    

  		




  
  7
  
    
@NgModule({


  		




  
  8
  
    
  imports: [


  		




  
  9
  
    
    RouterModule.forChild([


  		




  
  10
  
    
      { path: '', component: VerificationComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}


  		




  
  11
  
    
    ])


  		




  
  12
  
    
  ]


  		




  
  13
  
    
})


  		




  
  14
  
    
export class VerificationManagerRoutingModule {


  		




  
  15
  
    
}


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/contact/contact-routing.module.ts
    
  





  2
  2
  
    
import {RouterModule} from '@angular/router';


  		




  3
  3
  
    
import {ContactComponent} from './contact.component';


  		




  4
  4
  
    
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";


  		




  
  5
  
    
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";


  		




  5
  6
  
    

  		




  6
  7
  
    
@NgModule({


  		




  7
  8
  
    
    imports: [


  		




  8
  9
  
    
        RouterModule.forChild([


  		




  9
  
  
    
            { path: '', component: ContactComponent, canActivate: [IsRouteEnabled]}


  		




  
  10
  
    
            { path: '', component: ContactComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}


  		




  10
  11
  
    
        ])


  		




  11
  12
  
    
    ]


  		




  12
  13
  
    
})


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/claims/linking/linking-routing.module.ts
    
  





  1
  
  
    
import { NgModule } from '@angular/core';


  		




  2
  
  
    
import { RouterModule } from '@angular/router';


  		




  3
  
  
    
import { OpenaireLinkingComponent } from './linkingGeneric.component';


  		




  4
  
  
    

  		




  5
  
  
    
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';


  		




  
  1
  
    
import {NgModule} from '@angular/core';


  		




  
  2
  
    
import {RouterModule} from '@angular/router';


  		




  
  3
  
    
import {OpenaireLinkingComponent} from './linkingGeneric.component';


  		




  6
  4
  
    
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';


  		




  7
  5
  
    
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';


  		




  8
  6
  
    
import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard';


  		




  
  7
  
    

  		




  9
  8
  
    
//LoginGuard


  		




  10
  9
  
    
@NgModule({


  		




  11
  10
  
    
  imports: [


  		












Also available in:  Unified diff