added root reducer injection

mkjangir · mkjangir · commit 42cb5c4eb8c2 · 2018-03-19T22:14:48.000+05:30
diff --git a/config/development.json b/config/development.json
@@ -1,6 +1,6 @@
 {
   "api": {
-    "baseUrl": "http://localhost:8000/api/v1/"
+    "baseUrl": "http://192.192.7.224:8000/api/v1/"
   },
 
   "paths": {
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "angular2-multiselect-dropdown": "^2.5.0",
     "bootstrap": "^4.0.0",
     "chart.js": "^2.7.2",
+    "combine-reducers-enhanced": "0.0.5",
     "core-js": "^2.4.1",
     "flag-icon-css": "^3.0.0",
     "font-awesome": "^4.7.0",
diff --git a/src/app/admin/access/permission/store/actions/save-permission.action.ts b/src/app/admin/access/permission/store/actions/save-permission.action.ts
diff --git a/src/app/admin/access/permission/store/reducers/index.ts b/src/app/admin/access/permission/store/reducers/index.ts
@@ -30,7 +30,7 @@ export const reducers: ActionReducerMap<AccessPermissionState> = {
   save:   fromSavePermission.reducer
 }
 
-export const combinedReducers = compose(combineReducers)(reducers);
+export const combinedReducers = combineReducers(reducers);
 
 // Main Access Permission State
 export const getAccessPermissionState = createFeatureSelector<AccessPermissionState>('accessPermission');
diff --git a/src/app/admin/access/permission/store/reducers/save-permission.reducer.ts b/src/app/admin/access/permission/store/reducers/save-permission.reducer.ts
diff --git a/src/app/admin/access/role/containers/form/role.form.ts b/src/app/admin/access/role/containers/form/role.form.ts
diff --git a/src/app/admin/access/role/store/reducers/index.ts b/src/app/admin/access/role/store/reducers/index.ts
@@ -33,7 +33,7 @@ export const reducers: ActionReducerMap<AccessRoleState> = {
   delete: fromDeleteRole.reducer
 }
 
-export const combinedReducers = compose(combineReducers)(reducers);
+export const combinedReducers = combineReducers(reducers);
 
 // Main Access Role State
 export const getAccessRoleState = createFeatureSelector<AccessRoleState>('accessRole');
diff --git a/src/app/admin/access/user/store/reducers/index.ts b/src/app/admin/access/user/store/reducers/index.ts
@@ -33,7 +33,7 @@ export const reducers: ActionReducerMap<AccessUserState> = {
   delete: fromDeleteUser.reducer
 }
 
-export const combinedReducers = compose(combineReducers)(reducers);
+export const combinedReducers = combineReducers(reducers);
 
 // Main Access User State
 export const getAccessUserState = createFeatureSelector<AccessUserState>('accessUser');
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -5,6 +5,11 @@ import { AdminLayoutComponent } from './shared/containers/admin-layout/admin-lay
 import { AuthGuard } from './shared/guards/auth.guard';
 
 const routes: Routes = [
+  {
+    path: '',
+    redirectTo: '/auth/login',
+    pathMatch: 'full'
+  },
   {
     path: 'auth',
     component: SimpleLayoutComponent,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -45,7 +45,7 @@ import { AuthApiClient }  from './auth/services/auth-api-client.service';
 import { UserApiClient }  from './admin/access/user/services/user-api-client.service';
 
 // For App Store
-import { reducers } from './store/app.reducer';
+import { reducers, reducerProvider, reducerToken } from './store/app.reducer';
 import { effects } from './store/app.effect';
 import { RoleApiClient } from './admin/access/role/services/role-api-client.service';
 import { PermissionApiClient } from './admin/access/permission/services/permission-api-client.service';
@@ -69,7 +69,7 @@ export function configServiceFactory (config: ConfigService) {
     HttpModule,
     TranslateModule.forRoot(),
     ToastModule.forRoot(),
-    StoreModule.forRoot(reducers),
+    StoreModule.forRoot(reducerToken),
     EffectsModule.forRoot(effects),
     SweetAlert2Module.forRoot({
       buttonsStyling: false,
@@ -99,7 +99,8 @@ export function configServiceFactory (config: ConfigService) {
     UserApiClient,
     RoleApiClient,
     PermissionApiClient,
-    UtilService
+    UtilService,
+    reducerProvider
   ],
   bootstrap: [AppComponent]
 })
diff --git a/src/app/app.store.ts b/src/app/app.store.ts
diff --git a/src/app/auth/auth.module.ts b/src/app/auth/auth.module.ts
@@ -39,8 +39,6 @@ import { AuthSandbox }      from './auth.sandbox';
     ReactiveFormsModule,
     TranslateModule,
     AlertModule.forRoot(),
-    StoreModule.forFeature('auth', reducers),
-    EffectsModule.forFeature(effects),
     AuthRoutingModule
   ],
   declarations: [
diff --git a/src/app/auth/containers/register/register.container.html b/src/app/auth/containers/register/register.container.html
@@ -100,7 +100,9 @@ <h1>{{'auth.register' | translate}}</h1>
                 <i [hidden]="!(authSandbox.registerLoading$ | async)" class='fa fa-circle-o-notch fa-spin'></i>
                 {{'auth.createAccount' | translate}}
               </button>
-              <button type="button" class="btn btn-success" (click)="logoutUser($event)">Logout</button>
+              <button type="button" class="btn btn-success" routerLink="/auth/login">
+                <i class="fa fa-lock"></i> Login
+              </button>
             </form>
           </div>
         </div>
diff --git a/src/app/auth/store/reducers/index.ts b/src/app/auth/store/reducers/index.ts
@@ -30,7 +30,7 @@ export const reducers: ActionReducerMap<AuthState> = {
   logout:         fromLogout.reducer
 }
 
-export const combinedReducers = compose(combineReducers)(reducers);
+export const combinedReducers = combineReducers(reducers);
 
 // Main Auth State
 export const getAuthState = createFeatureSelector<AuthState>('auth');
diff --git a/src/app/shared/containers/admin-layout/admin-layout.component.ts b/src/app/shared/containers/admin-layout/admin-layout.component.ts
@@ -20,7 +20,7 @@ export class AdminLayoutComponent implements OnInit {
     
   }
 
-  logout() {
+  logout(event) {
     this.authSandbox.logout();
   }
 
diff --git a/src/app/store/app.effect.ts b/src/app/store/app.effect.ts
diff --git a/src/app/store/app.reducer.ts b/src/app/store/app.reducer.ts
@@ -1,13 +1,16 @@
 import { 
   ActionReducer, 
   combineReducers 
-}                   from '@ngrx/store';
-import { compose }  from '@ngrx/core/compose';
+}                                 from '@ngrx/store';
+import { compose }                from '@ngrx/core';
+import {combineReducersEnhanced}  from "combine-reducers-enhanced";
 
 import * as fromAuth        from '../auth/store';
 import * as fromUser        from '../admin/access/user/store';
 import * as fromRole        from '../admin/access/role/store';
 import * as fromPermission  from '../admin/access/permission/store';
+import { InjectionToken }   from '@angular/core';
+import { ActionReducerMap } from '@ngrx/store';
 
 export interface State {
   auth:             fromAuth.AuthState,
@@ -21,4 +24,12 @@ export const reducers = {
   accessUser:       fromUser.combinedReducers,
   accessRole:       fromRole.combinedReducers,
   accessPermission: fromPermission.combinedReducers
-};
+};
+
+export const rootReducer = combineReducersEnhanced(reducers, false);
+
+export const reducerToken = new InjectionToken<ActionReducerMap<State>>('Registered Reducers');
+
+export const reducerProvider = [
+  { provide: reducerToken, useValue: rootReducer }
+];

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"api": {`
`3`		`- "baseUrl": "http://localhost:8000/api/v1/"`
	`3`	`+ "baseUrl": "http://192.192.7.224:8000/api/v1/"`
`4`	`4`	`},`
`5`	`5`
`6`	`6`	`"paths": {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export const reducers: ActionReducerMap<AccessPermissionState> = {`
`30`	`30`	`save: fromSavePermission.reducer`
`31`	`31`	`}`
`32`	`32`
`33`		`-export const combinedReducers = compose(combineReducers)(reducers);`
	`33`	`+export const combinedReducers = combineReducers(reducers);`
`34`	`34`
`35`	`35`	`// Main Access Permission State`
`36`	`36`	`export const getAccessPermissionState = createFeatureSelector<AccessPermissionState>('accessPermission');`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export const reducers: ActionReducerMap<AccessRoleState> = {`
`33`	`33`	`delete: fromDeleteRole.reducer`
`34`	`34`	`}`
`35`	`35`
`36`		`-export const combinedReducers = compose(combineReducers)(reducers);`
	`36`	`+export const combinedReducers = combineReducers(reducers);`
`37`	`37`
`38`	`38`	`// Main Access Role State`
`39`	`39`	`export const getAccessRoleState = createFeatureSelector<AccessRoleState>('accessRole');`