Skip to content

Commit 9050d02

Browse files
authored
Merge pull request #59 from ioet/56/Prettier-tslint
close #56
2 parents 9d861df + b9f6516 commit 9050d02

File tree

7 files changed

+49
-23
lines changed

7 files changed

+49
-23
lines changed

.prettierrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"printWidth": 120,
3+
"singleQuote": true,
4+
"useTabs": false,
5+
"tabWidth": 2,
6+
"semi": true,
7+
"bracketSpacing": true,
8+
"endOfLine": "lf"
9+
}

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This project was generated using [Angular CLI](https://github.com/angular/angula
99
Install Node.js from [https://nodejs.org/en/download/] but we recommend that you install it using Node Version Management [https://github.com/nvm-sh/nvm] (v12.16.1 LTS).
1010

1111
### Angular CLI
12+
1213
Angular CLI is a Command Line Interface (CLI) to speed up your development with Angular.
1314

1415
Run `npm install -g @angular/cli` to install Angular CLI
@@ -22,6 +23,15 @@ Run `npm install` to install the required node_modules for this project.
2223
Run `ng serve` to run the app in dev mode. After executing this command, you can navigate to `http://localhost:4200/` to see the app working.
2324
The app will automatically reload if you change anything in the source files.
2425

26+
## Prepare your environment for vscode
27+
28+
Install the following extensions:
29+
30+
- `EditorConfig for Visual Studio Code`.
31+
- `TSLint`
32+
- `Prettier - Code formatter`.
33+
- Go to user settings (`settings.json`) and enable formatting on save: `"editor.formatOnSave": true`.
34+
2535
## Code scaffolding
2636

2737
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@
4545
"karma-coverage-istanbul-reporter": "~2.1.0",
4646
"karma-jasmine": "~2.0.1",
4747
"karma-jasmine-html-reporter": "^1.4.2",
48+
"prettier": "^2.0.2",
4849
"protractor": "~5.4.3",
4950
"ts-node": "~8.3.0",
5051
"tslint": "~5.18.0",
5152
"typescript": "~3.7.5"
5253
},
5354
"husky": {
5455
"hooks": {
55-
"commit-msg": "commit-message-validator"
56+
"commit-msg": "commit-message-validator",
57+
"pre-commit": "ng lint"
5658
}
5759
},
5860
"config": {

src/app/modules/project-management/pages/project-management.component.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
[projectToEdit]="project"
55
(savedProject)="updateProject($event)"
66
(cancelForm)="cancelForm()"
7-
>
8-
</app-create-project>
7+
></app-create-project>
98

109
<app-project-list
1110
class="item"
1211
[projects]="projects"
1312
(editProject)="editProject($event)"
1413
(deleteProject)="deleteProject($event)"
15-
>
16-
</app-project-list>
14+
></app-project-list>
1715
</div>

src/app/modules/project-management/pages/project-management.component.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,35 @@ import { ProjectService } from '../services/project.service';
55
@Component({
66
selector: 'app-project-management',
77
templateUrl: './project-management.component.html',
8-
styleUrls: ['./project-management.component.scss']
8+
styleUrls: ['./project-management.component.scss'],
99
})
1010
export class ProjectManagementComponent implements OnInit {
11-
1211
editedProjectId;
1312

1413
project: Project;
1514

1615
projects: Project[] = [];
1716

18-
constructor(private projectService: ProjectService) {
19-
}
17+
constructor(private projectService: ProjectService) {}
2018

2119
ngOnInit(): void {
2220
this.getProjects();
2321
}
2422

2523
updateProject(projectData): void {
2624
if (this.editedProjectId) {
27-
const projectIndex = this.projects.findIndex((project => project.id === this.editedProjectId));
25+
const projectIndex = this.projects.findIndex((project) => project.id === this.editedProjectId);
2826
this.projects[projectIndex].name = projectData.name;
2927
this.projects[projectIndex].details = projectData.details;
3028
this.projects[projectIndex].status = projectData.status;
3129
this.projects[projectIndex].completed = projectData.completed;
3230
} else {
33-
const newProject: Project = { id: (this.projects.length + 1).toString(), name: projectData.name,
34-
details: projectData.details, status: projectData.status, completed: false
31+
const newProject: Project = {
32+
id: (this.projects.length + 1).toString(),
33+
name: projectData.name,
34+
details: projectData.details,
35+
status: projectData.status,
36+
completed: false,
3537
};
3638
this.projects = this.projects.concat(newProject);
3739
}
@@ -50,8 +52,8 @@ export class ProjectManagementComponent implements OnInit {
5052
this.project = null;
5153
}
5254

53-
getProjects() {
54-
this.projectService.getProjects().subscribe(data => {
55+
getProjects() {
56+
this.projectService.getProjects().subscribe((data) => {
5557
this.projects = data;
5658
});
5759
}
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
export interface Entry {
2-
id: string,
3-
project: string,
4-
startDate: string,
5-
endDate: string,
6-
activity: string,
7-
technology: string,
8-
comments?: string,
9-
ticket?: string
2+
id: string;
3+
project: string;
4+
startDate: string;
5+
endDate: string;
6+
activity: string;
7+
technology: string;
8+
comments?: string;
9+
ticket?: string;
1010
}
11-

0 commit comments

Comments
 (0)