From 44a75e5ffd8538b5b5039f6560db8a10d5dcd435 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Mon, 15 Apr 2024 14:08:44 +0300
Subject: [PATCH] ui fixes on dashboard (unauthorized)

---
 .../app/ui/dashboard/dashboard.component.html | 107 ++++++++++--------
 .../app/ui/dashboard/dashboard.component.scss |   8 --
 2 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index be5c74704..1aba0a390 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -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.dashboardStatistics" class="main-content">
 			<div class="container-fluid">
 				<div class="row flex-column-reverse flex-xl-row">
-
 					<div class="col-12 col-xl-10">
 						<div class="row">
 								<div *ngIf="newReleaseNotificationVisible" class="new-releases-card col-auto mt-0 mr-4">
@@ -79,7 +78,6 @@
 							</mat-tab-group>
 						</div>
 					</div>
-
 					<!-- Right Sidebar -->
 					<div *ngIf="!this.hasDmps()" class="col-12 col-xl-2 mb-4 stats">
 						<div class="row">
@@ -108,7 +106,6 @@
 							</div>
 						</div>
 					</div>
-
 					<div *ngIf="this.hasDmps()" class="col-12 col-xl-2 mb-4 stats">
 						<div class="row">
 							<div class="col-12">
@@ -147,13 +144,13 @@
 	</div>
 
 	<!-- Home screen on log out -->
-	<div class="col p-0" *ngIf="!this.isAuthenticated()">
-		<div class="col-auto">
-			<div class="main-content">
-				<div class="col">
-					<div class="row">
-						<div class="col d-flex flex-column">
-							<div class="card non-auth-card" [style.display]="isIntroCardVisible ? 'block' : 'none'">
+	<div class="container-fluid" *ngIf="!this.isAuthenticated()">
+		<div class="main-content">
+			<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="col-auto 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>
 								<div class="d-flex flex-column align-items-center non-auth-title-container">
 									<h4 class="pt-4">{{'DASHBOARD.TITLE' | translate}}</h4>
@@ -163,49 +160,69 @@
 									<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
 								</div>
 							</div>
-							<!-- <div *ngIf="hasDmps()" class="col activity">
-								<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 aria-label="recent" label="{{'DASHBOARD.ALL' | translate}}">
-										<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)" [isActive]="currentType == 'recent'"></app-recent-edited-activity>
-										<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-									</mat-tab>
-									<mat-tab aria-label="dmps" label="{{'DASHBOARD.PUBLIC-DMPS' | translate}}">
-										<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)" [isActive]="currentType == 'dmps'"></app-recent-edited-dmp-activity>
-										<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-									</mat-tab>
-									<mat-tab aria-label="datasets" label="{{'DASHBOARD.PUBLIC-DATASETS' | translate}}">
-										<app-recent-edited-description-activity (totalCountDatasets)="onCountDatasets($event)" [isActive]="currentType == 'datasets'"></app-recent-edited-description-activity>
-										<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-									</mat-tab>
-								</mat-tab-group>
-							</div> -->
 						</div>
-						<div class="col-auto">
-							<div *ngIf="!hasDmps()" class="ml-auto pl-4 personal-usage-block">
-								<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
-								<div class="counter-zero">0</div>
+						<!-- <div *ngIf="hasDmps()" class="col activity">
+							<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 aria-label="recent" label="{{'DASHBOARD.ALL' | translate}}">
+									<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)" [isActive]="currentType == 'recent'"></app-recent-edited-activity>
+									<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+								</mat-tab>
+								<mat-tab aria-label="dmps" label="{{'DASHBOARD.PUBLIC-DMPS' | translate}}">
+									<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)" [isActive]="currentType == 'dmps'"></app-recent-edited-dmp-activity>
+									<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+								</mat-tab>
+								<mat-tab aria-label="datasets" label="{{'DASHBOARD.PUBLIC-DATASETS' | translate}}">
+									<app-recent-edited-description-activity (totalCountDatasets)="onCountDatasets($event)" [isActive]="currentType == 'datasets'"></app-recent-edited-description-activity>
+									<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+								</mat-tab>
+							</mat-tab-group>
+						</div> -->
+					</div>
+					<div class="col-12 col-xl-3 mb-4 stats">
+						<div *ngIf="!hasDmps()" class="row">
+							<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 class="counter-zero"><span>0</span></div>
 								<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>
-								<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>
-								<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>
 							</div>
-							<div *ngIf="hasDmps()" class="ml-auto stats">
-								<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
-								<div [ngClass]="{'counter': dashboardStatistics?.dmpCount != 0, 'counter-zero': dashboardStatistics?.dmpCount == 0}">
-									{{dashboardStatistics?.dmpCount}}</div>
+						</div>
+
+						<div *ngIf="hasDmps()" class="row">
+							<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>
-								<div [ngClass]="{'counter': dashboardStatistics?.descriptionCount != 0, 'counter-zero': dashboardStatistics?.descriptionCount == 0}">
-									{{dashboardStatistics?.descriptionCount}}</div>
+							</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>
-								<div [ngClass]="{'counter': grantCount != 0, 'counter-zero': grantCount == 0}">
-									{{grantCount}}</div>
+							</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>
-								<div [ngClass]="{'counter': organizationCount != 0, 'counter-zero': organizationCount == 0}">
-									{{organizationCount}}</div>
+							</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>
 							</div>
 						</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
index 88c19f0e9..949e0b96f 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
@@ -374,14 +374,6 @@ input[type="text"] {
 	padding: 0rem 7em 0rem 3rem;
 }
 
-.non-auth-main-container {
-	padding-left: 0;
-}
-
-.non-auth-card {
-	margin-left: 3rem;
-}
-
 .app-info {
 	font-size: 1rem;
 	padding: 1rem 2rem;