Skip to content

Commit

Permalink
fix: remove ngxs router plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Romain Ziba committed Nov 8, 2018
1 parent 6e15232 commit d4f6e93
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 24 deletions.
8 changes: 0 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"@material/card": "^0.41.0",
"@material/list": "^0.41.0",
"@ngxs/form-plugin": "^3.2.0",
"@ngxs/router-plugin": "^3.2.0",
"@ngxs/storage-plugin": "^3.2.0",
"@ngxs/store": "^3.2.0",
"@stomp/ng2-stompjs": "^4.0.1",
Expand Down
6 changes: 0 additions & 6 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,10 @@ import { AppComponent } from './app.component';
import { SharedModule } from './shared/shared.module';
import { NgxsModule } from '@ngxs/store';
import { NgxsReduxDevtoolsPluginModule } from '@ngxs/devtools-plugin';
import { NgxsRouterPluginModule } from '@ngxs/router-plugin';
import { EventsModule } from './events/events.module';
import { NgxsFormPluginModule } from '@ngxs/form-plugin';
import { NgxsStoragePluginModule } from '@ngxs/storage-plugin';

export function tokenGetter() {
return localStorage.getItem('access_token');
}

export const API_URL = new InjectionToken<string>('apiUrl');

const stompConfig: StompConfig = {
Expand Down Expand Up @@ -77,7 +72,6 @@ export const COMPONENTS = [AppComponent];
SharedModule,

NgxsModule.forRoot([]),
NgxsRouterPluginModule.forRoot(),
NgxsFormPluginModule.forRoot(),
NgxsStoragePluginModule.forRoot(),
NgxsReduxDevtoolsPluginModule.forRoot({
Expand Down
12 changes: 6 additions & 6 deletions src/app/auth/store/login.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from './login.actions';
import { catchError, map, switchMap } from 'rxjs/operators';
import { asapScheduler } from 'rxjs/index';
import { Navigate } from '@ngxs/router-plugin';
import { Router } from '@angular/router';

export class AuthStateModel {
user: User | null;
Expand All @@ -28,7 +28,7 @@ export class AuthStateModel {
}
})
export class AuthState {
constructor(private service: AuthService) {}
constructor(private service: AuthService, private router: Router) {}

@Selector()
static getUser(state: AuthStateModel) {
Expand Down Expand Up @@ -72,13 +72,13 @@ export class AuthState {
}

@Action(LoginSuccess)
loginSuccess({ patchState, dispatch }: StateContext<AuthStateModel>, { payload }: LoginSuccess) {
loginSuccess({ patchState }: StateContext<AuthStateModel>, { payload }: LoginSuccess) {
patchState({
pending: false,
user: payload,
error: null
});
dispatch(new Navigate(['/']));
this.router.navigate(['/']);
}

@Action(UserLogged)
Expand All @@ -100,7 +100,7 @@ export class AuthState {
}

@Action([LoginRedirect, Logout])
loginRedirect({ dispatch }: StateContext<AuthStateModel>) {
dispatch(new Navigate(['/login']));
loginRedirect() {
this.router.navigate(['/login']);
}
}
2 changes: 2 additions & 0 deletions src/app/events/pages/list/events-page.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { NgxsModule } from '@ngxs/store';
import { EventsState } from '../../store';
import { EventService } from '../../services/event.service';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { RouterTestingModule } from '@angular/router/testing';

describe('EventsPageComponent', () => {
let component: EventsPageComponent;
Expand All @@ -16,6 +17,7 @@ describe('EventsPageComponent', () => {
TestBed.configureTestingModule({
imports: [
HttpClientTestingModule,
RouterTestingModule,
MatIconModule,
MatListModule,
NgxsModule.forRoot([EventsState])
Expand Down
6 changes: 3 additions & 3 deletions src/app/events/pages/list/events-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { EventsState, LoadEvents } from '../../store';
import { TeamsState } from '../../../core/store';
import { EventsQuery } from '../../models/events-query';
import { Observable } from 'rxjs/Observable';
import { Navigate } from '@ngxs/router-plugin';
import { Router } from '@angular/router';

@Component({
selector: 'app-events',
Expand All @@ -24,7 +24,7 @@ export class EventsPageComponent implements OnInit {
@Select(EventsState.getAllEvents)
events$: Observable<Event[]>;

constructor(private store: Store) {}
constructor(private store: Store, private router: Router) {}

ngOnInit() {
this.store.select(TeamsState.getSelected).subscribe(selected => {
Expand All @@ -41,6 +41,6 @@ export class EventsPageComponent implements OnInit {
}

goToNewEvent() {
this.store.dispatch(new Navigate(['/new-event']));
this.router.navigate(['/new-event']);
}
}

0 comments on commit d4f6e93

Please sign in to comment.