hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 05:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'resolvers-branch-angular6' into w2p-57053_menu-angular6

Browse Source 
Conflicts:
	src/app/app.module.ts
	src/app/header/header.component.ts
	src/app/navbar/navbar.effects.ts
This commit is contained in:
lotte
2018-11-12 09:49:26 +01:00
parent 83bf3ab8b8 54dad64ab4
commit 17239cd1be
230 changed files with 6657 additions and 7197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,57 +48,75 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
return config.debug ? [...metaReducers, ...debugMetaReducers] : metaReducers;
}
const DEV_MODULES: any[] = [];
const IMPORTS = [
CommonModule,
SharedModule,
HttpClientModule,
AppRoutingModule,
CoreModule.forRoot(),
NgbModule.forRoot(),
TranslateModule.forRoot(),
EffectsModule.forRoot(appEffects),
StoreModule.forRoot(appReducers),
StoreRouterConnectingModule,
];
if (!ENV_CONFIG.production) {
DEV_MODULES.push(StoreDevtoolsModule.instrument({ maxAge: 500 }));
}
IMPORTS.push(
StoreDevtoolsModule.instrument({
maxAge: 100,
logOnly: ENV_CONFIG.production,
})
);
const PROVIDERS = [
{
provide: GLOBAL_CONFIG,
useFactory: (getConfig)
},
{
provide: APP_BASE_HREF,
useFactory: (getBase)
},
{
provide: META_REDUCERS,
useFactory: getMetaReducers,
deps: [GLOBAL_CONFIG]
},
{
provide: RouterStateSerializer,
useClass: DSpaceRouterStateSerializer
}
];
const DECLARATIONS = [
AppComponent,
HeaderComponent,
NavbarComponent,
HeaderNavbarWrapperComponent,
AdminSidebarComponent,
FooterComponent,
PageNotFoundComponent,
NotificationComponent,
NotificationsBoardComponent
];
const EXPORTS = [
AppComponent
];
@NgModule({
imports: [
CommonModule,
SharedModule,
HttpClientModule,
AppRoutingModule,
CoreModule.forRoot(),
NgbModule.forRoot(),
TranslateModule.forRoot(),
EffectsModule.forRoot(appEffects),
StoreModule.forRoot(appReducers),
StoreRouterConnectingModule,
...DEV_MODULES
...IMPORTS
],
providers: [
{
provide: GLOBAL_CONFIG,
useFactory: (getConfig)
},
{
provide: APP_BASE_HREF,
useFactory: (getBase)
},
{
provide: META_REDUCERS,
useFactory: getMetaReducers,
deps: [GLOBAL_CONFIG]
},
{
provide: RouterStateSerializer,
useClass: DSpaceRouterStateSerializer
}
...PROVIDERS
],
declarations: [
AppComponent,
HeaderComponent,
NavbarComponent,
HeaderNavbarWrapperComponent,
AdminSidebarComponent,
FooterComponent,
PageNotFoundComponent,
NotificationComponent,
NotificationsBoardComponent
...DECLARATIONS
],
exports: [AppComponent]
exports: [
...EXPORTS
]
})
export class AppModule {