Skip to content

Commit

Permalink
🤖 GITHUB ACTIONS format_prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
amontenegro committed Mar 7, 2024
1 parent c51c1ad commit 1ad75d0
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@

<p class="mat-caption m-t-0">
<ng-container i18n="@@authorize.ifAuthorize">
If authorized, this organization will have access to your ORCID record,
as outlined above and described in further detail in</ng-container
If authorized, this organization will have access to your ORCID
record, as outlined above and described in further detail
in</ng-container
>
<a
href="{{ environment.INFO_SITE + 'privacy-policy' }}"
Expand Down Expand Up @@ -152,16 +153,13 @@
<ng-container *ngIf="signInUpdatesV1Togglz">
<mat-card-header class="authorize-header">
<mat-card-title role="heading" aria-level="1">
<mat-icon
class="logo-icon"
aria-hidden="false"
[attr.aria-label]=""
><img src="./assets/vectors/orcid.logo.icon.svg" />
<mat-icon class="logo-icon" aria-hidden="false" [attr.aria-label]=""
><img src="./assets/vectors/orcid.logo.icon.svg" />
</mat-icon>
<h1 class="orc-font-heading-small" i18n="@@authorize.authorize"
>Authorize access</h1
>
</mat-card-title>
<h1 class="orc-font-heading-small" i18n="@@authorize.authorize">
Authorize access
</h1>
</mat-card-title>
</mat-card-header>
<mat-progress-bar
id="loading-bar"
Expand All @@ -185,7 +183,7 @@
class="profile-icon"
aria-hidden="false"
[attr.aria-label]=""
><img src="./assets/vectors/profile-not-verified.svg" />
><img src="./assets/vectors/profile-not-verified.svg" />
</mat-icon>
</div>
</div>
Expand Down Expand Up @@ -223,8 +221,12 @@
[signInUpdatesV1Togglz]="signInUpdatesV1Togglz"
></app-info-drop-down>

<p class="mat-body-1 m-t-16 m-b-32" i18n="@@authorize.organizationAskedFollowingAccess">
This organization has asked for the following access to your ORCID record
<p
class="mat-body-1 m-t-16 m-b-32"
i18n="@@authorize.organizationAskedFollowingAccess"
>
This organization has asked for the following access to your ORCID
record
</p>

<ul class="mat-body-1 m-t-base m-b-64">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { GoogleTagManagerService } from '../../../core/google-tag-manager/google
templateUrl: './form-authorize.component.html',
styleUrls: [
'./form-authorize.component.scss',
'./form-authorize.component.scss-theme.scss'
'./form-authorize.component.scss-theme.scss',
],
preserveWhitespaces: true,
})
Expand Down Expand Up @@ -150,21 +150,21 @@ export class FormAuthorizeComponent implements OnInit, OnDestroy {
}

if (scope === '/person/update') {
return !this.signInUpdatesV1Togglz ?
$localize`:@@authorize.personUpdate:Add/update other information about you (country, keywords, etc.)` :
$localize`:@@authorize.addUpdateInformation:Add/update information about your (country, keywords, etc.)`
return !this.signInUpdatesV1Togglz
? $localize`:@@authorize.personUpdate:Add/update other information about you (country, keywords, etc.)`
: $localize`:@@authorize.addUpdateInformation:Add/update information about your (country, keywords, etc.)`
}

if (scope === '/activities/update') {
return !this.signInUpdatesV1Togglz ?
$localize`:@@authorize.activitiesUpdate:Add/update your research activities (works, affiliations, etc)` :
$localize`:@@authorize.addUpdateReseachActivities:Add/update your research activities (works, affiliations, etc.)`
return !this.signInUpdatesV1Togglz
? $localize`:@@authorize.activitiesUpdate:Add/update your research activities (works, affiliations, etc)`
: $localize`:@@authorize.addUpdateReseachActivities:Add/update your research activities (works, affiliations, etc.)`
}

