MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

[Monitor | Trunk]: Remove properties resolver 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@60775 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2021-04-01 14:45:13 +00:00
parent 6d16aa2c5c
commit d326201439
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/app-routing.module.ts
View File

@ -1,53 +1,42 @@
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
import {OpenaireErrorPageComponent} from './error/errorPage.component';
const routes: Routes = [
{path: '', loadChildren: './home/home.module#HomeModule', resolve: {envSpecific: EnvironmentSpecificResolver}},
{path: '', loadChildren: './home/home.module#HomeModule'},
{
path: 'browse',
loadChildren: './search-stakeholders/search-stakeholders.module#SearchStakeholdersModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
loadChildren: './search-stakeholders/search-stakeholders.module#SearchStakeholdersModule'
},
{path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'},
{
path: 'about/learn-how',
loadChildren: './learn-how/learn-how.module#LearnHowModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
loadChildren: './learn-how/learn-how.module#LearnHowModule'
},
{
path: 'contact-us',
loadChildren: './contact/contact.module#ContactModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
loadChildren: './contact/contact.module#ContactModule'
},
{
path: 'reload',
loadChildren: './reload/libReload.module#LibReloadModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
loadChildren: './reload/libReload.module#LibReloadModule'
},
{
path: 'user-info',
loadChildren: './login/libUser.module#LibUserModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
loadChildren: './login/libUser.module#LibUserModule'
},
{path: 'error', component: OpenaireErrorPageComponent, resolve: {envSpecific: EnvironmentSpecificResolver}},
{ path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
{path: 'error', component: OpenaireErrorPageComponent},
{path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
{
path: '**',
pathMatch: 'full',
component: OpenaireErrorPageComponent,
resolve: {envSpecific: EnvironmentSpecificResolver}
component: OpenaireErrorPageComponent
}
];
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
providers: [EnvironmentSpecificResolver, EnvironmentSpecificService]
exports: [RouterModule]
})
export class AppRoutingModule {
}

17
src/app/app.module.ts
View File

@ -13,15 +13,13 @@ import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/coo
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
import {ErrorModule} from './openaireLibrary/error/error.module';
import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
@NgModule({
imports: [
SharedModule,
BrowserAnimationsModule,
@ -37,9 +35,9 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
AppRoutingModule,
Schema2jsonldModule
],
declarations: [ AppComponent, OpenaireErrorPageComponent],
exports: [ AppComponent ],
providers:[EnvironmentSpecificResolver,
declarations: [AppComponent, OpenaireErrorPageComponent],
exports: [AppComponent],
providers: [
{
provide: HTTP_INTERCEPTORS,
useClass: HttpInterceptorService,
@ -50,10 +48,11 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
useClass: ErrorInterceptorService,
multi: true
},
[{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
[{ provide: DEFAULT_TIMEOUT, useValue: 30000 }]
[{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
[{provide: DEFAULT_TIMEOUT, useValue: 30000}]
],
bootstrap: [AppComponent]
})
//
export class AppModule {}
export class AppModule {
}