diff --git a/ToDo.yaml b/ToDo.yaml index 35c717a..060e44a 100755 --- a/ToDo.yaml +++ b/ToDo.yaml @@ -50,6 +50,9 @@ Client: Need to impliment Remove employee Edit Company -> Dont allow edit of company email due to it being verified + All: + Make sure im using the new NG format for for and if + database: Add Applied Jobs Table \ No newline at end of file diff --git a/src/Client/src/app/app.ts b/src/Client/src/app/app.ts index 147e71a..f070416 100644 --- a/src/Client/src/app/app.ts +++ b/src/Client/src/app/app.ts @@ -20,10 +20,8 @@ export class App { this.devMode = isDevMode(); this.route.queryParams.subscribe(params => { - const loginToken = params['LoginToken']; console.log("LoginToken : " + loginToken); - if (loginToken){ this.http.post( "api/account/loginticket", JSON.stringify(loginToken), { headers: {'Content-Type': 'application/json'} } ).subscribe({ next: data => { @@ -40,8 +38,8 @@ export class App { }else{ auth.getLoginState(); } - }); + } } diff --git a/src/Client/src/app/models/Account.ts b/src/Client/src/app/models/Account.ts index 45cf54a..4440194 100644 --- a/src/Client/src/app/models/Account.ts +++ b/src/Client/src/app/models/Account.ts @@ -2,12 +2,6 @@ export class Account { public id: number | null = null; public userName: string = ""; public email: string = ""; - public emailVerified: boolean = false; - public passwordHash: string = ""; - public failedPasswordLock: boolean = false; - public passwordAttempts: number = 5; - public currentPasswordAttempts: number = 0; - public role: string = "Generic"; - public emailToken: string = ""; + public role: string = ""; public dataServer: string = ""; } \ No newline at end of file diff --git a/src/Client/src/app/pages/company/company.component.html b/src/Client/src/app/pages/company/company.component.html index f033da4..e299ab6 100644 --- a/src/Client/src/app/pages/company/company.component.html +++ b/src/Client/src/app/pages/company/company.component.html @@ -1,8 +1,8 @@
@for(company of Employers; track company.accountID){ - } +
@if(Comp != null){ diff --git a/src/Client/src/app/services/Authentication.ts b/src/Client/src/app/services/Authentication.ts index 8a25a86..4e693e0 100644 --- a/src/Client/src/app/services/Authentication.ts +++ b/src/Client/src/app/services/Authentication.ts @@ -15,7 +15,6 @@ export class Authentication{ let sub = this.http.post( "api/account/loginState", {}, {} ); sub.subscribe({ next: data => { - data.passwordHash = ""; this._user.next(data); }, error: err => {