From 973ab396be1a8b071c5bae280869413acbd61954 Mon Sep 17 00:00:00 2001 From: rhenck <richard.henck@iqb.hu-berlin.de> Date: Tue, 22 Feb 2022 11:55:08 +0100 Subject: [PATCH] [editor] Remove page view component It did not do anyhting anyway. Is now integrated in unit view. --- projects/editor/src/app/app.module.ts | 2 - .../page-view/page-view.component.ts | 17 ----- .../unit-view/unit-view.component.css | 64 +++++++++++++++++++ .../unit-view/unit-view.component.html | 2 +- .../unit-view/unit-view.component.ts | 16 +---- 5 files changed, 66 insertions(+), 35 deletions(-) delete mode 100644 projects/editor/src/app/components/unit-view/page-view/page-view.component.ts create mode 100644 projects/editor/src/app/components/unit-view/unit-view.component.css diff --git a/projects/editor/src/app/app.module.ts b/projects/editor/src/app/app.module.ts index 9c30f9039..71b9bec7b 100644 --- a/projects/editor/src/app/app.module.ts +++ b/projects/editor/src/app/app.module.ts @@ -24,7 +24,6 @@ import { ToolbarComponent } from './components/toolbar/toolbar.component'; import { UiElementToolboxComponent } from './components/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component'; import { UnitViewComponent } from './components/unit-view/unit-view.component'; -import { PageViewComponent } from './components/unit-view/page-view/page-view.component'; import { CanvasComponent } from './components/unit-view/page-view/canvas/canvas.component'; import { StaticCanvasOverlayComponent } from './components/unit-view/page-view/canvas/overlays/static-canvas-overlay.component'; @@ -67,7 +66,6 @@ import { ElementModelPropertiesComponent } from ToolbarComponent, UiElementToolboxComponent, UnitViewComponent, - PageViewComponent, CanvasComponent, StaticCanvasOverlayComponent, DynamicCanvasOverlayComponent, diff --git a/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts b/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts deleted file mode 100644 index e1881435b..000000000 --- a/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { - Component, Input -} from '@angular/core'; -import { Page } from '../../../../../../common/interfaces/unit'; - -@Component({ - selector: 'aspect-page-view', - template: ` - <aspect-page-canvas [page]="page" fxLayout="column"></aspect-page-canvas> - `, - styles: [ - 'aspect-page-canvas {height: 100%; display: block}' - ] -}) -export class PageViewComponent { - @Input() page!: Page; -} diff --git a/projects/editor/src/app/components/unit-view/unit-view.component.css b/projects/editor/src/app/components/unit-view/unit-view.component.css new file mode 100644 index 000000000..419dd64ac --- /dev/null +++ b/projects/editor/src/app/components/unit-view/unit-view.component.css @@ -0,0 +1,64 @@ +.toolbox_drawer { + width: 248px; +} + +.properties_drawer { + width: 320px; +} + +.drawer-button { + font-size: large; + background-color: lightgray; + min-width: 0; + width: 2%; +} + +.drawer-button { + border: none; + cursor: pointer; +} + +.show-elements-button span { + transform: rotate(-90deg); + display: inherit; +} + +.show-properties-button { + padding-bottom: 140px; +} + +.show-properties-button span { + transform: rotate(90deg); + display: inherit; +} + +::ng-deep .mat-drawer-content .mat-tab-body-wrapper { + height: 100%; +} + +.menuItem { + padding: 0 16px; +} + +mat-checkbox.menuItem { + padding: 0 16px 10px 16px; +} + +mat-divider { + margin-bottom: 10px; +} + +::ng-deep .mat-tab-label:hover .menu-button { + visibility: visible; +} + +.menu-button { + position: absolute; + left: 130px; + bottom: 6px; + visibility: hidden; +} + +aspect-page-canvas { + height: 100%; display: block; +} diff --git a/projects/editor/src/app/components/unit-view/unit-view.component.html b/projects/editor/src/app/components/unit-view/unit-view.component.html index 0a2875e13..359f8461d 100644 --- a/projects/editor/src/app/components/unit-view/unit-view.component.html +++ b/projects/editor/src/app/components/unit-view/unit-view.component.html @@ -102,7 +102,7 @@ </mat-menu> </ng-template> - <aspect-page-view [page]="page"></aspect-page-view> + <aspect-page-canvas [page]="page" fxLayout="column"></aspect-page-canvas> </mat-tab> <mat-tab disabled> <ng-template mat-tab-label> diff --git a/projects/editor/src/app/components/unit-view/unit-view.component.ts b/projects/editor/src/app/components/unit-view/unit-view.component.ts index e95a4b228..51e48cd36 100644 --- a/projects/editor/src/app/components/unit-view/unit-view.component.ts +++ b/projects/editor/src/app/components/unit-view/unit-view.component.ts @@ -10,21 +10,7 @@ import { Page } from '../../../../../common/interfaces/unit'; @Component({ selector: 'aspect-unit-view', templateUrl: './unit-view.component.html', - styles: [ - '.toolbox_drawer {width: 248px}', - '.properties_drawer {width: 320px}', - '.drawer-button {font-size: large;background-color: lightgray; min-width: 0; width: 2%;}', - '.drawer-button {border: none; cursor: pointer}', - '.show-elements-button span {transform: rotate(-90deg); display: inherit}', - '.show-properties-button {padding-bottom: 140px}', - '.show-properties-button span {transform: rotate(90deg); display: inherit;}', - '::ng-deep .mat-drawer-content .mat-tab-body-wrapper {height: 100%}', - '.menuItem {padding: 0 16px}', - 'mat-checkbox.menuItem {padding: 0 16px 10px 16px}', - 'mat-divider {margin-bottom: 10px}', - '::ng-deep .mat-tab-label:hover .menu-button {visibility: visible}', - '.menu-button {position: absolute; left: 130px; bottom: 6px; visibility: hidden}' - ] + styleUrls: ['./unit-view.component.css'] }) export class UnitViewComponent implements OnInit, OnDestroy { selectedPageIndex: number = 0; -- GitLab