diff --git a/Code/groupH_M32COM.Angular/ClientApp/src/app/account/account.service.ts b/Code/groupH_M32COM.Angular/ClientApp/src/app/account/account.service.ts index 5a5ff02..acc18e2 100644 --- a/Code/groupH_M32COM.Angular/ClientApp/src/app/account/account.service.ts +++ b/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, diff --git a/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.html b/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.html index ee0914e..47ae1f2 100644 --- a/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.html +++ b/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.html @@ -37,14 +37,14 @@ - Roles - --> + diff --git a/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.ts b/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.ts index cc8282c..337e530 100644 --- a/Code/groupH_M32COM.Angular/ClientApp/src/app/account/component/account.component.ts +++ b/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); } diff --git a/Code/groupH_M32COM.Angular/ClientApp/src/app/auth/auth.service.ts b/Code/groupH_M32COM.Angular/ClientApp/src/app/auth/auth.service.ts index 3206d48..ef41a25 100644 --- a/Code/groupH_M32COM.Angular/ClientApp/src/app/auth/auth.service.ts +++ b/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(); 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' }); diff --git a/Code/groupH_M32COM.Angular/ClientApp/src/app/models/CrewMember.ts b/Code/groupH_M32COM.Angular/ClientApp/src/app/models/CrewMember.ts index 41d7070..a06ccfb 100644 --- a/Code/groupH_M32COM.Angular/ClientApp/src/app/models/CrewMember.ts +++ b/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, diff --git a/Code/groupH_M32COM.Angular/ClientApp/src/environments/environment.prod.ts b/Code/groupH_M32COM.Angular/ClientApp/src/environments/environment.prod.ts index 2d1bfd8..7cdca32 100644 --- a/Code/groupH_M32COM.Angular/ClientApp/src/environments/environment.prod.ts +++ b/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/' - }; diff --git a/Code/groupH_M32COM.Angular/localdatabase.db b/Code/groupH_M32COM.Angular/localdatabase.db index 786802e..81545ab 100644 Binary files a/Code/groupH_M32COM.Angular/localdatabase.db and b/Code/groupH_M32COM.Angular/localdatabase.db differ