Merge pull request #12 from FurtunaDaniel/structure

Get rid on Inject in constructor for momentjs
FurtunaDaniel · Sep 6, 2018 · c962fda · c962fda
2 parents cef005e + bd30dba
commit c962fda
Show file tree

Hide file tree

Showing 26 changed files with 140 additions and 130 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,10 @@ before_script:
   - npm install -g --silent firebase-tools # installs firebase to run firebase deploy
   - npm install -g --silent @angular/cli
 
-script:
+install:
   - travis_wait 30 npm install
+
+script:
   - npm run deploy
 
 deploy:

diff --git a/package.json b/package.json
@@ -9,11 +9,10 @@
     "test": "ng test --source-map=false",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "deploy":
-      "ng build --prod && compodoc -p tsconfig.json -n \"Hr Assist Documentation\" && cp -r documentation/ dist",
-    "doc":
-      "./node_modules/.bin/compodoc -p tsconfig.json  -s --port 8081 --theme postmark -o ",
-    "checkNode": "check-node-version --package "
+    "deploy": "ng build --prod && compodoc -p tsconfig.json -n \"Hr Assist Documentation\" && cp -r documentation/ dist",
+    "doc": "./node_modules/.bin/compodoc -p tsconfig.json  -s --port 8081 --theme postmark -o ",
+    "checkNode": "check-node-version --package",
+    "fixLint": "ng lint hr-assist --fix"
   },
   "engines": {
     "node": ">=8.0.0",
@@ -52,16 +51,17 @@
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "check-node-version": "1.1.0",
     "@angular-devkit/build-angular": "~0.6.8",
-    "@angular/cli": "6.1.3",
+    "@angular/cli": "6.1.5",
     "@angular/compiler-cli": "6.0.7",
     "@angular/language-service": "6.0.7",
     "@compodoc/compodoc": "^1.1.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~10.5.1",
-    "codelyzer": "~4.4.2",
+    "check-node-version": "1.1.0",
+    "codelyzer": "^4.4.4",
+    "i": "^0.3.6",
     "jasmine-core": "~3.1.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~2.0.4",
@@ -74,6 +74,7 @@
     "protractor": "~5.3.2",
     "ts-node": "~4.1.0",
     "tslint": "~5.10.0",
+    "tslint-angular": "^1.1.2",
     "typescript": "2.7.2"
   }
 }
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
@@ -1,24 +1,28 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
 import { HttpTokenInterceptor } from './interceptors/http.token.interceptor';
 
 import {
 	AuthentificatHelper,
 	UserLoginService,
 	AuthGuard,
-	AuthStatusService
+	AuthStatusService,
+	ApiService,
+	MomentService
 } from './services';
