Skip to content

Commit d26e728

Browse files
committed
client store folder moved out from core
1 parent 9d61c38 commit d26e728

File tree

28 files changed

+354
-304
lines changed

28 files changed

+354
-304
lines changed

src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'app-root',
55
templateUrl: './app.component.html',
6-
styleUrls: ['./app.component.less']
6+
styleUrls: ['./app.component.less'],
77
})
88
export class AppComponent {
9-
title = 'tuto-angular-store';
9+
title = 'angular-apollo-store';
1010
}

src/app/core/core.module.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import { ForbiddenPageComponent } from './pages/forbidden-page/forbidden-page.co
1111
import { MainLayoutComponent } from './layouts/main-layout/main-layout.component';
1212
import { HeaderComponent } from './layouts/header/header.component';
1313
import { HTTP_INTERCEPTORS } from '@angular/common/http';
14-
import { BaseInterceptor } from '@core/interceptors/base.interceptor';
15-
14+
import { BaseInterceptor } from '../core/interceptors/base.interceptor';
1615

1716
export const COMPONENTS = [
1817
AppComponent,
@@ -21,16 +20,11 @@ export const COMPONENTS = [
2120
MainLayoutComponent,
2221

2322
NotFoundPageComponent,
24-
ForbiddenPageComponent
23+
ForbiddenPageComponent,
2524
];
2625

2726
@NgModule({
28-
imports: [
29-
CommonModule,
30-
RouterModule,
31-
32-
MaterialModule,
33-
],
27+
imports: [CommonModule, RouterModule, MaterialModule],
3428
declarations: COMPONENTS,
3529
exports: COMPONENTS,
3630
})
@@ -42,7 +36,7 @@ export class CoreModule {
4236
{
4337
provide: HTTP_INTERCEPTORS,
4438
useClass: BaseInterceptor,
45-
multi: true
39+
multi: true,
4640
},
4741
],
4842
};

src/app/core/store/client/client.state.ts

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/app/core/store/client/effects/index.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/app/core/store/client/effects/list.effects.ts

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/app/core/store/index.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/app/features/todo/todo-page/todo-page.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import { Component, OnInit } from '@angular/core';
22
import { Store } from '@ngrx/store';
33
import { Observable } from 'rxjs';
44

5-
import { State } from 'src/app/store';
5+
import { GlobalState } from 'src/app/store';
66
import { Todo } from 'src/app/store/todo/selectors';
77
import { addTodo, loadTodo } from 'src/app/store/todo/actions';
88

