UI: package restructure

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 {
 

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 {

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';
 

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 {RelativePipe} from "../../api/relative.pipe";
-import {Device} from "../../api/Device/Device";
+import {Device} from "../Device";
-import {DeviceService} from '../../api/Device/device.service';
+import {DeviceService} from '../device.service';
 import {NgClass} from '@angular/common';
 
 @Component({

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 {ApiService} from '../api/api.service';
-import {Next} from '../common/types';
+import {Next} from '../api/types';
 
 @Injectable({
   providedIn: 'root'

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 {

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 {ApiService} from '../api/api.service';
-import {Next} from '../common/types';
+import {Next} from '../api/types';
 
 @Injectable({
   providedIn: 'root'

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 {KnxGroupListComponent} from '../knx-group-list/knx-group-list.component';
-import {Group} from '../../api/Group/Group';
+import {Group} from '../Group';
-import {GroupService} from '../../api/Group/group.service';
+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({

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';
 

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 {RelativePipe} from '../../api/relative.pipe';
-import {Group} from '../../api/Group/Group';
+import {Group} from '../Group';
 
 @Component({
   selector: 'app-knx-group-tile',

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 {
 

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';
 

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';
 

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',

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 {RelativePipe} from "../../api/relative.pipe";
-import {Shutter} from "../../api/Shutter/Shutter";
+import {Shutter} from "../Shutter";
-import {ShutterService} from '../../api/Shutter/shutter.service';
+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',

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 {ApiService} from '../api/api.service';
-import {Next} from '../common/types';
+import {Next} from '../api/types';
 
 @Injectable({
   providedIn: 'root'

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 {
 

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 {
 

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 {ApiService} from '../api/api.service';
-import {CrudService} from '../common/CrudService';
+import {CrudService} from '../api/CrudService';
 import {Tag} from './Tag';
 
 @Injectable({

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;
 

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 {TaggableListComponent} from '../taggable-list/taggable-list.component';
-import {Taggable} from '../../api/Taggable/Taggable';
+import {Taggable} from '../Taggable';
-import {TaggableService} from '../../api/Taggable/taggable.service';
+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({

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',

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 {Device} from '../../Device/Device';
-import {Tunable} from '../../api/Tunable/Tunable';
+import {Tunable} from '../../Tunable/Tunable';
-import {Shutter} from '../../api/Shutter/Shutter';
+import {Shutter} from '../../Shutter/Shutter';
-import {DeviceTileComponent} from '../device-tile/device-tile.component';
+import {DeviceTileComponent} from '../../Device/device-tile/device-tile.component';
 import {NgIf} from '@angular/common';
-import {ShutterTileComponent} from '../shutter-tile/shutter-tile.component';
+import {ShutterTileComponent} from '../../Shutter/shutter-tile/shutter-tile.component';
-import {TunableTileComponent} from '../tunable-tile/tunable-tile.component';
+import {TunableTileComponent} from '../../Tunable/tunable-tile/tunable-tile.component';
-import {Taggable} from '../../api/Taggable/Taggable';
+import {Taggable} from '../Taggable';
 
 @Component({
   selector: 'app-taggable-tile',

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 {ApiService} from '../api/api.service';
-import {CrudService} from '../common/CrudService';
+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';

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 {

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';

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 {RelativePipe} from "../../api/relative.pipe";
-import {Tunable} from "../../api/Tunable/Tunable";
+import {Tunable} from "../Tunable";
-import {TunableService} from '../../api/Tunable/tunable.service';
+import {TunableService} from '../tunable.service';
 
 @Component({
   selector: 'app-tunable-tile',

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 {ApiService} from '../api/api.service';
-import {Next} from '../common/types';
+import {Next} from '../api/types';
 
 @Injectable({
   providedIn: 'root'

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<T> = (json: any) => T;
 

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({

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);

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 {KnxGroupListPageComponent} from './Group/knx-group-list-page/knx-group-list-page.component';
-import {DashboardComponent} from './pages/dashboard/dashboard.component';
+import {DashboardComponent} from './dashboard/dashboard.component';
-import {TaggableListPageComponent} from './pages/taggable-list-page/taggable-list-page.component';
+import {TaggableListPageComponent} from './Taggable/taggable-list-page/taggable-list-page.component';
 
 export const routes: Routes = [
   {path: 'Dashboard', component: DashboardComponent},

src/main/angular/src/app/dashboard/dashboard.component.less

@@ -1,4 +1,4 @@
-@import "../../../config";
+@import "../../config";
 
 .subheading {
   font-size: 65%;

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 {DeviceService} from '../Device/device.service';
-import {TunableService} from '../../api/Tunable/tunable.service';
+import {TunableService} from '../Tunable/tunable.service';
-import {Device} from '../../api/Device/Device';
+import {Device} from '../Device/Device';
-import {Tunable} from '../../api/Tunable/Tunable';
+import {Tunable} from '../Tunable/Tunable';
-import {Shutter} from '../../api/Shutter/Shutter';
+import {Shutter} from '../Shutter/Shutter';
-import {ShutterService} from '../../api/Shutter/shutter.service';
+import {ShutterService} from '../Shutter/shutter.service';
-import {DeviceListComponent} from '../../shared/device-list/device-list.component';
+import {DeviceListComponent} from '../Device/device-list/device-list.component';
 import {FormsModule} from '@angular/forms';
-import {CrudLiveList} from '../../api/common/CrudLiveList';
+import {CrudLiveList} from '../api/CrudLiveList';
-import {TunableListComponent} from '../../shared/tunable-list/tunable-list.component';
+import {TunableListComponent} from '../Tunable/tunable-list/tunable-list.component';
-import {ShutterListComponent} from '../../shared/shutter-list/shutter-list.component';
+import {ShutterListComponent} from '../Shutter/shutter-list/shutter-list.component';
 import {Subscription, timer} from 'rxjs';
 import {NgIf} from '@angular/common';