Skip to content

Commit c41a001

Browse files
committed
#78 improve structure
1 parent d178cf4 commit c41a001

File tree

45 files changed

+131
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+131
-166
lines changed

src/app/app-routing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ProjectManagementComponent } from './modules/project-management/pages/p
99
import { ActivitiesManagementComponent } from './modules/activities-management/pages/activities-management.component';
1010
import { HomeComponent } from './modules/home/home.component';
1111
import { LoginComponent } from './modules/login/login.component';
12-
import { CustomerComponent } from './modules/customer/pages/customer.component';
12+
import { CustomerComponent } from './modules/customer-managment/pages/customer.component';
1313

1414
const routes: Routes = [
1515
{

src/app/app.module.ts

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,20 @@ import { ActivityEffects } from './modules/activities-management/store/activity-
3737
import { ProjectEffects } from './modules/project-management/store/project.effects';
3838
import { reducers, metaReducers } from './reducers';
3939
import { environment } from '../environments/environment';
40-
import { CustomerComponent } from './modules/customer/pages/customer.component';
41-
import { CustomerTableListComponent } from './modules/customer/components/customer-table-list/customer-table-list.component';
42-
import { SearchComponent } from './modules/customer/components/search/search.component';
43-
// tslint:disable-next-line:import-spacing
44-
import { ManagmentCustomerProjectsComponent }
45-
from './modules/customer/components/managment-customer-projects/managment-customer-projects.component';
46-
import { InputCustomerComponent } from './modules/customer/components/input-customer/input-customer';
47-
import { InputProjectComponent } from './modules/customer/components/input-project/input-project.component';
48-
import { ProjectTableListComponent } from './modules/customer/components/project-table-list/project-table-list.component';
49-
import { ProjectTypeTableListComponent } from './modules/customer/components/project-type-table-list/project-type-table-list.component';
50-
import { InputProjectTypeComponent } from './modules/customer/components/input-project-type/input-project-type.component';
40+
import { CustomerComponent } from './modules/customer-managment/pages/customer.component';
41+
// tslint:disable-next-line: max-line-length
42+
import { CustomerListComponent } from './modules/customer-managment/components/customer-info/components/customer-list/customer-list.component';
43+
import { SearchComponent } from './modules/customer-managment/components/search/search.component';
44+
// tslint:disable-next-line: max-line-length
45+
import { ManagmentCustomerProjectsComponent } from './modules/customer-managment/components/managment-customer-projects/managment-customer-projects.component';
46+
import { CreateCustomerComponent } from './modules/customer-managment/components/customer-info/components/create-customer/create-customer';
47+
// tslint:disable-next-line: max-line-length
48+
import { CreateeProjectComponent } from './modules/customer-managment/components/projects/components/create-project/createe-project.component';
49+
import { ProjectLiistComponent } from './modules/customer-managment/components/projects/components/project-liist/project-liist.component';
50+
// tslint:disable-next-line: max-line-length
51+
import { ProjectTypeListComponent } from './modules/customer-managment/components/projects-type/components/project-type-list/project-type-list.component';
52+
// tslint:disable-next-line: max-line-length
53+
import { CreateProjectTypeComponent } from './modules/customer-managment/components/projects-type/components/create-project-type/create-project-type.component';
5154

5255
@NgModule({
5356
declarations: [
@@ -76,14 +79,14 @@ import { InputProjectTypeComponent } from './modules/customer/components/input-p
7679
FilterProjectPipe,
7780
SearchProjectComponent,
7881
CustomerComponent,
79-
CustomerTableListComponent,
82+
CustomerListComponent,
8083
SearchComponent,
8184
ManagmentCustomerProjectsComponent,
82-
InputCustomerComponent,
83-
InputProjectComponent,
84-
ProjectTableListComponent,
85-
ProjectTypeTableListComponent,
86-
InputProjectTypeComponent,
85+
CreateCustomerComponent,
86+
CreateeProjectComponent,
87+
ProjectLiistComponent,
88+
ProjectTypeListComponent,
89+
CreateProjectTypeComponent,
8790
],
8891
imports: [
8992
CommonModule,

src/app/modules/customer/components/input-customer/input-customer.spec.ts renamed to src/app/modules/customer-managment/components/customer-info/components/create-customer/create-customer.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22

3-
import { InputCustomerComponent } from './input-customer';
3+
import { CreateCustomerComponent } from './create-customer';
44

55
describe('InputCustomerComponent', () => {
6-
let component: InputCustomerComponent;
7-
let fixture: ComponentFixture<InputCustomerComponent>;
6+
let component: CreateCustomerComponent;
7+
let fixture: ComponentFixture<CreateCustomerComponent>;
88

99
beforeEach(async(() => {
1010
TestBed.configureTestingModule({
11-
declarations: [InputCustomerComponent],
11+
declarations: [CreateCustomerComponent],
1212
}).compileComponents();
1313
}));
1414

1515
beforeEach(() => {
16-
fixture = TestBed.createComponent(InputCustomerComponent);
16+
fixture = TestBed.createComponent(CreateCustomerComponent);
1717
component = fixture.componentInstance;
1818
fixture.detectChanges();
1919
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-create-customer',
5+
templateUrl: './create-customer.html',
6+
styleUrls: ['./create-customer.scss'],
7+
})
8+
export class CreateCustomerComponent implements OnInit {
9+
constructor() {}
10+
11+
ngOnInit(): void {}
12+
}

src/app/modules/customer/components/customer-table-list/customer-table-list.component.html renamed to src/app/modules/customer-managment/components/customer-info/components/customer-list/customer-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<table class="table table-sm table-bordered table-striped mb-0">
2-
<thead class="bg-header">
2+
<thead class="thead-orange">
33
<tr class="d-flex">
44
<th class="col-9">Name</th>
55
<th class="col-3 text-center"></th>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import '../../../../../../../styles/themes/orange-theme';

src/app/modules/customer/components/customer-table-list/customer-table-list.component.spec.ts renamed to src/app/modules/customer-managment/components/customer-info/components/customer-list/customer-list.component.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22

3-
import { CustomerTableListComponent } from './customer-table-list.component';
3+
import { CustomerListComponent } from './customer-list.component';
44
import { NgxPaginationModule } from 'ngx-pagination';
55

66
describe('CustomerTableListComponent', () => {
7-
let component: CustomerTableListComponent;
8-
let fixture: ComponentFixture<CustomerTableListComponent>;
7+
let component: CustomerListComponent;
8+
let fixture: ComponentFixture<CustomerListComponent>;
99

1010
beforeEach(async(() => {
1111
TestBed.configureTestingModule({
1212
imports: [NgxPaginationModule],
13-
declarations: [CustomerTableListComponent],
13+
declarations: [CustomerListComponent],
1414
}).compileComponents();
1515
}));
1616

1717
beforeEach(() => {
18-
fixture = TestBed.createComponent(CustomerTableListComponent);
18+
fixture = TestBed.createComponent(CustomerListComponent);
1919
component = fixture.componentInstance;
2020
fixture.detectChanges();
2121
});

src/app/modules/customer/components/customer-table-list/customer-table-list.component.ts renamed to src/app/modules/customer-managment/components/customer-info/components/customer-list/customer-list.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
22

33
@Component({
4-
selector: 'app-customer-table-list',
5-
templateUrl: './customer-table-list.component.html',
6-
styleUrls: ['./customer-table-list.component.scss'],
4+
selector: 'app-customer-list',
5+
templateUrl: './customer-list.component.html',
6+
styleUrls: ['./customer-list.component.scss'],
77
})
8-
export class CustomerTableListComponent implements OnInit {
8+
export class CustomerListComponent implements OnInit {
99
initPage1 = 1;
1010

1111
customers = [

0 commit comments

Comments
 (0)