Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ export class PreprintModerationMapper {
})),
totalCount: response.meta.total,
pageSize: response.meta.per_page,
pendingCount: response.meta.reviews_state_counts.pending,
acceptedCount: response.meta.reviews_state_counts.accepted,
rejectedCount: response.meta.reviews_state_counts.rejected,
withdrawnCount: response.meta.reviews_state_counts.withdrawn,
pendingCount: response.meta?.reviews_state_counts?.pending || 0,
acceptedCount: response.meta?.reviews_state_counts?.accepted || 0,
rejectedCount: response.meta?.reviews_state_counts?.rejected || 0,
withdrawnCount: response.meta?.reviews_state_counts?.withdrawn || 0,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,9 @@ <h1>{{ currentUser()?.fullName }}</h1>
</div>

<div class="flex flex-column gap-4 mt-4 md:gap-5 xl:flex-row xl:justify-content-between">
<div class="flex flex-column gap-3 xl:gap-4">
@if (currentUser()?.employment?.length) {
<p class="font-bold">
{{ currentUser()?.employment?.[0]?.title }},
{{ currentUser()?.employment?.[0]?.institution }}
</p>
}

<p class="font-normal">
{{ 'myProfile.memberSince' | translate }}: {{ currentUser()?.dateRegistered | date: 'MMM d, yyyy' }}
</p>
</div>
<p class="font-normal">
{{ 'myProfile.memberSince' | translate }}: {{ currentUser()?.dateRegistered | date: 'MMM d, yyyy' }}
</p>

<div class="flex flex-column gap-4 min-w-0 xl:align-items-end xl:flex-1">
<div class="flex flex-column gap-3 w-full md:flex-row xl:gap-4 xl:justify-content-end">
Expand All @@ -38,27 +29,6 @@ <h1>{{ currentUser()?.fullName }}</h1>
</div>
</div>

@if (isEmploymentAndEducationVisible()) {
<div class="flex flex-column gap-3 w-full md:flex-row xl:gap-4 xl:justify-content-end">
@if (currentUser()?.education?.length) {
<div class="flex flex-row align-items-center gap-2 flex-1 min-w-0">
<i class="fas fa-landmark"></i>
<h3 class="font-bold text-overflow-ellipsis overflow-hidden white-space-nowrap">
{{ currentUser()?.education?.[0]?.institution }}
</h3>
</div>
}

@if (currentUser()?.employment?.length) {
<div class="flex flex-row align-items-center gap-2">
<h3 class="font-bold">
{{ currentUser()?.employment?.[0]?.institution }}
</h3>
</div>
}
</div>
}

<div class="flex flex-wrap align-items-center gap-3">
@for (social of userSocials(); track social.alt) {
<a class="cursor-pointer custom-light-hover" [href]="social.url" target="_blank" rel="noopener noreferrer">
Expand Down