if (scope === '/read-limited') {
return !this.signInUpdatesV1Togglz ?
$localize`:@@authorize.readLimited:Read your information with visibility set to Trusted Organizations` :
$localize`:@@authorize.readInfomationVisibilityTrustedParties:Read your information with visibility set to Trusted parties`
return !this.signInUpdatesV1Togglz
? $localize`:@@authorize.readLimited:Read your information with visibility set to Trusted Organizations`
: $localize`:@@authorize.readInfomationVisibilityTrustedParties:Read your information with visibility set to Trusted parties`
}

// For any unreconized scope just use the description from the backend
Expand Down
4 changes: 2 additions & 2 deletions src/app/authorize/pages/authorize/authorize.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
'orcid-wizard-2': !signInUpdatesV1Togglz,
'orcid-wizard': signInUpdatesV1Togglz,
'authorize-wrapper': signInUpdatesV1Togglz,
'mobile': !platform.columns12
mobile: !platform.columns12
}"
>
>
<app-form-authorize
[signInUpdatesV1Togglz]="signInUpdatesV1Togglz"
*ngIf="showAuthorizationComponent"
Expand Down
1 change: 0 additions & 1 deletion src/app/authorize/pages/authorize/authorize.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
mat-divider {
margin: 24px 0;
}

}

.authorize-wrapper.mobile {
Expand Down
12 changes: 6 additions & 6 deletions src/app/authorize/pages/authorize/authorize.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export class AuthorizeComponent implements OnInit {
constructor(
_user: UserService,
private _platformInfo: PlatformInfoService,
private _togglz: TogglzService,
) {
private _togglz: TogglzService
) {
_user.getUserSession().subscribe((session) => {
if (session.oauthSession && session.oauthSession.error) {
this.showAuthorizationComponent = false
Expand All @@ -32,9 +32,9 @@ export class AuthorizeComponent implements OnInit {
}

ngOnInit(): void {
this._togglz
.getStateOf('SIGN_IN_UPDATES_V1')
.pipe(take(1))
.subscribe((value) => (this.signInUpdatesV1Togglz = value))
this._togglz
.getStateOf('SIGN_IN_UPDATES_V1')
.pipe(take(1))
.subscribe((value) => (this.signInUpdatesV1Togglz = value))
}
}
34 changes: 16 additions & 18 deletions src/app/cdk/info-drop-down/info-drop-down.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,23 @@
<div class="description-container" *ngIf="show">
{{ description }}
</div>

</ng-container>

<ng-container *ngIf="signInUpdatesV1Togglz">
<div class="row">
<b class="orc-font-body m-b-16">
{{ name }}
</b>
<a
class="underline "
[ngClass]="{ 'm-b-16': show }"
(click)="show = !show"
>
<ng-container i18n="@@shared.showDetails" *ngIf="!show">Show details</ng-container>
<ng-container i18n="@@shared.hideDetails" *ngIf="show">Hide details</ng-container>
</a>
</div>
<div class="description-container description-client" *ngIf="show">
{{ description }}
</div>
<div class="row">
<b class="orc-font-body m-b-16">
{{ name }}
</b>
<a class="underline" [ngClass]="{ 'm-b-16': show }" (click)="show = !show">
<ng-container i18n="@@shared.showDetails" *ngIf="!show"
>Show details</ng-container
>
<ng-container i18n="@@shared.hideDetails" *ngIf="show"
>Hide details</ng-container
>
</a>
</div>
<div class="description-container description-client" *ngIf="show">
{{ description }}
</div>
</ng-container>

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*ngIf="delegators?.length || switchToMeAccount"
[ngClass]="{
'mat-button-font': !signInUpdatesV1Togglz,
'underline': signInUpdatesV1Togglz
underline: signInUpdatesV1Togglz
}"
[matMenuTriggerFor]="menu"
i18n="@@delegators.switchAccount"
Expand Down

0 comments on commit 1ad75d0

Please sign in to comment.