From b6f3db79e4d00e3ea2ae2eb63d2bb3a3643c2bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Thu, 28 Nov 2024 14:48:46 +0100 Subject: [PATCH] UI: package restructure --- .../angular/src/app/{api => }/Area/Area.ts | 2 +- .../src/app/{api => }/Device/Device.ts | 2 +- .../src/app/{api => }/Device/DeviceFilter.ts | 0 .../device-list/device-list.component.html | 0 .../device-list/device-list.component.less | 0 .../device-list/device-list.component.ts | 2 +- .../device-tile/device-tile.component.html | 0 .../device-tile/device-tile.component.less | 0 .../device-tile/device-tile.component.ts | 6 +++--- .../app/{api => }/Device/device.service.ts | 6 +++--- .../angular/src/app/{api => }/Group/Group.ts | 2 +- .../src/app/{api => }/Group/GroupFilter.ts | 0 .../src/app/{api => }/Group/group.service.ts | 6 +++--- .../knx-group-list-page.component.html | 0 .../knx-group-list-page.component.less | 0 .../knx-group-list-page.component.ts | 10 +++++----- .../knx-group-list.component.html | 0 .../knx-group-list.component.less | 0 .../knx-group-list.component.ts | 2 +- .../knx-group-tile.component.html | 0 .../knx-group-tile.component.less | 0 .../knx-group-tile.component.ts | 4 ++-- .../src/app/{api => }/Property/Property.ts | 2 +- .../src/app/{api => }/Shutter/Shutter.ts | 2 +- .../app/{api => }/Shutter/ShutterFilter.ts | 0 .../shutter-list/shutter-list.component.html | 0 .../shutter-list/shutter-list.component.less | 0 .../shutter-list/shutter-list.component.ts | 2 +- .../shutter-icon/shutter-icon.component.html | 0 .../shutter-icon/shutter-icon.component.less | 0 .../shutter-icon/shutter-icon.component.ts | 2 +- .../shutter-tile/shutter-tile.component.html | 0 .../shutter-tile/shutter-tile.component.less | 0 .../shutter-tile/shutter-tile.component.ts | 8 ++++---- .../app/{api => }/Shutter/shutter.service.ts | 6 +++--- .../angular/src/app/{api => }/State/State.ts | 2 +- src/main/angular/src/app/{api => }/Tag/Tag.ts | 2 +- .../src/app/{api => }/Tag/tag.service.ts | 4 ++-- .../src/app/{api => }/Taggable/Taggable.ts | 2 +- .../app/{api => }/Taggable/TaggableFilter.ts | 0 .../taggable-list-page.component.html | 0 .../taggable-list-page.component.less | 0 .../taggable-list-page.component.ts | 10 +++++----- .../taggable-list.component.html | 0 .../taggable-list.component.less | 0 .../taggable-list/taggable-list.component.ts | 2 +- .../taggable-tile.component.html | 0 .../taggable-tile.component.less | 0 .../taggable-tile/taggable-tile.component.ts | 14 ++++++------- .../{api => }/Taggable/taggable.service.ts | 6 +++--- .../src/app/{api => }/Tunable/Tunable.ts | 2 +- .../app/{api => }/Tunable/TunableFilter.ts | 0 .../tunable-list/tunable-list.component.html | 0 .../tunable-list/tunable-list.component.less | 0 .../tunable-list/tunable-list.component.ts | 2 +- .../tunable-tile/tunable-tile.component.html | 0 .../tunable-tile/tunable-tile.component.less | 0 .../tunable-tile/tunable-tile.component.ts | 6 +++--- .../app/{api => }/Tunable/tunable.service.ts | 6 +++--- .../src/app/api/{common => }/CrudDirection.ts | 0 .../src/app/api/{common => }/CrudLiveList.ts | 0 .../src/app/api/{common => }/CrudService.ts | 0 .../angular/src/app/api/{common => }/Order.ts | 0 .../angular/src/app/api/{common => }/Page.ts | 0 .../angular/src/app/api/{common => }/Sort.ts | 0 .../src/app/api/{common => }/api.service.ts | 0 .../src/app/api/{common => }/relative.pipe.ts | 0 .../angular/src/app/api/{common => }/types.ts | 2 +- .../src/app/api/{common => }/validators.ts | 0 .../angular/src/app/api/{common => }/ws.ts | 0 src/main/angular/src/app/app.component.ts | 2 +- src/main/angular/src/app/app.config.ts | 2 +- src/main/angular/src/app/app.routes.ts | 6 +++--- .../dashboard/dashboard.component.html | 0 .../dashboard/dashboard.component.less | 2 +- .../dashboard/dashboard.component.ts | 20 +++++++++---------- 76 files changed, 78 insertions(+), 78 deletions(-) rename src/main/angular/src/app/{api => }/Area/Area.ts (88%) rename src/main/angular/src/app/{api => }/Device/Device.ts (95%) rename src/main/angular/src/app/{api => }/Device/DeviceFilter.ts (100%) rename src/main/angular/src/app/{shared => Device}/device-list/device-list.component.html (100%) rename src/main/angular/src/app/{shared => Device}/device-list/device-list.component.less (100%) rename src/main/angular/src/app/{shared => Device}/device-list/device-list.component.ts (95%) rename src/main/angular/src/app/{shared => Device}/device-tile/device-tile.component.html (100%) rename src/main/angular/src/app/{shared => Device}/device-tile/device-tile.component.less (100%) rename src/main/angular/src/app/{shared => Device}/device-tile/device-tile.component.ts (79%) rename src/main/angular/src/app/{api => }/Device/device.service.ts (78%) rename src/main/angular/src/app/{api => }/Group/Group.ts (90%) rename src/main/angular/src/app/{api => }/Group/GroupFilter.ts (100%) rename src/main/angular/src/app/{api => }/Group/group.service.ts (73%) rename src/main/angular/src/app/{pages => Group}/knx-group-list-page/knx-group-list-page.component.html (100%) rename src/main/angular/src/app/{pages => Group}/knx-group-list-page/knx-group-list-page.component.less (100%) rename src/main/angular/src/app/{pages => Group}/knx-group-list-page/knx-group-list-page.component.ts (81%) rename src/main/angular/src/app/{shared => Group}/knx-group-list/knx-group-list.component.html (100%) rename src/main/angular/src/app/{shared => Group}/knx-group-list/knx-group-list.component.less (100%) rename src/main/angular/src/app/{shared => Group}/knx-group-list/knx-group-list.component.ts (95%) rename src/main/angular/src/app/{shared => Group}/knx-group-tile/knx-group-tile.component.html (100%) rename src/main/angular/src/app/{shared => Group}/knx-group-tile/knx-group-tile.component.less (100%) rename src/main/angular/src/app/{shared => Group}/knx-group-tile/knx-group-tile.component.ts (84%) rename src/main/angular/src/app/{api => }/Property/Property.ts (85%) rename src/main/angular/src/app/{api => }/Shutter/Shutter.ts (95%) rename src/main/angular/src/app/{api => }/Shutter/ShutterFilter.ts (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-list/shutter-list.component.html (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-list/shutter-list.component.less (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-list/shutter-list.component.ts (95%) rename src/main/angular/src/app/{shared => Shutter}/shutter-tile/shutter-icon/shutter-icon.component.html (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-tile/shutter-icon/shutter-icon.component.less (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-tile/shutter-icon/shutter-icon.component.ts (89%) rename src/main/angular/src/app/{shared => Shutter}/shutter-tile/shutter-tile.component.html (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-tile/shutter-tile.component.less (100%) rename src/main/angular/src/app/{shared => Shutter}/shutter-tile/shutter-tile.component.ts (71%) rename src/main/angular/src/app/{api => }/Shutter/shutter.service.ts (79%) rename src/main/angular/src/app/{api => }/State/State.ts (84%) rename src/main/angular/src/app/{api => }/Tag/Tag.ts (82%) rename src/main/angular/src/app/{api => }/Tag/tag.service.ts (72%) rename src/main/angular/src/app/{api => }/Taggable/Taggable.ts (89%) rename src/main/angular/src/app/{api => }/Taggable/TaggableFilter.ts (100%) rename src/main/angular/src/app/{pages => Taggable}/taggable-list-page/taggable-list-page.component.html (100%) rename src/main/angular/src/app/{pages => Taggable}/taggable-list-page/taggable-list-page.component.less (100%) rename src/main/angular/src/app/{pages => Taggable}/taggable-list-page/taggable-list-page.component.ts (82%) rename src/main/angular/src/app/{shared => Taggable}/taggable-list/taggable-list.component.html (100%) rename src/main/angular/src/app/{shared => Taggable}/taggable-list/taggable-list.component.less (100%) rename src/main/angular/src/app/{shared => Taggable}/taggable-list/taggable-list.component.ts (94%) rename src/main/angular/src/app/{shared => Taggable}/taggable-tile/taggable-tile.component.html (100%) rename src/main/angular/src/app/{shared => Taggable}/taggable-tile/taggable-tile.component.less (100%) rename src/main/angular/src/app/{shared => Taggable}/taggable-tile/taggable-tile.component.ts (66%) rename src/main/angular/src/app/{api => }/Taggable/taggable.service.ts (88%) rename src/main/angular/src/app/{api => }/Tunable/Tunable.ts (96%) rename src/main/angular/src/app/{api => }/Tunable/TunableFilter.ts (100%) rename src/main/angular/src/app/{shared => Tunable}/tunable-list/tunable-list.component.html (100%) rename src/main/angular/src/app/{shared => Tunable}/tunable-list/tunable-list.component.less (100%) rename src/main/angular/src/app/{shared => Tunable}/tunable-list/tunable-list.component.ts (95%) rename src/main/angular/src/app/{shared => Tunable}/tunable-tile/tunable-tile.component.html (100%) rename src/main/angular/src/app/{shared => Tunable}/tunable-tile/tunable-tile.component.less (100%) rename src/main/angular/src/app/{shared => Tunable}/tunable-tile/tunable-tile.component.ts (82%) rename src/main/angular/src/app/{api => }/Tunable/tunable.service.ts (85%) rename src/main/angular/src/app/api/{common => }/CrudDirection.ts (100%) rename src/main/angular/src/app/api/{common => }/CrudLiveList.ts (100%) rename src/main/angular/src/app/api/{common => }/CrudService.ts (100%) rename src/main/angular/src/app/api/{common => }/Order.ts (100%) rename src/main/angular/src/app/api/{common => }/Page.ts (100%) rename src/main/angular/src/app/api/{common => }/Sort.ts (100%) rename src/main/angular/src/app/api/{common => }/api.service.ts (100%) rename src/main/angular/src/app/api/{common => }/relative.pipe.ts (100%) rename src/main/angular/src/app/api/{common => }/types.ts (82%) rename src/main/angular/src/app/api/{common => }/validators.ts (100%) rename src/main/angular/src/app/api/{common => }/ws.ts (100%) rename src/main/angular/src/app/{pages => }/dashboard/dashboard.component.html (100%) rename src/main/angular/src/app/{pages => }/dashboard/dashboard.component.less (85%) rename src/main/angular/src/app/{pages => }/dashboard/dashboard.component.ts (75%) diff --git a/src/main/angular/src/app/api/Area/Area.ts b/src/main/angular/src/app/Area/Area.ts similarity index 88% rename from src/main/angular/src/app/api/Area/Area.ts rename to src/main/angular/src/app/Area/Area.ts index 6577d6f..10153a8 100644 --- a/src/main/angular/src/app/api/Area/Area.ts +++ b/src/main/angular/src/app/Area/Area.ts @@ -1,4 +1,4 @@ -import {validateString} from "../common/validators"; +import {validateString} from "../api/validators"; export class Area { diff --git a/src/main/angular/src/app/api/Device/Device.ts b/src/main/angular/src/app/Device/Device.ts similarity index 95% rename from src/main/angular/src/app/api/Device/Device.ts rename to src/main/angular/src/app/Device/Device.ts index 986da94..c9b679f 100644 --- a/src/main/angular/src/app/api/Device/Device.ts +++ b/src/main/angular/src/app/Device/Device.ts @@ -1,5 +1,5 @@ import {Property} from "../Property/Property"; -import {orNull, validateString} from "../common/validators"; +import {orNull, validateString} from "../api/validators"; import {Area} from '../Area/Area'; export class Device { diff --git a/src/main/angular/src/app/api/Device/DeviceFilter.ts b/src/main/angular/src/app/Device/DeviceFilter.ts similarity index 100% rename from src/main/angular/src/app/api/Device/DeviceFilter.ts rename to src/main/angular/src/app/Device/DeviceFilter.ts diff --git a/src/main/angular/src/app/shared/device-list/device-list.component.html b/src/main/angular/src/app/Device/device-list/device-list.component.html similarity index 100% rename from src/main/angular/src/app/shared/device-list/device-list.component.html rename to src/main/angular/src/app/Device/device-list/device-list.component.html diff --git a/src/main/angular/src/app/shared/device-list/device-list.component.less b/src/main/angular/src/app/Device/device-list/device-list.component.less similarity index 100% rename from src/main/angular/src/app/shared/device-list/device-list.component.less rename to src/main/angular/src/app/Device/device-list/device-list.component.less diff --git a/src/main/angular/src/app/shared/device-list/device-list.component.ts b/src/main/angular/src/app/Device/device-list/device-list.component.ts similarity index 95% rename from src/main/angular/src/app/shared/device-list/device-list.component.ts rename to src/main/angular/src/app/Device/device-list/device-list.component.ts index fa2a0a1..78d0da9 100644 --- a/src/main/angular/src/app/shared/device-list/device-list.component.ts +++ b/src/main/angular/src/app/Device/device-list/device-list.component.ts @@ -1,6 +1,6 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {NgForOf} from '@angular/common'; -import {Device} from '../../api/Device/Device'; +import {Device} from '../Device'; import {Subscription, timer} from 'rxjs'; import {DeviceTileComponent} from '../device-tile/device-tile.component'; diff --git a/src/main/angular/src/app/shared/device-tile/device-tile.component.html b/src/main/angular/src/app/Device/device-tile/device-tile.component.html similarity index 100% rename from src/main/angular/src/app/shared/device-tile/device-tile.component.html rename to src/main/angular/src/app/Device/device-tile/device-tile.component.html diff --git a/src/main/angular/src/app/shared/device-tile/device-tile.component.less b/src/main/angular/src/app/Device/device-tile/device-tile.component.less similarity index 100% rename from src/main/angular/src/app/shared/device-tile/device-tile.component.less rename to src/main/angular/src/app/Device/device-tile/device-tile.component.less diff --git a/src/main/angular/src/app/shared/device-tile/device-tile.component.ts b/src/main/angular/src/app/Device/device-tile/device-tile.component.ts similarity index 79% rename from src/main/angular/src/app/shared/device-tile/device-tile.component.ts rename to src/main/angular/src/app/Device/device-tile/device-tile.component.ts index 74d5da8..08adcc2 100644 --- a/src/main/angular/src/app/shared/device-tile/device-tile.component.ts +++ b/src/main/angular/src/app/Device/device-tile/device-tile.component.ts @@ -1,7 +1,7 @@ import {Component, Input} from '@angular/core'; -import {RelativePipe} from "../../api/common/relative.pipe"; -import {Device} from "../../api/Device/Device"; -import {DeviceService} from '../../api/Device/device.service'; +import {RelativePipe} from "../../api/relative.pipe"; +import {Device} from "../Device"; +import {DeviceService} from '../device.service'; import {NgClass} from '@angular/common'; @Component({ diff --git a/src/main/angular/src/app/api/Device/device.service.ts b/src/main/angular/src/app/Device/device.service.ts similarity index 78% rename from src/main/angular/src/app/api/Device/device.service.ts rename to src/main/angular/src/app/Device/device.service.ts index 0a4daa6..785c16e 100644 --- a/src/main/angular/src/app/api/Device/device.service.ts +++ b/src/main/angular/src/app/Device/device.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; -import {CrudService} from '../common/CrudService'; +import {CrudService} from '../api/CrudService'; import {Device} from './Device'; -import {ApiService} from '../common/api.service'; -import {Next} from '../common/types'; +import {ApiService} from '../api/api.service'; +import {Next} from '../api/types'; @Injectable({ providedIn: 'root' diff --git a/src/main/angular/src/app/api/Group/Group.ts b/src/main/angular/src/app/Group/Group.ts similarity index 90% rename from src/main/angular/src/app/api/Group/Group.ts rename to src/main/angular/src/app/Group/Group.ts index eab309b..dccfbc6 100644 --- a/src/main/angular/src/app/api/Group/Group.ts +++ b/src/main/angular/src/app/Group/Group.ts @@ -1,4 +1,4 @@ -import {orNull, validateDateOrNull, validateString} from '../common/validators'; +import {orNull, validateDateOrNull, validateString} from '../api/validators'; import {State} from '../State/State'; export class Group { diff --git a/src/main/angular/src/app/api/Group/GroupFilter.ts b/src/main/angular/src/app/Group/GroupFilter.ts similarity index 100% rename from src/main/angular/src/app/api/Group/GroupFilter.ts rename to src/main/angular/src/app/Group/GroupFilter.ts diff --git a/src/main/angular/src/app/api/Group/group.service.ts b/src/main/angular/src/app/Group/group.service.ts similarity index 73% rename from src/main/angular/src/app/api/Group/group.service.ts rename to src/main/angular/src/app/Group/group.service.ts index 08ffa70..be74d4c 100644 --- a/src/main/angular/src/app/api/Group/group.service.ts +++ b/src/main/angular/src/app/Group/group.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; -import {CrudService} from '../common/CrudService'; +import {CrudService} from '../api/CrudService'; import {Group} from './Group'; -import {ApiService} from '../common/api.service'; -import {Next} from '../common/types'; +import {ApiService} from '../api/api.service'; +import {Next} from '../api/types'; @Injectable({ providedIn: 'root' diff --git a/src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.html b/src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.html similarity index 100% rename from src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.html rename to src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.html diff --git a/src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.less b/src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.less similarity index 100% rename from src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.less rename to src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.less diff --git a/src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.ts b/src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.ts similarity index 81% rename from src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.ts rename to src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.ts index e10e394..a76e88c 100644 --- a/src/main/angular/src/app/pages/knx-group-list-page/knx-group-list-page.component.ts +++ b/src/main/angular/src/app/Group/knx-group-list-page/knx-group-list-page.component.ts @@ -1,11 +1,11 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; -import {KnxGroupListComponent} from '../../shared/knx-group-list/knx-group-list.component'; -import {Group} from '../../api/Group/Group'; -import {GroupService} from '../../api/Group/group.service'; +import {KnxGroupListComponent} from '../knx-group-list/knx-group-list.component'; +import {Group} from '../Group'; +import {GroupService} from '../group.service'; import {FormsModule} from '@angular/forms'; -import {GroupFilter} from '../../api/Group/GroupFilter'; +import {GroupFilter} from '../GroupFilter'; import {Subscription} from 'rxjs'; -import {ApiService} from '../../api/common/api.service'; +import {ApiService} from '../../api/api.service'; import {SearchComponent} from '../../shared/search/search.component'; @Component({ diff --git a/src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.html b/src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.html similarity index 100% rename from src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.html rename to src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.html diff --git a/src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.less b/src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.less similarity index 100% rename from src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.less rename to src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.less diff --git a/src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.ts b/src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.ts similarity index 95% rename from src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.ts rename to src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.ts index daed7bb..1cfeb37 100644 --- a/src/main/angular/src/app/shared/knx-group-list/knx-group-list.component.ts +++ b/src/main/angular/src/app/Group/knx-group-list/knx-group-list.component.ts @@ -1,6 +1,6 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {NgForOf} from '@angular/common'; -import {Group} from '../../api/Group/Group'; +import {Group} from '../Group'; import {Subscription, timer} from 'rxjs'; import {KnxGroupTileComponent} from '../knx-group-tile/knx-group-tile.component'; diff --git a/src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.html b/src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.html similarity index 100% rename from src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.html rename to src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.html diff --git a/src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.less b/src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.less similarity index 100% rename from src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.less rename to src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.less diff --git a/src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.ts b/src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.ts similarity index 84% rename from src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.ts rename to src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.ts index f2db7a6..8ffdae6 100644 --- a/src/main/angular/src/app/shared/knx-group-tile/knx-group-tile.component.ts +++ b/src/main/angular/src/app/Group/knx-group-tile/knx-group-tile.component.ts @@ -1,7 +1,7 @@ import {Component, Input} from '@angular/core'; import {NgClass} from '@angular/common'; -import {RelativePipe} from '../../api/common/relative.pipe'; -import {Group} from '../../api/Group/Group'; +import {RelativePipe} from '../../api/relative.pipe'; +import {Group} from '../Group'; @Component({ selector: 'app-knx-group-tile', diff --git a/src/main/angular/src/app/api/Property/Property.ts b/src/main/angular/src/app/Property/Property.ts similarity index 85% rename from src/main/angular/src/app/api/Property/Property.ts rename to src/main/angular/src/app/Property/Property.ts index 202a936..591d986 100644 --- a/src/main/angular/src/app/api/Property/Property.ts +++ b/src/main/angular/src/app/Property/Property.ts @@ -1,5 +1,5 @@ import {State} from "../State/State"; -import {orNull, validateDateOrNull, validateString} from "../common/validators"; +import {orNull, validateDateOrNull, validateString} from "../api/validators"; export class Property { diff --git a/src/main/angular/src/app/api/Shutter/Shutter.ts b/src/main/angular/src/app/Shutter/Shutter.ts similarity index 95% rename from src/main/angular/src/app/api/Shutter/Shutter.ts rename to src/main/angular/src/app/Shutter/Shutter.ts index 13ab9f4..d257fb3 100644 --- a/src/main/angular/src/app/api/Shutter/Shutter.ts +++ b/src/main/angular/src/app/Shutter/Shutter.ts @@ -1,5 +1,5 @@ import {Property} from "../Property/Property"; -import {orNull, validateString} from "../common/validators"; +import {orNull, validateString} from "../api/validators"; import {Area} from '../Area/Area'; diff --git a/src/main/angular/src/app/api/Shutter/ShutterFilter.ts b/src/main/angular/src/app/Shutter/ShutterFilter.ts similarity index 100% rename from src/main/angular/src/app/api/Shutter/ShutterFilter.ts rename to src/main/angular/src/app/Shutter/ShutterFilter.ts diff --git a/src/main/angular/src/app/shared/shutter-list/shutter-list.component.html b/src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.html similarity index 100% rename from src/main/angular/src/app/shared/shutter-list/shutter-list.component.html rename to src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.html diff --git a/src/main/angular/src/app/shared/shutter-list/shutter-list.component.less b/src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.less similarity index 100% rename from src/main/angular/src/app/shared/shutter-list/shutter-list.component.less rename to src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.less diff --git a/src/main/angular/src/app/shared/shutter-list/shutter-list.component.ts b/src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.ts similarity index 95% rename from src/main/angular/src/app/shared/shutter-list/shutter-list.component.ts rename to src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.ts index 32dbc3f..8447ee8 100644 --- a/src/main/angular/src/app/shared/shutter-list/shutter-list.component.ts +++ b/src/main/angular/src/app/Shutter/shutter-list/shutter-list.component.ts @@ -1,6 +1,6 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {NgForOf} from '@angular/common'; -import {Shutter} from '../../api/Shutter/Shutter'; +import {Shutter} from '../Shutter'; import {Subscription, timer} from 'rxjs'; import {ShutterTileComponent} from '../shutter-tile/shutter-tile.component'; diff --git a/src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.html b/src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.html similarity index 100% rename from src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.html rename to src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.html diff --git a/src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.less b/src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.less similarity index 100% rename from src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.less rename to src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.less diff --git a/src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.ts b/src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.ts similarity index 89% rename from src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.ts rename to src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.ts index d49f3cd..1989de0 100644 --- a/src/main/angular/src/app/shared/shutter-tile/shutter-icon/shutter-icon.component.ts +++ b/src/main/angular/src/app/Shutter/shutter-tile/shutter-icon/shutter-icon.component.ts @@ -1,7 +1,7 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; import {NgIf} from '@angular/common'; -import {isSet, isUnset} from '../../../api/common/validators'; +import {isSet, isUnset} from '../../../api/validators'; @Component({ selector: 'app-shutter-icon', diff --git a/src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.html b/src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.html similarity index 100% rename from src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.html rename to src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.html diff --git a/src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.less b/src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.less similarity index 100% rename from src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.less rename to src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.less diff --git a/src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.ts b/src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.ts similarity index 71% rename from src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.ts rename to src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.ts index 682220b..a538e91 100644 --- a/src/main/angular/src/app/shared/shutter-tile/shutter-tile.component.ts +++ b/src/main/angular/src/app/Shutter/shutter-tile/shutter-tile.component.ts @@ -1,9 +1,9 @@ import {Component, Input} from '@angular/core'; -import {RelativePipe} from "../../api/common/relative.pipe"; -import {Shutter} from "../../api/Shutter/Shutter"; -import {ShutterService} from '../../api/Shutter/shutter.service'; +import {RelativePipe} from "../../api/relative.pipe"; +import {Shutter} from "../Shutter"; +import {ShutterService} from '../shutter.service'; import {ShutterIconComponent} from './shutter-icon/shutter-icon.component'; -import {isUnset} from '../../api/common/validators'; +import {isUnset} from '../../api/validators'; @Component({ selector: 'app-shutter-tile', diff --git a/src/main/angular/src/app/api/Shutter/shutter.service.ts b/src/main/angular/src/app/Shutter/shutter.service.ts similarity index 79% rename from src/main/angular/src/app/api/Shutter/shutter.service.ts rename to src/main/angular/src/app/Shutter/shutter.service.ts index 04999bb..d7e023f 100644 --- a/src/main/angular/src/app/api/Shutter/shutter.service.ts +++ b/src/main/angular/src/app/Shutter/shutter.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; -import {CrudService} from '../common/CrudService'; +import {CrudService} from '../api/CrudService'; import {Shutter} from './Shutter'; -import {ApiService} from '../common/api.service'; -import {Next} from '../common/types'; +import {ApiService} from '../api/api.service'; +import {Next} from '../api/types'; @Injectable({ providedIn: 'root' diff --git a/src/main/angular/src/app/api/State/State.ts b/src/main/angular/src/app/State/State.ts similarity index 84% rename from src/main/angular/src/app/api/State/State.ts rename to src/main/angular/src/app/State/State.ts index 4a343a3..3612c85 100644 --- a/src/main/angular/src/app/api/State/State.ts +++ b/src/main/angular/src/app/State/State.ts @@ -1,4 +1,4 @@ -import {validateDate, validateString} from "../common/validators"; +import {validateDate, validateString} from "../api/validators"; export class State { diff --git a/src/main/angular/src/app/api/Tag/Tag.ts b/src/main/angular/src/app/Tag/Tag.ts similarity index 82% rename from src/main/angular/src/app/api/Tag/Tag.ts rename to src/main/angular/src/app/Tag/Tag.ts index bdbf978..9635b39 100644 --- a/src/main/angular/src/app/api/Tag/Tag.ts +++ b/src/main/angular/src/app/Tag/Tag.ts @@ -1,4 +1,4 @@ -import {validateString} from '../common/validators'; +import {validateString} from '../api/validators'; export class Tag { diff --git a/src/main/angular/src/app/api/Tag/tag.service.ts b/src/main/angular/src/app/Tag/tag.service.ts similarity index 72% rename from src/main/angular/src/app/api/Tag/tag.service.ts rename to src/main/angular/src/app/Tag/tag.service.ts index 388262e..53ff8fe 100644 --- a/src/main/angular/src/app/api/Tag/tag.service.ts +++ b/src/main/angular/src/app/Tag/tag.service.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; -import {ApiService} from '../common/api.service'; -import {CrudService} from '../common/CrudService'; +import {ApiService} from '../api/api.service'; +import {CrudService} from '../api/CrudService'; import {Tag} from './Tag'; @Injectable({ diff --git a/src/main/angular/src/app/api/Taggable/Taggable.ts b/src/main/angular/src/app/Taggable/Taggable.ts similarity index 89% rename from src/main/angular/src/app/api/Taggable/Taggable.ts rename to src/main/angular/src/app/Taggable/Taggable.ts index 5d78dd4..e1997a6 100644 --- a/src/main/angular/src/app/api/Taggable/Taggable.ts +++ b/src/main/angular/src/app/Taggable/Taggable.ts @@ -1,7 +1,7 @@ import {Device} from "../Device/Device"; import {Shutter} from "../Shutter/Shutter"; import {Tunable} from "../Tunable/Tunable"; -import {validateAndRemoveDtoSuffix} from "../common/validators"; +import {validateAndRemoveDtoSuffix} from "../api/validators"; export type Taggable = Device | Shutter | Tunable; diff --git a/src/main/angular/src/app/api/Taggable/TaggableFilter.ts b/src/main/angular/src/app/Taggable/TaggableFilter.ts similarity index 100% rename from src/main/angular/src/app/api/Taggable/TaggableFilter.ts rename to src/main/angular/src/app/Taggable/TaggableFilter.ts diff --git a/src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.html b/src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.html similarity index 100% rename from src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.html rename to src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.html diff --git a/src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.less b/src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.less similarity index 100% rename from src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.less rename to src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.less diff --git a/src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.ts b/src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.ts similarity index 82% rename from src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.ts rename to src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.ts index 3d7a513..77c3943 100644 --- a/src/main/angular/src/app/pages/taggable-list-page/taggable-list-page.component.ts +++ b/src/main/angular/src/app/Taggable/taggable-list-page/taggable-list-page.component.ts @@ -1,12 +1,12 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; -import {TaggableListComponent} from '../../shared/taggable-list/taggable-list.component'; -import {Taggable} from '../../api/Taggable/Taggable'; -import {TaggableService} from '../../api/Taggable/taggable.service'; +import {TaggableListComponent} from '../taggable-list/taggable-list.component'; +import {Taggable} from '../Taggable'; +import {TaggableService} from '../taggable.service'; import {FormsModule} from '@angular/forms'; import {Subscription} from 'rxjs'; -import {TaggableFilter} from '../../api/Taggable/TaggableFilter'; +import {TaggableFilter} from '../TaggableFilter'; import {ActivatedRoute} from '@angular/router'; -import {CrudLiveList} from '../../api/common/CrudLiveList'; +import {CrudLiveList} from '../../api/CrudLiveList'; import {SearchComponent} from '../../shared/search/search.component'; @Component({ diff --git a/src/main/angular/src/app/shared/taggable-list/taggable-list.component.html b/src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.html similarity index 100% rename from src/main/angular/src/app/shared/taggable-list/taggable-list.component.html rename to src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.html diff --git a/src/main/angular/src/app/shared/taggable-list/taggable-list.component.less b/src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.less similarity index 100% rename from src/main/angular/src/app/shared/taggable-list/taggable-list.component.less rename to src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.less diff --git a/src/main/angular/src/app/shared/taggable-list/taggable-list.component.ts b/src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.ts similarity index 94% rename from src/main/angular/src/app/shared/taggable-list/taggable-list.component.ts rename to src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.ts index 283d15f..fd95c7f 100644 --- a/src/main/angular/src/app/shared/taggable-list/taggable-list.component.ts +++ b/src/main/angular/src/app/Taggable/taggable-list/taggable-list.component.ts @@ -2,7 +2,7 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {NgForOf} from '@angular/common'; import {Subscription, timer} from 'rxjs'; import {TaggableTileComponent} from '../taggable-tile/taggable-tile.component'; -import {Taggable} from '../../api/Taggable/Taggable'; +import {Taggable} from '../Taggable'; @Component({ selector: 'app-taggable-list', diff --git a/src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.html b/src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.html similarity index 100% rename from src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.html rename to src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.html diff --git a/src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.less b/src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.less similarity index 100% rename from src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.less rename to src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.less diff --git a/src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.ts b/src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.ts similarity index 66% rename from src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.ts rename to src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.ts index 43e4d0d..b4174e8 100644 --- a/src/main/angular/src/app/shared/taggable-tile/taggable-tile.component.ts +++ b/src/main/angular/src/app/Taggable/taggable-tile/taggable-tile.component.ts @@ -1,12 +1,12 @@ import {Component, Input} from '@angular/core'; -import {Device} from '../../api/Device/Device'; -import {Tunable} from '../../api/Tunable/Tunable'; -import {Shutter} from '../../api/Shutter/Shutter'; -import {DeviceTileComponent} from '../device-tile/device-tile.component'; +import {Device} from '../../Device/Device'; +import {Tunable} from '../../Tunable/Tunable'; +import {Shutter} from '../../Shutter/Shutter'; +import {DeviceTileComponent} from '../../Device/device-tile/device-tile.component'; import {NgIf} from '@angular/common'; -import {ShutterTileComponent} from '../shutter-tile/shutter-tile.component'; -import {TunableTileComponent} from '../tunable-tile/tunable-tile.component'; -import {Taggable} from '../../api/Taggable/Taggable'; +import {ShutterTileComponent} from '../../Shutter/shutter-tile/shutter-tile.component'; +import {TunableTileComponent} from '../../Tunable/tunable-tile/tunable-tile.component'; +import {Taggable} from '../Taggable'; @Component({ selector: 'app-taggable-tile', diff --git a/src/main/angular/src/app/api/Taggable/taggable.service.ts b/src/main/angular/src/app/Taggable/taggable.service.ts similarity index 88% rename from src/main/angular/src/app/api/Taggable/taggable.service.ts rename to src/main/angular/src/app/Taggable/taggable.service.ts index 316057f..979f9e8 100644 --- a/src/main/angular/src/app/api/Taggable/taggable.service.ts +++ b/src/main/angular/src/app/Taggable/taggable.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; -import {ApiService} from '../common/api.service'; -import {CrudService} from '../common/CrudService'; +import {ApiService} from '../api/api.service'; +import {CrudService} from '../api/CrudService'; import {Taggable, taggableFromJson} from './Taggable'; -import {Next} from '../common/types'; +import {Next} from '../api/types'; import {Subject, Subscription} from 'rxjs'; import {DeviceService} from '../Device/device.service'; import {ShutterService} from '../Shutter/shutter.service'; diff --git a/src/main/angular/src/app/api/Tunable/Tunable.ts b/src/main/angular/src/app/Tunable/Tunable.ts similarity index 96% rename from src/main/angular/src/app/api/Tunable/Tunable.ts rename to src/main/angular/src/app/Tunable/Tunable.ts index d504b37..9f03dc3 100644 --- a/src/main/angular/src/app/api/Tunable/Tunable.ts +++ b/src/main/angular/src/app/Tunable/Tunable.ts @@ -1,5 +1,5 @@ import {Property} from "../Property/Property"; -import {orNull, validateString} from "../common/validators"; +import {orNull, validateString} from "../api/validators"; import {Area} from '../Area/Area'; export class Tunable { diff --git a/src/main/angular/src/app/api/Tunable/TunableFilter.ts b/src/main/angular/src/app/Tunable/TunableFilter.ts similarity index 100% rename from src/main/angular/src/app/api/Tunable/TunableFilter.ts rename to src/main/angular/src/app/Tunable/TunableFilter.ts diff --git a/src/main/angular/src/app/shared/tunable-list/tunable-list.component.html b/src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.html similarity index 100% rename from src/main/angular/src/app/shared/tunable-list/tunable-list.component.html rename to src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.html diff --git a/src/main/angular/src/app/shared/tunable-list/tunable-list.component.less b/src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.less similarity index 100% rename from src/main/angular/src/app/shared/tunable-list/tunable-list.component.less rename to src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.less diff --git a/src/main/angular/src/app/shared/tunable-list/tunable-list.component.ts b/src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.ts similarity index 95% rename from src/main/angular/src/app/shared/tunable-list/tunable-list.component.ts rename to src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.ts index b4bfe31..093a521 100644 --- a/src/main/angular/src/app/shared/tunable-list/tunable-list.component.ts +++ b/src/main/angular/src/app/Tunable/tunable-list/tunable-list.component.ts @@ -1,6 +1,6 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {NgForOf} from '@angular/common'; -import {Tunable} from '../../api/Tunable/Tunable'; +import {Tunable} from '../Tunable'; import {Subscription, timer} from 'rxjs'; import {FormsModule} from '@angular/forms'; import {TunableTileComponent} from '../tunable-tile/tunable-tile.component'; diff --git a/src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.html b/src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.html similarity index 100% rename from src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.html rename to src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.html diff --git a/src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.less b/src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.less similarity index 100% rename from src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.less rename to src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.less diff --git a/src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.ts b/src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.ts similarity index 82% rename from src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.ts rename to src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.ts index 4055d2f..4499807 100644 --- a/src/main/angular/src/app/shared/tunable-tile/tunable-tile.component.ts +++ b/src/main/angular/src/app/Tunable/tunable-tile/tunable-tile.component.ts @@ -1,9 +1,9 @@ import {Component, Input} from '@angular/core'; import {NgClass, NgIf} from "@angular/common"; import {FormsModule, ReactiveFormsModule} from "@angular/forms"; -import {RelativePipe} from "../../api/common/relative.pipe"; -import {Tunable} from "../../api/Tunable/Tunable"; -import {TunableService} from '../../api/Tunable/tunable.service'; +import {RelativePipe} from "../../api/relative.pipe"; +import {Tunable} from "../Tunable"; +import {TunableService} from '../tunable.service'; @Component({ selector: 'app-tunable-tile', diff --git a/src/main/angular/src/app/api/Tunable/tunable.service.ts b/src/main/angular/src/app/Tunable/tunable.service.ts similarity index 85% rename from src/main/angular/src/app/api/Tunable/tunable.service.ts rename to src/main/angular/src/app/Tunable/tunable.service.ts index 8b903a2..8f24eed 100644 --- a/src/main/angular/src/app/api/Tunable/tunable.service.ts +++ b/src/main/angular/src/app/Tunable/tunable.service.ts @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; -import {CrudService} from '../common/CrudService'; +import {CrudService} from '../api/CrudService'; import {Tunable} from './Tunable'; -import {ApiService} from '../common/api.service'; -import {Next} from '../common/types'; +import {ApiService} from '../api/api.service'; +import {Next} from '../api/types'; @Injectable({ providedIn: 'root' diff --git a/src/main/angular/src/app/api/common/CrudDirection.ts b/src/main/angular/src/app/api/CrudDirection.ts similarity index 100% rename from src/main/angular/src/app/api/common/CrudDirection.ts rename to src/main/angular/src/app/api/CrudDirection.ts diff --git a/src/main/angular/src/app/api/common/CrudLiveList.ts b/src/main/angular/src/app/api/CrudLiveList.ts similarity index 100% rename from src/main/angular/src/app/api/common/CrudLiveList.ts rename to src/main/angular/src/app/api/CrudLiveList.ts diff --git a/src/main/angular/src/app/api/common/CrudService.ts b/src/main/angular/src/app/api/CrudService.ts similarity index 100% rename from src/main/angular/src/app/api/common/CrudService.ts rename to src/main/angular/src/app/api/CrudService.ts diff --git a/src/main/angular/src/app/api/common/Order.ts b/src/main/angular/src/app/api/Order.ts similarity index 100% rename from src/main/angular/src/app/api/common/Order.ts rename to src/main/angular/src/app/api/Order.ts diff --git a/src/main/angular/src/app/api/common/Page.ts b/src/main/angular/src/app/api/Page.ts similarity index 100% rename from src/main/angular/src/app/api/common/Page.ts rename to src/main/angular/src/app/api/Page.ts diff --git a/src/main/angular/src/app/api/common/Sort.ts b/src/main/angular/src/app/api/Sort.ts similarity index 100% rename from src/main/angular/src/app/api/common/Sort.ts rename to src/main/angular/src/app/api/Sort.ts diff --git a/src/main/angular/src/app/api/common/api.service.ts b/src/main/angular/src/app/api/api.service.ts similarity index 100% rename from src/main/angular/src/app/api/common/api.service.ts rename to src/main/angular/src/app/api/api.service.ts diff --git a/src/main/angular/src/app/api/common/relative.pipe.ts b/src/main/angular/src/app/api/relative.pipe.ts similarity index 100% rename from src/main/angular/src/app/api/common/relative.pipe.ts rename to src/main/angular/src/app/api/relative.pipe.ts diff --git a/src/main/angular/src/app/api/common/types.ts b/src/main/angular/src/app/api/types.ts similarity index 82% rename from src/main/angular/src/app/api/common/types.ts rename to src/main/angular/src/app/api/types.ts index f940ccb..8ade916 100644 --- a/src/main/angular/src/app/api/common/types.ts +++ b/src/main/angular/src/app/api/types.ts @@ -1,4 +1,4 @@ -import {environment} from "../../../environments/environment"; +import {environment} from "../../environments/environment"; export type FromJson = (json: any) => T; diff --git a/src/main/angular/src/app/api/common/validators.ts b/src/main/angular/src/app/api/validators.ts similarity index 100% rename from src/main/angular/src/app/api/common/validators.ts rename to src/main/angular/src/app/api/validators.ts diff --git a/src/main/angular/src/app/api/common/ws.ts b/src/main/angular/src/app/api/ws.ts similarity index 100% rename from src/main/angular/src/app/api/common/ws.ts rename to src/main/angular/src/app/api/ws.ts diff --git a/src/main/angular/src/app/app.component.ts b/src/main/angular/src/app/app.component.ts index 0f71672..f553106 100644 --- a/src/main/angular/src/app/app.component.ts +++ b/src/main/angular/src/app/app.component.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router'; -import {ApiService} from './api/common/api.service'; +import {ApiService} from './api/api.service'; import {NgIf} from '@angular/common'; @Component({ diff --git a/src/main/angular/src/app/app.config.ts b/src/main/angular/src/app/app.config.ts index 8fe04f5..c9b462a 100644 --- a/src/main/angular/src/app/app.config.ts +++ b/src/main/angular/src/app/app.config.ts @@ -7,7 +7,7 @@ import {registerLocaleData} from '@angular/common'; import localeDe from '@angular/common/locales/de'; import localeDeExtra from '@angular/common/locales/extra/de'; -import {stompServiceFactory} from './api/common/ws'; +import {stompServiceFactory} from './api/ws'; import {StompService} from '@stomp/ng2-stompjs'; registerLocaleData(localeDe, 'de-DE', localeDeExtra); diff --git a/src/main/angular/src/app/app.routes.ts b/src/main/angular/src/app/app.routes.ts index 2a18082..b270178 100644 --- a/src/main/angular/src/app/app.routes.ts +++ b/src/main/angular/src/app/app.routes.ts @@ -1,7 +1,7 @@ import {Routes} from '@angular/router'; -import {KnxGroupListPageComponent} from './pages/knx-group-list-page/knx-group-list-page.component'; -import {DashboardComponent} from './pages/dashboard/dashboard.component'; -import {TaggableListPageComponent} from './pages/taggable-list-page/taggable-list-page.component'; +import {KnxGroupListPageComponent} from './Group/knx-group-list-page/knx-group-list-page.component'; +import {DashboardComponent} from './dashboard/dashboard.component'; +import {TaggableListPageComponent} from './Taggable/taggable-list-page/taggable-list-page.component'; export const routes: Routes = [ {path: 'Dashboard', component: DashboardComponent}, diff --git a/src/main/angular/src/app/pages/dashboard/dashboard.component.html b/src/main/angular/src/app/dashboard/dashboard.component.html similarity index 100% rename from src/main/angular/src/app/pages/dashboard/dashboard.component.html rename to src/main/angular/src/app/dashboard/dashboard.component.html diff --git a/src/main/angular/src/app/pages/dashboard/dashboard.component.less b/src/main/angular/src/app/dashboard/dashboard.component.less similarity index 85% rename from src/main/angular/src/app/pages/dashboard/dashboard.component.less rename to src/main/angular/src/app/dashboard/dashboard.component.less index 1f4b210..52c9977 100644 --- a/src/main/angular/src/app/pages/dashboard/dashboard.component.less +++ b/src/main/angular/src/app/dashboard/dashboard.component.less @@ -1,4 +1,4 @@ -@import "../../../config"; +@import "../../config"; .subheading { font-size: 65%; diff --git a/src/main/angular/src/app/pages/dashboard/dashboard.component.ts b/src/main/angular/src/app/dashboard/dashboard.component.ts similarity index 75% rename from src/main/angular/src/app/pages/dashboard/dashboard.component.ts rename to src/main/angular/src/app/dashboard/dashboard.component.ts index 670bbbe..21a314e 100644 --- a/src/main/angular/src/app/pages/dashboard/dashboard.component.ts +++ b/src/main/angular/src/app/dashboard/dashboard.component.ts @@ -1,15 +1,15 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; -import {DeviceService} from '../../api/Device/device.service'; -import {TunableService} from '../../api/Tunable/tunable.service'; -import {Device} from '../../api/Device/Device'; -import {Tunable} from '../../api/Tunable/Tunable'; -import {Shutter} from '../../api/Shutter/Shutter'; -import {ShutterService} from '../../api/Shutter/shutter.service'; -import {DeviceListComponent} from '../../shared/device-list/device-list.component'; +import {DeviceService} from '../Device/device.service'; +import {TunableService} from '../Tunable/tunable.service'; +import {Device} from '../Device/Device'; +import {Tunable} from '../Tunable/Tunable'; +import {Shutter} from '../Shutter/Shutter'; +import {ShutterService} from '../Shutter/shutter.service'; +import {DeviceListComponent} from '../Device/device-list/device-list.component'; import {FormsModule} from '@angular/forms'; -import {CrudLiveList} from '../../api/common/CrudLiveList'; -import {TunableListComponent} from '../../shared/tunable-list/tunable-list.component'; -import {ShutterListComponent} from '../../shared/shutter-list/shutter-list.component'; +import {CrudLiveList} from '../api/CrudLiveList'; +import {TunableListComponent} from '../Tunable/tunable-list/tunable-list.component'; +import {ShutterListComponent} from '../Shutter/shutter-list/shutter-list.component'; import {Subscription, timer} from 'rxjs'; import {NgIf} from '@angular/common';