MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

ui fixes on dashboard (unauthorized)

This commit is contained in:
Sofia Papacharalampous 2024-04-15 14:08:44 +03:00
parent 8c89ffe50e
commit 44a75e5ffd
2 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dmp-frontend/src/app/ui/dashboard/dashboard.component.html
View File

@ -1,9 +1,8 @@
<div class="main-content dashboard-main-container h-100" [class.non-auth-main-container]="!this.isAuthenticated()"> <div class="main-content dashboard-main-container h-100">
<div *ngIf="this.isAuthenticated()" class="container-fluid"> <div *ngIf="this.isAuthenticated()" class="container-fluid">
<div *ngIf="this.dashboardStatistics" class="main-content"> <div *ngIf="this.dashboardStatistics" class="main-content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-column-reverse flex-xl-row"> <div class="row flex-column-reverse flex-xl-row">
<div class="col-12 col-xl-10"> <div class="col-12 col-xl-10">
<div class="row"> <div class="row">
<div *ngIf="newReleaseNotificationVisible" class="new-releases-card col-auto mt-0 mr-4"> <div *ngIf="newReleaseNotificationVisible" class="new-releases-card col-auto mt-0 mr-4">
@ -79,7 +78,6 @@
</mat-tab-group> </mat-tab-group>
</div> </div>
</div> </div>
<!-- Right Sidebar --> <!-- Right Sidebar -->
<div *ngIf="!this.hasDmps()" class="col-12 col-xl-2 mb-4 stats"> <div *ngIf="!this.hasDmps()" class="col-12 col-xl-2 mb-4 stats">
<div class="row"> <div class="row">
@ -108,7 +106,6 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="this.hasDmps()" class="col-12 col-xl-2 mb-4 stats"> <div *ngIf="this.hasDmps()" class="col-12 col-xl-2 mb-4 stats">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@ -147,13 +144,13 @@
</div> </div>
<!-- Home screen on log out --> <!-- Home screen on log out -->
<div class="col p-0" *ngIf="!this.isAuthenticated()"> <div class="container-fluid" *ngIf="!this.isAuthenticated()">
<div class="col-auto">
<div class="main-content"> <div class="main-content">
<div class="col"> <div class="container-fluid">
<div class="row flex-column-reverse flex-xl-row">
<div class="col-12 col-xl-9">
<div class="row"> <div class="row">
<div class="col d-flex flex-column"> <div class="col-auto card" [style.display]="isIntroCardVisible ? 'block' : 'none'">
<div class="card non-auth-card" [style.display]="isIntroCardVisible ? 'block' : 'none'">
<a class="col-auto d-flex" (click)="dismissIntroCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a> <a class="col-auto d-flex" (click)="dismissIntroCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
<div class="d-flex flex-column align-items-center non-auth-title-container"> <div class="d-flex flex-column align-items-center non-auth-title-container">
<h4 class="pt-4">{{'DASHBOARD.TITLE' | translate}}</h4> <h4 class="pt-4">{{'DASHBOARD.TITLE' | translate}}</h4>
@ -163,6 +160,7 @@
<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png"> <img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
</div> </div>
</div> </div>
</div>
<!-- <div *ngIf="hasDmps()" class="col activity"> <!-- <div *ngIf="hasDmps()" class="col activity">
<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div> <div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
<mat-tab-group mat-align-tabs="start" class="remove-border-bottom" ( [selectedIndex]="indexFromCurrentType" selectedTabChange)="currentType = $event.tab.ariaLabel"> <mat-tab-group mat-align-tabs="start" class="remove-border-bottom" ( [selectedIndex]="indexFromCurrentType" selectedTabChange)="currentType = $event.tab.ariaLabel">
@ -181,31 +179,50 @@
</mat-tab-group> </mat-tab-group>
</div> --> </div> -->
</div> </div>
<div class="col-auto"> <div class="col-12 col-xl-3 mb-4 stats">
<div *ngIf="!hasDmps()" class="ml-auto pl-4 personal-usage-block"> <div *ngIf="!hasDmps()" class="row">
<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div> <div class="col-12">
<div class="counter-zero">0</div> <div class="personal-usage" style="width: fit-content;"><span>{{'DASHBOARD.PUBLIC-USAGE' | translate}}</span></div>
</div>
<div class="col-auto col-xl-12">
<div class="counter-zero"><span>0</span></div>
<a>{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a> <a>{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a>
<div class="counter-zero">0</div> </div>
<div class="col-auto col-xl-12">
<div class="counter-zero"><span>0</span></div>
<a>{{'DASHBOARD.PUBLIC-DATASETS' | translate}}</a> <a>{{'DASHBOARD.PUBLIC-DATASETS' | translate}}</a>
<div class="counter-zero">0</div> </div>
<div class="col-auto col-xl-12">
<div class="counter-zero"><span>0</span></div>
<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a> <a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
<div class="counter-zero">0</div> </div>
<div class="col-auto col-xl-12">
<div class="counter-zero"><span>0</span></div>
<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a> <a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
</div> </div>
<div *ngIf="hasDmps()" class="ml-auto stats"> </div>
<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
<div [ngClass]="{'counter': dashboardStatistics?.dmpCount != 0, 'counter-zero': dashboardStatistics?.dmpCount == 0}"> <div *ngIf="hasDmps()" class="row">
{{dashboardStatistics?.dmpCount}}</div> <div class="col-12">
<div class="personal-usage" style="width: fit-content;"><span>{{'DASHBOARD.PUBLIC-USAGE' | translate}}</span></div>
</div>
<div class="col-auto col-xl-12">
<div [ngClass]="{'counter': dashboardStatistics?.dmpCount != 0, 'counter-zero': dashboardStatistics?.dmpCount == 0}"><span>{{dashboardStatistics?.dmpCount}}</span></div>
<a [routerLink]="['/explore-plans']" class="link">{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a> <a [routerLink]="['/explore-plans']" class="link">{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a>
<div [ngClass]="{'counter': dashboardStatistics?.descriptionCount != 0, 'counter-zero': dashboardStatistics?.descriptionCount == 0}"> </div>
{{dashboardStatistics?.descriptionCount}}</div>
<div class="col-auto col-xl-12">
<div [ngClass]="{'counter': dashboardStatistics?.descriptionCount != 0, 'counter-zero': dashboardStatistics?.descriptionCount == 0}"><span>{{dashboardStatistics?.descriptionCount}}</span></div>
<a [routerLink]="['/explore-descriptions']" class="link">{{'DASHBOARD.PUBLIC-DESCRIPTIONS' | translate}}</a> <a [routerLink]="['/explore-descriptions']" class="link">{{'DASHBOARD.PUBLIC-DESCRIPTIONS' | translate}}</a>
<div [ngClass]="{'counter': grantCount != 0, 'counter-zero': grantCount == 0}"> </div>
{{grantCount}}</div>
<div class="col-auto col-xl-12">
<div [ngClass]="{'counter': grantCount != 0, 'counter-zero': grantCount == 0}"><span>{{grantCount}}</span></div>
<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a> <a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
<div [ngClass]="{'counter': organizationCount != 0, 'counter-zero': organizationCount == 0}"> </div>
{{organizationCount}}</div>
<div class="col-auto col-xl-12">
<div [ngClass]="{'counter': organizationCount != 0, 'counter-zero': organizationCount == 0}"><span>{{organizationCount}}</span></div>
<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a> <a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
</div> </div>
</div> </div>

8
dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
View File

@ -374,14 +374,6 @@ input[type="text"] {
padding: 0rem 7em 0rem 3rem; padding: 0rem 7em 0rem 3rem;
} }
.non-auth-main-container {
padding-left: 0;
}
.non-auth-card {
margin-left: 3rem;
}
.app-info { .app-info {
font-size: 1rem; font-size: 1rem;
padding: 1rem 2rem; padding: 1rem 2rem;