From 26f92dd6617f1efea917482ed3808daf0d553cc3 Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Fri, 15 Oct 2021 14:59:06 +0200
Subject: [PATCH] Rename classes to models
---
.../common/element-component.directive.ts | 2 +-
.../element-components/audio.component.ts | 2 +-
.../element-components/button.component.ts | 2 +-
.../element-components/checkbox.component.ts | 2 +-
.../element-components/dropdown.component.ts | 2 +-
.../element-components/image.component.ts | 2 +-
.../pipes/error-transform.pipe.ts | 2 +-
.../radio-button-group.component.ts | 2 +-
.../element-components/text-area.component.ts | 2 +-
.../text-field.component.ts | 2 +-
.../element-components/text.component.ts | 2 +-
.../element-components/video.component.ts | 2 +-
.../form-element-component.directive.ts | 2 +-
.../{classes => models}/audio-element.ts | 0
.../{classes => models}/button-element.ts | 0
.../{classes => models}/checkbox-element.ts | 0
.../{classes => models}/dropdown-element.ts | 0
.../{classes => models}/image-element.ts | 0
projects/common/{classes => models}/page.ts | 0
.../radio-button-group-element.ts | 0
.../common/{classes => models}/section.ts | 0
.../{classes => models}/text-area-element.ts | 0
.../{classes => models}/text-element.ts | 0
.../{classes => models}/text-field-element.ts | 0
.../common/{classes => models}/uI-element.ts | 0
projects/common/{classes => models}/unit.ts | 0
.../{classes => models}/video-element.ts | 0
projects/common/util/element.factory.ts | 22 +++++++++----------
.../canvas/canvas-element-overlay.ts | 2 +-
.../page-view/canvas/canvas.component.ts | 6 ++---
.../dynamic-canvas-overlay.component.ts | 2 +-
.../canvas/section-dynamic.component.ts | 2 +-
.../canvas/section-menu.component.ts | 2 +-
.../canvas/section-static.component.ts | 2 +-
.../page-view/page-view.component.ts | 2 +-
.../element-properties.component.ts | 2 +-
.../element-sizing-properties.component.ts | 2 +-
.../element-style-properties.component.ts | 2 +-
.../unit-view/unit-view.component.ts | 4 ++--
projects/editor/src/app/selection.service.ts | 2 +-
projects/editor/src/app/unit.service.ts | 10 ++++-----
projects/player/src/app/app.component.ts | 4 ++--
.../components/element/element.component.ts | 2 +-
.../app/components/layout/layout.component.ts | 2 +-
.../src/app/components/page/page.component.ts | 2 +-
.../player-state/player-state.component.ts | 2 +-
.../components/section/section.component.ts | 2 +-
.../unit-state/unit-state.component.ts | 2 +-
.../src/app/services/unit-state.service.ts | 2 +-
49 files changed, 53 insertions(+), 53 deletions(-)
rename projects/common/{classes => models}/audio-element.ts (100%)
rename projects/common/{classes => models}/button-element.ts (100%)
rename projects/common/{classes => models}/checkbox-element.ts (100%)
rename projects/common/{classes => models}/dropdown-element.ts (100%)
rename projects/common/{classes => models}/image-element.ts (100%)
rename projects/common/{classes => models}/page.ts (100%)
rename projects/common/{classes => models}/radio-button-group-element.ts (100%)
rename projects/common/{classes => models}/section.ts (100%)
rename projects/common/{classes => models}/text-area-element.ts (100%)
rename projects/common/{classes => models}/text-element.ts (100%)
rename projects/common/{classes => models}/text-field-element.ts (100%)
rename projects/common/{classes => models}/uI-element.ts (100%)
rename projects/common/{classes => models}/unit.ts (100%)
rename projects/common/{classes => models}/video-element.ts (100%)
diff --git a/projects/common/element-component.directive.ts b/projects/common/element-component.directive.ts
index 74bd49eb0..0ae755a49 100644
--- a/projects/common/element-component.directive.ts
+++ b/projects/common/element-component.directive.ts
@@ -1,7 +1,7 @@
import {
Directive
} from '@angular/core';
-import { UIElement } from './classes/uI-element';
+import { UIElement } from './models/uI-element';
@Directive()
export abstract class ElementComponent {
diff --git a/projects/common/element-components/audio.component.ts b/projects/common/element-components/audio.component.ts
index 98e86102d..dda243d1b 100644
--- a/projects/common/element-components/audio.component.ts
+++ b/projects/common/element-components/audio.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { ElementComponent } from '../element-component.directive';
-import { AudioElement } from '../classes/audio-element';
+import { AudioElement } from '../models/audio-element';
@Component({
selector: 'app-audio',
diff --git a/projects/common/element-components/button.component.ts b/projects/common/element-components/button.component.ts
index 7ece62f11..513f55f6a 100644
--- a/projects/common/element-components/button.component.ts
+++ b/projects/common/element-components/button.component.ts
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Output } from '@angular/core';
import { ElementComponent } from '../element-component.directive';
-import { ButtonElement } from '../classes/button-element';
+import { ButtonElement } from '../models/button-element';
@Component({
selector: 'app-button',
diff --git a/projects/common/element-components/checkbox.component.ts b/projects/common/element-components/checkbox.component.ts
index 46926d938..64c5cbccc 100644
--- a/projects/common/element-components/checkbox.component.ts
+++ b/projects/common/element-components/checkbox.component.ts
@@ -1,7 +1,7 @@
import { Component, EventEmitter, Output } from '@angular/core';
import { ValidatorFn, Validators } from '@angular/forms';
import { FormElementComponent } from '../form-element-component.directive';
-import { CheckboxElement } from '../classes/checkbox-element';
+import { CheckboxElement } from '../models/checkbox-element';
@Component({
selector: 'app-checkbox',
diff --git a/projects/common/element-components/dropdown.component.ts b/projects/common/element-components/dropdown.component.ts
index f69b6a446..abc265895 100644
--- a/projects/common/element-components/dropdown.component.ts
+++ b/projects/common/element-components/dropdown.component.ts
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Output } from '@angular/core';
import { FormElementComponent } from '../form-element-component.directive';
-import { DropdownElement } from '../classes/dropdown-element';
+import { DropdownElement } from '../models/dropdown-element';
@Component({
selector: 'app-dropdown',
diff --git a/projects/common/element-components/image.component.ts b/projects/common/element-components/image.component.ts
index 26d414ef1..c5732bd9f 100644
--- a/projects/common/element-components/image.component.ts
+++ b/projects/common/element-components/image.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { ElementComponent } from '../element-component.directive';
-import { ImageElement } from '../classes/image-element';
+import { ImageElement } from '../models/image-element';
@Component({
selector: 'app-image',
diff --git a/projects/common/element-components/pipes/error-transform.pipe.ts b/projects/common/element-components/pipes/error-transform.pipe.ts
index 55e393598..14d1e74fd 100644
--- a/projects/common/element-components/pipes/error-transform.pipe.ts
+++ b/projects/common/element-components/pipes/error-transform.pipe.ts
@@ -1,7 +1,7 @@
import { Pipe, PipeTransform } from '@angular/core';
import { ValidationErrors } from '@angular/forms';
import { TranslateService } from '@ngx-translate/core';
-import { UIElement } from '../../classes/uI-element';
+import { UIElement } from '../../models/uI-element';
@Pipe({
name: 'errorTransform'
diff --git a/projects/common/element-components/radio-button-group.component.ts b/projects/common/element-components/radio-button-group.component.ts
index 4f5502e1f..5a54c9137 100644
--- a/projects/common/element-components/radio-button-group.component.ts
+++ b/projects/common/element-components/radio-button-group.component.ts
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Output } from '@angular/core';
import { FormElementComponent } from '../form-element-component.directive';
-import { RadioButtonGroupElement } from '../classes/radio-button-group-element';
+import { RadioButtonGroupElement } from '../models/radio-button-group-element';
@Component({
selector: 'app-radio-button-group',
diff --git a/projects/common/element-components/text-area.component.ts b/projects/common/element-components/text-area.component.ts
index 06c8304df..2ed4261cf 100644
--- a/projects/common/element-components/text-area.component.ts
+++ b/projects/common/element-components/text-area.component.ts
@@ -1,6 +1,6 @@
import { Component, Output, EventEmitter } from '@angular/core';
import { FormElementComponent } from '../form-element-component.directive';
-import { TextAreaElement } from '../classes/text-area-element';
+import { TextAreaElement } from '../models/text-area-element';
@Component({
selector: 'app-text-area',
diff --git a/projects/common/element-components/text-field.component.ts b/projects/common/element-components/text-field.component.ts
index 860bd88f8..01926d308 100644
--- a/projects/common/element-components/text-field.component.ts
+++ b/projects/common/element-components/text-field.component.ts
@@ -1,7 +1,7 @@
import { Component, EventEmitter, Output } from '@angular/core';
import { ValidatorFn, Validators } from '@angular/forms';
import { FormElementComponent } from '../form-element-component.directive';
-import { TextFieldElement } from '../classes/text-field-element';
+import { TextFieldElement } from '../models/text-field-element';
@Component({
selector: 'app-text-field',
diff --git a/projects/common/element-components/text.component.ts b/projects/common/element-components/text.component.ts
index 75325cccc..e1f4b1d9a 100644
--- a/projects/common/element-components/text.component.ts
+++ b/projects/common/element-components/text.component.ts
@@ -3,7 +3,7 @@ import {
} from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import { ElementComponent } from '../element-component.directive';
-import { TextElement } from '../classes/text-element';
+import { TextElement } from '../models/text-element';
@Component({
selector: 'app-text',
diff --git a/projects/common/element-components/video.component.ts b/projects/common/element-components/video.component.ts
index 73d4e5311..fa70b500c 100644
--- a/projects/common/element-components/video.component.ts
+++ b/projects/common/element-components/video.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { ElementComponent } from '../element-component.directive';
-import { VideoElement } from '../classes/video-element';
+import { VideoElement } from '../models/video-element';
@Component({
selector: 'app-video',
diff --git a/projects/common/form-element-component.directive.ts b/projects/common/form-element-component.directive.ts
index a0c2c0c62..1703b60c8 100644
--- a/projects/common/form-element-component.directive.ts
+++ b/projects/common/form-element-component.directive.ts
@@ -9,7 +9,7 @@ import { pairwise, startWith, takeUntil } from 'rxjs/operators';
import { FormService } from './form.service';
import { ValueChangeElement } from './form';
import { ElementComponent } from './element-component.directive';
-import { InputElement } from './classes/uI-element';
+import { InputElement } from './models/uI-element';
@Directive()
export abstract class FormElementComponent extends ElementComponent implements OnInit, OnDestroy {
diff --git a/projects/common/classes/audio-element.ts b/projects/common/models/audio-element.ts
similarity index 100%
rename from projects/common/classes/audio-element.ts
rename to projects/common/models/audio-element.ts
diff --git a/projects/common/classes/button-element.ts b/projects/common/models/button-element.ts
similarity index 100%
rename from projects/common/classes/button-element.ts
rename to projects/common/models/button-element.ts
diff --git a/projects/common/classes/checkbox-element.ts b/projects/common/models/checkbox-element.ts
similarity index 100%
rename from projects/common/classes/checkbox-element.ts
rename to projects/common/models/checkbox-element.ts
diff --git a/projects/common/classes/dropdown-element.ts b/projects/common/models/dropdown-element.ts
similarity index 100%
rename from projects/common/classes/dropdown-element.ts
rename to projects/common/models/dropdown-element.ts
diff --git a/projects/common/classes/image-element.ts b/projects/common/models/image-element.ts
similarity index 100%
rename from projects/common/classes/image-element.ts
rename to projects/common/models/image-element.ts
diff --git a/projects/common/classes/page.ts b/projects/common/models/page.ts
similarity index 100%
rename from projects/common/classes/page.ts
rename to projects/common/models/page.ts
diff --git a/projects/common/classes/radio-button-group-element.ts b/projects/common/models/radio-button-group-element.ts
similarity index 100%
rename from projects/common/classes/radio-button-group-element.ts
rename to projects/common/models/radio-button-group-element.ts
diff --git a/projects/common/classes/section.ts b/projects/common/models/section.ts
similarity index 100%
rename from projects/common/classes/section.ts
rename to projects/common/models/section.ts
diff --git a/projects/common/classes/text-area-element.ts b/projects/common/models/text-area-element.ts
similarity index 100%
rename from projects/common/classes/text-area-element.ts
rename to projects/common/models/text-area-element.ts
diff --git a/projects/common/classes/text-element.ts b/projects/common/models/text-element.ts
similarity index 100%
rename from projects/common/classes/text-element.ts
rename to projects/common/models/text-element.ts
diff --git a/projects/common/classes/text-field-element.ts b/projects/common/models/text-field-element.ts
similarity index 100%
rename from projects/common/classes/text-field-element.ts
rename to projects/common/models/text-field-element.ts
diff --git a/projects/common/classes/uI-element.ts b/projects/common/models/uI-element.ts
similarity index 100%
rename from projects/common/classes/uI-element.ts
rename to projects/common/models/uI-element.ts
diff --git a/projects/common/classes/unit.ts b/projects/common/models/unit.ts
similarity index 100%
rename from projects/common/classes/unit.ts
rename to projects/common/models/unit.ts
diff --git a/projects/common/classes/video-element.ts b/projects/common/models/video-element.ts
similarity index 100%
rename from projects/common/classes/video-element.ts
rename to projects/common/models/video-element.ts
diff --git a/projects/common/util/element.factory.ts b/projects/common/util/element.factory.ts
index f60533efc..7e8dabeee 100644
--- a/projects/common/util/element.factory.ts
+++ b/projects/common/util/element.factory.ts
@@ -1,14 +1,14 @@
-import { UIElement } from '../classes/uI-element';
-import { TextElement } from '../classes/text-element';
-import { ButtonElement } from '../classes/button-element';
-import { TextFieldElement } from '../classes/text-field-element';
-import { TextAreaElement } from '../classes/text-area-element';
-import { CheckboxElement } from '../classes/checkbox-element';
-import { DropdownElement } from '../classes/dropdown-element';
-import { RadioButtonGroupElement } from '../classes/radio-button-group-element';
-import { ImageElement } from '../classes/image-element';
-import { AudioElement } from '../classes/audio-element';
-import { VideoElement } from '../classes/video-element';
+import { UIElement } from '../models/uI-element';
+import { TextElement } from '../models/text-element';
+import { ButtonElement } from '../models/button-element';
+import { TextFieldElement } from '../models/text-field-element';
+import { TextAreaElement } from '../models/text-area-element';
+import { CheckboxElement } from '../models/checkbox-element';
+import { DropdownElement } from '../models/dropdown-element';
+import { RadioButtonGroupElement } from '../models/radio-button-group-element';
+import { ImageElement } from '../models/image-element';
+import { AudioElement } from '../models/audio-element';
+import { VideoElement } from '../models/video-element';
export function createElement(elementModel: UIElement, coordinates?: { x: number; y: number }): UIElement {
let newElement: UIElement;
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
index 06d6878a9..7bc47388c 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
@@ -12,7 +12,7 @@ import { FormElementComponent } from '../../../../../../../common/form-element-c
import { ValueChangeElement } from '../../../../../../../common/form';
import { ElementComponent } from '../../../../../../../common/element-component.directive';
import { SelectionService } from '../../../../selection.service';
-import { InputElement, UIElement } from '../../../../../../../common/classes/uI-element';
+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.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
index 661403c85..9699cea44 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
@@ -6,9 +6,9 @@ import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { UnitService } from '../../../../unit.service';
import { SelectionService } from '../../../../selection.service';
-import { Page } from '../../../../../../../common/classes/page';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
-import { Section } from '../../../../../../../common/classes/section';
+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/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
index e52173916..ba120d842 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
+++ b/projects/editor/src/app/components/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/classes/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/components/unit-view/page-view/canvas/section-dynamic.component.ts
index e939d1fd5..7f3309cfd 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts
@@ -4,7 +4,7 @@ import {
import { CdkDragDrop } from '@angular/cdk/drag-drop/drag-events';
import { DragItemData, DropListData } from './canvas.component';
import { UnitService } from '../../../../unit.service';
-import { Section } from '../../../../../../../common/classes/section';
+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/components/unit-view/page-view/canvas/section-menu.component.ts
index f4342b9c1..920f2fb39 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts
@@ -7,7 +7,7 @@ import { takeUntil } from 'rxjs/operators';
import { UnitService } from '../../../../unit.service';
import { DialogService } from '../../../../dialog.service';
import { SelectionService } from '../../../../selection.service';
-import { Section } from '../../../../../../../common/classes/section';
+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/components/unit-view/page-view/canvas/section-static.component.ts
index 5c2d2bf9b..4284b6bdc 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts
@@ -2,7 +2,7 @@ import {
Component, ElementRef, Input, ViewChild
} from '@angular/core';
import { UnitService } from '../../../../unit.service';
-import { Section } from '../../../../../../../common/classes/section';
+import { Section } from '../../../../../../../common/models/section';
@Component({
selector: 'app-section-static',
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
index 06487976e..7b0b9ce9c 100644
--- 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
@@ -1,7 +1,7 @@
import {
Component, Input
} from '@angular/core';
-import { Page } from '../../../../../../common/classes/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.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
index e80886e55..147b8e535 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
@@ -10,7 +10,7 @@ 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/classes/uI-element';
+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/components/unit-view/page-view/properties/element-sizing-properties.component.ts
index 1fbd963ab..b3b3f6515 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
@@ -3,7 +3,7 @@ import {
} from '@angular/core';
import { UnitService } from '../../../../unit.service';
import { SelectionService } from '../../../../selection.service';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
+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/components/unit-view/page-view/properties/element-style-properties.component.ts
index e891409af..cb73eb851 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
@@ -1,7 +1,7 @@
import {
Component, EventEmitter, Input, Output
} from '@angular/core';
-import { UIElement } from '../../../../../../../common/classes/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.ts b/projects/editor/src/app/components/unit-view/unit-view.component.ts
index ee996937f..00702d225 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
@@ -5,8 +5,8 @@ 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/classes/page';
-import { Unit } from '../../../../../common/classes/unit';
+import { Page } from '../../../../../common/models/page';
+import { Unit } from '../../../../../common/models/unit';
@Component({
selector: 'app-unit-view',
diff --git a/projects/editor/src/app/selection.service.ts b/projects/editor/src/app/selection.service.ts
index e12d39a0b..1f6ae279b 100644
--- a/projects/editor/src/app/selection.service.ts
+++ b/projects/editor/src/app/selection.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
-import { UIElement } from '../../../common/classes/uI-element';
+import { UIElement } from '../../../common/models/uI-element';
@Injectable({
providedIn: 'root'
diff --git a/projects/editor/src/app/unit.service.ts b/projects/editor/src/app/unit.service.ts
index bf63817a3..49a2c31b8 100644
--- a/projects/editor/src/app/unit.service.ts
+++ b/projects/editor/src/app/unit.service.ts
@@ -6,11 +6,11 @@ import { MessageService } from '../../../common/message.service';
import { IdService } from '../../../common/id.service';
import { DialogService } from './dialog.service';
import { VeronaAPIService } from './verona-api.service';
-import { Unit } from '../../../common/classes/unit';
-import { Page } from '../../../common/classes/page';
-import { Section } from '../../../common/classes/section';
-import { InputElement, UIElement } from '../../../common/classes/uI-element';
-import { TextElement } from '../../../common/classes/text-element';
+import { Unit } from '../../../common/models/unit';
+import { Page } from '../../../common/models/page';
+import { Section } from '../../../common/models/section';
+import { InputElement, UIElement } from '../../../common/models/uI-element';
+import { TextElement } from '../../../common/models/text-element';
@Injectable({
providedIn: 'root'
diff --git a/projects/player/src/app/app.component.ts b/projects/player/src/app/app.component.ts
index 9a91a7e7a..dc281bafb 100644
--- a/projects/player/src/app/app.component.ts
+++ b/projects/player/src/app/app.component.ts
@@ -3,7 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
import { MatDialog } from '@angular/material/dialog';
import {
Unit
-} from '../../../common/classes/unit';
+} from '../../../common/models/unit';
import { VeronaSubscriptionService } from './services/verona-subscription.service';
import { VeronaPostService } from './services/verona-post.service';
import { NativeEventService } from './services/native-event.service';
@@ -12,7 +12,7 @@ import { PlayerConfig, VopStartCommand } from './models/verona';
import { AlertDialogComponent } from './components/alert-dialog/alert-dialog.component';
import { KeyboardService } from './services/keyboard.service';
import { UnitStateService } from './services/unit-state.service';
-import { Page } from '../../../common/classes/page';
+import { Page } from '../../../common/models/page';
@Component({
selector: 'player-aspect',
diff --git a/projects/player/src/app/components/element/element.component.ts b/projects/player/src/app/components/element/element.component.ts
index 86e024c16..37b9a6020 100644
--- a/projects/player/src/app/components/element/element.component.ts
+++ b/projects/player/src/app/components/element/element.component.ts
@@ -13,7 +13,7 @@ import { FormService } from '../../../../../common/form.service';
import { ValueChangeElement } from '../../../../../common/form';
import { UnitStateService } from '../../services/unit-state.service';
import { MarkingService } from '../../services/marking.service';
-import { UIElement } from '../../../../../common/classes/uI-element';
+import { UIElement } from '../../../../../common/models/uI-element';
@Component({
selector: 'app-element',
diff --git a/projects/player/src/app/components/layout/layout.component.ts b/projects/player/src/app/components/layout/layout.component.ts
index c020d2353..7ebc2619a 100644
--- a/projects/player/src/app/components/layout/layout.component.ts
+++ b/projects/player/src/app/components/layout/layout.component.ts
@@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { PlayerConfig } from '../../models/verona';
import { KeyboardService } from '../../services/keyboard.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
@Component({
selector: 'app-layout',
diff --git a/projects/player/src/app/components/page/page.component.ts b/projects/player/src/app/components/page/page.component.ts
index 4e68b9ec9..41085dc6f 100644
--- a/projects/player/src/app/components/page/page.component.ts
+++ b/projects/player/src/app/components/page/page.component.ts
@@ -4,7 +4,7 @@ import {
import { FormBuilder, FormGroup } from '@angular/forms';
import { FormService } from '../../../../../common/form.service';
import { UnitStateService } from '../../services/unit-state.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
@Component({
selector: 'app-page',
diff --git a/projects/player/src/app/components/player-state/player-state.component.ts b/projects/player/src/app/components/player-state/player-state.component.ts
index ed311d907..718e3a15b 100644
--- a/projects/player/src/app/components/player-state/player-state.component.ts
+++ b/projects/player/src/app/components/player-state/player-state.component.ts
@@ -10,7 +10,7 @@ import {
VopContinueCommand, VopGetStateRequest, VopPageNavigationCommand, VopStopCommand
} from '../../models/verona';
import { VeronaPostService } from '../../services/verona-post.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
@Component({
selector: 'app-player-state',
diff --git a/projects/player/src/app/components/section/section.component.ts b/projects/player/src/app/components/section/section.component.ts
index 0c1d7a9a9..f863ea8ef 100644
--- a/projects/player/src/app/components/section/section.component.ts
+++ b/projects/player/src/app/components/section/section.component.ts
@@ -3,7 +3,7 @@ import {
} from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { FormService } from '../../../../../common/form.service';
-import { Section } from '../../../../../common/classes/section';
+import { Section } from '../../../../../common/models/section';
@Component({
selector: 'app-section',
diff --git a/projects/player/src/app/components/unit-state/unit-state.component.ts b/projects/player/src/app/components/unit-state/unit-state.component.ts
index 6d44f0f64..860332937 100644
--- a/projects/player/src/app/components/unit-state/unit-state.component.ts
+++ b/projects/player/src/app/components/unit-state/unit-state.component.ts
@@ -20,7 +20,7 @@ import {
PlayerConfig, Progress, UnitState, VopNavigationDeniedNotification
} from '../../models/verona';
import { UnitStateService } from '../../services/unit-state.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
@Component({
selector: 'app-unit-state',
diff --git a/projects/player/src/app/services/unit-state.service.ts b/projects/player/src/app/services/unit-state.service.ts
index 0de87d960..e0f42cdbc 100644
--- a/projects/player/src/app/services/unit-state.service.ts
+++ b/projects/player/src/app/services/unit-state.service.ts
@@ -7,7 +7,7 @@ import {
UnitStateElementCodeStatusValue
} from '../models/verona';
import { ValueChangeElement } from '../../../../common/form';
-import { InputElement, InputElementValue } from '../../../../common/classes/uI-element';
+import { InputElement, InputElementValue } from '../../../../common/models/uI-element';
@Injectable({
providedIn: 'root'
--
GitLab