From c8e345bdd14cfdb8b676b61db9122ea03dfecf5b Mon Sep 17 00:00:00 2001 From: Sarah Abouzainah 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 --- .../configuration-dashboard.component.html | 111 ++- .../packages/designer/designer.component.css | 89 ++- .../packages/designer/designer.component.html | 113 ++- .../jointjs/elements/board.function.element.ts | 13 +- .../jointjs/elements/palette.function.element.ts | 8 +- .../designer/source-view/source-view.component.css | 6 +- .../imports-tab/imports-tab.component.html | 53 +- .../imports-tab/imports-tab.component.ts | 1 - .../metadata-tab/metadata-tab.component.html | 44 +- .../metadata-tab/metadata-tab.component.ts | 8 +- .../package-creation.component.html | 32 +- .../scripts-tab/scripts-tab.component.html | 50 +- .../templ-mapp-creation.component.html | 28 +- .../templ-mapp-listing.component.html | 2 +- .../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 + .../shared-modules/header/header.component.html | 8 +- cds-ui/designer-client/src/assets/css/style1.css | 0 cds-ui/designer-client/src/assets/css/style2.css | 3 - .../src/assets/icomoon/fonts/icomoon.eot | Bin 9268 -> 22112 bytes .../src/assets/icomoon/fonts/icomoon.svg | 94 ++- .../src/assets/icomoon/fonts/icomoon.ttf | Bin 9104 -> 21948 bytes .../src/assets/icomoon/fonts/icomoon.woff | Bin 9180 -> 22028 bytes .../designer-client/src/assets/icomoon/style.css | 153 +++- .../src/assets/img/icon-deploy-active.svg | 27 + .../src/assets/img/icon-deploy-inactive.svg | 25 + .../src/assets/img/icon-discard-sm.svg | 28 + .../src/assets/img/icon-download-sm.svg | 28 + .../src/assets/img/icon-file-code.svg | 22 + .../src/assets/img/icon-remove-file.svg | 17 + .../src/assets/img/icon-required-no.svg | 22 + .../src/assets/img/icon-required-yes.svg | 19 + .../src/assets/img/icon-save-sm.svg | 30 + cds-ui/designer-client/src/styles.css | 879 +++++++++++++++------ 37 files changed, 1464 insertions(+), 523 deletions(-) delete mode 100644 cds-ui/designer-client/src/assets/css/style1.css delete mode 100644 cds-ui/designer-client/src/assets/css/style2.css create mode 100644 cds-ui/designer-client/src/assets/img/icon-deploy-active.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-deploy-inactive.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-discard-sm.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-download-sm.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-file-code.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-remove-file.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-required-no.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-required-yes.svg create mode 100644 cds-ui/designer-client/src/assets/img/icon-save-sm.svg (limited to 'cds-ui/designer-client') diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html index df1911a7d..730525504 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html @@ -7,13 +7,11 @@

-
- - +
@@ -23,54 +21,97 @@
- +
-
-
-
- -
-
-
- {{viewedPackage.artifactName}} - .vLB.CDS - -
-
- Last modified {{ viewedPackage.createdDate | date:'short' }} By - {{viewedPackage.updatedBy}} -
-
- -
+
+
+
+
+ {{viewedPackage.artifactName}}.vLB.CDS + + Version 1.0.2 +
+
+ Last modified {{ viewedPackage.createdDate | date:'short' }} By + {{viewedPackage.updatedBy}} +
+
+
+
+

Author Name

+ Shaaban Ebrahim +
+
+

Author Email

+ shaaban.eltanany.ext@orange.com +
+
+

Contributions

+
-
+
+ - - -
@@ -80,7 +121,7 @@
@@ -22,15 +66,15 @@
  • @@ -58,24 +102,24 @@
    - +
    + [mode]="'push'" #sidebarLeft>
    -

    Actions

    - - + +
    - -

    Functions

    - Drag and drop function to Action’s box -
    -
    +

    Functions

    + Drag and drop function to Action’s box +
    +
    - +
    - +
    @@ -180,8 +224,7 @@
    + [position]="'right'" #sidebarRight>
    @@ -203,8 +246,7 @@

    @@ -214,7 +256,7 @@
    + data-parent="#accordionExample">
    @@ -234,7 +276,7 @@
    + rows="3">
    @@ -248,8 +290,7 @@

    @@ -258,7 +299,7 @@
    + data-parent="#accordionExample">
    @@ -278,7 +319,7 @@
    + rows="3">
    @@ -292,8 +333,8 @@

    @@ -302,7 +343,7 @@
    + data-parent="#accordionExample">
    @@ -322,7 +363,7 @@
    + rows="3">
    diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/board.function.element.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/board.function.element.ts index 42813075c..72019bfa0 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/board.function.element.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/board.function.element.ts @@ -28,9 +28,9 @@ const FunctionElement = joint.shapes.standard.Rectangle.define('board.FunctionEl - - - + + + - execute - - execute + diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/palette.function.element.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/palette.function.element.ts index 896ecaa88..48a680982 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/palette.function.element.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/jointjs/elements/palette.function.element.ts @@ -34,7 +34,7 @@ const FunctionElement = joint.shapes.standard.Rectangle.define('palette.Function }, { markup: ` - + @@ -53,7 +53,7 @@ const FunctionElement = joint.shapes.standard.Rectangle.define('palette.Function - + @@ -67,7 +67,7 @@ const FunctionElement = joint.shapes.standard.Rectangle.define('palette.Function - + - + diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.css b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.css index 01ae599a4..75274ba33 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.css +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.css @@ -49,6 +49,9 @@ header{ color: #C3CDDB; font-size: 10px; } +.designer-breadcrumb .fa-angle-right::before{ + color: #fff; +} .sidebar-container{ height: calc(100vh - 60px) !important; } @@ -255,6 +258,7 @@ p.compType-4{ color: #C3CDDB; } .controllerSidebar b{ + margin-left: 12px; font-size: 12px; color: #C3CDDB; } @@ -272,9 +276,9 @@ p.compType-4{ } .actionBtns .btn:last-child{ padding-left: 34px !important; - background: url(src/assets/img/icon-import-blue.svg) 12px center #fff no-repeat; border: solid 1px #D0DFF1; color: #1B3E6F; + outline: 0 !important; } .actionsList, .componentsList{ diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html index bf86c46ea..ac02c50e2 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html @@ -1,20 +1,20 @@
    - - + +
    Or you can also Import File + (click)="resetTheUploadedFiles()" data-target="#importModal">Import File
    -
    +
    + +
    - -
    @@ -91,7 +115,8 @@
  • {{sortType}}
  • -
    @@ -23,10 +22,9 @@
    - - - + + +
    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', } diff --git a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html index b6dadf88a..4b1c17e35 100644 --- a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html +++ b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html @@ -8,13 +8,13 @@ Packages - +