You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/02/25 11:17:22 UTC
[incubator-dlab] branch DLAB-1476 updated: [DLAB-1587]: Adjust
images for demo-regime
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1476
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1476 by this push:
new 3c8122b [DLAB-1587]: Adjust images for demo-regime
3c8122b is described below
commit 3c8122bead0583f661f9483710df2135ee21dc4e
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Feb 25 13:13:26 2020 +0200
[DLAB-1587]: Adjust images for demo-regime
---
.../cluster-details/cluster-details.component.ts | 6 +-
.../demo-picture-dialog.component.html | 4 +-
.../demo-picture-dialog.component.ts | 62 ++-------------------
.../webapp/src/assets/img/demo/Rstudio.png | Bin 210897 -> 469093 bytes
.../webapp/src/assets/img/demo/handoop_cluster.png | Bin 105996 -> 278905 bytes
.../webapp/src/assets/img/demo/spark_cluster.png | Bin 75258 -> 73193 bytes
.../webapp/src/assets/img/demo/tensorboard.png | Bin 61639 -> 60737 bytes
.../webapp/src/assets/img/demo/zeppeling.png | Bin 146524 -> 133973 bytes
.../webapp/src/assets/styles/_dialogs.scss | 22 +++++++-
9 files changed, 30 insertions(+), 64 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
index d724f71..0f7e57a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
@@ -60,8 +60,6 @@ export class DetailComputationalResourcesComponent implements OnInit {
ngOnInit() {
this.open(this.data.environment, this.data.resource);
-
- console.log(this.PROVIDER);
}
public open(environment, resource): void {
@@ -123,13 +121,15 @@ export class DetailComputationalResourcesComponent implements OnInit {
private openDemoLink(template) {
const demoData = {
- title: template.slice(0, -3),
+ title: '',
url: ''
};
if (this.data.resource.image === 'docker.dlab-dataengine') {
+ demoData.title = 'Apache Spark Master';
demoData.url = 'assets/img/demo/spark_cluster.png';
} else {
+ demoData.title = 'Hadoop';
demoData.url = 'assets/img/demo/handoop_cluster.png';
}
this.dialog.open(DemoPictureDialogComponent, { data: demoData, panelClass: 'modal-fullscreen' })
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html
index 3623bb3..95462f0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html
@@ -22,7 +22,7 @@
<h4 class="modal-title"> It is only demo preview for {{data.title}} UI. For real environment you can use all available tools on {{data.title}} UI. </h4>
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="dialog-content">
- <img class="demo-picture" src="{{data.url}}" alt="">
+ <div class="dialog-content" [hidden]="!isVisible">
+ <img class="demo-picture" [src]="data.url" (load)="show()">
</div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.ts
index dd13006..feb77c4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.ts
@@ -18,13 +18,7 @@
*/
import { Component, OnInit, Inject } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { ToastrService } from 'ngx-toastr';
-
-import { UserResourceService } from '../../../core/services';
-import { HTTP_STATUS_CODES } from '../../../core/util';
-import { DICTIONARY } from '../../../../dictionary/global.dictionary';
@Component({
selector: 'demo-picture-dialog',
@@ -32,63 +26,17 @@ import { DICTIONARY } from '../../../../dictionary/global.dictionary';
styleUrls: ['./demo-picture-dialog.component.scss']
})
export class DemoPictureDialogComponent implements OnInit {
- readonly DICTIONARY = DICTIONARY;
- public notebook: any;
- public createAMIForm: FormGroup;
- public provider: string;
- namePattern = '[-_a-zA-Z0-9]+';
- delimitersRegex = /[-_]?/g;
- imagesList: any;
+ private isVisible: boolean = false;
constructor(
@Inject(MAT_DIALOG_DATA) public data: any,
- public toastr: ToastrService,
- public dialogRef: MatDialogRef<DemoPictureDialogComponent>,
- private _userResource: UserResourceService,
- private _fb: FormBuilder,
+ public dialogRef: MatDialogRef<DemoPictureDialogComponent>
) { }
ngOnInit() {
- this.notebook = this.data;
- this.provider = this.data.cloud_provider;
-
- this.initFormModel();
- this._userResource.getImagesList(this.data.project).subscribe(res => this.imagesList = res);
- }
-
- public assignChanges(data) {
- this._userResource.createAMI(data).subscribe(
- response => response.status === HTTP_STATUS_CODES.ACCEPTED && this.dialogRef.close(),
- error => this.toastr.error(error.message || `Image creation failed!`, 'Oops!'));
- }
-
- private initFormModel(): void {
- this.createAMIForm = this._fb.group({
- name: ['', [Validators.required, Validators.pattern(this.namePattern), this.providerMaxLength, this.checkDuplication.bind(this)]],
- description: [''],
- exploratory_name: [this.notebook.name]
- });
- }
-
- private providerMaxLength(control) {
- if (control && control.value)
- return control.value.length <= 10 ? null : { valid: false };
- }
-
- private checkDuplication(control) {
- if (control.value)
- return this.isDuplicate(control.value) ? { duplication: true } : null;
- }
-
- private isDuplicate(value: string) {
- for (let index = 0; index < this.imagesList.length; index++) {
- if (this.delimitersFiltering(value) === this.delimitersFiltering(this.imagesList[index].name))
- return true;
- }
- return false;
}
+show() {
+ this.isVisible = true;
+}
- private delimitersFiltering(resource): string {
- return resource.replace(this.delimitersRegex, '').toString().toLowerCase();
- }
}
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/Rstudio.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/Rstudio.png
index 45f7367..6499ca0 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/Rstudio.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/Rstudio.png differ
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/handoop_cluster.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/handoop_cluster.png
index 741f9b1..0d35790 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/handoop_cluster.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/handoop_cluster.png differ
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/spark_cluster.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/spark_cluster.png
index 79999b9..ff50eed 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/spark_cluster.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/spark_cluster.png differ
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/tensorboard.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/tensorboard.png
index 5387534..b6fd589 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/tensorboard.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/tensorboard.png differ
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/zeppeling.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/zeppeling.png
index ed71f56..291f0e9 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/zeppeling.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/zeppeling.png differ
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 4912903..b1dbb41 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -49,7 +49,7 @@
.modal-fullscreen {
width: 100vw;
- min-height: 60vh;
+ min-height: 85vh;
}
mat-dialog-container {
@@ -343,8 +343,26 @@ mat-dialog-container {
cursor: pointer;
}
-@media screen and (max-width: 1280px) {
+@media screen and (max-width: 1650px) {
.modal-fullscreen {
max-width: 95vw !important;
}
}
+
+
+ @media screen and (max-width: 1370px) {
+ .modal-fullscreen {
+ mat-dialog-container.mat-dialog-container #dialog-box .dialog-header .modal-title {
+ font-size: 16px;
+ }
+ }
+ }
+
+@media screen and (max-width: 1220px) {
+ .modal-fullscreen {
+ mat-dialog-container.mat-dialog-container #dialog-box .dialog-header .modal-title {
+ font-size: 14px;
+ }
+ }
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org