Merge branch 'master' of https://github.coventry.ac.uk/rollingc/group…

…H_M32COM

Code/groupH_M32COM.Angular/ClientApp/src/app/account/account.service.ts

@@ -59,7 +59,7 @@ export class AccountService {
   updateMemberDetails(crewMember: CrewMember) {
     var obj = {
       ID: crewMember.id,
-      DOB: crewMember.dOB,
+      DOB: crewMember.dob,
       FirstName: crewMember.firstName,
       LastName: crewMember.lastName,
       Email: crewMember.email,

Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.html

@@ -37,14 +37,14 @@
             </mat-form-field>
 
             <mat-form-field formControlName="CrewMemberTitle" appearance="outline">
-                <mat-label>Roles</mat-label>
-                <select matNativeControl>
+                <!-- <mat-label>Roles</mat-label> -->
+                <!-- <select matNativeControl >
                       <option value="0">Captain</option>
                       <option value="1">Boat Engineer</option>
                       <option value="2">Boat Recovery</option>
                       <option value="3">Boat Research And Development</option>
-                </select>
-                <!-- <input matInput type="text" formControlName="CrewMemberTitle" placeholder="Title"> -->
+                </select> -->
+                <input matInput type="text" formControlName="CrewMemberTitle" placeholder="Crew title">
             </mat-form-field>
 
             <mat-form-field appearance="outline">

Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.ts

@@ -38,7 +38,7 @@ export class AccountComponent implements OnInit, OnDestroy {
           this.account = account;
           this.crewmemberForm.setValue({
             Email: account.crewMember.email,
-            DateOfBirth: new Date(account.crewMember.dOB),
+            DateOfBirth: new Date(account.crewMember.dob),
             FirstName: account.crewMember.firstName,
             LastName: account.crewMember.lastName,
             PhoneNumber: account.crewMember.phone,
@@ -122,7 +122,7 @@ export class AccountComponent implements OnInit, OnDestroy {
     this.crewMember.lastName = this.LastName.value;
     this.crewMember.phone = this.PhoneNumber.value;
     this.crewMember.username = this.UserName.value;
-    this.crewMember.dOB = this.DateOfBirth.value;
+    this.crewMember.dob = this.DateOfBirth.value;
     console.log('updating details');
     this.accountService.updateMemberDetails(this.crewMember);
   }

Code/groupH_M32COM.Angular/ClientApp/src/app/auth/auth.service.ts

@@ -32,12 +32,12 @@ export class AuthService {
   private _userRoles: string[] = [];
   private authStatuesListener = new Subject<boolean>();
   redirectUrl: string;
-  apiUrl:string = environment.apiUrl;
+  apiUrl: string = environment.apiUrl;
   auth0 = new auth0.WebAuth({
     clientID: 'E02Ls5Bl6mYQK48j9MdQyyETFXcIygwj',
     domain: 'groupm32com.auth0.com',
     responseType: 'token id_token',
-    redirectUri: this.apiUrl + 'callback',
+    redirectUri: 'http://localhost:4200/callback',
     scope: 'openid email profile',
     audience: 'https://api.rcboat.com'
   });

Code/groupH_M32COM.Angular/ClientApp/src/app/models/CrewMember.ts

@@ -1,7 +1,7 @@
 export class CrewMember {
   constructor(
     public id: string,
-    public dOB: Date,
+    public dob: Date,
     public firstName: string,
     public lastName: string,
     public email: string,

Code/groupH_M32COM.Angular/ClientApp/src/environments/environment.prod.ts

@@ -1,7 +1,5 @@
 export const environment = {
   production: true,
   apiUrl: 'https://rcboatwebapp.azurewebsites.net/',
-  //apiUrl: 'http://localhost:4200/'
-
 };