Sign up
diff --git a/src/app/auth/register.component.html b/src/app/auth/register.component.html
index dbe0c82..1a0c868 100644
--- a/src/app/auth/register.component.html
+++ b/src/app/auth/register.component.html
@@ -6,7 +6,7 @@
Register
Create your account
-
+
-
+
-
+
-
+
-
+
@@ -137,7 +137,7 @@
Form validation failed, please ensure the form is filled correctly.
- Failed to send to server, please try again later.
+ {{registerStatusError}}
diff --git a/src/app/auth/register.component.ts b/src/app/auth/register.component.ts
index ebc69d2..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,117 +16,136 @@ export class RegisterComponent {
organisationForm: ValidationManager;
years: Object[];
registerStatus: any;
-
- constructor(
- private http: Http,
- private formBuilder: FormBuilder,
- private router: Router,
- private api: ApiService,
- ) {
- this.years = [];
- let max = new Date().getFullYear() - 10,
- min = max - 140;
+ registerStatusError = 'Error received, please try again.';
- 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',
- });
+ constructor(
+ 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',
+ sector: '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;
-
- 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
+ return;
+ }
+ const signupForm = this.signupForm.getForm().value;
+ const customerForm = this.customerForm.getForm().value;
+
+ 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( error._body );
- this.registerStatus = "send_failed";
- console.log(this.registerStatus)
+ console.log('Register Error');
+ console.log(error);
+ try {
+ console.log(error.error);
+ const jsonError = error.json();
+ console.log('boop');
+ this.registerStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+ } catch (e) {
+ this.registerStatusError = 'There was a server error, please try again later.';
+ }
+ this.registerStatus = 'send_failed';
+ console.log(this.registerStatus);
}
);
}
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;
-
- let data = {
- token: signupForm.token,
- usertype: signupForm.usertype,
- email: signupForm.email,
- password: signupForm.password,
- name: organisationForm.name,
+ return;
+ }
+ const signupForm = this.signupForm.getForm().value;
+ const organisationForm = this.organisationForm.getForm().value;
+
+ 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']);
},
error => {
- console.log( error._body );
- this.registerStatus = "send_failed";
+ console.log('Register Error');
+ console.log(error);
+ try {
+ console.log(error.error);
+ const jsonError = error.json();
+ console.log('boop');
+ this.registerStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+ } catch (e) {
+ this.registerStatusError = 'There was a server error, please try again later.';
+ }
+ this.registerStatus = 'send_failed';
console.log(this.registerStatus);
}
);
diff --git a/src/app/dashboard/account-edit.component.html b/src/app/dashboard/account-edit.component.html
index f46aca7..5d4e7b4 100644
--- a/src/app/dashboard/account-edit.component.html
+++ b/src/app/dashboard/account-edit.component.html
@@ -122,7 +122,7 @@
Form validation failed, please ensure the form is filled correctly.
- Failed to send to server, please try again later.
+ {{submitStatusError}}