From d928388e9a9bab884cdf576f492d753d6e5289ee Mon Sep 17 00:00:00 2001
From: Sarah Abouzainah <sarah.abouzainah@Sarahs-MacBook-Pro.local>
Date: Fri, 10 Apr 2020 14:54:02 +0200
Subject: Merge live repo with design changes ccsdk-2309

Issue-ID: CCSDK-2309
Change-Id: Iba91eebc5880a930842e66fa97d20441c52e347b
Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 .../filter-by-tags/filter-by-tags.component.html   |  4 +-
 .../package-list/package-list.component.html       | 60 +++++++++++++---------
 .../package-pagination.component.html              |  1 -
 .../sort-packages/sort-packages.component.html     |  8 ++-
 .../sort-packages/sort-packages.component.ts       |  1 +
 5 files changed, 43 insertions(+), 31 deletions(-)

(limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard')

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html
index e5ebc315a..07c192d2c 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html
@@ -1,6 +1,6 @@
 <div class="dropdown packagesFilter w-100">
     <input class="dropdown-toggle" type="text">
-    <div class="dropdown-text">{{checkBoxTages.substr(0,checkBoxTages.length-1)}}</div>
+    <div class="dropdown-text">Filter By Tags {{checkBoxTages.substr(0,checkBoxTages.length-1)}}</div>
     <ul class="dropdown-content w-100">
         <li>
             <div class="form-group">
@@ -13,6 +13,6 @@
                 <label class="custom-control-label" for={{tag}}>{{tag}}</label>
             </div>
         </li>
+        <li class="reset-filter"><a href="">Reset filter</a></li>
     </ul>
 </div>
-
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
index f33615dfe..ed67dff40 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
@@ -1,35 +1,33 @@
 <div class="row packages-card">
-    <div class="col-lg-3 col-md-6">
+    <div class="col-lg-3 col-md-6 d-flex">
         <!--Add Package Card-->
         <div class="card addPaackage-card">
             <div class="card-body text-center">
-                <img src="/assets/img/icon-addPackage.svg">
+                <img src="/assets/img/icon-addPackage.svg" width="40%">
             </div>
             <div class="card-footer row">
-                <div class="col">
+                <div class="col text-center">
                     <a routerLink="/packages/createPackage" role="button" aria-pressed="true"
-                        class="btn-create-package float">Create
+                        class="btn-create-package float"><i class="icon-create-white" aria-hidden="true"></i>Create Package
                     </a>
-                </div>
-                <div class="col">
-                    <a href="#" role="button" aria-pressed="true" class="btn-import-package float">Import
+                    <br/>
+                    <a href="#" role="button" aria-pressed="true" class="btn-import-package float mb-3"><i class="icon-import-blue" aria-hidden="true"></i>Import Package
                     </a>
                 </div>
             </div>
         </div>
     </div>
-    <div class="col-lg-3 col-md-6" *ngFor="let bluePrint of viewedPackages">
-
+    <div class="col-lg-3 col-md-6 d-flex" *ngFor="let bluePrint of viewedPackages">
         <!--Card 1-->
-        <div>
             <div class="card">
                 <div class="card-body">
                     <div class="row">
                         <div class="col-9 pr-0">
                             <a class="card-title" [routerLink]="['/packages/package', bluePrint.id]"
                                 (click)="testDispatch(bluePrint)">
-                                <img class="icon-deployed" src="/assets/img/icon-deploy.svg">
-                                {{bluePrint.artifactName}}
+                                <!-- <img class="icon-deployed" src="/assets/img/icon-deploy.svg"> -->
+                                {{bluePrint.artifactName}}<span>.vLB.CDS</span>
+                                <span class="package-version">Version 1.0.2</span>
                             </a>
 
                         </div>
@@ -38,17 +36,33 @@
                             <div class="dropdown">
                                 <input class="dropdown-toggle" type="text">
                                 <div class="dropdown-text">
-                                    <img src="/assets/img/icon-menuDots.svg" title="Actions">
+                                    <!-- <img src="/assets/img/icon-menuDots.svg" title="Actions"> -->
+                                    <i class="icon-menuDots" aria-hidden="true"></i>
                                 </div>
                                 <ul class="dropdown-content">
                                     <li class="action-clone">
-                                        <a href="#">Clone</a>
+                                        <a href="#">
+                                            <i class="icon-clone-sm" aria-hidden="true"></i>
+                                            Clone
+                                        </a>
+                                    </li>
+                                    <li class="action-archive">
+                                        <a href="#">
+                                            <i class="icon-archive-sm" aria-hidden="true"></i>
+                                            Archive
+                                        </a>
                                     </li>
                                     <li class="action-archive">
-                                        <a href="#">Archive</a>
+                                        <a href="#">
+                                            <i class="icon-download" aria-hidden="true"></i>
+                                            Download
+                                        </a>
                                     </li>
                                     <li class="action-delete">
-                                        <a href="#">Delete</a>
+                                        <a href="#">
+                                            <i class="icon-delete-sm" aria-hidden="true"></i>
+                                            Delete
+                                        </a>
                                     </li>
                                 </ul>
                             </div>
@@ -57,9 +71,12 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <p class="mb-0">Last modified {{ bluePrint.createdDate | date:'short' }}
+                            <p class="mb-0 mt-1">Last modified {{ bluePrint.createdDate | date:'short' }}
                             </p>
-                            <p>By {{bluePrint.updatedBy}}</p>
+                            <p class="mb-2">By {{bluePrint.updatedBy}}</p>
+                            <p class="package-desc tooltip-bottom" data-tooltip="DESCRIPTION:
+                            The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from de Finibus Bonorum et Malorum by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.">Description text quisquam est dolorem, velit...</p>
+                            
                             <ul class="package-contributers">
                                 <li>
                                     <button type="button" class="border-fade" data-toggle="tooltip"
@@ -88,19 +105,16 @@
                     <div class="card-footer">
                         <div class="row">
                             <div class="col">
-                                <button type="button" class="btn btn-card-topology">Topology View
+                                <button type="button" class="btn btn-card-topology"><i class="icon-btn-card-topology" aria-hidden="true"></i>Designer Mode
                                 </button>
                             </div>
                             <div class="col">
-                                <button type="button" (click)="view(bluePrint.id)"
-                                    class="btn btn-card-config">Configuration</button>
+                                <button type="button" (click)="view(bluePrint.id)" class="btn btn-card-config"><i class="icon-btn-card-config" aria-hidden="true"></i>Configuration</button>
                             </div>
                         </div>
                     </div>
                 </div>
 
             </div>
-
-        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-pagination/package-pagination.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-pagination/package-pagination.component.html
index b5245f757..86db08110 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-pagination/package-pagination.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-pagination/package-pagination.component.html
@@ -2,6 +2,5 @@
 <div class="col package-paginator pr-0">
     <ngb-pagination [collectionSize]="totalCount" [(page)]="pageNumber" [pageSize]="pageSize" class="float-right"
         (pageChange)="getPageFromService($event)"
-
     ></ngb-pagination>
 </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.html
index 9eb45f1be..ff937fa72 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.html
@@ -13,7 +13,6 @@
                                 <li  *ngFor="let sortType of sortTypes">
                                     <a (click)="sortPackages($event)" name={{sortType}}>{{sortType}}</a>
                                 </li>
-                                
                             </ul>
                         </div>
                     </div>
@@ -23,10 +22,9 @@
                 <app-packages-list></app-packages-list>
 
             </div>
-            <div class="tab-pane fade" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">...</div>
-            <div class="tab-pane fade" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">...</div>
-            <div class="tab-pane fade" id="nav-contact1" role="tabpanel" aria-labelledby="nav-contact1-tab">...
-            </div>
+            <div class="tab-pane fade text-center" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">No Deployed Package is available</div>
+            <div class="tab-pane fade text-center" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">...</div>
+            <div class="tab-pane fade text-center" id="nav-contact1" role="tabpanel" aria-labelledby="nav-contact1-tab">No Archived Package is available</div>
         </div>
     </div>
 </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.ts
index b63f8879f..0c16292c0 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/sort-packages/sort-packages.component.ts
@@ -29,4 +29,5 @@ export class SortPackagesComponent implements OnInit {
 enum SortByToServerValue {
     Recent = 'DATE',
     Name = 'NAME',
+    Version = 'VERSION',
 }
-- 
cgit 1.2.3-korg