From 61ac856cc238dc838961a9969443b234032db189 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Tue, 19 Sep 2017 14:48:22 +0100 Subject: [PATCH] fix linter errors on register component --- src/app/auth/register.component.ts | 162 ++++++++++++++--------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/src/app/auth/register.component.ts b/src/app/auth/register.component.ts index bdb9815..d716340 100644 --- a/src/app/auth/register.component.ts +++ b/src/app/auth/register.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { ValidationManager } from "ng2-validation-manager"; +import { ValidationManager } from 'ng2-validation-manager'; import { Http, Response } from '@angular/http'; import { ApiService } from '../providers/api-service'; import {Router } from '@angular/router'; @@ -16,87 +16,87 @@ export class RegisterComponent { organisationForm: ValidationManager; years: Object[]; registerStatus: any; - registerStatusError: string = 'Error received, please try again.'; + registerStatusError = 'Error received, please try again.'; constructor( - private http: Http, - private formBuilder: FormBuilder, - private router: Router, - private api: ApiService, - ) { - this.years = []; - let max = new Date().getFullYear() - 10, - min = max - 140; + private http: Http, + private formBuilder: FormBuilder, + private router: Router, + private api: ApiService, + ) { + this.years = []; + const max = new Date().getFullYear() - 10, + min = max - 140; - for (let i = max; i>=min; i--){ - this.years.push(i); - } - this.signupForm = new ValidationManager({ - token: 'required', - usertype: 'required', - email: 'required|email', - password: 'required', - confirmpassword: 'required|equalTo:password' - }); - this.customerForm = new ValidationManager({ - display_name: 'required', - full_name: 'required', - postcode: 'required', - year_of_birth:'required', - }); - this.organisationForm = new ValidationManager({ - name: 'required', + for (let i = max; i >= min; i--) { + this.years.push(i); + } + this.signupForm = new ValidationManager({ + token: 'required', + usertype: 'required', + email: 'required|email', + password: 'required', + confirmpassword: 'required|equalTo:password' + }); + this.customerForm = new ValidationManager({ + display_name: 'required', + full_name: 'required', + postcode: 'required', + year_of_birth: 'required', + }); + this.organisationForm = new ValidationManager({ + name: 'required', sector: 'required', - street_name: 'required', - town: 'required', - postcode: 'required', - }); + street_name: 'required', + town: 'required', + postcode: 'required', + }); } onSubmitCustomer() { console.log(this.signupForm.isValid()); - if (!this.signupForm.isValid() && !this.customerForm.isValid()) { - console.log("Not Valid!"); - this.registerStatus = "validation_failed"; + if (!this.signupForm.isValid() && !this.customerForm.isValid()) { + console.log('Not Valid!'); + this.registerStatus = 'validation_failed'; console.log(this.registerStatus); - return; - } - let signupForm = this.signupForm.getForm().value; - let customerForm = this.customerForm.getForm().value; + return; + } + const signupForm = this.signupForm.getForm().value; + const customerForm = this.customerForm.getForm().value; - let data = { - token: signupForm.token, - usertype: signupForm.usertype, - email: signupForm.email, - password: signupForm.password, - display_name: customerForm.display_name, - full_name: customerForm.full_name, - postcode: customerForm.postcode, - year_of_birth:customerForm.year_of_birth, - }; - console.log(data); - this.api + const data = { + token: signupForm.token, + usertype: signupForm.usertype, + email: signupForm.email, + password: signupForm.password, + display_name: customerForm.display_name, + full_name: customerForm.full_name, + postcode: customerForm.postcode, + year_of_birth: customerForm.year_of_birth, + }; + console.log(data); + this.api .register(data) .subscribe( result => { console.log('registered!'); - this.registerStatus = "success"; + this.registerStatus = 'success'; console.log(this.registerStatus); - this.router.navigate(['/dashboard']); + this.router.navigate(['/dashboard']); }, error => { console.log('Register Error'); console.log(error); try { console.log(error.error); - let jsonError = error.json(); - console.log("boop"); + const jsonError = error.json(); + console.log('boop'); this.registerStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message; - } catch(e) { + } catch (e) { this.registerStatusError = 'There was a server error, please try again later.'; } - this.registerStatus = "send_failed"; + this.registerStatus = 'send_failed'; console.log(this.registerStatus); } ); @@ -104,33 +104,33 @@ export class RegisterComponent { onSubmitOrganisation() { console.log(this.signupForm.isValid()); - if (!this.signupForm.isValid() || !this.organisationForm.isValid()) { - console.log("Not Valid!"); - this.registerStatus = "validation_failed"; + if (!this.signupForm.isValid() || !this.organisationForm.isValid()) { + console.log('Not Valid!'); + this.registerStatus = 'validation_failed'; console.log(this.registerStatus); - return; - } - let signupForm = this.signupForm.getForm().value; - let organisationForm = this.organisationForm.getForm().value; + return; + } + const signupForm = this.signupForm.getForm().value; + const organisationForm = this.organisationForm.getForm().value; - let data = { - token: signupForm.token, - usertype: signupForm.usertype, - email: signupForm.email, - password: signupForm.password, - name: organisationForm.name, + const data = { + token: signupForm.token, + usertype: signupForm.usertype, + email: signupForm.email, + password: signupForm.password, + name: organisationForm.name, sector: organisationForm.sector, - street_name: organisationForm.street_name, - town: organisationForm.town, - postcode: organisationForm.postcode, - }; - console.log(data); - this.api + street_name: organisationForm.street_name, + town: organisationForm.town, + postcode: organisationForm.postcode, + }; + console.log(data); + this.api .register(data) .subscribe( result => { console.log('registered!'); - this.registerStatus = "success"; + this.registerStatus = 'success'; console.log(this.registerStatus); this.router.navigate(['/dashboard']); }, @@ -139,13 +139,13 @@ export class RegisterComponent { console.log(error); try { console.log(error.error); - let jsonError = error.json(); - console.log("boop"); + const jsonError = error.json(); + console.log('boop'); this.registerStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message; - } catch(e) { + } catch (e) { this.registerStatusError = 'There was a server error, please try again later.'; } - this.registerStatus = "send_failed"; + this.registerStatus = 'send_failed'; console.log(this.registerStatus); } );