hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-11 20:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into w2p-44024_simple-search-with-select

Browse Source 
Conflicts:
	package.json
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Lotte Hofstede
2017-09-20 16:07:34 +02:00
parent b0bfff15a6 6db85d1e7b
commit c38a43ff2b
43 changed files with 325 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,12 +2,11 @@ import { NgModule } from '@angular/core';
import { HttpModule } from '@angular/http';
import { FormsModule } from '@angular/forms';
import { StoreModule, Store } from '@ngrx/store';
import { RouterStoreModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { rootReducer, AppState } from './app.reducer';
import { effects } from './app.effects';
import { appReducers } from './app.reducer';
import { appEffects } from './app.effects';
import { CoreModule } from './core/core.module';
import { SharedModule } from './shared/shared.module';
@@ -28,6 +27,8 @@ import { HeaderComponent } from './header/header.component';
import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
import { GLOBAL_CONFIG, ENV_CONFIG } from '../config';
import { EffectsModule } from '@ngrx/effects';
import { appMetaReducers } from './app.metareducers';
export function getConfig() {
return ENV_CONFIG;
@@ -46,10 +47,9 @@ export function getConfig() {
CommunityPageModule,
SearchPageModule,
AppRoutingModule,
StoreModule.provideStore(rootReducer),
RouterStoreModule.connectRouter(),
StoreDevtoolsModule.instrumentOnlyWithExtension(),
effects
StoreModule.forRoot(appReducers, { metaReducers: appMetaReducers }),
StoreDevtoolsModule.instrument({ maxAge: 50 }),
EffectsModule.forRoot(appEffects)
],
providers: [
{ provide: GLOBAL_CONFIG, useFactory: (getConfig) },