diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 9d6ee0cd..cf6fba5a 100644 --- a/src/app/app-routing.module.ts +++ b/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 { ServersComponent } from "./servers/servers.component"; -import { ProjectsComponent } from "./projects/projects.component"; +import { ProjectMapComponent } from './components/project-map/project-map.component'; +import { ServersComponent } from "./components/servers/servers.component"; +import { ProjectsComponent } from "./components/projects/projects.component"; import { DefaultLayoutComponent } from "./layouts/default-layout/default-layout.component"; -import { SettingsComponent } from "./settings/settings.component"; -import { LocalServerComponent } from "./local-server/local-server.component"; +import { SettingsComponent } from "./components/settings/settings.component"; +import { LocalServerComponent } from "./components/local-server/local-server.component"; const routes: Routes = [ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index dc714a8c..12f715c8 100644 --- a/src/app/app.module.ts +++ b/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 { ServersComponent, AddServerDialogComponent } from './servers/servers.component'; -import { NodeContextMenuComponent } from './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 { StopNodeActionComponent } from './project-map/node-context-menu/actions/stop-node-action/stop-node-action.component'; -import { ApplianceComponent } from './appliance/appliance.component'; -import { ApplianceListDialogComponent } from './appliance/appliance-list-dialog/appliance-list-dialog.component'; -import { NodeSelectInterfaceComponent } from './project-map/node-select-interface/node-select-interface.component'; +import { CreateSnapshotDialogComponent, ProjectMapComponent } from './components/project-map/project-map.component'; +import { ServersComponent, AddServerDialogComponent } from './components/servers/servers.component'; +import { NodeContextMenuComponent } from './components/project-map/node-context-menu/node-context-menu.component'; +import { StartNodeActionComponent } from './components/project-map/node-context-menu/actions/start-node-action/start-node-action.component'; +import { StopNodeActionComponent } from './components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component'; +import { ApplianceComponent } from './components/appliance/appliance.component'; +import { ApplianceListDialogComponent } from './components/appliance/appliance-list-dialog/appliance-list-dialog.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 { MoveLayerUpActionComponent } from './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 { SettingsComponent } from './settings/settings.component'; +import { MoveLayerDownActionComponent } from './components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component'; +import { MoveLayerUpActionComponent } from './components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component'; +import { ProjectMapShortcutsComponent } from './components/project-map/project-map-shortcuts/project-map-shortcuts.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"; diff --git a/src/app/cartography/cartography.module.ts b/src/app/cartography/cartography.module.ts index 8ff8462e..e84bda0c 100644 --- a/src/app/cartography/cartography.module.ts +++ b/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: [ diff --git a/src/app/cartography/map/helpers/in-rectangle-helper.spec.ts b/src/app/cartography/components/map/helpers/in-rectangle-helper.spec.ts similarity index 91% rename from src/app/cartography/map/helpers/in-rectangle-helper.spec.ts rename to src/app/cartography/components/map/helpers/in-rectangle-helper.spec.ts index 26b2a54f..7f2f799e 100644 --- a/src/app/cartography/map/helpers/in-rectangle-helper.spec.ts +++ b/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"; diff --git a/src/app/cartography/map/helpers/in-rectangle-helper.ts b/src/app/cartography/components/map/helpers/in-rectangle-helper.ts similarity index 72% rename from src/app/cartography/map/helpers/in-rectangle-helper.ts rename to src/app/cartography/components/map/helpers/in-rectangle-helper.ts index 74059097..761b4d45 100644 --- a/src/app/cartography/map/helpers/in-rectangle-helper.ts +++ b/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 { Rectangle } from "../../models/rectangle"; +import { Selectable } from "../../../managers/selection-manager"; +import { Rectangle } from "../../../models/rectangle"; @Injectable() diff --git a/src/app/cartography/map/helpers/multi-link-calculator-helper.ts b/src/app/cartography/components/map/helpers/multi-link-calculator-helper.ts similarity index 96% rename from src/app/cartography/map/helpers/multi-link-calculator-helper.ts rename to src/app/cartography/components/map/helpers/multi-link-calculator-helper.ts index 671d827a..4546af00 100644 --- a/src/app/cartography/map/helpers/multi-link-calculator-helper.ts +++ b/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; diff --git a/src/app/cartography/map/map.component.html b/src/app/cartography/components/map/map.component.html similarity index 100% rename from src/app/cartography/map/map.component.html rename to src/app/cartography/components/map/map.component.html diff --git a/src/app/cartography/map/map.component.scss b/src/app/cartography/components/map/map.component.scss similarity index 100% rename from src/app/cartography/map/map.component.scss rename to src/app/cartography/components/map/map.component.scss diff --git a/src/app/cartography/map/map.component.spec.ts b/src/app/cartography/components/map/map.component.spec.ts similarity index 100% rename from src/app/cartography/map/map.component.spec.ts rename to src/app/cartography/components/map/map.component.spec.ts diff --git a/src/app/cartography/map/map.component.ts b/src/app/cartography/components/map/map.component.ts similarity index 93% rename from src/app/cartography/map/map.component.ts rename to src/app/cartography/components/map/map.component.ts index afea58b0..87430bb8 100644 --- a/src/app/cartography/map/map.component.ts +++ b/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 { Link } from "../models/link"; -import { GraphLayout } from "../widgets/graph-layout"; -import { Context } from "../models/context"; -import { Size } from "../models/size"; -import { Drawing } from "../models/drawing"; -import {Symbol} from "../models/symbol"; +import { Node } from "../../models/node"; +import { Link } from "../../models/link"; +import { GraphLayout } from "../../widgets/graph-layout"; +import { Context } from "../../models/context"; +import { Size } from "../../models/size"; +import { Drawing } from "../../models/drawing"; +import {Symbol} from "../../models/symbol"; @Component({ diff --git a/src/app/cartography/managers/selection-manager.spec.ts b/src/app/cartography/managers/selection-manager.spec.ts index 8a04683d..9954b015 100644 --- a/src/app/cartography/managers/selection-manager.spec.ts +++ b/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"; diff --git a/src/app/cartography/managers/selection-manager.ts b/src/app/cartography/managers/selection-manager.ts index 3c5c76aa..74a435c0 100644 --- a/src/app/cartography/managers/selection-manager.ts +++ b/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"; diff --git a/src/app/cartography/widgets/links.ts b/src/app/cartography/widgets/links.ts index f846296d..9ba7b2e8 100644 --- a/src/app/cartography/widgets/links.ts +++ b/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"; diff --git a/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.html b/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.html similarity index 100% rename from src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.html rename to src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.html diff --git a/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.scss b/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.scss similarity index 100% rename from src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.scss rename to src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.scss diff --git a/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts b/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts similarity index 100% rename from src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts rename to src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts diff --git a/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.ts b/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.ts similarity index 100% rename from src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.ts rename to src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.ts diff --git a/src/app/appliance/appliance.component.html b/src/app/components/appliance/appliance.component.html similarity index 100% rename from src/app/appliance/appliance.component.html rename to src/app/components/appliance/appliance.component.html diff --git a/src/app/appliance/appliance.component.scss b/src/app/components/appliance/appliance.component.scss similarity index 100% rename from src/app/appliance/appliance.component.scss rename to src/app/components/appliance/appliance.component.scss diff --git a/src/app/appliance/appliance.component.spec.ts b/src/app/components/appliance/appliance.component.spec.ts similarity index 100% rename from src/app/appliance/appliance.component.spec.ts rename to src/app/components/appliance/appliance.component.spec.ts diff --git a/src/app/appliance/appliance.component.ts b/src/app/components/appliance/appliance.component.ts similarity index 90% rename from src/app/appliance/appliance.component.ts rename to src/app/components/appliance/appliance.component.ts index 56d098a1..6eb7801f 100644 --- a/src/app/appliance/appliance.component.ts +++ b/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 {Appliance} from "../models/appliance"; +import {Server} from "../../models/server"; +import {Appliance} from "../../models/appliance"; @Component({ selector: 'app-appliance', diff --git a/src/app/local-server/local-server.component.html b/src/app/components/local-server/local-server.component.html similarity index 100% rename from src/app/local-server/local-server.component.html rename to src/app/components/local-server/local-server.component.html diff --git a/src/app/local-server/local-server.component.scss b/src/app/components/local-server/local-server.component.scss similarity index 100% rename from src/app/local-server/local-server.component.scss rename to src/app/components/local-server/local-server.component.scss diff --git a/src/app/local-server/local-server.component.spec.ts b/src/app/components/local-server/local-server.component.spec.ts similarity index 91% rename from src/app/local-server/local-server.component.spec.ts rename to src/app/components/local-server/local-server.component.spec.ts index 4777cc98..68829ef4 100644 --- a/src/app/local-server/local-server.component.spec.ts +++ b/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 { MockedServerService } from "../services/server.service.spec"; +import { ServerService } from "../../services/server.service"; +import { MockedServerService } from "../../services/server.service.spec"; class MockedLocation { diff --git a/src/app/local-server/local-server.component.ts b/src/app/components/local-server/local-server.component.ts similarity index 86% rename from src/app/local-server/local-server.component.ts rename to src/app/components/local-server/local-server.component.ts index 131fa8b6..5e86de50 100644 --- a/src/app/local-server/local-server.component.ts +++ b/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 { Server } from "../models/server"; +import { ServerService } from "../../services/server.service"; +import { Server } from "../../models/server"; @Component({ diff --git a/src/app/project-map/create-snapshot-dialog.html b/src/app/components/project-map/create-snapshot-dialog.html similarity index 100% rename from src/app/project-map/create-snapshot-dialog.html rename to src/app/components/project-map/create-snapshot-dialog.html diff --git a/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html b/src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html similarity index 100% rename from src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html rename to src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html diff --git a/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts b/src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts similarity index 100% rename from src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts rename to src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts diff --git a/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts b/src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts similarity index 68% rename from src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts rename to src/app/components/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts index 2d439b91..709e080e 100644 --- a/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts +++ b/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 { Node } from '../../../../cartography/models/node'; -import { NodesDataSource } from '../../../../cartography/datasources/nodes-datasource'; -import { NodeService } from '../../../../services/node.service'; +import { Server } from '../../../../../models/server'; +import { Node } from '../../../../../cartography/models/node'; +import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; +import { NodeService } from '../../../../../services/node.service'; @Component({ selector: 'app-move-layer-down-action', diff --git a/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html b/src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html similarity index 100% rename from src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html rename to src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html diff --git a/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts b/src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts similarity index 100% rename from src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts rename to src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts diff --git a/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts b/src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts similarity index 66% rename from src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts rename to src/app/components/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts index 1ba2458d..564405e1 100644 --- a/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts +++ b/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 { Node } from '../../../../cartography/models/node'; -import { NodesDataSource } from '../../../../cartography/datasources/nodes-datasource'; -import { NodeService } from '../../../../services/node.service'; +import { Server } from '../../../../../models/server'; +import { Node } from '../../../../../cartography/models/node'; +import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; +import { NodeService } from '../../../../../services/node.service'; @Component({ selector: 'app-move-layer-up-action', diff --git a/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.html b/src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.html similarity index 100% rename from src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.html rename to src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.html diff --git a/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts b/src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts similarity index 100% rename from src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts rename to src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts diff --git a/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts similarity index 72% rename from src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts rename to src/app/components/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts index 2725e610..cd8b6911 100644 --- a/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts +++ b/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 {NodeService} from "../../../../services/node.service"; -import {Node} from "../../../../cartography/models/node"; +import {Server} from "../../../../../models/server"; +import {NodeService} from "../../../../../services/node.service"; +import {Node} from "../../../../../cartography/models/node"; @Component({ diff --git a/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.html b/src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.html similarity index 100% rename from src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.html rename to src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.html diff --git a/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts b/src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts similarity index 100% rename from src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts rename to src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts diff --git a/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts similarity index 72% rename from src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts rename to src/app/components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts index e7ef2c6e..2edd306b 100644 --- a/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts +++ b/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 {NodeService} from "../../../../services/node.service"; -import {Node} from "../../../../cartography/models/node"; +import {Server} from "../../../../../models/server"; +import {NodeService} from "../../../../../services/node.service"; +import {Node} from "../../../../../cartography/models/node"; @Component({ diff --git a/src/app/project-map/node-context-menu/node-context-menu.component.html b/src/app/components/project-map/node-context-menu/node-context-menu.component.html similarity index 100% rename from src/app/project-map/node-context-menu/node-context-menu.component.html rename to src/app/components/project-map/node-context-menu/node-context-menu.component.html diff --git a/src/app/project-map/node-context-menu/node-context-menu.component.scss b/src/app/components/project-map/node-context-menu/node-context-menu.component.scss similarity index 100% rename from src/app/project-map/node-context-menu/node-context-menu.component.scss rename to src/app/components/project-map/node-context-menu/node-context-menu.component.scss diff --git a/src/app/project-map/node-context-menu/node-context-menu.component.spec.ts b/src/app/components/project-map/node-context-menu/node-context-menu.component.spec.ts similarity index 100% rename from src/app/project-map/node-context-menu/node-context-menu.component.spec.ts rename to src/app/components/project-map/node-context-menu/node-context-menu.component.spec.ts diff --git a/src/app/project-map/node-context-menu/node-context-menu.component.ts b/src/app/components/project-map/node-context-menu/node-context-menu.component.ts similarity index 84% rename from src/app/project-map/node-context-menu/node-context-menu.component.ts rename to src/app/components/project-map/node-context-menu/node-context-menu.component.ts index 0ba8e73d..22927c9e 100644 --- a/src/app/project-map/node-context-menu/node-context-menu.component.ts +++ b/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 { Server } from "../../models/server"; -import { Project } from "../../models/project"; -import { ProjectService } from "../../services/project.service"; +import { Node } from "../../../cartography/models/node"; +import { Server } from "../../../models/server"; +import { Project } from "../../../models/project"; +import { ProjectService } from "../../../services/project.service"; @Component({ diff --git a/src/app/project-map/node-select-interface/node-select-interface.component.html b/src/app/components/project-map/node-select-interface/node-select-interface.component.html similarity index 100% rename from src/app/project-map/node-select-interface/node-select-interface.component.html rename to src/app/components/project-map/node-select-interface/node-select-interface.component.html diff --git a/src/app/project-map/node-select-interface/node-select-interface.component.scss b/src/app/components/project-map/node-select-interface/node-select-interface.component.scss similarity index 100% rename from src/app/project-map/node-select-interface/node-select-interface.component.scss rename to src/app/components/project-map/node-select-interface/node-select-interface.component.scss diff --git a/src/app/project-map/node-select-interface/node-select-interface.component.spec.ts b/src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts similarity index 100% rename from src/app/project-map/node-select-interface/node-select-interface.component.spec.ts rename to src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts diff --git a/src/app/project-map/node-select-interface/node-select-interface.component.ts b/src/app/components/project-map/node-select-interface/node-select-interface.component.ts similarity index 93% rename from src/app/project-map/node-select-interface/node-select-interface.component.ts rename to src/app/components/project-map/node-select-interface/node-select-interface.component.ts index b47171a9..8b5100dc 100644 --- a/src/app/project-map/node-select-interface/node-select-interface.component.ts +++ b/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 {Port} from "../../models/port"; +import {Node} from "../../../cartography/models/node"; +import {Port} from "../../../models/port"; @Component({ diff --git a/src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts b/src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts similarity index 81% rename from src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts rename to src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts index 9739b7b2..3ff08746 100644 --- a/src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts +++ b/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 { NodeService } from "../../services/node.service"; -import { HttpServer } from "../../services/http-server.service"; -import { SelectionManager } from "../../cartography/managers/selection-manager"; -import { Server } from "../../models/server"; -import { Node } from "../../cartography/models/node"; -import { Project } from "../../models/project"; -import { ProjectService } from "../../services/project.service"; -import { MockedProjectService } from "../../services/project.service.spec"; -import { SettingsService } from "../../services/settings.service"; -import { MockedToasterService } from "../../services/toaster.service.spec"; +import { ToasterService, } from "../../../services/toaster.service"; +import { NodeService } from "../../../services/node.service"; +import { HttpServer } from "../../../services/http-server.service"; +import { SelectionManager } from "../../../cartography/managers/selection-manager"; +import { Server } from "../../../models/server"; +import { Node } from "../../../cartography/models/node"; +import { Project } from "../../../models/project"; +import { ProjectService } from "../../../services/project.service"; +import { MockedProjectService } from "../../../services/project.service.spec"; +import { SettingsService } from "../../../services/settings.service"; +import { MockedToasterService } from "../../../services/toaster.service.spec"; describe('ProjectMapShortcutsComponent', () => { diff --git a/src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.ts b/src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.ts similarity index 76% rename from src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.ts rename to src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.ts index 961b69ea..1e4813f3 100644 --- a/src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.ts +++ b/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 { NodeService } from '../../services/node.service'; -import { Server } from '../../models/server'; -import { ToasterService } from '../../services/toaster.service'; -import { Project } from "../../models/project"; -import { ProjectService } from "../../services/project.service"; +import { SelectionManager } from '../../../cartography/managers/selection-manager'; +import { NodeService } from '../../../services/node.service'; +import { Server } from '../../../models/server'; +import { ToasterService } from '../../../services/toaster.service'; +import { Project } from "../../../models/project"; +import { ProjectService } from "../../../services/project.service"; @Component({ diff --git a/src/app/project-map/project-map.component.css b/src/app/components/project-map/project-map.component.css similarity index 100% rename from src/app/project-map/project-map.component.css rename to src/app/components/project-map/project-map.component.css diff --git a/src/app/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html similarity index 100% rename from src/app/project-map/project-map.component.html rename to src/app/components/project-map/project-map.component.html diff --git a/src/app/project-map/project-map.component.spec.ts b/src/app/components/project-map/project-map.component.spec.ts similarity index 100% rename from src/app/project-map/project-map.component.spec.ts rename to src/app/components/project-map/project-map.component.spec.ts diff --git a/src/app/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts similarity index 85% rename from src/app/project-map/project-map.component.ts rename to src/app/components/project-map/project-map.component.ts index ea32c9f5..f65b88f0 100644 --- a/src/app/project-map/project-map.component.ts +++ b/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 { Node } from '../cartography/models/node'; -import { SymbolService } from '../services/symbol.service'; -import { Link } from "../cartography/models/link"; -import { MapComponent } from "../cartography/map/map.component"; -import { ServerService } from "../services/server.service"; -import { ProjectService } from '../services/project.service'; -import { Server } from "../models/server"; +import { Project } from '../../models/project'; +import { Node } from '../../cartography/models/node'; +import { SymbolService } from '../../services/symbol.service'; +import { Link } from "../../cartography/models/link"; +import { MapComponent } from "../../cartography/components/map/map.component"; +import { ServerService } from "../../services/server.service"; +import { ProjectService } from '../../services/project.service'; +import { Server } from "../../models/server"; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material"; -import { SnapshotService } from "../services/snapshot.service"; -import { Snapshot } from "../models/snapshot"; -import { ProgressDialogService } from "../common/progress-dialog/progress-dialog.service"; -import { ProgressDialogComponent } from "../common/progress-dialog/progress-dialog.component"; -import { Drawing } from "../cartography/models/drawing"; +import { SnapshotService } from "../../services/snapshot.service"; +import { Snapshot } from "../../models/snapshot"; +import { ProgressDialogService } from "../../common/progress-dialog/progress-dialog.service"; +import { ProgressDialogComponent } from "../../common/progress-dialog/progress-dialog.component"; +import { Drawing } from "../../cartography/models/drawing"; import { NodeContextMenuComponent } from "./node-context-menu/node-context-menu.component"; -import { Appliance } from "../models/appliance"; -import { NodeService } from "../services/node.service"; -import { Symbol } from "../cartography/models/symbol"; +import { Appliance } from "../../models/appliance"; +import { NodeService } from "../../services/node.service"; +import { Symbol } from "../../cartography/models/symbol"; import { NodeSelectInterfaceComponent } from "./node-select-interface/node-select-interface.component"; -import { Port } from "../models/port"; -import { LinkService } from "../services/link.service"; -import { ToasterService } from '../services/toaster.service'; -import { NodesDataSource } from "../cartography/datasources/nodes-datasource"; -import { LinksDataSource } from "../cartography/datasources/links-datasource"; -import { ProjectWebServiceHandler } from "../handlers/project-web-service-handler"; -import { SelectionManager } from "../cartography/managers/selection-manager"; -import { InRectangleHelper } from "../cartography/map/helpers/in-rectangle-helper"; -import { DrawingsDataSource } from "../cartography/datasources/drawings-datasource"; +import { Port } from "../../models/port"; +import { LinkService } from "../../services/link.service"; +import { ToasterService } from '../../services/toaster.service'; +import { NodesDataSource } from "../../cartography/datasources/nodes-datasource"; +import { LinksDataSource } from "../../cartography/datasources/links-datasource"; +import { ProjectWebServiceHandler } from "../../handlers/project-web-service-handler"; +import { SelectionManager } from "../../cartography/managers/selection-manager"; +import { InRectangleHelper } from "../../cartography/components/map/helpers/in-rectangle-helper"; +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({ diff --git a/src/app/projects/projects.component.css b/src/app/components/projects/projects.component.css similarity index 100% rename from src/app/projects/projects.component.css rename to src/app/components/projects/projects.component.css diff --git a/src/app/projects/projects.component.html b/src/app/components/projects/projects.component.html similarity index 100% rename from src/app/projects/projects.component.html rename to src/app/components/projects/projects.component.html diff --git a/src/app/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts similarity index 100% rename from src/app/projects/projects.component.spec.ts rename to src/app/components/projects/projects.component.spec.ts diff --git a/src/app/projects/projects.component.ts b/src/app/components/projects/projects.component.ts similarity index 91% rename from src/app/projects/projects.component.ts rename to src/app/components/projects/projects.component.ts index b064dd1e..1f7c87ed 100644 --- a/src/app/projects/projects.component.ts +++ b/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 { ProjectService } from "../services/project.service"; -import { Server } from "../models/server"; -import { ServerService } from "../services/server.service"; +import { Project } from "../../models/project"; +import { ProjectService } from "../../services/project.service"; +import { Server } from "../../models/server"; +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 { ProgressService } from "../common/progress/progress.service"; +import { SettingsService, Settings } from "../../services/settings.service"; +import { ProgressService } from "../../common/progress/progress.service"; @Component({ diff --git a/src/app/servers/add-server-dialog.html b/src/app/components/servers/add-server-dialog.html similarity index 100% rename from src/app/servers/add-server-dialog.html rename to src/app/components/servers/add-server-dialog.html diff --git a/src/app/servers/servers.component.css b/src/app/components/servers/servers.component.css similarity index 100% rename from src/app/servers/servers.component.css rename to src/app/components/servers/servers.component.css diff --git a/src/app/servers/servers.component.html b/src/app/components/servers/servers.component.html similarity index 100% rename from src/app/servers/servers.component.html rename to src/app/components/servers/servers.component.html diff --git a/src/app/servers/servers.component.spec.ts b/src/app/components/servers/servers.component.spec.ts similarity index 100% rename from src/app/servers/servers.component.spec.ts rename to src/app/components/servers/servers.component.spec.ts diff --git a/src/app/servers/servers.component.ts b/src/app/components/servers/servers.component.ts similarity index 100% rename from src/app/servers/servers.component.ts rename to src/app/components/servers/servers.component.ts diff --git a/src/app/settings/settings.component.html b/src/app/components/settings/settings.component.html similarity index 100% rename from src/app/settings/settings.component.html rename to src/app/components/settings/settings.component.html diff --git a/src/app/settings/settings.component.scss b/src/app/components/settings/settings.component.scss similarity index 100% rename from src/app/settings/settings.component.scss rename to src/app/components/settings/settings.component.scss diff --git a/src/app/settings/settings.component.spec.ts b/src/app/components/settings/settings.component.spec.ts similarity index 89% rename from src/app/settings/settings.component.spec.ts rename to src/app/components/settings/settings.component.spec.ts index c9119d26..4b7ecaef 100644 --- a/src/app/settings/settings.component.spec.ts +++ b/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 { ToasterService } from "../services/toaster.service"; -import { MockedToasterService } from "../services/toaster.service.spec"; +import { SettingsService } from "../../services/settings.service"; +import { ToasterService } from "../../services/toaster.service"; +import { MockedToasterService } from "../../services/toaster.service.spec"; describe('SettingsComponent', () => { diff --git a/src/app/settings/settings.component.ts b/src/app/components/settings/settings.component.ts similarity index 81% rename from src/app/settings/settings.component.ts rename to src/app/components/settings/settings.component.ts index f5f2669f..42592856 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/components/settings/settings.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { SettingsService } from "../services/settings.service"; -import { ToasterService } from "../services/toaster.service"; +import { SettingsService } from "../../services/settings.service"; +import { ToasterService } from "../../services/toaster.service"; @Component({ selector: 'app-settings',