Skip to content

Commit

Permalink
Merge pull request #2202 from ORCID/feature/9107-record-summaries
Browse files Browse the repository at this point in the history
Feature/9107 record summaries
  • Loading branch information
leomendoza123 authored Mar 18, 2024
2 parents f7f87fa + ff65e86 commit c1a1f1e
Show file tree
Hide file tree
Showing 32 changed files with 778 additions and 316 deletions.
2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const routes: Routes = [
matcher: routerSummaryPageUrl,
loadChildren: () =>
import('./trusted-summary/trusted-summary.module').then(
(m) => m.TrustedSummaryModule
(m) => m.TrustedSummaryPageModule
),
},
{
Expand Down
3 changes: 1 addition & 2 deletions src/app/cdk/platform-info/browserlist.regexp.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
// tslint:disable-next-line: max-line-length
export const BROWSERLIST_REGEXP =
/((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
*ngIf="trustedSummary"
class="panel"
[ngClass]="{
'stand-alone-mode': standaloneMode,
mobile: mobile,
'inside-iframe': insideIframe
}"
>
<header class="panel-header">
<header class="panel-header" *ngIf="standaloneMode">
<!-- orcid logo -->
<img
*ngIf="trustedSummary?.status === 'active'"
Expand Down Expand Up @@ -121,13 +122,13 @@ <h1 class="orc-font-body-large">
(mouseenter)="affiliationsHover = true"
(mouseleave)="affiliationsHover = false"
>
<h2
<h3
class="orc-font-small-print"
i18n="@@summary.affiliations"
[ngClass]="{ 'hover-effect': affiliationsHover }"
>
AFFILIATIONS
</h2>
</h3>
</a>
<app-summary-panel
[url]="trustedSummary?.orcid + '#affiliations'"
Expand All @@ -139,9 +140,9 @@ <h1 class="orc-font-body-large">
></app-summary-panel>
</ng-container>
<ng-container *ngIf="lastUpdateDate || creationDateWithOffset">
<h2 class="orc-font-small-print" i18n="@@summary.keyDates">
<h3 class="orc-font-small-print" i18n="@@summary.keyDates">
KEY DATES
</h2>
</h3>
<div class="card-container">
<ul>
<li>
Expand Down Expand Up @@ -197,15 +198,15 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates">
(mouseenter)="worksHover = true"
(mouseleave)="worksHover = false"
>
<h2
<h3
class="orc-font-small-print"
i18n="@@summary.works"
[ngClass]="{
'hover-effect': worksHover
}"
>
WORKS
</h2>
</h3>
</a>
<app-summary-simple-panel
[hoverEffect]="worksHover"
Expand All @@ -220,15 +221,15 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates">
(mouseenter)="peerReviewsHover = true"
(mouseleave)="peerReviewsHover = false"
>
<h2
<h3
[ngClass]="{
'hover-effect': peerReviewsHover
}"
class="orc-font-small-print"
i18n="@@summary.peerReviews"
>
PEER REVIEWS
</h2>
</h3>
</a>
<app-summary-simple-panel
[hoverEffect]="peerReviewsHover"
Expand All @@ -243,15 +244,15 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates">
(mouseenter)="fundsHover = true"
(mouseleave)="fundsHover = false"
>
<h2
<h3
class="orc-font-small-print"
[ngClass]="{
'hover-effect': fundsHover
}"
i18n="@@summary.funding"
>
FUNDING
</h2>
</h3>
</a>

<app-summary-simple-panel
Expand All @@ -275,15 +276,15 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates">
(mouseenter)="professionalActivitiesHover = true"
(mouseleave)="professionalActivitiesHover = false"
>
<h2
<h3
class="orc-font-small-print"
i18n="@@summary.professionalActivites"
[ngClass]="{
'hover-effect': professionalActivitiesHover
}"
>
PROFESSIONAL ACTIVITIES
</h2>
</h3>
</a>
<app-summary-panel
[hoverEffect]="professionalActivitiesHover"
Expand All @@ -302,13 +303,13 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates">
(mouseenter)="externalIdentifiersHover = true"
(mouseleave)="externalIdentifiersHover = false"
>
<h2
<h3
class="orc-font-small-print"
i18n="@@summary.otherids"
[ngClass]="{ 'hover-effect': externalIdentifiersHover }"
>
OTHER IDENTIFIERS
</h2>
</h3>
</a>
<app-summary-simple-panel
[simpleActivities]="externalIdentifiers"
Expand All @@ -322,6 +323,14 @@ <h2 class="orc-font-small-print" i18n="@@summary.keyDates">
</div>
</div>
</main>
<div *ngIf="!trustedSummary">
<mat-spinner></mat-spinner>
</div>
<main class="loading" *ngIf="!trustedSummary">
<div>
<mat-spinner></mat-spinner>
<p
class="orc-font-body-small"
i18n="@@summary.loadingRecordSummary"
>
Loading record summary
</p>
</div>
</main>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
justify-content: center;
}

main {
main.stand-alone-mode {
margin-top: 32px;
}

.stand-alone-mode {
.panel {
border: 2px solid;
}
}

main.inside-iframe {
margin-top: 0;
align-content: start;
Expand All @@ -25,7 +31,6 @@ main.inside-iframe {
display: grid;
grid-gap: 16px;
border-radius: 8px 8px 0px 0px;
border: 2px solid;
}

.panel-header {
Expand Down Expand Up @@ -71,7 +76,7 @@ main.inside-iframe {

.panel-body-3-cols {
// 3 columns with a max with of 320px each
grid-template-columns: repeat(3, minmax(auto, 340px));
grid-template-columns: repeat(3, minmax(auto, 433px));
}

.panel-body-2-cols {
Expand All @@ -91,9 +96,20 @@ h2 {
letter-spacing: 2px;
}

main {
main.loading {
display: flex;
max-width: 100%;
display: flex;
justify-content: center;
align-items: center;
min-height: 352px;
width: 1304px;
overflow: hidden;
div {
display: flex;
align-items: center;
flex-direction: column;
}
}

main.panel.mobile {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@
main {
background-color: map-get($background, 'ui-background-lightest');
}
main.loading {
color: mat.get-color-from-palette($primary, '50-contrast');
}

::ng-deep {
.mat-progress-spinner circle,
.mat-spinner circle {
stroke: mat.get-color-from-palette($primary, '50-contrast');
}
}

.verified {
color: mat.get-color-from-palette($accent, 400);
Expand Down
Loading

0 comments on commit c1a1f1e

Please sign in to comment.