-import { ApiService } from './services/api.service';
 
 @NgModule({
-	imports: [CommonModule],
+	imports: [CommonModule, FormsModule, ReactiveFormsModule],
 	providers: [
 		AuthentificatHelper,
 		UserLoginService,
 		AuthGuard,
 		ApiService,
 		AuthStatusService,
+		MomentService,
 		{
 			provide: HTTP_INTERCEPTORS,
 			useClass: HttpTokenInterceptor,

diff --git a/src/app/core/services/index.ts b/src/app/core/services/index.ts
@@ -2,3 +2,5 @@ export * from './auth-guard.service';
 export * from './user-login.service';
 export * from './AuthentificationHelper.service';
 export * from './auth-status.service';
+export * from './api.service';
+export * from './moment-service';
diff --git a/src/app/core/services/moment-service.ts b/src/app/core/services/moment-service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+import * as m from 'moment';
+
+// tslint:disable-next-line:max-line-length
+/* better implementation of moment inspired by https://stackoverflow.com/questions/39780378/making-moment-injectable-in-angular2?answertab=active#tab-top */
+@Injectable()
+export class MomentService {
+	moment = m;
+}
diff --git a/src/app/holiday/holidays-list/holidays-list.component.html b/src/app/holiday/holidays-list/holidays-list.component.html
@@ -13,7 +13,7 @@
     <ng-container matColumnDef="index">
       <mat-header-cell *matHeaderCellDef
                        [translate]="'TABLE.NO_HEADER'"> </mat-header-cell>
-      <mat-cell *matCellDef="let element; let i = index;">{{i+1}}.</mat-cell>
+      <mat-cell *matCellDef="let element; let i = index;">{{ i+1 }}.</mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="employee">
@@ -30,7 +30,7 @@
                        mat-sort-header>
         <span [translate]="'TABLE.SART_DATE_HEADER'"></span>
       </mat-header-cell>
-      <mat-cell *matCellDef="let element"> {{ element.start_date ? moment(element.start_date).format('LL') : '' }} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{ element.start_date ? ms.moment(element.start_date).format('LL') : '' }} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="end_date"
@@ -39,7 +39,7 @@
                        mat-sort-header>
         <span [translate]="'TABLE.END_DATE_HEADER'"></span>
       </mat-header-cell>
-      <mat-cell *matCellDef="let element"> {{ element.end_date ? moment(element.end_date).format('LL') : '' }} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{ element.end_date ? ms.moment(element.end_date).format('LL') : '' }} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="days">
@@ -56,7 +56,7 @@
       <mat-header-cell *matHeaderCellDef
                        [translate]="'TABLE.HOLIDAYS.SIGNING_DAY'"> </mat-header-cell>
       <mat-cell *matCellDef="let element">
-        {{ element.signing_day? moment(element.signing_day).format('LL'): '' }}
+        {{ element.signing_day? ms.moment(element.signing_day).format('LL'): '' }}
       </mat-cell>
     </ng-container>
 

diff --git a/src/app/holiday/holidays-list/holidays-list.component.spec.ts b/src/app/holiday/holidays-list/holidays-list.component.spec.ts
@@ -7,19 +7,19 @@ describe('HolidaysListComponent', () => {
   let fixture: ComponentFixture<HolidaysListComponent>;
 
   beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ HolidaysListComponent ]
-    })
-    .compileComponents();
+	TestBed.configureTestingModule({
+		declarations: [ HolidaysListComponent ]
+	})
+	.compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(HolidaysListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+	fixture = TestBed.createComponent(HolidaysListComponent);
+	component = fixture.componentInstance;
+	fixture.detectChanges();
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+	expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/holiday/holidays-list/holidays-list.component.ts b/src/app/holiday/holidays-list/holidays-list.component.ts
@@ -3,6 +3,7 @@ import { HolidayService } from '../services/holiday.service';
 import { UserService } from '../../user/services/user.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material';
+import { MomentService } from '../../core/services';
 
 @Component({
 	selector: 'app-holidays-list',
@@ -22,15 +23,13 @@ export class HolidaysListComponent implements OnInit {
 		'action'
 	];
 	dataSource: MatTableDataSource<any>;
-	@ViewChild(MatPaginator)
-	paginator: MatPaginator;
-	@ViewChild(MatSort)
-	sort: MatSort;
+	@ViewChild(MatPaginator) paginator: MatPaginator;
+	@ViewChild(MatSort) sort: MatSort;
 
 	constructor(
 		private holidayService: HolidayService,
 		private userService: UserService,
-		@Inject('moment') private moment,
+		private ms: MomentService,
 		translate: TranslateService
 	) {
 		// this language will be used as a fallback when a translation isn't found in the current language

diff --git a/src/app/holiday/services/holiday.service.spec.ts b/src/app/holiday/services/holiday.service.spec.ts
@@ -4,12 +4,12 @@ import { HolidayService } from './holiday.service';
 
 describe('HolidayService', () => {
   beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [HolidayService]
-    });
+	TestBed.configureTestingModule({
+		providers: [HolidayService]
+	});
   });
 
   it('should be created', inject([HolidayService], (service: HolidayService) => {
-    expect(service).toBeTruthy();
+	expect(service).toBeTruthy();
   }));
 });
diff --git a/src/app/project/project-details/project-details.component.spec.ts b/src/app/project/project-details/project-details.component.spec.ts
@@ -7,19 +7,19 @@ describe('ProjectDetailsComponent', () => {
   let fixture: ComponentFixture<ProjectDetailsComponent>;
 
   beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ProjectDetailsComponent ]
-    })
-    .compileComponents();
+	TestBed.configureTestingModule({
+		declarations: [ ProjectDetailsComponent ]
+	})
+	.compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ProjectDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+	fixture = TestBed.createComponent(ProjectDetailsComponent);
+	component = fixture.componentInstance;
+	fixture.detectChanges();
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+	expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/project/projects-list/projects-list.component.html b/src/app/project/projects-list/projects-list.component.html
@@ -13,7 +13,7 @@
     <ng-container matColumnDef="index">
       <mat-header-cell *matHeaderCellDef
                        [translate]="'TABLE.NO_HEADER'"> </mat-header-cell>
