From 9f65f0c9e3833f6c10415affd05e7ffdb7211b84 Mon Sep 17 00:00:00 2001 From: rhenck <richard.henck@iqb.hu-berlin.de> Date: Mon, 18 Oct 2021 14:33:45 +0200 Subject: [PATCH] [editor] Refactor directory structure The main components are right at top level and the directories below mimic the data structure (unit->page->section). The toolbar is only used in dev mode and does not belong directly to the unit view. The TextEditor is a complex component and deserves it's own directory even though it is used within the unit-view. Might be refactored to its own module later. --- projects/editor/src/app/app.module.ts | 28 +++++++++---------- .../font-size-extension.ts | 0 .../page-view => text-editor}/indent.ts | 0 .../paragraph-extension.ts | 0 .../rich-text-editor.component.css | 0 .../rich-text-editor.component.html | 0 .../rich-text-editor.component.ts | 0 .../toolbar/toolbar.component.html | 0 .../toolbar/toolbar.component.ts | 2 +- .../canvas/canvas-element-overlay.ts | 14 +++++----- .../page-view/canvas/canvas.component.html | 0 .../page-view/canvas/canvas.component.ts | 10 +++---- .../dynamic-canvas-overlay.component.ts | 2 +- .../canvas/section-dynamic.component.ts | 4 +-- .../canvas/section-menu.component.ts | 8 +++--- .../canvas/section-static.component.ts | 4 +-- .../canvas/static-canvas-overlay.component.ts | 2 +- .../ui-element-toolbox.component.html | 0 .../ui-element-toolbox.component.ts | 4 +-- .../page-view/page-view.component.ts | 2 +- .../element-properties.component.css | 0 .../element-properties.component.html | 0 .../element-properties.component.ts | 10 +++---- .../element-sizing-properties.component.ts | 6 ++-- .../element-style-properties.component.ts | 2 +- .../unit-view/unit-view.component.html | 0 .../unit-view/unit-view.component.ts | 12 ++++---- 27 files changed, 55 insertions(+), 55 deletions(-) rename projects/editor/src/app/{components/unit-view/page-view => text-editor}/font-size-extension.ts (100%) rename projects/editor/src/app/{components/unit-view/page-view => text-editor}/indent.ts (100%) rename projects/editor/src/app/{components/unit-view/page-view => text-editor}/paragraph-extension.ts (100%) rename projects/editor/src/app/{components/unit-view/page-view => text-editor}/rich-text-editor.component.css (100%) rename projects/editor/src/app/{components/unit-view/page-view => text-editor}/rich-text-editor.component.html (100%) rename projects/editor/src/app/{components/unit-view/page-view => text-editor}/rich-text-editor.component.ts (100%) rename projects/editor/src/app/{components => }/toolbar/toolbar.component.html (100%) rename projects/editor/src/app/{components => }/toolbar/toolbar.component.ts (90%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/canvas-element-overlay.ts (83%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/canvas.component.html (100%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/canvas.component.ts (93%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts (97%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/section-dynamic.component.ts (98%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/section-menu.component.ts (97%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/section-static.component.ts (91%) rename projects/editor/src/app/{components => }/unit-view/page-view/canvas/static-canvas-overlay.component.ts (97%) rename projects/editor/src/app/{components/unit-view/page-view/ui-element-toolbox => unit-view/page-view/new-ui-element-panel}/ui-element-toolbox.component.html (100%) rename projects/editor/src/app/{components/unit-view/page-view/ui-element-toolbox => unit-view/page-view/new-ui-element-panel}/ui-element-toolbox.component.ts (87%) rename projects/editor/src/app/{components => }/unit-view/page-view/page-view.component.ts (83%) rename projects/editor/src/app/{components/unit-view/page-view/properties => unit-view/page-view/properties-panel}/element-properties.component.css (100%) rename projects/editor/src/app/{components/unit-view/page-view/properties => unit-view/page-view/properties-panel}/element-properties.component.html (100%) rename projects/editor/src/app/{components/unit-view/page-view/properties => unit-view/page-view/properties-panel}/element-properties.component.ts (92%) rename projects/editor/src/app/{components/unit-view/page-view/properties => unit-view/page-view/properties-panel}/element-sizing-properties.component.ts (97%) rename projects/editor/src/app/{components/unit-view/page-view/properties => unit-view/page-view/properties-panel}/element-style-properties.component.ts (97%) rename projects/editor/src/app/{components => }/unit-view/unit-view.component.html (100%) rename projects/editor/src/app/{components => }/unit-view/unit-view.component.ts (90%) diff --git a/projects/editor/src/app/app.module.ts b/projects/editor/src/app/app.module.ts index 8b153492c..764b6b18d 100644 --- a/projects/editor/src/app/app.module.ts +++ b/projects/editor/src/app/app.module.ts @@ -11,25 +11,25 @@ import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatMenuModule } from '@angular/material/menu'; import { AppComponent } from './app.component'; -import { ToolbarComponent } from './components/toolbar/toolbar.component'; -import { UiElementToolboxComponent } from './components/unit-view/page-view/ui-element-toolbox/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/static-canvas-overlay.component'; -import { DynamicCanvasOverlayComponent } from './components/unit-view/page-view/canvas/dynamic-canvas-overlay.component'; +import { ToolbarComponent } from './toolbar/toolbar.component'; +import { UiElementToolboxComponent } from './unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component'; +import { UnitViewComponent } from './unit-view/unit-view.component'; +import { PageViewComponent } from './unit-view/page-view/page-view.component'; +import { CanvasComponent } from './unit-view/page-view/canvas/canvas.component'; +import { StaticCanvasOverlayComponent } from './unit-view/page-view/canvas/static-canvas-overlay.component'; +import { DynamicCanvasOverlayComponent } from './unit-view/page-view/canvas/dynamic-canvas-overlay.component'; import { SharedModule } from '../../../common/shared.module'; import { ConfirmationDialog, TextEditDialog, MultilineTextEditDialog, RichTextEditDialog } from './dialog.service'; import { EditorTranslateLoader } from './editor-translate-loader'; -import { ElementPropertiesComponent } from './components/unit-view/page-view/properties/element-properties.component'; -import { SectionMenuComponent } from './components/unit-view/page-view/canvas/section-menu.component'; -import { SectionStaticComponent } from './components/unit-view/page-view/canvas/section-static.component'; -import { SectionDynamicComponent } from './components/unit-view/page-view/canvas/section-dynamic.component'; -import { RichTextEditorComponent } from './components/unit-view/page-view/rich-text-editor.component'; -import { ElementStylePropertiesComponent } from './components/unit-view/page-view/properties/element-style-properties.component'; -import { ElementSizingPropertiesComponent } from './components/unit-view/page-view/properties/element-sizing-properties.component'; +import { ElementPropertiesComponent } from './unit-view/page-view/properties-panel/element-properties.component'; +import { SectionMenuComponent } from './unit-view/page-view/canvas/section-menu.component'; +import { SectionStaticComponent } from './unit-view/page-view/canvas/section-static.component'; +import { SectionDynamicComponent } from './unit-view/page-view/canvas/section-dynamic.component'; +import { RichTextEditorComponent } from './text-editor/rich-text-editor.component'; +import { ElementStylePropertiesComponent } from './unit-view/page-view/properties-panel/element-style-properties.component'; +import { ElementSizingPropertiesComponent } from './unit-view/page-view/properties-panel/element-sizing-properties.component'; @NgModule({ declarations: [ diff --git a/projects/editor/src/app/components/unit-view/page-view/font-size-extension.ts b/projects/editor/src/app/text-editor/font-size-extension.ts similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/font-size-extension.ts rename to projects/editor/src/app/text-editor/font-size-extension.ts diff --git a/projects/editor/src/app/components/unit-view/page-view/indent.ts b/projects/editor/src/app/text-editor/indent.ts similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/indent.ts rename to projects/editor/src/app/text-editor/indent.ts diff --git a/projects/editor/src/app/components/unit-view/page-view/paragraph-extension.ts b/projects/editor/src/app/text-editor/paragraph-extension.ts similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/paragraph-extension.ts rename to projects/editor/src/app/text-editor/paragraph-extension.ts diff --git a/projects/editor/src/app/components/unit-view/page-view/rich-text-editor.component.css b/projects/editor/src/app/text-editor/rich-text-editor.component.css similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/rich-text-editor.component.css rename to projects/editor/src/app/text-editor/rich-text-editor.component.css diff --git a/projects/editor/src/app/components/unit-view/page-view/rich-text-editor.component.html b/projects/editor/src/app/text-editor/rich-text-editor.component.html similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/rich-text-editor.component.html rename to projects/editor/src/app/text-editor/rich-text-editor.component.html diff --git a/projects/editor/src/app/components/unit-view/page-view/rich-text-editor.component.ts b/projects/editor/src/app/text-editor/rich-text-editor.component.ts similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/rich-text-editor.component.ts rename to projects/editor/src/app/text-editor/rich-text-editor.component.ts diff --git a/projects/editor/src/app/components/toolbar/toolbar.component.html b/projects/editor/src/app/toolbar/toolbar.component.html similarity index 100% rename from projects/editor/src/app/components/toolbar/toolbar.component.html rename to projects/editor/src/app/toolbar/toolbar.component.html diff --git a/projects/editor/src/app/components/toolbar/toolbar.component.ts b/projects/editor/src/app/toolbar/toolbar.component.ts similarity index 90% rename from projects/editor/src/app/components/toolbar/toolbar.component.ts rename to projects/editor/src/app/toolbar/toolbar.component.ts index 77e6aeb5d..2200af4a0 100644 --- a/projects/editor/src/app/components/toolbar/toolbar.component.ts +++ b/projects/editor/src/app/toolbar/toolbar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { UnitService } from '../../unit.service'; +import { UnitService } from '../unit.service'; @Component({ selector: 'app-toolbar', diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts b/projects/editor/src/app/unit-view/page-view/canvas/canvas-element-overlay.ts similarity index 83% rename from projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts rename to projects/editor/src/app/unit-view/page-view/canvas/canvas-element-overlay.ts index 31f249828..ca4027041 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/canvas-element-overlay.ts @@ -5,13 +5,13 @@ import { } from '@angular/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { UnitService } from '../../../../unit.service'; -import * as ComponentUtils from '../../../../../../../common/component-utils'; -import { FormElementComponent } from '../../../../../../../common/form-element-component.directive'; -import { ValueChangeElement } from '../../../../../../../common/form'; -import { ElementComponent } from '../../../../../../../common/element-component.directive'; -import { SelectionService } from '../../../../selection.service'; -import { InputElement, UIElement } from '../../../../../../../common/models/uI-element'; +import { UnitService } from '../../../unit.service'; +import * as ComponentUtils from '../../../../../../common/component-utils'; +import { FormElementComponent } from '../../../../../../common/form-element-component.directive'; +import { ValueChangeElement } from '../../../../../../common/form'; +import { ElementComponent } from '../../../../../../common/element-component.directive'; +import { SelectionService } from '../../../selection.service'; +import { InputElement, UIElement } from '../../../../../../common/models/uI-element'; @Directive() export abstract class CanvasElementOverlay implements OnInit, OnDestroy { diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.html b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.html similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.html rename to projects/editor/src/app/unit-view/page-view/canvas/canvas.component.html diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts similarity index 93% rename from projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts rename to projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts index 9699cea44..da070a160 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts @@ -4,11 +4,11 @@ import { import { CdkDragDrop } from '@angular/cdk/drag-drop'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { UnitService } from '../../../../unit.service'; -import { SelectionService } from '../../../../selection.service'; -import { Page } from '../../../../../../../common/models/page'; -import { UIElement } from '../../../../../../../common/models/uI-element'; -import { Section } from '../../../../../../../common/models/section'; +import { UnitService } from '../../../unit.service'; +import { SelectionService } from '../../../selection.service'; +import { Page } from '../../../../../../common/models/page'; +import { UIElement } from '../../../../../../common/models/uI-element'; +import { Section } from '../../../../../../common/models/section'; @Component({ selector: 'app-page-canvas', diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts similarity index 97% rename from projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts rename to projects/editor/src/app/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts index ba120d842..ea04c33e5 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts @@ -3,7 +3,7 @@ import { } from '@angular/core'; import { CdkDragMove } from '@angular/cdk/drag-drop'; import { CanvasElementOverlay } from './canvas-element-overlay'; -import { UIElement } from '../../../../../../../common/models/uI-element'; +import { UIElement } from '../../../../../../common/models/uI-element'; @Component({ selector: 'app-dynamic-canvas-overlay', diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts similarity index 98% rename from projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts rename to projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts index 7f3309cfd..9f489d7c3 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts @@ -3,8 +3,8 @@ import { } from '@angular/core'; import { CdkDragDrop } from '@angular/cdk/drag-drop/drag-events'; import { DragItemData, DropListData } from './canvas.component'; -import { UnitService } from '../../../../unit.service'; -import { Section } from '../../../../../../../common/models/section'; +import { UnitService } from '../../../unit.service'; +import { Section } from '../../../../../../common/models/section'; @Component({ selector: 'app-section-dynamic', diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-menu.component.ts similarity index 97% rename from projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts rename to projects/editor/src/app/unit-view/page-view/canvas/section-menu.component.ts index 920f2fb39..14acd9628 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/section-menu.component.ts @@ -4,10 +4,10 @@ import { } from '@angular/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { UnitService } from '../../../../unit.service'; -import { DialogService } from '../../../../dialog.service'; -import { SelectionService } from '../../../../selection.service'; -import { Section } from '../../../../../../../common/models/section'; +import { UnitService } from '../../../unit.service'; +import { DialogService } from '../../../dialog.service'; +import { SelectionService } from '../../../selection.service'; +import { Section } from '../../../../../../common/models/section'; @Component({ selector: 'app-section-menu', diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts similarity index 91% rename from projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts rename to projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts index 4284b6bdc..83776be2d 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts @@ -1,8 +1,8 @@ import { Component, ElementRef, Input, ViewChild } from '@angular/core'; -import { UnitService } from '../../../../unit.service'; -import { Section } from '../../../../../../../common/models/section'; +import { UnitService } from '../../../unit.service'; +import { Section } from '../../../../../../common/models/section'; @Component({ selector: 'app-section-static', diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/static-canvas-overlay.component.ts similarity index 97% rename from projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts rename to projects/editor/src/app/unit-view/page-view/canvas/static-canvas-overlay.component.ts index 2c9ceb777..2a71a3431 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts +++ b/projects/editor/src/app/unit-view/page-view/canvas/static-canvas-overlay.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { take } from 'rxjs/operators'; import { CdkDragMove } from '@angular/cdk/drag-drop'; import { CanvasElementOverlay } from './canvas-element-overlay'; -import { UIElement } from '../../../../../../../common/models/uI-element'; +import { UIElement } from '../../../../../../common/models/uI-element'; @Component({ selector: 'app-static-canvas-overlay', diff --git a/projects/editor/src/app/components/unit-view/page-view/ui-element-toolbox/ui-element-toolbox.component.html b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.html similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/ui-element-toolbox/ui-element-toolbox.component.html rename to projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.html diff --git a/projects/editor/src/app/components/unit-view/page-view/ui-element-toolbox/ui-element-toolbox.component.ts b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts similarity index 87% rename from projects/editor/src/app/components/unit-view/page-view/ui-element-toolbox/ui-element-toolbox.component.ts rename to projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts index e9ec00281..ee8749421 100644 --- a/projects/editor/src/app/components/unit-view/page-view/ui-element-toolbox/ui-element-toolbox.component.ts +++ b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { UnitService } from '../../../../unit.service'; -import { SelectionService } from '../../../../selection.service'; +import { UnitService } from '../../../unit.service'; +import { SelectionService } from '../../../selection.service'; @Component({ selector: 'app-ui-element-toolbox', diff --git a/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts b/projects/editor/src/app/unit-view/page-view/page-view.component.ts similarity index 83% rename from projects/editor/src/app/components/unit-view/page-view/page-view.component.ts rename to projects/editor/src/app/unit-view/page-view/page-view.component.ts index 7b0b9ce9c..74b8a394e 100644 --- a/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts +++ b/projects/editor/src/app/unit-view/page-view/page-view.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; -import { Page } from '../../../../../../common/models/page'; +import { Page } from '../../../../../common/models/page'; @Component({ selector: 'app-page-view', diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.css b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.css similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.css rename to projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.css diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.html b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html similarity index 100% rename from projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.html rename to projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.ts similarity index 92% rename from projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts rename to projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.ts index 147b8e535..7d2b06d76 100644 --- a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts +++ b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.ts @@ -6,11 +6,11 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { CdkDragDrop } from '@angular/cdk/drag-drop/drag-events'; import { moveItemInArray } from '@angular/cdk/drag-drop'; -import { UnitService } from '../../../../unit.service'; -import { SelectionService } from '../../../../selection.service'; -import { MessageService } from '../../../../../../../common/message.service'; -import { FileService } from '../../../../../../../common/file.service'; -import { UIElement } from '../../../../../../../common/models/uI-element'; +import { UnitService } from '../../../unit.service'; +import { SelectionService } from '../../../selection.service'; +import { MessageService } from '../../../../../../common/message.service'; +import { FileService } from '../../../../../../common/file.service'; +import { UIElement } from '../../../../../../common/models/uI-element'; @Component({ selector: 'app-element-properties', diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts b/projects/editor/src/app/unit-view/page-view/properties-panel/element-sizing-properties.component.ts similarity index 97% rename from projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts rename to projects/editor/src/app/unit-view/page-view/properties-panel/element-sizing-properties.component.ts index b3b3f6515..5b1e33e86 100644 --- a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts +++ b/projects/editor/src/app/unit-view/page-view/properties-panel/element-sizing-properties.component.ts @@ -1,9 +1,9 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { UnitService } from '../../../../unit.service'; -import { SelectionService } from '../../../../selection.service'; -import { UIElement } from '../../../../../../../common/models/uI-element'; +import { UnitService } from '../../../unit.service'; +import { SelectionService } from '../../../selection.service'; +import { UIElement } from '../../../../../../common/models/uI-element'; @Component({ selector: 'app-element-sizing-properties', diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts b/projects/editor/src/app/unit-view/page-view/properties-panel/element-style-properties.component.ts similarity index 97% rename from projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts rename to projects/editor/src/app/unit-view/page-view/properties-panel/element-style-properties.component.ts index cb73eb851..06167047b 100644 --- a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts +++ b/projects/editor/src/app/unit-view/page-view/properties-panel/element-style-properties.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { UIElement } from '../../../../../../../common/models/uI-element'; +import { UIElement } from '../../../../../../common/models/uI-element'; @Component({ selector: 'app-element-style-properties', diff --git a/projects/editor/src/app/components/unit-view/unit-view.component.html b/projects/editor/src/app/unit-view/unit-view.component.html similarity index 100% rename from projects/editor/src/app/components/unit-view/unit-view.component.html rename to projects/editor/src/app/unit-view/unit-view.component.html diff --git a/projects/editor/src/app/components/unit-view/unit-view.component.ts b/projects/editor/src/app/unit-view/unit-view.component.ts similarity index 90% rename from projects/editor/src/app/components/unit-view/unit-view.component.ts rename to projects/editor/src/app/unit-view/unit-view.component.ts index 00702d225..a1b2a1b92 100644 --- a/projects/editor/src/app/components/unit-view/unit-view.component.ts +++ b/projects/editor/src/app/unit-view/unit-view.component.ts @@ -1,12 +1,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { UnitService } from '../../unit.service'; -import { DialogService } from '../../dialog.service'; -import { SelectionService } from '../../selection.service'; -import { MessageService } from '../../../../../common/message.service'; -import { Page } from '../../../../../common/models/page'; -import { Unit } from '../../../../../common/models/unit'; +import { UnitService } from '../unit.service'; +import { DialogService } from '../dialog.service'; +import { SelectionService } from '../selection.service'; +import { MessageService } from '../../../../common/message.service'; +import { Page } from '../../../../common/models/page'; +import { Unit } from '../../../../common/models/unit'; @Component({ selector: 'app-unit-view', -- GitLab