From 400608e8dd8ade276fb6c060b976a7206617e820 Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Fri, 12 May 2017 12:58:12 +0100
Subject: [PATCH] Fixed forms and added code

---
 src/app/pages/login.component.html    |  4 ++--
 src/app/pages/login.component.ts      |  2 +-
 src/app/pages/register.component.html | 11 ++++++++++-
 src/app/pages/register.component.ts   |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/login.component.html b/src/app/pages/login.component.html
index c9c29b5..4e1d620 100644
--- a/src/app/pages/login.component.html
+++ b/src/app/pages/login.component.html
@@ -10,7 +10,7 @@
 			  <form [formGroup]="signin" (ngSubmit)="onSubmit()">
               <div class="input-group mb-3">
                 <span class="input-group-addon">@</span>
-                <input type="text" class="form-control" placeholder="Email">
+                <input type="text" class="form-control" formControlName="email" placeholder="Email">
               </div>
               <div class="input-group mb-4">
                 <span class="input-group-addon"><i class="icon-lock"></i></span>
@@ -18,7 +18,7 @@
               </div>
               <div class="row">
                 <div class="col-6">
-                  <button type="button" class="btn btn-primary px-4">Login</button>
+                  <button type="submit" class="btn btn-primary px-4">Login</button>
                 </div>
                 <div class="col-6 text-right">
                   <button type="button" class="btn btn-link px-0">Forgot password?</button>
diff --git a/src/app/pages/login.component.ts b/src/app/pages/login.component.ts
index d02f3a3..054c06c 100644
--- a/src/app/pages/login.component.ts
+++ b/src/app/pages/login.component.ts
@@ -36,7 +36,7 @@ export class LoginComponent {
     console.log(this.signin.value);
 	
 	this.api
-      .register(this.signin.value)
+      .login(this.signin.value)
       .subscribe(
         result => {
           console.log('logged in!');
diff --git a/src/app/pages/register.component.html b/src/app/pages/register.component.html
index 39f5c76..883cd76 100644
--- a/src/app/pages/register.component.html
+++ b/src/app/pages/register.component.html
@@ -13,6 +13,15 @@
             </div>
 			
 			<div class="input-group mb-3">
+				<span class="input-group-addon"><i class="icon-people"></i></span>
+                <select required class="form-control" type="text" formControlName="usertype">
+                  <option value=''>Please select</option>
+				  <option value='customer'>Customer</option>
+				  <option value='organisation'>Organisation</option>
+                </select>
+            </div>
+			
+			<div class="input-group mb-3">
               <span class="input-group-addon"><i class="icon-user"></i></span>
               <input type="text" class="form-control" formControlName="full_name" placeholder="Username">
             </div>
@@ -49,7 +58,7 @@
               <input type="password" class="form-control" formControlName="password" placeholder="Repeat password">
             </div>
 
-            <button type="button" class="btn btn-block btn-success">Create Account</button>
+            <button type="submit" class="btn btn-block btn-success">Create Account</button>
             </form>
 		  </div>
         </div>
diff --git a/src/app/pages/register.component.ts b/src/app/pages/register.component.ts
index 89a95fc..c4a2db4 100644
--- a/src/app/pages/register.component.ts
+++ b/src/app/pages/register.component.ts
@@ -28,6 +28,7 @@ export class RegisterComponent {
 		);
 	  this.signup = this.formBuilder.group({
 		token:        ['', [Validators.required]],
+		usertype:     ['', [Validators.required]],
 		full_name:    ['', [Validators.required]],
 		display_name: ['', [Validators.required]],
 		email:        ['', [Validators.required]],