-      <mat-cell *matCellDef="let element; let i = index;">{{i+1}}.</mat-cell>
+      <mat-cell *matCellDef="let element; let i = index;">{{ i+1 }}.</mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="name">
@@ -30,7 +30,7 @@
                        mat-sort-header>
         <span [translate]="'TABLE.SART_DATE_HEADER'"></span>
       </mat-header-cell>
-      <mat-cell *matCellDef="let element"> {{ element.start_date ? moment(element.start_date).format('LL') : '' }} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{ element.start_date ? ms.moment(element.start_date).format('LL') : '' }} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="end_date"
@@ -39,7 +39,7 @@
                        mat-sort-header>
         <span [translate]="'TABLE.END_DATE_HEADER'"></span>
       </mat-header-cell>
-      <mat-cell *matCellDef="let element"> {{ element.end_date ? moment(element.end_date).format('LL') : '' }} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{ element.end_date ? ms.moment(element.end_date).format('LL') : '' }} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="customer">

diff --git a/src/app/project/projects-list/projects-list.component.spec.ts b/src/app/project/projects-list/projects-list.component.spec.ts
@@ -7,19 +7,19 @@ describe('ProjectsListComponent', () => {
   let fixture: ComponentFixture<ProjectsListComponent>;
 
   beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ProjectsListComponent ]
-    })
-    .compileComponents();
+	TestBed.configureTestingModule({
+		declarations: [ ProjectsListComponent ]
+	})
+	.compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ProjectsListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+	fixture = TestBed.createComponent(ProjectsListComponent);
+	component = fixture.componentInstance;
+	fixture.detectChanges();
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+	expect(component).toBeTruthy();
   });
 });
diff --git a/src/app/project/projects-list/projects-list.component.ts b/src/app/project/projects-list/projects-list.component.ts
@@ -1,7 +1,8 @@
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatSort, MatPaginator, MatTableDataSource } from '@angular/material';
 import { ProjectService } from '../services/project.service';
 import { TranslateService } from '@ngx-translate/core';
+import { MomentService } from '../../core/services';
 
 @Component({
 	selector: 'app-projects-list',
@@ -25,14 +26,12 @@ export class ProjectsListComponent implements OnInit {
 	dataSource: MatTableDataSource<any>;
 	isLoading: boolean;
 
-	@ViewChild(MatPaginator)
-	paginator: MatPaginator;
-	@ViewChild(MatSort)
-	sort: MatSort;
+	@ViewChild(MatPaginator) paginator: MatPaginator;
+	@ViewChild(MatSort) sort: MatSort;
 
 	constructor(
 		private projectService: ProjectService,
-		@Inject('moment') private moment,
+		private ms: MomentService,
 		translate: TranslateService
 	) {
 		this.isLoading = true;

diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
@@ -74,9 +74,6 @@ import { SpinnerComponent } from './spinner/spinner.component';
 	imports: [
 		RouterModule,
 		HttpClientModule,
-		CommonModule,
-		FormsModule,
-		ReactiveFormsModule,
 		MatButtonModule,
 		MatMenuModule,
 		MatToolbarModule,
@@ -170,10 +167,6 @@ import { SpinnerComponent } from './spinner/spinner.component';
 			useClass: MomentDateAdapter,
 			deps: [MAT_DATE_LOCALE]
 		},
-		{
-			provide: 'moment',
-			useFactory: (): any => _moment
-		},
 
 		{ provide: MAT_DATE_FORMATS, useValue: MY_FORMATS }
 	]

diff --git a/src/app/shared/spinner/spinner.component.spec.ts b/src/app/shared/spinner/spinner.component.spec.ts
@@ -7,19 +7,19 @@ describe('SpinnerComponent', () => {
   let fixture: ComponentFixture<SpinnerComponent>;
 
   beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SpinnerComponent ]
-    })
-    .compileComponents();
+	TestBed.configureTestingModule({
+		declarations: [ SpinnerComponent ]
+	})
+	.compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SpinnerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+	fixture = TestBed.createComponent(SpinnerComponent);
+	component = fixture.componentInstance;
+	fixture.detectChanges();
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+	expect(component).toBeTruthy();
   });
 });