Linting done

jeroenouw · jeroenouw · commit 64f4e162debd · 2017-09-09T14:05:23.000+02:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![dependencies](https://img.shields.io/badge/dependencies-up%20to%20date-brightgreen.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/package.json)
 [![updates](https://img.shields.io/badge/updates-weekly-yellowgreen.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/commits/master)
 [![stars](https://img.shields.io/github/stars/jeroenouw/AngularMaterialFirebase.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/stargazers)
-[![downloads](https://img.shields.io/npm/dm/ngxmatfire.svg)]()
+[![downloads](https://img.shields.io/npm/dy/ngxmatfire.svg)]()
 
 ![logo](https://jerouw.nl/wp-content/uploads/2017/05/ngfbmd.png "Logo")  
 
@@ -15,16 +15,16 @@ A full stack starter app containing [Angular 4](https://angular.io) (v4.4.0-RC.0
 ![loginpage](https://jerouw.nl/wp-content/uploads/2017/05/ngfbmdprintscreen.png "Logo")  
 
 ## Quick start & Development
-[Get started now](https://github.com/jeroenouw/Angular4MaterialDesign/blob/master/docs/DEVELOPER.md)  
+[Get started now](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/docs/DEVELOPER.md)  
 
 ## Features
-[Everything included in this project](https://github.com/jeroenouw/Angular4MaterialDesign/blob/master/docs/FEATURES.md)  
+[Everything included in this project](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/docs/FEATURES.md)  
 
 ## Future updates
-[To do and finish list](https://github.com/jeroenouw/Angular4MaterialDesign/blob/master/docs/TODO.md)  
+[To do and finish list](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/docs/TODO.md)  
 
 ## Contributing
 Want to file a bug, contribute some code, or improve documentation? Feel free to place an [issue](https://github.com/jeroenouw/AngularMaterialFirebase/issues).
 
 ## License
-[![npmlicense](https://img.shields.io/npm/l/ng4matfire.svg)](https://github.com/jeroenouw/Angular4MaterialDesign/blob/master/LICENSE/)
+[![npmlicense](https://img.shields.io/npm/l/ng4matfire.svg)](https://github.com/jeroenouw/AngularMaterialFirebase/blob/master/LICENSE/)
diff --git a/src/app/components/auth/phone-signin/phone-signin.component.ts b/src/app/components/auth/phone-signin/phone-signin.component.ts
@@ -21,7 +21,7 @@ export class PhoneSigninComponent implements OnInit {
   constructor(private win: WindowService,
               private router: Router,
               private authService: AuthService,
-              private alertService: AlertService) { 
+              private alertService: AlertService) {
       this.isAuthenticated = this.authService.isAuthenticated()
   }
 
@@ -48,15 +48,15 @@ export class PhoneSigninComponent implements OnInit {
       .confirm(this.verificationCode)
         .then((result) => {
           const currentUser = result.user;
-        }) 
+        })
         .then(response => {
           this.router.navigate(['/']);
           firebase.auth().currentUser.getIdToken()
           .then(
               (token: string) => this.token = token
           );
           this.alertService.showToaster('Login code is entered');
-        }) 
-    .catch( error => console.log(error, "Incorrect code entered?"));
+        })
+    .catch( error => console.log(error, 'Incorrect code entered?'));
   }
 }
diff --git a/src/app/components/auth/signin.component.ts b/src/app/components/auth/signin.component.ts
@@ -9,7 +9,7 @@ import { AlertService, AuthService } from '../shared';
   styleUrls: ['./signin.component.scss']
 })
 export class SigninComponent implements OnInit {
-  @Input() loading: boolean = false;
+  @Input() loading = false;
 
   constructor(
     private authService: AuthService,
diff --git a/src/app/components/blocks/card-block/card-block.component.ts b/src/app/components/blocks/card-block/card-block.component.ts
@@ -6,10 +6,10 @@ import { Component } from '@angular/core';
   styleUrls: ['./card-block.component.scss']
 })
 export class CardBlockComponent {
-  titleCard: string = 'Angular';
-  numberCard: number = 4;
-  subTitleCard: string = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi nisl ligula.';
-  contentCard: string = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi nisl ligula.';
+  titleCard = 'Angular';
+  numberCard = 4;
+  subTitleCard = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi nisl ligula.';
+  contentCard = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi nisl ligula.';
   angularImage: string;
 
   constructor() {
diff --git a/src/app/components/blocks/first-block/first-block.component.ts b/src/app/components/blocks/first-block/first-block.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
   styleUrls: ['./first-block.component.scss']
 })
 export class FirstBlockComponent {
-  titleOne: string = 'Starter kit';
-  contentOne: string = 'Angular 4 | Material Design | Firebase (0Auth authentication and NoSQL database)';
+  titleOne = 'Starter kit';
+  contentOne = 'Angular 4 | Material Design | Firebase (0Auth authentication and NoSQL database)';
 
 }
diff --git a/src/app/components/blocks/second-block/second-block.component.ts b/src/app/components/blocks/second-block/second-block.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
   styleUrls: ['./second-block.component.scss']
 })
 export class SecondBlockComponent {
-  titleTwo: string = 'Authentication and Database';
-  contentTwo: string = 'Provided by Firebase';
+  titleTwo = 'Authentication and Database';
+  contentTwo = 'Provided by Firebase';
     
 }
diff --git a/src/app/components/blocks/third-block/third-block.component.ts b/src/app/components/blocks/third-block/third-block.component.ts
@@ -6,12 +6,12 @@ import { Component } from '@angular/core';
   styleUrls: ['./third-block.component.scss']
 })
 export class ThirdBlockComponent  {
-  titleThree: string = 'Angular 4';
-  contentThree: string = 'Angular is a framework for building client applications in HTML and TypeScript that compiles to JavaScript.';
+  titleThree = 'Angular 4';
+  contentThree = 'Angular is a framework for building client applications in HTML and TypeScript that compiles to JavaScript.';
 
-  titleFour: string = 'Material 2';
-  contentFour: string = 'Material Design is a unified system that combines theory, resources, and tools for crafting digital experiences.';
+  titleFour = 'Material 2';
+  contentFour = 'Material Design is a unified system that combines theory, resources, and tools for crafting digital experiences.';
 
-  titleFive: string = 'Firebase';
-  contentFive: string = 'Firebase is built on Google infrastructure and scales automatically, for even the largest apps.';
+  titleFive = 'Firebase';
+  contentFive = 'Firebase is built on Google infrastructure and scales automatically, for even the largest apps.';
 }
diff --git a/src/app/components/messages/message.service.ts b/src/app/components/messages/message.service.ts
@@ -15,7 +15,7 @@ export class MessageService {
     // this.messages = this.firebase.database.list('messages');
     // let messages = firebase.database().ref().child('messages/');
   }
- 
+
   sendMessage(message, text) {
       return firebase.database().ref().child('messages/' + message).push({
       message: text,
diff --git a/src/app/components/messages/messages.component.ts b/src/app/components/messages/messages.component.ts
@@ -57,5 +57,5 @@ export class MessagesComponent implements OnInit, AfterViewChecked {
     this.messageService.sendMessage('', this.newMessage);
     this.newMessage = '';
   }
- 
+
 }
diff --git a/src/app/components/misc/misc.component.html b/src/app/components/misc/misc.component.html
@@ -23,7 +23,7 @@ <h3>MD Datepicker : </h3>
       <input mdInput [mdDatepicker]="picker" placeholder="Choose a date">
       <md-datepicker-toggle mdSuffix [for]="picker"></md-datepicker-toggle>
       <md-datepicker #picker></md-datepicker>
-    </md-form-field>>
+    </md-form-field>
 
     <hr>
 
diff --git a/src/app/components/misc/table/table.component.ts b/src/app/components/misc/table/table.component.ts
@@ -15,7 +15,7 @@ import 'rxjs/add/operator/map';
 })
 export class TableComponent implements OnInit {
   displayedColumns = ['userId', 'userName', 'progress', 'color'];
-  database = new database();
+  database = new DataBase();
   dataSource: dataSource | null;
 
   @ViewChild(MdSort) sort: MdSort;
@@ -24,7 +24,7 @@ export class TableComponent implements OnInit {
 
   ngOnInit() {
     this.dataSource = new dataSource(this.database, this.sort);
-  }  
+  }
 }
 
 // Local data
@@ -41,7 +41,7 @@ export interface UserData {
     color: string;
 }
 
-export class database {
+export class DataBase {
   // Stream that emits whenever the data has been modified
   dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
   get data(): UserData[] { return this.dataChange.value; }
@@ -75,43 +75,43 @@ export class database {
 
 // Data source to provide what data should be rendered in the table
 export class dataSource extends DataSource<any> {
-    constructor(private database: database, private sort: MdSort) {
+    constructor(private database: DataBase, private sort: MdSort) {
     super();
     }
-    
+
     connect(): Observable<UserData[]> {
     const displayDataChanges = [
         this.database.dataChange,
         this.sort.mdSortChange,
     ];
-    
+
     return Observable.merge(...displayDataChanges).map(() => {
         return this.getSortedData();
     });
     }
-    
+
     disconnect() {}
 
     // Sorting the database data
     getSortedData(): UserData[] {
     const data = this.database.data.slice();
-    if (!this.sort.active || this.sort.direction == '') { return data; }
-    
+    if (!this.sort.active || this.sort.direction === '') { return data; }
+
     return data.sort((a, b) => {
         let propertyA: number|string = '';
         let propertyB: number|string = '';
-    
+
         switch (this.sort.active) {
         case 'userId': [propertyA, propertyB] = [a.id, b.id]; break;
         case 'userName': [propertyA, propertyB] = [a.name, b.name]; break;
         case 'progress': [propertyA, propertyB] = [a.progress, b.progress]; break;
         case 'color': [propertyA, propertyB] = [a.color, b.color]; break;
         }
-    
-        let valueA = isNaN(+propertyA) ? propertyA : +propertyA;
-        let valueB = isNaN(+propertyB) ? propertyB : +propertyB;
-    
-        return (valueA < valueB ? -1 : 1) * (this.sort.direction == 'asc' ? 1 : -1);
+
+        const valueA = isNaN(+propertyA) ? propertyA : +propertyA;
+        const valueB = isNaN(+propertyB) ? propertyB : +propertyB;
+
+        return (valueA < valueB ? -1 : 1) * (this.sort.direction === 'asc' ? 1 : -1);
     });
     }
 }
diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts
@@ -31,21 +31,21 @@ export class ProfileComponent implements OnInit {
   currentUser: User;
   user: {uid: any};
 
-  profileTitle: string = 'My profile';
+  profileTitle = 'My profile';
   // profileBio: string = 'Here you can place your own personal bio text.';
   fullImagePath: string;
 
-  state: string = 'small';
+  state = 'small';
 
   constructor(private route: ActivatedRoute,
               private userService: UserService,
-              private alertService: AlertService) { 
+              private alertService: AlertService) {
               this.fullImagePath = '/assets/img/mb-bg-04.png';
   }
 
   ngOnInit() {
     this.user = {
-      uid: this.route.snapshot.params['uid']       
+      uid: this.route.snapshot.params['uid']  
     };
     this.route.params
       .subscribe(
diff --git a/src/app/components/shared/services/auth.service.ts b/src/app/components/shared/services/auth.service.ts
@@ -12,10 +12,7 @@ export class AuthService {
     constructor(
         private router: Router,
         private alertService: AlertService,
-        private userService: UserService) 
-    {
-
-    }
+        private userService: UserService) { }
 
     // Signup/register
     signUpWithGoogle() {
@@ -230,7 +227,7 @@ export class AuthService {
                     ),
                     this.alertService.showToaster('Anonymous login succesful');
                     console.log(currentUser);
-                })     
+                })
             }
         )
         .catch(
diff --git a/src/app/components/shared/services/user.service.ts b/src/app/components/shared/services/user.service.ts
@@ -49,11 +49,11 @@ export class UserService {
     contactFormSend(company, firstname, lastname, address, city, postal, message) {
      this.alertService.showToaster('This contact form is saved');
      return firebase.database().ref().child('contactform/').push({
-        company: company, 
-        firstname: firstname, 
-        lastname: lastname, 
-        address: address, 
-        city: city, 
+        company: company,
+        firstname: firstname,
+        lastname: lastname,
+        address: address,
+        city: city,
         postal: postal,
         message: message
       });
@@ -124,7 +124,7 @@ export class UserService {
               // Update successful.
             }, (error) => {
               // An error happened.
-            });   
+            });
     }
     */
 
@@ -140,14 +140,14 @@ export class UserService {
     /*
     updateUserPassword() {
         let newPassword = getASecureRandomPassword();
-        
+
         currentUser.updatePassword(getASecureRandomPassword).then(() => {
           // Update successful.
         }, (error) => {
           // An error happened.
         });
     }
-    */ 
+    */
 
     sendUserPasswordResetEmail() {
         firebase.auth().sendPasswordResetEmail(firebase.auth().currentUser.email).then(() => {
diff --git a/src/app/components/shared/services/window.service.ts b/src/app/components/shared/services/window.service.ts
@@ -7,4 +7,4 @@ export class WindowService {
     return window
   }
 
-}
+}
diff --git a/src/app/components/shared/validators/email.ts b/src/app/components/shared/validators/email.ts
@@ -2,16 +2,16 @@ import { FormControl } from '@angular/forms';
 
 export class EmailValidator {
 
-  static isValid(control: FormControl){
+  static isValid (control: FormControl) {
     const re = /^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5})$/.test(control.value);
 
-    if (re){
+    if (re) {
       return null;
     }
 
     return {
-      "invalidEmail": true
+      'invalidEmail': true
     };
 
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { Component } from '@angular/core';`
`6`	`6`	`styleUrls: ['./first-block.component.scss']`
`7`	`7`	`})`
`8`	`8`	`export class FirstBlockComponent {`
`9`		`- titleOne: string = 'Starter kit';`
`10`		`- contentOne: string = 'Angular 4 \| Material Design \| Firebase (0Auth authentication and NoSQL database)';`
	`9`	`+ titleOne = 'Starter kit';`
	`10`	`+ contentOne = 'Angular 4 \| Material Design \| Firebase (0Auth authentication and NoSQL database)';`
`11`	`11`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { Component } from '@angular/core';`
`6`	`6`	`styleUrls: ['./second-block.component.scss']`
`7`	`7`	`})`
`8`	`8`	`export class SecondBlockComponent {`
`9`		`- titleTwo: string = 'Authentication and Database';`
`10`		`- contentTwo: string = 'Provided by Firebase';`
	`9`	`+ titleTwo = 'Authentication and Database';`
	`10`	`+ contentTwo = 'Provided by Firebase';`
`11`	`11`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export class MessageService {`
`15`	`15`	`// this.messages = this.firebase.database.list('messages');`
`16`	`16`	`// let messages = firebase.database().ref().child('messages/');`
`17`	`17`	`}`
`18`		`-`
	`18`	`+`
`19`	`19`	`sendMessage(message, text) {`
`20`	`20`	`return firebase.database().ref().child('messages/' + message).push({`
`21`	`21`	`message: text,`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ export class MessagesComponent implements OnInit, AfterViewChecked {`
`57`	`57`	`this.messageService.sendMessage('', this.newMessage);`
`58`	`58`	`this.newMessage = '';`
`59`	`59`	`}`
`60`		`-`
	`60`	`+`
`61`	`61`	`}`