Skip to content

Commit

Permalink
Merge branch 'add-eslint' of https://github.com/ORCID/orcid-member-se…
Browse files Browse the repository at this point in the history
…rvices into add-eslint
  • Loading branch information
auumgn committed Oct 26, 2023
2 parents d6eb0a1 + c7c6582 commit 1771376
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"format": "ng lint --fix && npx prettier --write ."
},
"private": true,
"dependencies": {
"dependencies": {
"@angular/animations": "^16.2.9",
"@angular/cdk": "^16.2.9",
"@angular/common": "^16.2.9",
Expand Down
1 change: 0 additions & 1 deletion ui/src/app/account/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ export class LoginComponent implements AfterViewInit, OnDestroy {
this.mfaSent = true
}


this.loginService
.login({
username: this.loginForm.get('username')!.value!,
Expand Down
15 changes: 13 additions & 2 deletions ui/src/app/layout/navbar/navbar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
<span jhiTranslate="global.menu.account.loggedInAs.string"></span>
<b>{{ this.getUserName() }}</b> |
<span jhiTranslate="global.menu.account.logoutAs.string"></span
><a tabindex="1" (click)="logoutAs()" (keypress)="logoutAs()" id="logoutAs.string">
><a
tabindex="1"
(click)="logoutAs()"
(keypress)="logoutAs()"
id="logoutAs.string"
>
{{ this.getUserName() }}
<fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
</a>
Expand Down Expand Up @@ -344,7 +349,13 @@
</a>
</li>
<li>
<a class="dropdown-item" tabindex="1" (click)="logout()" (keypress)="logout()" id="logout">
<a
class="dropdown-item"
tabindex="1"
(click)="logout()"
(keypress)="logout()"
id="logout"
>
<fa-icon [icon]="faSignOutAlt" [fixedWidth]="true"></fa-icon>
<span jhiTranslate="global.menu.account.logout.string"
>Sign out</span
Expand Down

0 comments on commit 1771376

Please sign in to comment.