99
@Component({
1010
selector: 'app-todo-page',
1111
templateUrl: './todo-page.component.html',
12-
styleUrls: ['./todo-page.component.less']
12+
styleUrls: ['./todo-page.component.less'],
1313
})
1414
export class TodoPageComponent implements OnInit {
1515
todoList$: Observable<Todo[]> = this.store.select(state => state.todo.todos);
1616

1717
newTodo = '';
1818

19-
constructor(private store: Store<State>) { }
19+
constructor(private store: Store<GlobalState>) {}
2020

2121
ngOnInit() {
2222
this.store.dispatch(loadTodo());

src/app/pages/clients/clients.module.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { MaterialModule } from '../../shared/material.module';
88
import { StoreModule } from '@ngrx/store';
99
import { EffectsModule } from '@ngrx/effects';
1010

11-
import { CLIENT_EFFECTS } from '@core/store/client/effects';
12-
import { CLIENT_REDUCERS } from '@core/store/client/client.state';
11+
import { CLIENT_EFFECTS } from 'src/app/store/client/effects';
12+
import { CLIENT_REDUCERS } from 'src/app/store/client/client.state';
1313
import { ClientsListComponent } from './components/clients-list/clients-list.component';
1414
import { NgxDatatableModule } from '@swimlane/ngx-datatable';
1515
import { ClientFormComponent } from './components/client-form/client-form.component';
@@ -20,7 +20,6 @@ import { ClientDetailsComponent } from './components/client-details/client-detai
2020
import { SharedModule } from '../../shared/shared.module';
2121
import { TextMaskModule } from 'angular2-text-mask';
2222

23-
2423
@NgModule({
2524
declarations: [
2625
ClientsPageComponent,
@@ -29,12 +28,12 @@ import { TextMaskModule } from 'angular2-text-mask';
2928
ClientAddComponent,
3029
ClientUpdateComponent,
3130
ClientFormComponent,
32-
ClientDetailsComponent
31+
ClientDetailsComponent,
3332
],
3433
entryComponents: [
3534
ClientAddComponent,
3635
ClientUpdateComponent,
37-
ClientDetailsComponent
36+
ClientDetailsComponent,
3837
],
3938
imports: [
4039
CommonModule,
@@ -49,7 +48,6 @@ import { TextMaskModule } from 'angular2-text-mask';
4948

5049
StoreModule.forFeature('clients', CLIENT_REDUCERS),
5150
EffectsModule.forFeature(CLIENT_EFFECTS),
52-
]
51+
],
5352
})
54-
export class ClientsModule {
55-
}
53+
export class ClientsModule {}
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
1+
import {
2+
ChangeDetectionStrategy,
3+
Component,
4+
Inject,
5+
OnInit,
6+
} from '@angular/core';
27
import { MAT_DIALOG_DATA } from '@angular/material';
3-
import { Client } from '@core/store/client/models/client.model';
4-
8+
import { Client } from 'src/app/store/client/models/client.model';
59

610
@Component({
711
selector: 'app-client-details',
@@ -10,10 +14,7 @@ import { Client } from '@core/store/client/models/client.model';
1014
changeDetection: ChangeDetectionStrategy.OnPush,
1115
})
1216
export class ClientDetailsComponent implements OnInit {
17+
constructor(@Inject(MAT_DIALOG_DATA) public client: Client) {}
1318

14-
constructor(@Inject(MAT_DIALOG_DATA) public client: Client) {
15-
}
16-
17-
ngOnInit() {
18-
}
19+
ngOnInit() {}
1920
}

src/app/pages/clients/components/client-form/client-form.component.ts

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
1+
import {
2+
ChangeDetectionStrategy,
3+
Component,
4+
EventEmitter,
5+
Input,
6+
Output,
7+
} from '@angular/core';
28
import { FormControl, FormGroup, Validators } from '@angular/forms';
3-
import { Client } from '../../../../core/store/client/models/client.model';
9+
import { Client } from '../../../../store/client/models/client.model';
410
import { EmailValidator } from '../../../../shared/form-validators/email.validator';
511

6-
712
@Component({
813
selector: 'app-client-form',
914
templateUrl: './client-form.component.html',
@@ -34,22 +39,51 @@ export class ClientFormComponent {
3439
@Output() submitted = new EventEmitter<Client>();
3540

3641
isPending: boolean;
37-
mask = [/[1-9]/, ' ', '(', /[1-9]/, /\d/, /\d/, ')', ' ', /\d/, /\d/, /\d/, ' ', '-', ' ', /\d/, /\d/, /\d/, /\d/];
42+
mask = [
43+
/[1-9]/,
44+
' ',
45+
'(',
46+
/[1-9]/,
47+
/\d/,
48+
/\d/,
49+
')',
50+
' ',
51+
/\d/,
52+
/\d/,
53+
/\d/,
54+
' ',
55+
'-',
56+
' ',
57+
/\d/,
58+
/\d/,
59+
/\d/,
60+
/\d/,
61+
];
3862

3963
form: FormGroup = new FormGroup({
4064
id: new FormControl(''),
41-
company: new FormControl('', Validators.compose([Validators.required, Validators.maxLength(100)])),
65+
company: new FormControl(
66+
'',
67+
Validators.compose([Validators.required, Validators.maxLength(100)])
68+
),
4269
description: new FormControl('', Validators.required),
4370
address: new FormControl('', Validators.required),
44-
name: new FormControl('', Validators.compose([Validators.required, Validators.maxLength(200)])),
45-
email: new FormControl('', Validators.compose([
46-
Validators.required, EmailValidator.validate, Validators.maxLength(200)
47-
])),
71+
name: new FormControl(
72+
'',
73+
Validators.compose([Validators.required, Validators.maxLength(200)])
74+
),
75+
email: new FormControl(
76+
'',
77+
Validators.compose([
78+
Validators.required,
79+
EmailValidator.validate,
80+
Validators.maxLength(200),
81+
])
82+
),
4883
phone: new FormControl('', Validators.required),
4984
});
5085

51-
constructor() {
52-
}
86+
constructor() {}
5387

5488
submit() {
5589
if (this.form.valid) {

0 commit comments

Comments
 (0)