Use .forRoot for NGRX + update common-data lib file structure

Author: jdgarvey

apps/dashboard/src/app/app.module.ts

@@ -44,12 +44,6 @@ import { StoreDevtoolsModule } from '@ngrx/store-devtools';
     AppMaterialModule,
     CommonDataModule,
     TotalsViewModule,
-    NxModule.forRoot(),
-    StoreModule.forRoot({}),
-    EffectsModule.forRoot([]),
-    StoreDevtoolsModule.instrument({
-      maxAge: 5
-    }),
   ],
   bootstrap: [AppComponent]
 })

libs/common-data/src/index.ts

@@ -1,10 +1,10 @@
 export { CommonDataModule } from './lib/common-data.module';
 
-export { Item } from './lib/items/item.model';
-export { ItemsService } from './lib/items/items.service';
+export { Item } from './lib/core/items/item.model';
+export { ItemsService } from './lib/core/items/items.service';
 
-export { Widget } from './lib/widgets/widget.model';
-export { WidgetsService } from './lib/widgets/widgets.service';
+export { Widget } from './lib/core/widgets/widget.model';
+export { WidgetsService } from './lib/core/widgets/widgets.service';
 
-export { ItemsFacade } from './lib/state/items.facade';
-export { WidgetsFacade } from './lib/state/widgets.facade';
+export { ItemsFacade } from './lib/state/items/items.facade';
+export { WidgetsFacade } from './lib/state/widgets/widgets.facade';

libs/common-data/src/lib/api-config.ts

@@ -1,35 +1,17 @@
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { EffectsModule } from '@ngrx/effects';
-import { StoreModule } from '@ngrx/store';
-import { ItemsService } from './items/items.service';
-import { ItemsEffects } from './state/items.effects';
-import { ItemsFacade } from './state/items.facade';
-import { initialState as itemsInitialState, itemsReducer } from './state/items.reducer';
-import { WidgetsEffects } from './state/widgets.effects';
-import { initialState as widgetsInitialState, widgetsReducer } from './state/widgets.reducer';
-import { WidgetsService } from './widgets/widgets.service';
+
+import { StateModule } from './state/state.module';
 
 @NgModule({
   imports: [
     CommonModule,
     HttpClientModule,
-    StoreModule.forFeature('items', itemsReducer, { initialState: itemsInitialState }),
-    StoreModule.forFeature('widgets', widgetsReducer, { initialState:  widgetsInitialState}),
-    EffectsModule.forFeature([ItemsEffects, WidgetsEffects]),
-  ],
-  providers: [
-    ItemsService,
-    WidgetsService,
-    ItemsEffects,
-    ItemsFacade,
-    WidgetsEffects
+    StateModule
   ],
-  exports: [
-    StoreModule,
-    EffectsModule
-  ]
+  providers: [],
+  exports: []
 })
 
 export class CommonDataModule {

libs/common-data/src/lib/common-data.module.ts

@@ -5,7 +5,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 const BASE_URL = 'http://localhost:3000/items/';
 const HEADER = {headers: new HttpHeaders({'Content-Type': 'application/json'})};
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class ItemsService {
   constructor(private http: HttpClient) {
   }

…/common-data/src/lib/items/item.model.ts …on-data/src/lib/core/items/item.model.tslibs/common-data/src/lib/items/item.model.ts renamed to libs/common-data/src/lib/core/items/item.model.ts libs/common-data/src/lib/items/item.model.ts renamed to libs/common-data/src/lib/core/items/item.model.ts

@@ -5,7 +5,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 const BASE_URL = 'http://localhost:3000/widgets/';
 const HEADER = {headers: new HttpHeaders({'Content-Type': 'application/json'})};
 
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class WidgetsService {
   constructor(private http: HttpClient) {
   }