Introduce components directories

src/app/app-routing.module.ts

@@ -3,12 +3,12 @@ import { environment } from "../environments/environment";
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { ProjectMapComponent } from './project-map/project-map.component';
+import { ProjectMapComponent } from './components/project-map/project-map.component';
-import { ServersComponent } from "./servers/servers.component";
+import { ServersComponent } from "./components/servers/servers.component";
-import { ProjectsComponent } from "./projects/projects.component";
+import { ProjectsComponent } from "./components/projects/projects.component";
 import { DefaultLayoutComponent } from "./layouts/default-layout/default-layout.component";
-import { SettingsComponent } from "./settings/settings.component";
+import { SettingsComponent } from "./components/settings/settings.component";
-import { LocalServerComponent } from "./local-server/local-server.component";
+import { LocalServerComponent } from "./components/local-server/local-server.component";
 
 
 const routes: Routes = [

src/app/app.module.ts

@@ -47,19 +47,19 @@ import { NodeService } from "./services/node.service";
 import { ApplianceService } from "./services/appliance.service";
 import { LinkService } from "./services/link.service";
 
-import { ProjectsComponent } from './projects/projects.component';
+import { ProjectsComponent } from './components/projects/projects.component';
 import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component';
 import { ProgressDialogComponent } from './common/progress-dialog/progress-dialog.component';
 import { AppComponent } from './app.component';
 
-import { CreateSnapshotDialogComponent, ProjectMapComponent } from './project-map/project-map.component';
+import { CreateSnapshotDialogComponent, ProjectMapComponent } from './components/project-map/project-map.component';
-import { ServersComponent, AddServerDialogComponent } from './servers/servers.component';
+import { ServersComponent, AddServerDialogComponent } from './components/servers/servers.component';
-import { NodeContextMenuComponent } from './project-map/node-context-menu/node-context-menu.component';
+import { NodeContextMenuComponent } from './components/project-map/node-context-menu/node-context-menu.component';
-import { StartNodeActionComponent } from './project-map/node-context-menu/actions/start-node-action/start-node-action.component';
+import { StartNodeActionComponent } from './components/project-map/node-context-menu/actions/start-node-action/start-node-action.component';
-import { StopNodeActionComponent } from './project-map/node-context-menu/actions/stop-node-action/stop-node-action.component';
+import { StopNodeActionComponent } from './components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component';
-import { ApplianceComponent } from './appliance/appliance.component';
+import { ApplianceComponent } from './components/appliance/appliance.component';
-import { ApplianceListDialogComponent } from './appliance/appliance-list-dialog/appliance-list-dialog.component';
+import { ApplianceListDialogComponent } from './components/appliance/appliance-list-dialog/appliance-list-dialog.component';
-import { NodeSelectInterfaceComponent } from './project-map/node-select-interface/node-select-interface.component';
+import { NodeSelectInterfaceComponent } from './components/project-map/node-select-interface/node-select-interface.component';
 import { CartographyModule } from './cartography/cartography.module';
 import { ToasterService } from './services/toaster.service';
 import { ProjectWebServiceHandler } from "./handlers/project-web-service-handler";
@@ -67,16 +67,16 @@ import { LinksDataSource } from "./cartography/datasources/links-datasource";
 import { NodesDataSource } from "./cartography/datasources/nodes-datasource";
 import { SymbolsDataSource } from "./cartography/datasources/symbols-datasource";
 import { SelectionManager } from "./cartography/managers/selection-manager";
-import { InRectangleHelper } from "./cartography/map/helpers/in-rectangle-helper";
+import { InRectangleHelper } from "./cartography/components/map/helpers/in-rectangle-helper";
 import { DrawingsDataSource } from "./cartography/datasources/drawings-datasource";
-import { MoveLayerDownActionComponent } from './project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component';
+import { MoveLayerDownActionComponent } from './components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component';
-import { MoveLayerUpActionComponent } from './project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component';
+import { MoveLayerUpActionComponent } from './components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component';
-import { ProjectMapShortcutsComponent } from './project-map/project-map-shortcuts/project-map-shortcuts.component';
+import { ProjectMapShortcutsComponent } from './components/project-map/project-map-shortcuts/project-map-shortcuts.component';
-import { SettingsComponent } from './settings/settings.component';
+import { SettingsComponent } from './components/settings/settings.component';
 import { SettingsService } from "./services/settings.service";
 
 import { RavenErrorHandler } from "./raven-error-handler";
-import { LocalServerComponent } from './local-server/local-server.component';
+import { LocalServerComponent } from './components/local-server/local-server.component';
 import { ProgressComponent } from './common/progress/progress.component';
 import { ProgressService } from "./common/progress/progress.service";
 

src/app/cartography/cartography.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MapComponent } from './map/map.component';
+import { MapComponent } from './components/map/map.component';
 
 @NgModule({
   imports: [

src/app/cartography/components/map/helpers/in-rectangle-helper.spec.ts

@@ -1,5 +1,5 @@
 import { InRectangleHelper } from "./in-rectangle-helper";
-import { Rectangle } from "../../models/rectangle";
+import { Rectangle } from "../../../models/rectangle";
 
 
 

src/app/cartography/components/map/helpers/in-rectangle-helper.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 
-import { Selectable } from "../../managers/selection-manager";
+import { Selectable } from "../../../managers/selection-manager";
-import { Rectangle } from "../../models/rectangle";
+import { Rectangle } from "../../../models/rectangle";
 
 
 @Injectable()

src/app/cartography/components/map/helpers/multi-link-calculator-helper.ts

@@ -1,4 +1,4 @@
-import {Link} from "../../models/link";
+import {Link} from "../../../models/link";
 
 export class MultiLinkCalculatorHelper {
   LINK_WIDTH = 2;

src/app/cartography/components/map/map.component.ts

@@ -4,13 +4,13 @@ import {
 import { D3, D3Service } from 'd3-ng2-service';
 import {select, Selection} from 'd3-selection';
 
-import { Node } from "../models/node";
+import { Node } from "../../models/node";
-import { Link } from "../models/link";
+import { Link } from "../../models/link";
-import { GraphLayout } from "../widgets/graph-layout";
+import { GraphLayout } from "../../widgets/graph-layout";
-import { Context } from "../models/context";
+import { Context } from "../../models/context";
-import { Size } from "../models/size";
+import { Size } from "../../models/size";
-import { Drawing } from "../models/drawing";
+import { Drawing } from "../../models/drawing";
-import {Symbol} from "../models/symbol";
+import {Symbol} from "../../models/symbol";
 
 
 @Component({

src/app/cartography/managers/selection-manager.spec.ts

@@ -7,7 +7,7 @@ import { Rectangle } from "../models/rectangle";
 import { SelectionManager } from "./selection-manager";
 import { NodesDataSource } from "../datasources/nodes-datasource";
 import { LinksDataSource } from "../datasources/links-datasource";
-import { InRectangleHelper } from "../map/helpers/in-rectangle-helper";
+import { InRectangleHelper } from "../components/map/helpers/in-rectangle-helper";
 import { DrawingsDataSource } from "../datasources/drawings-datasource";
 
 

src/app/cartography/managers/selection-manager.ts

@@ -6,7 +6,7 @@ import { Subscription } from "rxjs/Subscription";
 import { NodesDataSource } from "../datasources/nodes-datasource";
 import { LinksDataSource } from "../datasources/links-datasource";
 import { Node } from "../models/node";
-import { InRectangleHelper } from "../map/helpers/in-rectangle-helper";
+import { InRectangleHelper } from "../components/map/helpers/in-rectangle-helper";
 import { Rectangle } from "../models/rectangle";
 import { Link} from "../models/link";
 import { DataSource } from "../datasources/datasource";

src/app/cartography/widgets/links.ts

@@ -4,7 +4,7 @@ import { Widget } from "./widget";
 import { SVGSelection } from "../models/types";
 import { Link } from "../models/link";
 import { LinkStatus } from "../models/link-status";
-import { MultiLinkCalculatorHelper } from "../map/helpers/multi-link-calculator-helper";
+import { MultiLinkCalculatorHelper } from "../components/map/helpers/multi-link-calculator-helper";
 import { SerialLinkWidget } from "./serial-link";
 import { EthernetLinkWidget } from "./ethernet-link";
 import { Layer } from "../models/layer";

src/app/components/appliance/appliance.component.ts

@@ -2,8 +2,8 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {MatDialog} from "@angular/material";
 import {ApplianceListDialogComponent} from "./appliance-list-dialog/appliance-list-dialog.component";
 
-import {Server} from "../models/server";
+import {Server} from "../../models/server";
-import {Appliance} from "../models/appliance";
+import {Appliance} from "../../models/appliance";
 
 @Component({
   selector: 'app-appliance',

src/app/components/local-server/local-server.component.spec.ts

@@ -4,8 +4,8 @@ import { LocalServerComponent } from './local-server.component';
 import { Location } from "@angular/common";
 import { RouterTestingModule } from "@angular/router/testing";
 import { Router } from "@angular/router";
-import { ServerService } from "../services/server.service";
+import { ServerService } from "../../services/server.service";
-import { MockedServerService } from "../services/server.service.spec";
+import { MockedServerService } from "../../services/server.service.spec";
 
 
 class MockedLocation {

src/app/components/local-server/local-server.component.ts

@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { Location } from "@angular/common";
 import { Router } from "@angular/router";
 
-import { ServerService } from "../services/server.service";
+import { ServerService } from "../../services/server.service";
-import { Server } from "../models/server";
+import { Server } from "../../models/server";
 
 
 @Component({

src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { Server } from '../../../../models/server';
+import { Server } from '../../../../../models/server';
-import { Node } from '../../../../cartography/models/node';
+import { Node } from '../../../../../cartography/models/node';
-import { NodesDataSource } from '../../../../cartography/datasources/nodes-datasource';
+import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
-import { NodeService } from '../../../../services/node.service';
+import { NodeService } from '../../../../../services/node.service';
 
 @Component({
   selector: 'app-move-layer-down-action',

src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { Server } from '../../../../models/server';
+import { Server } from '../../../../../models/server';
-import { Node } from '../../../../cartography/models/node';
+import { Node } from '../../../../../cartography/models/node';
-import { NodesDataSource } from '../../../../cartography/datasources/nodes-datasource';
+import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
-import { NodeService } from '../../../../services/node.service';
+import { NodeService } from '../../../../../services/node.service';
 
 @Component({
   selector: 'app-move-layer-up-action',

src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts

@@ -1,7 +1,7 @@
 import {Component, Input, OnInit} from '@angular/core';
-import {Server} from "../../../../models/server";
+import {Server} from "../../../../../models/server";
-import {NodeService} from "../../../../services/node.service";
+import {NodeService} from "../../../../../services/node.service";
-import {Node} from "../../../../cartography/models/node";
+import {Node} from "../../../../../cartography/models/node";
 
 
 @Component({

src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts

@@ -1,7 +1,7 @@
 import {Component, Input, OnInit} from '@angular/core';
-import {Server} from "../../../../models/server";
+import {Server} from "../../../../../models/server";
-import {NodeService} from "../../../../services/node.service";
+import {NodeService} from "../../../../../services/node.service";
-import {Node} from "../../../../cartography/models/node";
+import {Node} from "../../../../../cartography/models/node";
 
 
 @Component({

src/app/components/project-map/node-context-menu/node-context-menu.component.ts

@@ -1,10 +1,10 @@
 import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
 import { MatMenuTrigger } from "@angular/material";
 import { DomSanitizer } from "@angular/platform-browser";
-import { Node } from "../../cartography/models/node";
+import { Node } from "../../../cartography/models/node";
-import { Server } from "../../models/server";
+import { Server } from "../../../models/server";
-import { Project } from "../../models/project";
+import { Project } from "../../../models/project";
-import { ProjectService } from "../../services/project.service";
+import { ProjectService } from "../../../services/project.service";
 
 
 @Component({

src/app/components/project-map/node-select-interface/node-select-interface.component.ts

@@ -1,8 +1,8 @@
 import {ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
 import {MatMenuTrigger} from "@angular/material";
 import {DomSanitizer} from "@angular/platform-browser";
-import {Node} from "../../cartography/models/node";
+import {Node} from "../../../cartography/models/node";
-import {Port} from "../../models/port";
+import {Port} from "../../../models/port";
 
 
 @Component({

src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts

@@ -7,17 +7,17 @@ import { HotkeyModule, HotkeysService, Hotkey } from "angular2-hotkeys";
 import { Observable } from "rxjs";
 
 import { ProjectMapShortcutsComponent } from './project-map-shortcuts.component';
-import { ToasterService, } from "../../services/toaster.service";
+import { ToasterService, } from "../../../services/toaster.service";
-import { NodeService } from "../../services/node.service";
+import { NodeService } from "../../../services/node.service";
-import { HttpServer } from "../../services/http-server.service";
+import { HttpServer } from "../../../services/http-server.service";
-import { SelectionManager } from "../../cartography/managers/selection-manager";
+import { SelectionManager } from "../../../cartography/managers/selection-manager";
-import { Server } from "../../models/server";
+import { Server } from "../../../models/server";
-import { Node } from "../../cartography/models/node";
+import { Node } from "../../../cartography/models/node";
-import { Project } from "../../models/project";
+import { Project } from "../../../models/project";
-import { ProjectService } from "../../services/project.service";
+import { ProjectService } from "../../../services/project.service";
-import { MockedProjectService } from "../../services/project.service.spec";
+import { MockedProjectService } from "../../../services/project.service.spec";
-import { SettingsService } from "../../services/settings.service";
+import { SettingsService } from "../../../services/settings.service";
-import { MockedToasterService } from "../../services/toaster.service.spec";
+import { MockedToasterService } from "../../../services/toaster.service.spec";
 
 
 describe('ProjectMapShortcutsComponent', () => {

src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.ts

@@ -1,12 +1,12 @@
 import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { HotkeysService, Hotkey } from 'angular2-hotkeys';
 
-import { SelectionManager } from '../../cartography/managers/selection-manager';
+import { SelectionManager } from '../../../cartography/managers/selection-manager';
-import { NodeService } from '../../services/node.service';
+import { NodeService } from '../../../services/node.service';
-import { Server } from '../../models/server';
+import { Server } from '../../../models/server';
-import { ToasterService } from '../../services/toaster.service';
+import { ToasterService } from '../../../services/toaster.service';
-import { Project } from "../../models/project";
+import { Project } from "../../../models/project";
-import { ProjectService } from "../../services/project.service";
+import { ProjectService } from "../../../services/project.service";
 
 
 @Component({

src/app/components/project-map/project-map.component.ts

@@ -11,36 +11,36 @@ import 'rxjs/add/observable/fromPromise';
 import 'rxjs/add/observable/dom/webSocket';
 
 
-import { Project } from '../models/project';
+import { Project } from '../../models/project';
-import { Node } from '../cartography/models/node';
+import { Node } from '../../cartography/models/node';
-import { SymbolService } from '../services/symbol.service';
+import { SymbolService } from '../../services/symbol.service';
-import { Link } from "../cartography/models/link";
+import { Link } from "../../cartography/models/link";
-import { MapComponent } from "../cartography/map/map.component";
+import { MapComponent } from "../../cartography/components/map/map.component";
-import { ServerService } from "../services/server.service";
+import { ServerService } from "../../services/server.service";
-import { ProjectService } from '../services/project.service';
+import { ProjectService } from '../../services/project.service';
-import { Server } from "../models/server";
+import { Server } from "../../models/server";
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material";
-import { SnapshotService } from "../services/snapshot.service";
+import { SnapshotService } from "../../services/snapshot.service";
-import { Snapshot } from "../models/snapshot";
+import { Snapshot } from "../../models/snapshot";
-import { ProgressDialogService } from "../common/progress-dialog/progress-dialog.service";
+import { ProgressDialogService } from "../../common/progress-dialog/progress-dialog.service";
-import { ProgressDialogComponent } from "../common/progress-dialog/progress-dialog.component";
+import { ProgressDialogComponent } from "../../common/progress-dialog/progress-dialog.component";
-import { Drawing } from "../cartography/models/drawing";
+import { Drawing } from "../../cartography/models/drawing";
 import { NodeContextMenuComponent } from "./node-context-menu/node-context-menu.component";
-import { Appliance } from "../models/appliance";
+import { Appliance } from "../../models/appliance";
-import { NodeService } from "../services/node.service";
+import { NodeService } from "../../services/node.service";
-import { Symbol } from "../cartography/models/symbol";
+import { Symbol } from "../../cartography/models/symbol";
 import { NodeSelectInterfaceComponent } from "./node-select-interface/node-select-interface.component";
-import { Port } from "../models/port";
+import { Port } from "../../models/port";
-import { LinkService } from "../services/link.service";
+import { LinkService } from "../../services/link.service";
-import { ToasterService } from '../services/toaster.service';
+import { ToasterService } from '../../services/toaster.service';
-import { NodesDataSource } from "../cartography/datasources/nodes-datasource";
+import { NodesDataSource } from "../../cartography/datasources/nodes-datasource";
-import { LinksDataSource } from "../cartography/datasources/links-datasource";
+import { LinksDataSource } from "../../cartography/datasources/links-datasource";
-import { ProjectWebServiceHandler } from "../handlers/project-web-service-handler";
+import { ProjectWebServiceHandler } from "../../handlers/project-web-service-handler";
-import { SelectionManager } from "../cartography/managers/selection-manager";
+import { SelectionManager } from "../../cartography/managers/selection-manager";
-import { InRectangleHelper } from "../cartography/map/helpers/in-rectangle-helper";
+import { InRectangleHelper } from "../../cartography/components/map/helpers/in-rectangle-helper";
-import { DrawingsDataSource } from "../cartography/datasources/drawings-datasource";
+import { DrawingsDataSource } from "../../cartography/datasources/drawings-datasource";
 import { Subscription } from "rxjs/Subscription";
-import { SettingsService } from "../services/settings.service";
+import { SettingsService } from "../../services/settings.service";
 
 
 @Component({

src/app/components/projects/projects.component.ts

@@ -2,15 +2,15 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 import { MatSort, MatSortable } from "@angular/material";
 
-import { Project } from "../models/project";
+import { Project } from "../../models/project";
-import { ProjectService } from "../services/project.service";
+import { ProjectService } from "../../services/project.service";
-import { Server } from "../models/server";
+import { Server } from "../../models/server";
-import { ServerService } from "../services/server.service";
+import { ServerService } from "../../services/server.service";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 import { DataSource } from "@angular/cdk/collections";
 import { Observable } from "rxjs/Observable";
-import { SettingsService, Settings } from "../services/settings.service";
+import { SettingsService, Settings } from "../../services/settings.service";
-import { ProgressService } from "../common/progress/progress.service";
+import { ProgressService } from "../../common/progress/progress.service";
 
 
 @Component({

src/app/components/settings/settings.component.spec.ts

@@ -6,9 +6,9 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { PersistenceModule } from "angular-persistence";
 
 import { SettingsComponent } from './settings.component';
-import { SettingsService } from "../services/settings.service";
+import { SettingsService } from "../../services/settings.service";
-import { ToasterService } from "../services/toaster.service";
+import { ToasterService } from "../../services/toaster.service";
-import { MockedToasterService } from "../services/toaster.service.spec";
+import { MockedToasterService } from "../../services/toaster.service.spec";
 
 
 describe('SettingsComponent', () => {

src/app/components/settings/settings.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { SettingsService } from "../services/settings.service";
+import { SettingsService } from "../../services/settings.service";
-import { ToasterService } from "../services/toaster.service";
+import { ToasterService } from "../../services/toaster.service";
 
 @Component({
   selector: 'app-settings',