You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/12 15:58:27 UTC
[incubator-streampipes] branch STREAMPIPES-558 updated: [STREAMPIPES-537] Harmonize layout of files module
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-558 by this push:
new 2d499bb97 [STREAMPIPES-537] Harmonize layout of files module
2d499bb97 is described below
commit 2d499bb97e4ba369c023096461fee03591dc5611
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Jul 12 17:58:15 2022 +0200
[STREAMPIPES-537] Harmonize layout of files module
---
.../existing-adapters.component.html | 2 +-
.../existing-adapters.component.scss | 1 +
.../filter-toolbar/filter-toolbar.component.html | 4 +-
ui/src/app/files/files.component.html | 51 +++++---------
ui/src/app/files/files.module.ts | 78 +++++++++++-----------
5 files changed, 62 insertions(+), 74 deletions(-)
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index c9b811da4..b15664311 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -26,7 +26,7 @@
(filterChangedEmitter)="applyFilter($event)">
</sp-connect-filter-toolbar>
<div fxFlex fxLayout="row" fxLayoutAlign="end center">
- <button mat-button mat-icon-button matTooltip="Refresh adapters" matTooltipPosition="below"
+ <button mat-button mat-icon-button matTooltip="Refresh adapters" matTooltipPosition="below" color="accent"
(click)="getAdaptersRunning()">
<i class="material-icons">
refresh
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss
index c5de02892..b0368049f 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.scss
@@ -50,3 +50,4 @@
padding-left: 10px;
border-left: 2px solid var(--color-bg-2)
}
+
diff --git a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html
index 60daec146..d6fc0b5a5 100644
--- a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html
+++ b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.html
@@ -16,9 +16,9 @@
~
-->
-<div fxLayout="row" class="fixed-height">
+<div fxLayout="row" fxFlex="100">
- <div class="data-marketplace-options-item pl-5" style="margin-top:8px;" fxLayoutAlign="start center"
+ <div class="data-marketplace-options-item pl-5 form-style" fxLayoutAlign="start center"
fxLayout="row">
<mat-icon color="accent">search</mat-icon>
<mat-form-field class="form-style" color="accent" floatLabel="never">
diff --git a/ui/src/app/files/files.component.html b/ui/src/app/files/files.component.html
index 52264e7b3..10e701fe2 100644
--- a/ui/src/app/files/files.component.html
+++ b/ui/src/app/files/files.component.html
@@ -16,40 +16,25 @@
~
-->
-<div fxLayout="column" class="page-container">
- <div fxLayout="row" style="padding:0;" class="sp-tab-bg">
- <div fxFlex="100" class="page-container-nav">
- <div fxFlex="100" fxLayout="row">
- <div fxFlex fxLayoutAlign="start center">
- <mat-tab-group color="accent">
- <mat-tab label="Files"></mat-tab>
- </mat-tab-group>
- </div>
- </div>
- </div>
- </div>
- <div fxLayout="row" class="fixed-height add-options sp-tab-bg">
- <div class="add-options-item" fxLayoutAlign="start center" fxLayout="row" style="padding-left:5px;">
- <div fxFlex="100" fxLayout="row">
- <button mat-button mat-raised-button color="accent"
- (click)="openFileUploadDialog()"
- data-cy="sp-open-file-upload-dialog"
- class="mr-10">
- <i class="material-icons">cloud_upload</i>
- Upload new file
- </button>
- </div>
- </div>
+<sp-basic-view [showBackLink]="false" [padding]="true">
+
+ <div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
+ <button mat-button mat-raised-button color="accent"
+ (click)="openFileUploadDialog()"
+ data-cy="sp-open-file-upload-dialog"
+ class="mr-10">
+ <i class="material-icons">cloud_upload</i>
+ Upload new file
+ </button>
</div>
- <div class="fixed-height page-container-padding-inner" fxLayout="column" fxFlex="100">
- <div class="assemblyOptions sp-blue-bg mt-20" style="padding:5px;">
- <div fxLayout="row" fxLayoutAlign="start center">
- <h4>My files</h4>
- </div>
- </div>
- <div class="sp-blue-border">
- <sp-file-overview #fileOverviewComponent></sp-file-overview>
+ <div fxFlex="100" fxLayout="column">
+ <sp-basic-header-title-component title="My Files"></sp-basic-header-title-component>
+ <div fxFlex="100" fxLayout="row" fxLayoutAlign="center start">
+ <sp-basic-inner-panel [showTitle]="false" innerPadding="0" outerMargin="0" fxFlex="90" [hideToolbar]="true">
+ <sp-file-overview #fileOverviewComponent></sp-file-overview>
+ </sp-basic-inner-panel>
</div>
</div>
-</div>
+
+</sp-basic-view>
diff --git a/ui/src/app/files/files.module.ts b/ui/src/app/files/files.module.ts
index 65847dfb4..7eb7b8d46 100644
--- a/ui/src/app/files/files.module.ts
+++ b/ui/src/app/files/files.module.ts
@@ -39,47 +39,49 @@ import { MatPaginatorModule } from '@angular/material/paginator';
import { MatChipsModule } from '@angular/material/chips';
import { MatTooltipModule } from '@angular/material/tooltip';
import { PlatformServicesModule } from '@streampipes/platform-services';
-import { RouterModule } from "@angular/router";
+import { RouterModule } from '@angular/router';
+import { SharedUiModule } from '@streampipes/shared-ui';
@NgModule({
- imports: [
- CommonModule,
- CoreUiModule,
- FlexLayoutModule,
- FormsModule,
- ReactiveFormsModule,
- MatButtonModule,
- MatChipsModule,
- MatFormFieldModule,
- MatGridListModule,
- MatIconModule,
- MatInputModule,
- MatDividerModule,
- MatListModule,
- MatPaginatorModule,
- MatProgressBarModule,
- MatTableModule,
- MatTabsModule,
- MatTooltipModule,
- PlatformServicesModule,
- ServicesModule,
- RouterModule.forChild([
- {
- path: 'files',
- children: [
- {
- path: '',
- component: FilesComponent
- }]
- }])
+ imports: [
+ CommonModule,
+ CoreUiModule,
+ FlexLayoutModule,
+ FormsModule,
+ ReactiveFormsModule,
+ MatButtonModule,
+ MatChipsModule,
+ MatFormFieldModule,
+ MatGridListModule,
+ MatIconModule,
+ MatInputModule,
+ MatDividerModule,
+ MatListModule,
+ MatPaginatorModule,
+ MatProgressBarModule,
+ MatTableModule,
+ MatTabsModule,
+ MatTooltipModule,
+ PlatformServicesModule,
+ ServicesModule,
+ SharedUiModule,
+ RouterModule.forChild([
+ {
+ path: 'files',
+ children: [
+ {
+ path: '',
+ component: FilesComponent
+ }]
+ }])
- ],
- declarations: [
- FilesComponent,
- FileOverviewComponent,
- FileUploadDialogComponent
- ],
- providers: []
+ ],
+ declarations: [
+ FilesComponent,
+ FileOverviewComponent,
+ FileUploadDialogComponent
+ ],
+ providers: []
})
export class FilesModule {
}