From bfca1865ddeb71ce3ee5eaae96cd480f11884c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Thu, 15 Oct 2020 03:28:54 +0300
Subject: [PATCH] Quick navigation list items

---
 .../initials-avatar.component.ts              |  2 +-
 .../file-preview-screen.component.html        | 34 ++++++++-------
 .../file-preview-screen.component.scss        | 17 +++++++-
 .../file-preview-screen.component.ts          | 11 ++++-
 .../project-listing-screen.component.html     |  2 +-
 .../project-overview-screen.component.html    |  6 +--
 .../src/assets/styles/red-components.scss     | 42 +++++++++++++------
 7 files changed, 80 insertions(+), 34 deletions(-)

diff --git a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.ts b/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.ts
index 253df0d9d..6c65d0a68 100644
--- a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.ts
+++ b/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.ts
@@ -10,7 +10,7 @@ export class InitialsAvatarComponent implements OnInit {
   public username: string;
 
   @Input()
-  public color: 'red-white' | 'gray-red' | 'gray-dark' = 'gray-dark';
+  public color = 'lightgray-dark';
 
   @Input()
   public size: 'small' | 'large' = 'small';
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
index 4f6b4aabb..d08fb5864 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
@@ -58,20 +58,26 @@
                [ngClass]="{ active: item.pageNumber === activeViewerPage }"
                (click)="selectPage(item.pageNumber)"
           >
-            <div class="page-number">Page {{ item.pageNumber }}</div>
-            <div class="stats-subtitle subtitle mt-5">
-              <div *ngIf="item.redactions" class="center">
-                <mat-icon svgIcon="red:secret"></mat-icon>
-                {{item.redactions}} Redactions
-              </div>
-              <div *ngIf="item.hints" class="center">
-                <mat-icon svgIcon="red:idea"></mat-icon>
-                {{item.hints}} Hints
-              </div>
-              <div *ngIf="item.hints" class="center">
-                <mat-icon svgIcon="red:info"></mat-icon>
-                {{item.ignore}} Ignore
-              </div>
+            <div class="page-number subtitle">{{ item.pageNumber }}</div>
+            <div *ngIf="item.hints" class="page-stats subtitle">
+              <div class="oval darkgray-white x-small">H</div>
+              {{item.hints}}
+            </div>
+            <div *ngIf="item.redactions" class="page-stats subtitle">
+              <div class="square darkgray-white x-small">R</div>
+              {{item.redactions}}
+            </div>
+            <div *ngIf="item.comments" class="page-stats subtitle">
+              <div class="oval darkgray-white x-small">C</div>
+              {{item.comments}}
+            </div>
+            <div *ngIf="item.requests" class="page-stats subtitle">
+              <div class="oval red-white x-small">S</div>
+              {{item.requests}}
+            </div>
+            <div *ngIf="item.ignore" class="page-stats subtitle">
+              <div class="oval lightgray-white x-small">I</div>
+              {{item.ignore}}
             </div>
           </div>
         </div>
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
index 2fee29db8..f8b4a11ed 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
@@ -105,6 +105,9 @@ redaction-pdf-viewer {
   }
 
   .page-navigation {
+    display: flex;
+    align-items: center;
+    gap: 12px;
     cursor: pointer;
     border-bottom: 1px solid $separator;
     padding: 14px;
@@ -115,7 +118,19 @@ redaction-pdf-viewer {
     }
 
     .page-number {
-      font-weight: 600;
+      border: 1px solid $separator;
+      padding: 7px;
+      margin-right: 3px;
+      width: 14px;
+      text-align: center;
+    }
+
+    .page-stats {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      gap: 6px;
+      opacity: 1;
     }
 
     &.active {
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
index 55cdd6607..4b4ac8a55 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
@@ -45,7 +45,14 @@ export class FilePreviewScreenComponent implements OnInit {
   public fileId: string;
   public annotations: Annotations.Annotation[] = [];
   public selectedAnnotation: Annotations.Annotation;
-  public quickNavigation: { pageNumber: number, redactions: number, hints: number, ignore: number; }[] = [];
+  public quickNavigation: {
+    pageNumber: number,
+    hints: number,
+    redactions: number,
+    comments: number;
+    suggestions: number,
+    ignore: number;
+  }[] = [];
 
   private _manualRedactionEntry: ManualRedactionEntry;
 
@@ -137,7 +144,7 @@ export class FilePreviewScreenComponent implements OnInit {
         const pageNumber = annotation.getPageNumber();
         let el = this.quickNavigation.find((page) => page.pageNumber === pageNumber);
         if (!el) {
-          el = { pageNumber, redactions: 0, hints: 0, ignore: 0 };
+          el = { pageNumber, redactions: 0, hints: 0, ignore: 0, comments: 0, suggestions: 0 };
           this.quickNavigation.push(el);
         }
         if (annotation.Id.startsWith('hint:')) {
diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
index dbaaa3af2..db5058065 100644
--- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
+++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
@@ -57,7 +57,7 @@
         </div>
         <div class="flex-1">
           <redaction-initials-avatar [username]="user.name"
-                                     color="gray-red"
+                                     color="lightgray-red"
                                      withName="true"
           ></redaction-initials-avatar>
         </div>
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
index fc1465971..e705dc45e 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
@@ -120,7 +120,7 @@
     <div class="owner flex-row mt-20">
       <redaction-initials-avatar [username]="user.name"
                                  size="large"
-                                 color="gray-red"
+                                 color="lightgray-red"
                                  withName="true"
       ></redaction-initials-avatar>
     </div>
@@ -136,10 +136,10 @@
           <redaction-initials-avatar [username]="username" size="large"></redaction-initials-avatar>
         </div>
         <div class="member">
-          <div class="oval large">+2</div>
+          <div class="oval large white-dark">+2</div>
         </div>
         <div class="member">
-          <div class="oval red large">+</div>
+          <div class="oval red-white large">+</div>
         </div>
       </div>
     </div>
diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss
index 9d836670f..571d0e406 100644
--- a/apps/red-ui/src/assets/styles/red-components.scss
+++ b/apps/red-ui/src/assets/styles/red-components.scss
@@ -1,44 +1,62 @@
 @import "red-variables";
 
-.oval {
+.oval, .square {
   font-weight: 600;
   display: flex;
   justify-content: center;
   align-items: center;
   height: 24px;
   width: 24px;
-  border-radius: 12px;
   font-size: 10px;
-  border: 1px solid #E2E4E9;
-  letter-spacing: 0;
   line-height: 12px;
   text-align: center;
   text-transform: uppercase;
-  font-family: Inter, sans-serif;
+  border: none;
 
   &.large {
     height: 32px;
     width: 32px;
-    border-radius: 16px;
     font-size: 13px;
   }
 
-  &.gray-dark {
-    background-color: $grey-4;
-    border: none;
+  &.x-small {
+    height: 16px;
+    width: 16px;
+    font-size: 11px;
+    line-height: 14px;
   }
 
-  &.gray-red {
+  &.lightgray-dark {
+    background-color: $grey-4;
+  }
+
+  &.lightgray-red {
     background-color: $grey-4;
     color: $red-1;
-    border: none;
+  }
+
+  &.darkgray-white {
+    background-color: $grey-1;
+    color: $white;
+  }
+
+  &.lightgray-white {
+    background-color: $grey-5;
+    color: $white;
   }
 
   &.red-white {
     background-color: $red-1;
     color: $white;
-    border: none;
   }
+
+  &.white-dark {
+    border: 1px solid #E2E4E9;
+  }
+}
+
+.oval {
+  border-radius: 50%;
 }
 
 .stats-subtitle {