From 92fff70354e4daa5252c799c0da40121be9c14fb Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Sat, 1 Jun 2024 13:48:48 +0200
Subject: [PATCH] [editor] Restructure canvas files
---
projects/editor/src/app/app.module.ts | 16 ++++++++--------
.../element-properties-panel.component.ts | 2 +-
.../canvas}/canvas-element-overlay.ts | 0
.../{ => unit-view}/canvas/canvas.component.html | 0
.../{ => unit-view}/canvas/canvas.component.ts | 10 +++++-----
.../dynamic-canvas-overlay.component.ts | 2 +-
.../dynamic-section-helper-grid.component.ts | 2 +-
.../element-grid-change-listener.directive.ts | 0
.../section-dynamic.component.ts | 2 +-
.../canvas/section-menu.component.ts | 6 +++---
.../section-static}/section-static.component.ts | 4 ++--
.../static-canvas-overlay.component.ts | 2 +-
.../editor/src/app/services/selection.service.ts | 2 +-
13 files changed, 24 insertions(+), 24 deletions(-)
rename projects/editor/src/app/components/{canvas/overlays => unit-view/canvas}/canvas-element-overlay.ts (100%)
rename projects/editor/src/app/components/{ => unit-view}/canvas/canvas.component.html (100%)
rename projects/editor/src/app/components/{ => unit-view}/canvas/canvas.component.ts (91%)
rename projects/editor/src/app/components/{canvas/overlays => unit-view/canvas/section-dynamic}/dynamic-canvas-overlay.component.ts (97%)
rename projects/editor/src/app/components/{canvas => unit-view/canvas/section-dynamic}/dynamic-section-helper-grid.component.ts (98%)
rename projects/editor/src/app/components/{canvas => unit-view/canvas/section-dynamic}/element-grid-change-listener.directive.ts (100%)
rename projects/editor/src/app/components/{canvas => unit-view/canvas/section-dynamic}/section-dynamic.component.ts (98%)
rename projects/editor/src/app/components/{ => unit-view}/canvas/section-menu.component.ts (98%)
rename projects/editor/src/app/components/{canvas => unit-view/canvas/section-static}/section-static.component.ts (93%)
rename projects/editor/src/app/components/{canvas/overlays => unit-view/canvas/section-static}/static-canvas-overlay.component.ts (98%)
diff --git a/projects/editor/src/app/app.module.ts b/projects/editor/src/app/app.module.ts
index 361ceb9c8..ba704c7c9 100644
--- a/projects/editor/src/app/app.module.ts
+++ b/projects/editor/src/app/app.module.ts
@@ -61,15 +61,15 @@ import { ToolbarComponent } from './components/toolbar/toolbar.component';
import { UiElementToolboxComponent } from
'./components/new-ui-element-panel/ui-element-toolbox.component';
import { UnitViewComponent } from './components/unit-view/unit-view.component';
-import { CanvasComponent } from './components/canvas/canvas.component';
+import { CanvasComponent } from 'editor/src/app/components/unit-view/canvas/canvas.component';
import { StaticCanvasOverlayComponent } from
- './components/canvas/overlays/static-canvas-overlay.component';
+ 'editor/src/app/components/unit-view/canvas/section-static/static-canvas-overlay.component';
import { DynamicCanvasOverlayComponent } from
- './components/canvas/overlays/dynamic-canvas-overlay.component';
+ 'editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-canvas-overlay.component';
import { EditorTranslateLoader } from './editor-translate-loader';
-import { SectionMenuComponent } from './components/canvas/section-menu.component';
-import { SectionStaticComponent } from './components/canvas/section-static.component';
-import { SectionDynamicComponent } from './components/canvas/section-dynamic.component';
+import { SectionMenuComponent } from 'editor/src/app/components/unit-view/canvas/section-menu.component';
+import { SectionStaticComponent } from 'editor/src/app/components/unit-view/canvas/section-static/section-static.component';
+import { SectionDynamicComponent } from 'editor/src/app/components/unit-view/canvas/section-dynamic/section-dynamic.component';
import { RichTextEditorComponent } from './text-editor/rich-text-editor.component';
import { DeleteConfirmationDialogComponent } from './components/dialogs/delete-confirmation-dialog.component';
import { TextEditDialogComponent } from './components/dialogs/text-edit-dialog.component';
@@ -98,8 +98,8 @@ import { ElementStylePropertiesComponent } from
'./components/properties-panel/style-properties-tab/element-style-properties.component';
import { ElementModelPropertiesComponent, IsInputElementPipe } from
'./components/properties-panel/model-properties-tab/element-model-properties.component';
-import { DynamicSectionHelperGridComponent } from './components/canvas/dynamic-section-helper-grid.component';
-import { ElementGridChangeListenerDirective } from './components/canvas/element-grid-change-listener.directive';
+import { DynamicSectionHelperGridComponent } from 'editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-section-helper-grid.component';
+import { ElementGridChangeListenerDirective } from 'editor/src/app/components/unit-view/canvas/section-dynamic/element-grid-change-listener.directive';
import { OptionsFieldSetComponent } from
'./components/properties-panel/model-properties-tab/input-groups/options-field-set.component';
diff --git a/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts b/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts
index d95f88cd2..5a39cea83 100644
--- a/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts
+++ b/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts
@@ -10,7 +10,7 @@ import { UIElement } from 'common/models/elements/element';
import { LikertRowElement } from 'common/models/elements/compound-elements/likert/likert-row';
import { UnitService } from '../../services/unit-services/unit.service';
import { SelectionService } from '../../services/selection.service';
-import { CanvasElementOverlay } from '../canvas/overlays/canvas-element-overlay';
+import { CanvasElementOverlay } from 'editor/src/app/components/unit-view/canvas/canvas-element-overlay';
import { ElementService } from 'editor/src/app/services/unit-services/element.service';
import { SectionService } from 'editor/src/app/services/unit-services/section.service';
diff --git a/projects/editor/src/app/components/canvas/overlays/canvas-element-overlay.ts b/projects/editor/src/app/components/unit-view/canvas/canvas-element-overlay.ts
similarity index 100%
rename from projects/editor/src/app/components/canvas/overlays/canvas-element-overlay.ts
rename to projects/editor/src/app/components/unit-view/canvas/canvas-element-overlay.ts
diff --git a/projects/editor/src/app/components/canvas/canvas.component.html b/projects/editor/src/app/components/unit-view/canvas/canvas.component.html
similarity index 100%
rename from projects/editor/src/app/components/canvas/canvas.component.html
rename to projects/editor/src/app/components/unit-view/canvas/canvas.component.html
diff --git a/projects/editor/src/app/components/canvas/canvas.component.ts b/projects/editor/src/app/components/unit-view/canvas/canvas.component.ts
similarity index 91%
rename from projects/editor/src/app/components/canvas/canvas.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/canvas.component.ts
index bee053c8b..b78a45ee4 100644
--- a/projects/editor/src/app/components/canvas/canvas.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/canvas.component.ts
@@ -5,11 +5,11 @@ import { CdkDragDrop } from '@angular/cdk/drag-drop';
import { PositionedUIElement, UIElement } from 'common/models/elements/element';
import { Page } from 'common/models/page';
import { Section } from 'common/models/section';
-import { UnitService } from '../../services/unit-services/unit.service';
-import { SelectionService } from '../../services/selection.service';
-import { CanvasElementOverlay } from './overlays/canvas-element-overlay';
-import { SectionStaticComponent } from './section-static.component';
-import { SectionDynamicComponent } from './section-dynamic.component';
+import { UnitService } from '../../../services/unit-services/unit.service';
+import { SelectionService } from '../../../services/selection.service';
+import { CanvasElementOverlay } from './canvas-element-overlay';
+import { SectionStaticComponent } from './section-static/section-static.component';
+import { SectionDynamicComponent } from './section-dynamic/section-dynamic.component';
import { SectionService } from 'editor/src/app/services/unit-services/section.service';
import { ElementService } from 'editor/src/app/services/unit-services/element.service';
diff --git a/projects/editor/src/app/components/canvas/overlays/dynamic-canvas-overlay.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-canvas-overlay.component.ts
similarity index 97%
rename from projects/editor/src/app/components/canvas/overlays/dynamic-canvas-overlay.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-canvas-overlay.component.ts
index 5cc27811c..bfd97b4a6 100644
--- a/projects/editor/src/app/components/canvas/overlays/dynamic-canvas-overlay.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-canvas-overlay.component.ts
@@ -1,7 +1,7 @@
import {
Component, Input, ViewChild, ElementRef
} from '@angular/core';
-import { CanvasElementOverlay } from './canvas-element-overlay';
+import { CanvasElementOverlay } from '../canvas-element-overlay';
@Component({
selector: 'aspect-dynamic-canvas-overlay',
diff --git a/projects/editor/src/app/components/canvas/dynamic-section-helper-grid.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-section-helper-grid.component.ts
similarity index 98%
rename from projects/editor/src/app/components/canvas/dynamic-section-helper-grid.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-section-helper-grid.component.ts
index eee34a0a2..412185e0b 100644
--- a/projects/editor/src/app/components/canvas/dynamic-section-helper-grid.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-section-helper-grid.component.ts
@@ -4,7 +4,7 @@ import {
} from '@angular/core';
import { UIElement, UIElementType } from 'common/models/elements/element';
import { Section } from 'common/models/section';
-import { UnitService } from '../../services/unit-services/unit.service';
+import { UnitService } from '../../../../services/unit-services/unit.service';
import { ElementService } from 'editor/src/app/services/unit-services/element.service';
@Component({
diff --git a/projects/editor/src/app/components/canvas/element-grid-change-listener.directive.ts b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/element-grid-change-listener.directive.ts
similarity index 100%
rename from projects/editor/src/app/components/canvas/element-grid-change-listener.directive.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-dynamic/element-grid-change-listener.directive.ts
diff --git a/projects/editor/src/app/components/canvas/section-dynamic.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/section-dynamic.component.ts
similarity index 98%
rename from projects/editor/src/app/components/canvas/section-dynamic.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-dynamic/section-dynamic.component.ts
index ef7e5e8a7..094069dbd 100644
--- a/projects/editor/src/app/components/canvas/section-dynamic.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-dynamic/section-dynamic.component.ts
@@ -3,7 +3,7 @@ import {
ViewChildren, QueryList, ViewChild
} from '@angular/core';
import { Section } from 'common/models/section';
-import { CanvasElementOverlay } from './overlays/canvas-element-overlay';
+import { CanvasElementOverlay } from '../canvas-element-overlay';
import { DynamicSectionHelperGridComponent } from './dynamic-section-helper-grid.component';
@Component({
diff --git a/projects/editor/src/app/components/canvas/section-menu.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts
similarity index 98%
rename from projects/editor/src/app/components/canvas/section-menu.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts
index e7ac740f8..a4cc1636e 100644
--- a/projects/editor/src/app/components/canvas/section-menu.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts
@@ -11,9 +11,9 @@ import { DropListElement } from 'common/models/elements/input-elements/drop-list
import { IDService } from 'editor/src/app/services/id.service';
import { VisibilityRule } from 'common/models/visibility-rule';
import { ReferenceManager } from 'editor/src/app/services/reference-manager';
-import { UnitService } from '../../services/unit-services/unit.service';
-import { DialogService } from '../../services/dialog.service';
-import { SelectionService } from '../../services/selection.service';
+import { UnitService } from '../../../services/unit-services/unit.service';
+import { DialogService } from '../../../services/dialog.service';
+import { SelectionService } from '../../../services/selection.service';
import { SectionService } from 'editor/src/app/services/unit-services/section.service';
@Component({
diff --git a/projects/editor/src/app/components/canvas/section-static.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-static/section-static.component.ts
similarity index 93%
rename from projects/editor/src/app/components/canvas/section-static.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-static/section-static.component.ts
index 85e89eb3d..e583b1190 100644
--- a/projects/editor/src/app/components/canvas/section-static.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-static/section-static.component.ts
@@ -3,8 +3,8 @@ import {
} from '@angular/core';
import { Section } from 'common/models/section';
import { UIElementType } from 'common/models/elements/element';
-import { UnitService } from '../../services/unit-services/unit.service';
-import { CanvasElementOverlay } from './overlays/canvas-element-overlay';
+import { UnitService } from '../../../../services/unit-services/unit.service';
+import { CanvasElementOverlay } from '../canvas-element-overlay';
import { ElementService } from 'editor/src/app/services/unit-services/element.service';
@Component({
diff --git a/projects/editor/src/app/components/canvas/overlays/static-canvas-overlay.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-static/static-canvas-overlay.component.ts
similarity index 98%
rename from projects/editor/src/app/components/canvas/overlays/static-canvas-overlay.component.ts
rename to projects/editor/src/app/components/unit-view/canvas/section-static/static-canvas-overlay.component.ts
index 006ba295e..abc7df7f1 100644
--- a/projects/editor/src/app/components/canvas/overlays/static-canvas-overlay.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-static/static-canvas-overlay.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { take } from 'rxjs/operators';
import { CdkDragEnd, CdkDragMove } from '@angular/cdk/drag-drop';
import { UIElement } from 'common/models/elements/element';
-import { CanvasElementOverlay } from './canvas-element-overlay';
+import { CanvasElementOverlay } from '../canvas-element-overlay';
@Component({
selector: 'aspect-static-canvas-overlay',
diff --git a/projects/editor/src/app/services/selection.service.ts b/projects/editor/src/app/services/selection.service.ts
index 3fa6afc0d..b9813562f 100644
--- a/projects/editor/src/app/services/selection.service.ts
+++ b/projects/editor/src/app/services/selection.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { UIElement } from 'common/models/elements/element';
-import { CanvasElementOverlay } from 'editor/src/app/components/canvas/overlays/canvas-element-overlay';
+import { CanvasElementOverlay } from 'editor/src/app/components/unit-view/canvas/canvas-element-overlay';
import {
ClozeChildOverlay
} from 'common/components/compound-elements/cloze/cloze-child-overlay.component';
--
GitLab