This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-1551
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 1c50ce16bf8e4c9b3036658a63cec971b5911811
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Fri Apr 10 17:06:41 2020 +0300

    Styling bucket browser
---
 .../app/core/services/bucket-browser.service.ts    | 26 +++++++++++++++-
 .../bucket-browser/bucket-browser.component.html   | 16 +++++++---
 .../bucket-browser/bucket-browser.component.scss   | 35 +++++++++++++++++++---
 .../bucket-browser/bucket-browser.component.ts     | 18 ++++++++---
 .../folder-tree/folder-tree.component.html         |  4 +--
 .../folder-tree/folder-tree.component.scss         | 20 +++++++++----
 6 files changed, 98 insertions(+), 21 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
 
b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
index c98df9b..36f4a05 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
@@ -19,10 +19,34 @@ export class TodoItemFlatNode {
  */
 const TREE_DATA = {
   'dlab-local-shared-bucket': {
+    'file1': null,
+    'file2': null,
+    'file3': null,
     FirsrFolder: {
       folder: {
         folder: ['2008.cvs.bz2', 'airports.csv', 'carriers.csv'],
-        folder1: [],
+        folder1: ['2008.cvs.bz2', 'airports.csv', 'carriers.csv', 'file1',
+          'file2',
+          'file3',
+          'file4',
+          'file5',
+          'file6', '2008.cvs.bz2', '2008.cvs.bz2', 'airports.csv', 
'carriers.csv', 'file1',
+          'file2',
+          'file3',
+          'file4',
+          'file5',
+          'file6',
+          '2008.cvs.bz2', 'airports.csv', 'carriers.csv', 'file1',
+          'file2',
+          'file3',
+          'file4',
+          'file5',
+          'file6', '2008.cvs.bz2', '2008.cvs.bz2', 'airports.csv', 
'carriers.csv', 'file1',
+          'file2',
+          'file3',
+          'file4',
+          'file5',
+          'file6'],
         folder2: []
       },
       'folder1': [],
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
index 50c812d..2a84c86 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
@@ -40,20 +40,28 @@
               <div class="size">2.4kb</div>
             </div>
             <div class="folder-item-wrapper" *ngIf="!file.children">
-              <div class="name name-file"> <mat-checkbox 
></mat-checkbox><span>{{file.item}}</span></div>
+              <div class="name name-file"> <mat-checkbox 
[(ngModel)]="file.isSelected"></mat-checkbox><span>{{file.item}}</span></div>
 <!--                [checked]="descendantsAllSelected(node)"-->
 <!--                [indeterminate]="descendantsPartiallySelected(node)"-->
 <!--                (change)="todoItemSelectionToggle(node)"-->
               <div class="size">2.4kb</div>
+              <div class="progress-wrapper">
+                <div class="progres" *ngIf="file.isSelected"><div 
class="bar"></div></div>
+              </div>
             </div>
-            <!--            <div class="progres"></div>-->
+
           </li>
         </ul>
         <ul class="folder-tree">
           <li *ngFor="let file of uploadPaths" class="folder-item">
             <div class="name">{{file}}</div>
             <div class="size">2.4kb</div>
-            <div class="progres"></div>
+            <div class="progress-wrapper">
+              <div class="progres">
+                <div class="bar" [ngClass]="{'full': isUploading}">
+                </div>
+              </div>
+            </div>
             <div (click)="deleteAddedFile(file)">X</div>
           </li>
         </ul>
@@ -61,7 +69,7 @@
     </div>
     <div class="text-center m-top-30 m-bott-30">
       <button type="button" class="butt" mat-raised-button 
(click)="this.dialogRef.close()">Close</button>
-      <button *ngIf="!this.uploadPaths.length" type="button" class="butt 
butt-success" mat-raised-button >Download</button>
+      <button *ngIf="!this.uploadPaths.length" type="button" class="butt 
butt-success" mat-raised-button (click)="downloadItems()">Download</button>
       <button *ngIf="this.uploadPaths.length !== 0" type="button" class="butt 
butt-success" mat-raised-button (click)="uploadItems()">Upload</button>
     </div>
   </div>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
index dba2d31..d20c10f 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
@@ -82,6 +82,8 @@
   }
 
   .directory{
+    max-height: 500px;
+    overflow: auto;
     flex: 2;
     .folder-tree{
       .name{
@@ -103,11 +105,27 @@
       .size{
         flex:1;
       }
-      .progres{
+      .progress-wrapper{
         flex:1;
-        border: 1px solid rgba(0,0,0,.12);
-        height: 15px;
+        .progres{
+          border: 1px solid rgba(0,0,0,.12);
+          height: 15px;
+          position: relative;
+          .bar{
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            width: 0;
+            background-color:  #00bcd4;
+            &.full{
+              width: 100%;
+              transition: 5s ease-in-out;
+            }
+          }
+        }
       }
+
       .action {
         display: flex;
         justify-content: space-around;
@@ -155,6 +173,9 @@
            color: #00bcd4;
            transition: .3s ease-in-out;
          }
+         .mat-checkbox .mat-ripple-element {
+           background-color: #00bcd4 !important;
+         }
        }
      }
    }
@@ -165,6 +186,12 @@
     color: #000;
   }
 
-
+  .check-box {
+    background-color: red;
+  }
 
 }
+
+
+
+
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
index 71d9dba..58454cb 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
@@ -41,6 +41,7 @@ export class BucketBrowserComponent implements OnInit {
   // @ViewChild('tabGroupGit', { static: false }) tabGroupGit;
   @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent;
   private selectedFolder: any;
+  private isUploading: boolean;
 
   constructor(
     public toastr: ToastrService,
@@ -106,17 +107,26 @@ export class BucketBrowserComponent implements OnInit {
     this.uploadPaths.splice(this.uploadPaths.indexOf(file), 1);
   }
 
-  uploadItems(){
-    // this.folderTreeComponent.addNewItem(this.selectedFolder);
+  uploadItems() {
+    this.isUploading = true;
+    setTimeout(() => this.upLoading(), 5000);
+  }
+
+  downloadItems(){
+    this.isUploading = true;
+  }
+
+  upLoading() {
     this.uploadPaths.forEach(v => {
       this.folderTreeComponent.addNewItem(this.selectedFolder, v, true);
     });
     this.uploadPaths = [];
-    // this.folderTreeComponent.saveNode(this.selectedFolder);
-
+    this.isUploading = false;
   }
 }
 
+
+
 // @Component({
 //   selector: 'dialog-result-example-dialog',
 //   template: `
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
index 5b05dea..0d1c480 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
@@ -19,14 +19,14 @@
   <mat-tree-node *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding>
     <button mat-icon-button matTreeNodeToggle
             [attr.aria-label]="'toggle ' + node.filename">
-      <mat-icon class="mat-icon-rtl-mirror">
+      <mat-icon class="mat-icon-rtl-mirror" [ngClass]="{'active-item': 
selectedFolder === node}">
         {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
       </mat-icon>
     </button>
 <!--    <mat-checkbox [checked]="descendantsAllSelected(node)"-->
 <!--                  [indeterminate]="descendantsPartiallySelected(node)"-->
 <!--                  
(change)="todoItemSelectionToggle(node)"></mat-checkbox>-->
-    <div (click)="showItem(node)" class="folder-item-line" 
[ngClass]="{'active': selectedFolder === node}"><i class="material-icons 
folder-icon">folder</i> <span class="folder">{{node.item}}</span></div>
+    <div (click)="showItem(node)" class="folder-item-line"  
[ngClass]="{'active-item': selectedFolder === node}"><i class="material-icons 
folder-icon">folder</i> <span class="folder">{{node.item}}</span></div>
 <!--    <button mat-icon-button 
(click)="addNewItem(node)"><mat-icon>add</mat-icon></button>-->
   </mat-tree-node>
 </mat-tree>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
index 8da2b8d..ffbf47d 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.scss
@@ -11,19 +11,27 @@
   display: flex;
   align-items: center;
   cursor: pointer;
-  &.active {
-    //border-bottom: 1px solid #00bcd4;
+
+}
+
+.active-item {
+  //border-bottom: 1px solid #00bcd4;
+  color: #00bcd4;
+  i{
     color: #00bcd4;
-    i{
-      color: #00bcd4;
-    }
+  }
+
 
 }
+
+.mat-tree-node{
+  cursor: pointer;
+  transition: .3s;
   &:hover{
     color: #00bcd4;
     i{
       color: #00bcd4;
     }
   }
-
 }
+


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to