From 4f3ad287f0ad4ae776b1d1c55860059f7619e475 Mon Sep 17 00:00:00 2001 From: ziajka Date: Wed, 27 Jun 2018 10:29:12 +0200 Subject: [PATCH] Drop shared directories --- src/app/app.component.spec.ts | 2 +- src/app/app.component.ts | 2 +- src/app/app.module.ts | 56 +++++++++---------- .../appliance-list-dialog.component.ts | 6 +- src/app/appliance/appliance.component.ts | 4 +- .../datasources/datasource.spec.ts | 0 .../{shared => }/datasources/datasource.ts | 0 .../datasources/drawings-datasource.spec.ts | 0 .../datasources/drawings-datasource.ts | 0 .../datasources/links-datasource.spec.ts | 0 .../datasources/links-datasource.ts | 0 .../datasources/nodes-datasource.spec.ts | 0 .../datasources/nodes-datasource.ts | 0 .../datasources/symbols-datasource.spec.ts | 0 .../datasources/symbols-datasource.ts | 0 .../{shared => }/helpers/css-fixer.spec.ts | 0 .../{shared => }/helpers/css-fixer.ts | 0 .../{shared => }/helpers/font-fixer.spec.ts | 0 .../{shared => }/helpers/font-fixer.ts | 0 .../helpers/qt-dasharray-fixer.spec.ts | 0 .../helpers/qt-dasharray-fixer.ts | 0 .../helpers/svg-to-drawing-converter.spec.ts | 0 .../helpers/svg-to-drawing-converter.ts | 0 .../ellipse-converter.spec.ts | 0 .../ellipse-converter.ts | 0 .../image-converter.spec.ts | 0 .../image-converter.ts | 0 .../line-converter.spec.ts | 0 .../line-converter.ts | 0 .../rect-converter.spec.ts | 0 .../rect-converter.ts | 0 .../svg-to-drawing-converter/svg-converter.ts | 0 .../text-converter.spec.ts | 0 .../text-converter.ts | 0 .../managers/layers-manager.spec.ts | 0 .../{shared => }/managers/layers-manager.ts | 0 .../managers/selection-manager.spec.ts | 2 +- .../managers/selection-manager.ts | 2 +- .../map/helpers/in-rectangle-helper.spec.ts | 2 +- .../map/helpers/in-rectangle-helper.ts | 4 +- .../helpers/multi-link-calculator-helper.ts | 2 +- src/app/cartography/map/map.component.ts | 14 ++--- .../{shared => }/models/context.ts | 0 .../{shared => }/models/drawing-line.ts | 0 .../{shared => }/models/drawing.ts | 0 .../models/drawings/drawing-element.ts | 0 .../models/drawings/ellipse-element.ts | 0 .../models/drawings/image-element.ts | 0 .../models/drawings/line-element.ts | 0 .../models/drawings/rect-element.ts | 0 .../models/drawings/text-element.ts | 0 .../cartography/{shared => }/models/font.ts | 0 .../{shared => }/models/interface-label.ts | 0 .../cartography/{shared => }/models/label.ts | 0 .../cartography/{shared => }/models/layer.ts | 0 .../{shared => }/models/link-node.ts | 0 .../{shared => }/models/link-status.ts | 0 .../cartography/{shared => }/models/link.ts | 0 .../cartography/{shared => }/models/node.ts | 2 +- .../cartography/{shared => }/models/point.ts | 0 .../{shared => }/models/rectangle.ts | 0 .../cartography/{shared => }/models/size.ts | 0 .../cartography/{shared => }/models/symbol.ts | 0 .../cartography/{shared => }/models/types.ts | 0 src/app/cartography/{shared => }/tool.ts | 0 .../{shared => }/tools/moving-tool.spec.ts | 2 +- .../{shared => }/tools/moving-tool.ts | 0 .../{shared => }/tools/selection-tool.spec.ts | 2 +- .../{shared => }/tools/selection-tool.ts | 0 .../{shared => }/widgets/drawing-line.ts | 0 .../{shared => }/widgets/drawings.ts | 0 .../widgets/drawings/drawing-widget.ts | 0 .../widgets/drawings/ellipse-drawing.spec.ts | 2 +- .../widgets/drawings/ellipse-drawing.ts | 0 .../widgets/drawings/image-drawing.spec.ts | 2 +- .../widgets/drawings/image-drawing.ts | 0 .../widgets/drawings/line-drawing.spec.ts | 2 +- .../widgets/drawings/line-drawing.ts | 0 .../widgets/drawings/rect-drawing.spec.ts | 2 +- .../widgets/drawings/rect-drawing.ts | 0 .../widgets/drawings/text-drawing.spec.ts | 2 +- .../widgets/drawings/text-drawing.ts | 0 .../{shared => }/widgets/ethernet-link.ts | 0 .../{shared => }/widgets/graph-layout.spec.ts | 0 .../{shared => }/widgets/graph-layout.ts | 0 .../widgets/interface-label.spec.ts | 2 +- .../{shared => }/widgets/interface-label.ts | 0 .../{shared => }/widgets/layers.spec.ts | 4 +- .../{shared => }/widgets/layers.ts | 0 .../{shared => }/widgets/links.spec.ts | 2 +- .../cartography/{shared => }/widgets/links.ts | 2 +- .../{shared => }/widgets/nodes.spec.ts | 2 +- .../cartography/{shared => }/widgets/nodes.ts | 0 .../{shared => }/widgets/serial-link.ts | 0 .../{shared => }/widgets/widget.ts | 0 .../progress-dialog.component.html | 0 .../progress-dialog.component.scss | 0 .../progress-dialog.component.spec.ts | 0 .../progress-dialog.component.ts | 0 .../progress-dialog.service.spec.ts | 0 .../progress-dialog.service.ts | 0 .../progress/progress.component.html | 0 .../progress/progress.component.scss | 0 .../progress/progress.component.spec.ts | 0 .../progress/progress.component.ts | 0 .../progress/progress.service.spec.ts | 0 .../{ => common}/progress/progress.service.ts | 0 .../project-web-service-handler.spec.ts | 12 ++-- .../handlers/project-web-service-handler.ts | 12 ++-- .../local-server.component.spec.ts | 4 +- .../local-server/local-server.component.ts | 4 +- src/app/{shared => }/models/appliance.ts | 0 src/app/{shared => }/models/port.ts | 0 src/app/{shared => }/models/project.ts | 0 src/app/{shared => }/models/server.ts | 0 src/app/{shared => }/models/snapshot.ts | 0 src/app/{shared => }/models/version.ts | 0 .../move-layer-down-action.component.html | 0 .../move-layer-down-action.component.spec.ts | 0 .../move-layer-down-action.component.ts | 8 +-- .../move-layer-up-action.component.html | 0 .../move-layer-up-action.component.spec.ts | 0 .../move-layer-up-action.component.ts | 8 +-- .../start-node-action.component.html | 0 .../start-node-action.component.spec.ts | 0 .../start-node-action.component.ts | 8 +-- .../stop-node-action.component.html | 0 .../stop-node-action.component.spec.ts | 0 .../stop-node-action.component.ts | 6 +- .../node-context-menu.component.html | 0 .../node-context-menu.component.scss | 0 .../node-context-menu.component.spec.ts | 0 .../node-context-menu.component.ts | 8 +-- .../node-select-interface.component.html | 0 .../node-select-interface.component.scss | 0 .../node-select-interface.component.spec.ts | 0 .../node-select-interface.component.ts | 4 +- .../project-map-shortcuts.component.spec.ts | 22 ++++---- .../project-map-shortcuts.component.ts | 12 ++-- src/app/project-map/project-map.component.ts | 52 ++++++++--------- src/app/projects/projects.component.ts | 12 ++-- src/app/raven-error-handler.spec.ts | 2 +- src/app/raven-error-handler.ts | 2 +- src/app/servers/servers.component.ts | 4 +- .../services/appliance.service.spec.ts | 0 .../services/appliance.service.ts | 0 .../services/http-server.service.spec.ts | 0 .../services/http-server.service.ts | 0 .../services/indexed-db.service.spec.ts | 0 .../services/indexed-db.service.ts | 0 .../services/link.service.spec.ts | 2 +- src/app/{shared => }/services/link.service.ts | 2 +- .../services/node.service.spec.ts | 2 +- src/app/{shared => }/services/node.service.ts | 4 +- .../services/project.service.spec.ts | 0 .../{shared => }/services/project.service.ts | 6 +- .../services/server.service.spec.ts | 0 .../{shared => }/services/server.service.ts | 0 .../services/settings.service.spec.ts | 0 .../{shared => }/services/settings.service.ts | 0 .../services/snapshot.service.spec.ts | 2 +- .../{shared => }/services/snapshot.service.ts | 0 .../services/symbol.service.spec.ts | 2 +- .../{shared => }/services/symbol.service.ts | 2 +- src/app/{shared => }/services/testing.ts | 2 +- .../services/toaster.service.spec.ts | 0 .../{shared => }/services/toaster.service.ts | 0 .../services/version.service.spec.ts | 2 +- .../{shared => }/services/version.service.ts | 0 src/app/settings/settings.component.spec.ts | 6 +- src/app/settings/settings.component.ts | 4 +- 171 files changed, 170 insertions(+), 170 deletions(-) rename src/app/cartography/{shared => }/datasources/datasource.spec.ts (100%) rename src/app/cartography/{shared => }/datasources/datasource.ts (100%) rename src/app/cartography/{shared => }/datasources/drawings-datasource.spec.ts (100%) rename src/app/cartography/{shared => }/datasources/drawings-datasource.ts (100%) rename src/app/cartography/{shared => }/datasources/links-datasource.spec.ts (100%) rename src/app/cartography/{shared => }/datasources/links-datasource.ts (100%) rename src/app/cartography/{shared => }/datasources/nodes-datasource.spec.ts (100%) rename src/app/cartography/{shared => }/datasources/nodes-datasource.ts (100%) rename src/app/cartography/{shared => }/datasources/symbols-datasource.spec.ts (100%) rename src/app/cartography/{shared => }/datasources/symbols-datasource.ts (100%) rename src/app/cartography/{shared => }/helpers/css-fixer.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/css-fixer.ts (100%) rename src/app/cartography/{shared => }/helpers/font-fixer.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/font-fixer.ts (100%) rename src/app/cartography/{shared => }/helpers/qt-dasharray-fixer.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/qt-dasharray-fixer.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/ellipse-converter.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/image-converter.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/image-converter.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/line-converter.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/line-converter.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/rect-converter.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/rect-converter.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/svg-converter.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/text-converter.spec.ts (100%) rename src/app/cartography/{shared => }/helpers/svg-to-drawing-converter/text-converter.ts (100%) rename src/app/cartography/{shared => }/managers/layers-manager.spec.ts (100%) rename src/app/cartography/{shared => }/managers/layers-manager.ts (100%) rename src/app/cartography/{shared => }/managers/selection-manager.spec.ts (97%) rename src/app/cartography/{shared => }/managers/selection-manager.ts (98%) rename src/app/cartography/{shared => }/models/context.ts (100%) rename src/app/cartography/{shared => }/models/drawing-line.ts (100%) rename src/app/cartography/{shared => }/models/drawing.ts (100%) rename src/app/cartography/{shared => }/models/drawings/drawing-element.ts (100%) rename src/app/cartography/{shared => }/models/drawings/ellipse-element.ts (100%) rename src/app/cartography/{shared => }/models/drawings/image-element.ts (100%) rename src/app/cartography/{shared => }/models/drawings/line-element.ts (100%) rename src/app/cartography/{shared => }/models/drawings/rect-element.ts (100%) rename src/app/cartography/{shared => }/models/drawings/text-element.ts (100%) rename src/app/cartography/{shared => }/models/font.ts (100%) rename src/app/cartography/{shared => }/models/interface-label.ts (100%) rename src/app/cartography/{shared => }/models/label.ts (100%) rename src/app/cartography/{shared => }/models/layer.ts (100%) rename src/app/cartography/{shared => }/models/link-node.ts (100%) rename src/app/cartography/{shared => }/models/link-status.ts (100%) rename src/app/cartography/{shared => }/models/link.ts (100%) rename src/app/cartography/{shared => }/models/node.ts (92%) rename src/app/cartography/{shared => }/models/point.ts (100%) rename src/app/cartography/{shared => }/models/rectangle.ts (100%) rename src/app/cartography/{shared => }/models/size.ts (100%) rename src/app/cartography/{shared => }/models/symbol.ts (100%) rename src/app/cartography/{shared => }/models/types.ts (100%) rename src/app/cartography/{shared => }/tool.ts (100%) rename src/app/cartography/{shared => }/tools/moving-tool.spec.ts (98%) rename src/app/cartography/{shared => }/tools/moving-tool.ts (100%) rename src/app/cartography/{shared => }/tools/selection-tool.spec.ts (98%) rename src/app/cartography/{shared => }/tools/selection-tool.ts (100%) rename src/app/cartography/{shared => }/widgets/drawing-line.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings/drawing-widget.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings/ellipse-drawing.spec.ts (97%) rename src/app/cartography/{shared => }/widgets/drawings/ellipse-drawing.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings/image-drawing.spec.ts (96%) rename src/app/cartography/{shared => }/widgets/drawings/image-drawing.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings/line-drawing.spec.ts (97%) rename src/app/cartography/{shared => }/widgets/drawings/line-drawing.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings/rect-drawing.spec.ts (97%) rename src/app/cartography/{shared => }/widgets/drawings/rect-drawing.ts (100%) rename src/app/cartography/{shared => }/widgets/drawings/text-drawing.spec.ts (98%) rename src/app/cartography/{shared => }/widgets/drawings/text-drawing.ts (100%) rename src/app/cartography/{shared => }/widgets/ethernet-link.ts (100%) rename src/app/cartography/{shared => }/widgets/graph-layout.spec.ts (100%) rename src/app/cartography/{shared => }/widgets/graph-layout.ts (100%) rename src/app/cartography/{shared => }/widgets/interface-label.spec.ts (98%) rename src/app/cartography/{shared => }/widgets/interface-label.ts (100%) rename src/app/cartography/{shared => }/widgets/layers.spec.ts (98%) rename src/app/cartography/{shared => }/widgets/layers.ts (100%) rename src/app/cartography/{shared => }/widgets/links.spec.ts (97%) rename src/app/cartography/{shared => }/widgets/links.ts (98%) rename src/app/cartography/{shared => }/widgets/nodes.spec.ts (97%) rename src/app/cartography/{shared => }/widgets/nodes.ts (100%) rename src/app/cartography/{shared => }/widgets/serial-link.ts (100%) rename src/app/cartography/{shared => }/widgets/widget.ts (100%) rename src/app/{shared => common}/progress-dialog/progress-dialog.component.html (100%) rename src/app/{shared => common}/progress-dialog/progress-dialog.component.scss (100%) rename src/app/{shared => common}/progress-dialog/progress-dialog.component.spec.ts (100%) rename src/app/{shared => common}/progress-dialog/progress-dialog.component.ts (100%) rename src/app/{shared => common}/progress-dialog/progress-dialog.service.spec.ts (100%) rename src/app/{shared => common}/progress-dialog/progress-dialog.service.ts (100%) rename src/app/{ => common}/progress/progress.component.html (100%) rename src/app/{ => common}/progress/progress.component.scss (100%) rename src/app/{ => common}/progress/progress.component.spec.ts (100%) rename src/app/{ => common}/progress/progress.component.ts (100%) rename src/app/{ => common}/progress/progress.service.spec.ts (100%) rename src/app/{ => common}/progress/progress.service.ts (100%) rename src/app/{shared => }/handlers/project-web-service-handler.spec.ts (91%) rename src/app/{shared => }/handlers/project-web-service-handler.ts (77%) rename src/app/{shared => }/models/appliance.ts (100%) rename src/app/{shared => }/models/port.ts (100%) rename src/app/{shared => }/models/project.ts (100%) rename src/app/{shared => }/models/server.ts (100%) rename src/app/{shared => }/models/snapshot.ts (100%) rename src/app/{shared => }/models/version.ts (100%) rename src/app/{shared => project-map}/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html (100%) rename src/app/{shared => project-map}/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts (100%) rename src/app/{shared => project-map}/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts (68%) rename src/app/{shared => project-map}/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html (100%) rename src/app/{shared => project-map}/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts (100%) rename src/app/{shared => project-map}/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts (66%) rename src/app/{shared => project-map}/node-context-menu/actions/start-node-action/start-node-action.component.html (100%) rename src/app/{shared => project-map}/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts (100%) rename src/app/{shared => project-map}/node-context-menu/actions/start-node-action/start-node-action.component.ts (72%) rename src/app/{shared => project-map}/node-context-menu/actions/stop-node-action/stop-node-action.component.html (100%) rename src/app/{shared => project-map}/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts (100%) rename src/app/{shared => project-map}/node-context-menu/actions/stop-node-action/stop-node-action.component.ts (72%) rename src/app/{shared => project-map}/node-context-menu/node-context-menu.component.html (100%) rename src/app/{shared => project-map}/node-context-menu/node-context-menu.component.scss (100%) rename src/app/{shared => project-map}/node-context-menu/node-context-menu.component.spec.ts (100%) rename src/app/{shared => project-map}/node-context-menu/node-context-menu.component.ts (84%) rename src/app/{shared => project-map}/node-select-interface/node-select-interface.component.html (100%) rename src/app/{shared => project-map}/node-select-interface/node-select-interface.component.scss (100%) rename src/app/{shared => project-map}/node-select-interface/node-select-interface.component.spec.ts (100%) rename src/app/{shared => project-map}/node-select-interface/node-select-interface.component.ts (93%) rename src/app/{shared => }/services/appliance.service.spec.ts (100%) rename src/app/{shared => }/services/appliance.service.ts (100%) rename src/app/{shared => }/services/http-server.service.spec.ts (100%) rename src/app/{shared => }/services/http-server.service.ts (100%) rename src/app/{shared => }/services/indexed-db.service.spec.ts (100%) rename src/app/{shared => }/services/indexed-db.service.ts (100%) rename src/app/{shared => }/services/link.service.spec.ts (97%) rename src/app/{shared => }/services/link.service.ts (94%) rename src/app/{shared => }/services/node.service.spec.ts (98%) rename src/app/{shared => }/services/node.service.ts (95%) rename src/app/{shared => }/services/project.service.spec.ts (100%) rename src/app/{shared => }/services/project.service.ts (91%) rename src/app/{shared => }/services/server.service.spec.ts (100%) rename src/app/{shared => }/services/server.service.ts (100%) rename src/app/{shared => }/services/settings.service.spec.ts (100%) rename src/app/{shared => }/services/settings.service.ts (100%) rename src/app/{shared => }/services/snapshot.service.spec.ts (97%) rename src/app/{shared => }/services/snapshot.service.ts (100%) rename src/app/{shared => }/services/symbol.service.spec.ts (97%) rename src/app/{shared => }/services/symbol.service.ts (95%) rename src/app/{shared => }/services/testing.ts (99%) rename src/app/{shared => }/services/toaster.service.spec.ts (100%) rename src/app/{shared => }/services/toaster.service.ts (100%) rename src/app/{shared => }/services/version.service.spec.ts (96%) rename src/app/{shared => }/services/version.service.ts (100%) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 82bc43b4..cf7fcb42 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -3,7 +3,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app.component'; import { MatIconModule } from "@angular/material"; -import { SettingsService } from "./shared/services/settings.service"; +import { SettingsService } from "./services/settings.service"; import { PersistenceService } from "angular-persistence"; import { ElectronService, NgxElectronModule } from "ngx-electron"; import createSpyObj = jasmine.createSpyObj; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 123baa5f..0dd59c5d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { MatIconRegistry } from "@angular/material"; import { DomSanitizer } from "@angular/platform-browser"; import { ElectronService } from "ngx-electron"; -import { SettingsService } from "./shared/services/settings.service"; +import { SettingsService } from "./services/settings.service"; @Component({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7ad44495..dc714a8c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -35,50 +35,50 @@ import { NgxElectronModule } from 'ngx-electron'; import { AppRoutingModule } from './app-routing.module'; -import { VersionService } from './shared/services/version.service'; -import { ProjectService } from './shared/services/project.service'; -import { SymbolService } from "./shared/services/symbol.service"; -import { ServerService } from "./shared/services/server.service"; -import { IndexedDbService } from "./shared/services/indexed-db.service"; -import { HttpServer } from "./shared/services/http-server.service"; -import { SnapshotService } from "./shared/services/snapshot.service"; -import { ProgressDialogService } from "./shared/progress-dialog/progress-dialog.service"; -import { NodeService } from "./shared/services/node.service"; -import { ApplianceService } from "./shared/services/appliance.service"; -import { LinkService } from "./shared/services/link.service"; +import { VersionService } from './services/version.service'; +import { ProjectService } from './services/project.service'; +import { SymbolService } from "./services/symbol.service"; +import { ServerService } from "./services/server.service"; +import { IndexedDbService } from "./services/indexed-db.service"; +import { HttpServer } from "./services/http-server.service"; +import { SnapshotService } from "./services/snapshot.service"; +import { ProgressDialogService } from "./common/progress-dialog/progress-dialog.service"; +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 { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; -import { ProgressDialogComponent } from './shared/progress-dialog/progress-dialog.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 './shared/node-context-menu/node-context-menu.component'; -import { StartNodeActionComponent } from './shared/node-context-menu/actions/start-node-action/start-node-action.component'; -import { StopNodeActionComponent } from './shared/node-context-menu/actions/stop-node-action/stop-node-action.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 './shared/node-select-interface/node-select-interface.component'; +import { NodeSelectInterfaceComponent } from './project-map/node-select-interface/node-select-interface.component'; import { CartographyModule } from './cartography/cartography.module'; -import { ToasterService } from './shared/services/toaster.service'; -import { ProjectWebServiceHandler } from "./shared/handlers/project-web-service-handler"; -import { LinksDataSource } from "./cartography/shared/datasources/links-datasource"; -import { NodesDataSource } from "./cartography/shared/datasources/nodes-datasource"; -import { SymbolsDataSource } from "./cartography/shared/datasources/symbols-datasource"; -import { SelectionManager } from "./cartography/shared/managers/selection-manager"; +import { ToasterService } from './services/toaster.service'; +import { ProjectWebServiceHandler } from "./handlers/project-web-service-handler"; +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 { DrawingsDataSource } from "./cartography/shared/datasources/drawings-datasource"; -import { MoveLayerDownActionComponent } from './shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component'; -import { MoveLayerUpActionComponent } from './shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component'; +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 { SettingsService } from "./shared/services/settings.service"; +import { SettingsService } from "./services/settings.service"; import { RavenErrorHandler } from "./raven-error-handler"; import { LocalServerComponent } from './local-server/local-server.component'; -import { ProgressComponent } from './progress/progress.component'; -import { ProgressService } from "./progress/progress.service"; +import { ProgressComponent } from './common/progress/progress.component'; +import { ProgressService } from "./common/progress/progress.service"; Raven .config('https://b2b1cfd9b043491eb6b566fd8acee358@sentry.io/842726') diff --git a/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.ts b/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.ts index 23b0f7df..dd5ab4e1 100644 --- a/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.ts +++ b/src/app/appliance/appliance-list-dialog/appliance-list-dialog.component.ts @@ -2,9 +2,9 @@ import {Component, ElementRef, Inject, Input, OnInit, ViewChild} from '@angular/ import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material"; import {DataSource} from "@angular/cdk/collections"; import {Observable} from "rxjs/Observable"; -import {Appliance} from "../../shared/models/appliance"; -import {ApplianceService} from "../../shared/services/appliance.service"; -import {Server} from "../../shared/models/server"; +import {Appliance} from "../../models/appliance"; +import {ApplianceService} from "../../services/appliance.service"; +import {Server} from "../../models/server"; import {BehaviorSubject} from "rxjs/BehaviorSubject"; import 'rxjs/add/operator/startWith'; diff --git a/src/app/appliance/appliance.component.ts b/src/app/appliance/appliance.component.ts index 9b18011b..56d098a1 100644 --- a/src/app/appliance/appliance.component.ts +++ b/src/app/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 "../shared/models/server"; -import {Appliance} from "../shared/models/appliance"; +import {Server} from "../models/server"; +import {Appliance} from "../models/appliance"; @Component({ selector: 'app-appliance', diff --git a/src/app/cartography/shared/datasources/datasource.spec.ts b/src/app/cartography/datasources/datasource.spec.ts similarity index 100% rename from src/app/cartography/shared/datasources/datasource.spec.ts rename to src/app/cartography/datasources/datasource.spec.ts diff --git a/src/app/cartography/shared/datasources/datasource.ts b/src/app/cartography/datasources/datasource.ts similarity index 100% rename from src/app/cartography/shared/datasources/datasource.ts rename to src/app/cartography/datasources/datasource.ts diff --git a/src/app/cartography/shared/datasources/drawings-datasource.spec.ts b/src/app/cartography/datasources/drawings-datasource.spec.ts similarity index 100% rename from src/app/cartography/shared/datasources/drawings-datasource.spec.ts rename to src/app/cartography/datasources/drawings-datasource.spec.ts diff --git a/src/app/cartography/shared/datasources/drawings-datasource.ts b/src/app/cartography/datasources/drawings-datasource.ts similarity index 100% rename from src/app/cartography/shared/datasources/drawings-datasource.ts rename to src/app/cartography/datasources/drawings-datasource.ts diff --git a/src/app/cartography/shared/datasources/links-datasource.spec.ts b/src/app/cartography/datasources/links-datasource.spec.ts similarity index 100% rename from src/app/cartography/shared/datasources/links-datasource.spec.ts rename to src/app/cartography/datasources/links-datasource.spec.ts diff --git a/src/app/cartography/shared/datasources/links-datasource.ts b/src/app/cartography/datasources/links-datasource.ts similarity index 100% rename from src/app/cartography/shared/datasources/links-datasource.ts rename to src/app/cartography/datasources/links-datasource.ts diff --git a/src/app/cartography/shared/datasources/nodes-datasource.spec.ts b/src/app/cartography/datasources/nodes-datasource.spec.ts similarity index 100% rename from src/app/cartography/shared/datasources/nodes-datasource.spec.ts rename to src/app/cartography/datasources/nodes-datasource.spec.ts diff --git a/src/app/cartography/shared/datasources/nodes-datasource.ts b/src/app/cartography/datasources/nodes-datasource.ts similarity index 100% rename from src/app/cartography/shared/datasources/nodes-datasource.ts rename to src/app/cartography/datasources/nodes-datasource.ts diff --git a/src/app/cartography/shared/datasources/symbols-datasource.spec.ts b/src/app/cartography/datasources/symbols-datasource.spec.ts similarity index 100% rename from src/app/cartography/shared/datasources/symbols-datasource.spec.ts rename to src/app/cartography/datasources/symbols-datasource.spec.ts diff --git a/src/app/cartography/shared/datasources/symbols-datasource.ts b/src/app/cartography/datasources/symbols-datasource.ts similarity index 100% rename from src/app/cartography/shared/datasources/symbols-datasource.ts rename to src/app/cartography/datasources/symbols-datasource.ts diff --git a/src/app/cartography/shared/helpers/css-fixer.spec.ts b/src/app/cartography/helpers/css-fixer.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/css-fixer.spec.ts rename to src/app/cartography/helpers/css-fixer.spec.ts diff --git a/src/app/cartography/shared/helpers/css-fixer.ts b/src/app/cartography/helpers/css-fixer.ts similarity index 100% rename from src/app/cartography/shared/helpers/css-fixer.ts rename to src/app/cartography/helpers/css-fixer.ts diff --git a/src/app/cartography/shared/helpers/font-fixer.spec.ts b/src/app/cartography/helpers/font-fixer.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/font-fixer.spec.ts rename to src/app/cartography/helpers/font-fixer.spec.ts diff --git a/src/app/cartography/shared/helpers/font-fixer.ts b/src/app/cartography/helpers/font-fixer.ts similarity index 100% rename from src/app/cartography/shared/helpers/font-fixer.ts rename to src/app/cartography/helpers/font-fixer.ts diff --git a/src/app/cartography/shared/helpers/qt-dasharray-fixer.spec.ts b/src/app/cartography/helpers/qt-dasharray-fixer.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/qt-dasharray-fixer.spec.ts rename to src/app/cartography/helpers/qt-dasharray-fixer.spec.ts diff --git a/src/app/cartography/shared/helpers/qt-dasharray-fixer.ts b/src/app/cartography/helpers/qt-dasharray-fixer.ts similarity index 100% rename from src/app/cartography/shared/helpers/qt-dasharray-fixer.ts rename to src/app/cartography/helpers/qt-dasharray-fixer.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter.spec.ts rename to src/app/cartography/helpers/svg-to-drawing-converter.spec.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.spec.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/ellipse-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter/image-converter.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.spec.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/image-converter.spec.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/image-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/image-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/image-converter.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter/line-converter.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.spec.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/line-converter.spec.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/line-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/line-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/line-converter.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.spec.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.spec.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/rect-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/svg-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/svg-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/svg-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/svg-converter.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter/text-converter.spec.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.spec.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/text-converter.spec.ts diff --git a/src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/text-converter.ts similarity index 100% rename from src/app/cartography/shared/helpers/svg-to-drawing-converter/text-converter.ts rename to src/app/cartography/helpers/svg-to-drawing-converter/text-converter.ts diff --git a/src/app/cartography/shared/managers/layers-manager.spec.ts b/src/app/cartography/managers/layers-manager.spec.ts similarity index 100% rename from src/app/cartography/shared/managers/layers-manager.spec.ts rename to src/app/cartography/managers/layers-manager.spec.ts diff --git a/src/app/cartography/shared/managers/layers-manager.ts b/src/app/cartography/managers/layers-manager.ts similarity index 100% rename from src/app/cartography/shared/managers/layers-manager.ts rename to src/app/cartography/managers/layers-manager.ts diff --git a/src/app/cartography/shared/managers/selection-manager.spec.ts b/src/app/cartography/managers/selection-manager.spec.ts similarity index 97% rename from src/app/cartography/shared/managers/selection-manager.spec.ts rename to src/app/cartography/managers/selection-manager.spec.ts index 4fc83d8c..8a04683d 100644 --- a/src/app/cartography/shared/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 "../map/helpers/in-rectangle-helper"; import { DrawingsDataSource } from "../datasources/drawings-datasource"; diff --git a/src/app/cartography/shared/managers/selection-manager.ts b/src/app/cartography/managers/selection-manager.ts similarity index 98% rename from src/app/cartography/shared/managers/selection-manager.ts rename to src/app/cartography/managers/selection-manager.ts index 300b85e8..3c5c76aa 100644 --- a/src/app/cartography/shared/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 "../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/map/helpers/in-rectangle-helper.spec.ts b/src/app/cartography/map/helpers/in-rectangle-helper.spec.ts index 43b1c1c9..26b2a54f 100644 --- a/src/app/cartography/map/helpers/in-rectangle-helper.spec.ts +++ b/src/app/cartography/map/helpers/in-rectangle-helper.spec.ts @@ -1,5 +1,5 @@ import { InRectangleHelper } from "./in-rectangle-helper"; -import { Rectangle } from "../../shared/models/rectangle"; +import { Rectangle } from "../../models/rectangle"; diff --git a/src/app/cartography/map/helpers/in-rectangle-helper.ts b/src/app/cartography/map/helpers/in-rectangle-helper.ts index ddd54448..74059097 100644 --- a/src/app/cartography/map/helpers/in-rectangle-helper.ts +++ b/src/app/cartography/map/helpers/in-rectangle-helper.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; -import { Selectable } from "../../shared/managers/selection-manager"; -import { Rectangle } from "../../shared/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/map/helpers/multi-link-calculator-helper.ts index 28ea0416..671d827a 100644 --- a/src/app/cartography/map/helpers/multi-link-calculator-helper.ts +++ b/src/app/cartography/map/helpers/multi-link-calculator-helper.ts @@ -1,4 +1,4 @@ -import {Link} from "../../shared/models/link"; +import {Link} from "../../models/link"; export class MultiLinkCalculatorHelper { LINK_WIDTH = 2; diff --git a/src/app/cartography/map/map.component.ts b/src/app/cartography/map/map.component.ts index 129d4bd2..afea58b0 100644 --- a/src/app/cartography/map/map.component.ts +++ b/src/app/cartography/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 "../shared/models/node"; -import { Link } from "../shared/models/link"; -import { GraphLayout } from "../shared/widgets/graph-layout"; -import { Context } from "../shared/models/context"; -import { Size } from "../shared/models/size"; -import { Drawing } from "../shared/models/drawing"; -import {Symbol} from "../shared/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/shared/models/context.ts b/src/app/cartography/models/context.ts similarity index 100% rename from src/app/cartography/shared/models/context.ts rename to src/app/cartography/models/context.ts diff --git a/src/app/cartography/shared/models/drawing-line.ts b/src/app/cartography/models/drawing-line.ts similarity index 100% rename from src/app/cartography/shared/models/drawing-line.ts rename to src/app/cartography/models/drawing-line.ts diff --git a/src/app/cartography/shared/models/drawing.ts b/src/app/cartography/models/drawing.ts similarity index 100% rename from src/app/cartography/shared/models/drawing.ts rename to src/app/cartography/models/drawing.ts diff --git a/src/app/cartography/shared/models/drawings/drawing-element.ts b/src/app/cartography/models/drawings/drawing-element.ts similarity index 100% rename from src/app/cartography/shared/models/drawings/drawing-element.ts rename to src/app/cartography/models/drawings/drawing-element.ts diff --git a/src/app/cartography/shared/models/drawings/ellipse-element.ts b/src/app/cartography/models/drawings/ellipse-element.ts similarity index 100% rename from src/app/cartography/shared/models/drawings/ellipse-element.ts rename to src/app/cartography/models/drawings/ellipse-element.ts diff --git a/src/app/cartography/shared/models/drawings/image-element.ts b/src/app/cartography/models/drawings/image-element.ts similarity index 100% rename from src/app/cartography/shared/models/drawings/image-element.ts rename to src/app/cartography/models/drawings/image-element.ts diff --git a/src/app/cartography/shared/models/drawings/line-element.ts b/src/app/cartography/models/drawings/line-element.ts similarity index 100% rename from src/app/cartography/shared/models/drawings/line-element.ts rename to src/app/cartography/models/drawings/line-element.ts diff --git a/src/app/cartography/shared/models/drawings/rect-element.ts b/src/app/cartography/models/drawings/rect-element.ts similarity index 100% rename from src/app/cartography/shared/models/drawings/rect-element.ts rename to src/app/cartography/models/drawings/rect-element.ts diff --git a/src/app/cartography/shared/models/drawings/text-element.ts b/src/app/cartography/models/drawings/text-element.ts similarity index 100% rename from src/app/cartography/shared/models/drawings/text-element.ts rename to src/app/cartography/models/drawings/text-element.ts diff --git a/src/app/cartography/shared/models/font.ts b/src/app/cartography/models/font.ts similarity index 100% rename from src/app/cartography/shared/models/font.ts rename to src/app/cartography/models/font.ts diff --git a/src/app/cartography/shared/models/interface-label.ts b/src/app/cartography/models/interface-label.ts similarity index 100% rename from src/app/cartography/shared/models/interface-label.ts rename to src/app/cartography/models/interface-label.ts diff --git a/src/app/cartography/shared/models/label.ts b/src/app/cartography/models/label.ts similarity index 100% rename from src/app/cartography/shared/models/label.ts rename to src/app/cartography/models/label.ts diff --git a/src/app/cartography/shared/models/layer.ts b/src/app/cartography/models/layer.ts similarity index 100% rename from src/app/cartography/shared/models/layer.ts rename to src/app/cartography/models/layer.ts diff --git a/src/app/cartography/shared/models/link-node.ts b/src/app/cartography/models/link-node.ts similarity index 100% rename from src/app/cartography/shared/models/link-node.ts rename to src/app/cartography/models/link-node.ts diff --git a/src/app/cartography/shared/models/link-status.ts b/src/app/cartography/models/link-status.ts similarity index 100% rename from src/app/cartography/shared/models/link-status.ts rename to src/app/cartography/models/link-status.ts diff --git a/src/app/cartography/shared/models/link.ts b/src/app/cartography/models/link.ts similarity index 100% rename from src/app/cartography/shared/models/link.ts rename to src/app/cartography/models/link.ts diff --git a/src/app/cartography/shared/models/node.ts b/src/app/cartography/models/node.ts similarity index 92% rename from src/app/cartography/shared/models/node.ts rename to src/app/cartography/models/node.ts index f53e16b7..a0d8ccae 100644 --- a/src/app/cartography/shared/models/node.ts +++ b/src/app/cartography/models/node.ts @@ -1,5 +1,5 @@ import {Label} from "./label"; -import {Port} from "../../../shared/models/port"; +import {Port} from "../../models/port"; import {Selectable} from "../managers/selection-manager"; diff --git a/src/app/cartography/shared/models/point.ts b/src/app/cartography/models/point.ts similarity index 100% rename from src/app/cartography/shared/models/point.ts rename to src/app/cartography/models/point.ts diff --git a/src/app/cartography/shared/models/rectangle.ts b/src/app/cartography/models/rectangle.ts similarity index 100% rename from src/app/cartography/shared/models/rectangle.ts rename to src/app/cartography/models/rectangle.ts diff --git a/src/app/cartography/shared/models/size.ts b/src/app/cartography/models/size.ts similarity index 100% rename from src/app/cartography/shared/models/size.ts rename to src/app/cartography/models/size.ts diff --git a/src/app/cartography/shared/models/symbol.ts b/src/app/cartography/models/symbol.ts similarity index 100% rename from src/app/cartography/shared/models/symbol.ts rename to src/app/cartography/models/symbol.ts diff --git a/src/app/cartography/shared/models/types.ts b/src/app/cartography/models/types.ts similarity index 100% rename from src/app/cartography/shared/models/types.ts rename to src/app/cartography/models/types.ts diff --git a/src/app/cartography/shared/tool.ts b/src/app/cartography/tool.ts similarity index 100% rename from src/app/cartography/shared/tool.ts rename to src/app/cartography/tool.ts diff --git a/src/app/cartography/shared/tools/moving-tool.spec.ts b/src/app/cartography/tools/moving-tool.spec.ts similarity index 98% rename from src/app/cartography/shared/tools/moving-tool.spec.ts rename to src/app/cartography/tools/moving-tool.spec.ts index c80cfb3a..233c001f 100644 --- a/src/app/cartography/shared/tools/moving-tool.spec.ts +++ b/src/app/cartography/tools/moving-tool.spec.ts @@ -1,7 +1,7 @@ import { Context } from "../models/context"; import { SVGSelection } from "../models/types"; import { MovingTool } from "./moving-tool"; -import { TestSVGCanvas } from "../../testing"; +import { TestSVGCanvas } from "../testing"; import { Size } from "../models/size"; diff --git a/src/app/cartography/shared/tools/moving-tool.ts b/src/app/cartography/tools/moving-tool.ts similarity index 100% rename from src/app/cartography/shared/tools/moving-tool.ts rename to src/app/cartography/tools/moving-tool.ts diff --git a/src/app/cartography/shared/tools/selection-tool.spec.ts b/src/app/cartography/tools/selection-tool.spec.ts similarity index 98% rename from src/app/cartography/shared/tools/selection-tool.spec.ts rename to src/app/cartography/tools/selection-tool.spec.ts index 5ac810d2..74c34107 100644 --- a/src/app/cartography/shared/tools/selection-tool.spec.ts +++ b/src/app/cartography/tools/selection-tool.spec.ts @@ -4,7 +4,7 @@ import { SelectionTool } from "./selection-tool"; import { Context } from "../models/context"; import { SVGSelection } from "../models/types"; import { Rectangle } from "../models/rectangle"; -import { TestSVGCanvas } from "../../testing"; +import { TestSVGCanvas } from "../testing"; describe('SelectionTool', () => { diff --git a/src/app/cartography/shared/tools/selection-tool.ts b/src/app/cartography/tools/selection-tool.ts similarity index 100% rename from src/app/cartography/shared/tools/selection-tool.ts rename to src/app/cartography/tools/selection-tool.ts diff --git a/src/app/cartography/shared/widgets/drawing-line.ts b/src/app/cartography/widgets/drawing-line.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawing-line.ts rename to src/app/cartography/widgets/drawing-line.ts diff --git a/src/app/cartography/shared/widgets/drawings.ts b/src/app/cartography/widgets/drawings.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings.ts rename to src/app/cartography/widgets/drawings.ts diff --git a/src/app/cartography/shared/widgets/drawings/drawing-widget.ts b/src/app/cartography/widgets/drawings/drawing-widget.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings/drawing-widget.ts rename to src/app/cartography/widgets/drawings/drawing-widget.ts diff --git a/src/app/cartography/shared/widgets/drawings/ellipse-drawing.spec.ts b/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts similarity index 97% rename from src/app/cartography/shared/widgets/drawings/ellipse-drawing.spec.ts rename to src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts index 800199f7..4015561f 100644 --- a/src/app/cartography/shared/widgets/drawings/ellipse-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts @@ -1,4 +1,4 @@ -import { TestSVGCanvas } from "../../../testing"; +import { TestSVGCanvas } from "../../testing"; import { Drawing } from "../../models/drawing"; import { EllipseDrawingWidget } from "./ellipse-drawing"; import { EllipseElement } from "../../models/drawings/ellipse-element"; diff --git a/src/app/cartography/shared/widgets/drawings/ellipse-drawing.ts b/src/app/cartography/widgets/drawings/ellipse-drawing.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings/ellipse-drawing.ts rename to src/app/cartography/widgets/drawings/ellipse-drawing.ts diff --git a/src/app/cartography/shared/widgets/drawings/image-drawing.spec.ts b/src/app/cartography/widgets/drawings/image-drawing.spec.ts similarity index 96% rename from src/app/cartography/shared/widgets/drawings/image-drawing.spec.ts rename to src/app/cartography/widgets/drawings/image-drawing.spec.ts index a2fbfb43..a722ff23 100644 --- a/src/app/cartography/shared/widgets/drawings/image-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/image-drawing.spec.ts @@ -1,4 +1,4 @@ -import { TestSVGCanvas } from "../../../testing"; +import { TestSVGCanvas } from "../../testing"; import { Drawing } from "../../models/drawing"; import { ImageDrawingWidget } from "./image-drawing"; import { ImageElement } from "../../models/drawings/image-element"; diff --git a/src/app/cartography/shared/widgets/drawings/image-drawing.ts b/src/app/cartography/widgets/drawings/image-drawing.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings/image-drawing.ts rename to src/app/cartography/widgets/drawings/image-drawing.ts diff --git a/src/app/cartography/shared/widgets/drawings/line-drawing.spec.ts b/src/app/cartography/widgets/drawings/line-drawing.spec.ts similarity index 97% rename from src/app/cartography/shared/widgets/drawings/line-drawing.spec.ts rename to src/app/cartography/widgets/drawings/line-drawing.spec.ts index 727129e7..cfe1739e 100644 --- a/src/app/cartography/shared/widgets/drawings/line-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/line-drawing.spec.ts @@ -1,4 +1,4 @@ -import { TestSVGCanvas } from "../../../testing"; +import { TestSVGCanvas } from "../../testing"; import { Drawing } from "../../models/drawing"; import { LineDrawingWidget } from "./line-drawing"; import { LineElement } from "../../models/drawings/line-element"; diff --git a/src/app/cartography/shared/widgets/drawings/line-drawing.ts b/src/app/cartography/widgets/drawings/line-drawing.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings/line-drawing.ts rename to src/app/cartography/widgets/drawings/line-drawing.ts diff --git a/src/app/cartography/shared/widgets/drawings/rect-drawing.spec.ts b/src/app/cartography/widgets/drawings/rect-drawing.spec.ts similarity index 97% rename from src/app/cartography/shared/widgets/drawings/rect-drawing.spec.ts rename to src/app/cartography/widgets/drawings/rect-drawing.spec.ts index a77a4adb..195ef634 100644 --- a/src/app/cartography/shared/widgets/drawings/rect-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/rect-drawing.spec.ts @@ -1,4 +1,4 @@ -import { TestSVGCanvas } from "../../../testing"; +import { TestSVGCanvas } from "../../testing"; import { Drawing } from "../../models/drawing"; import { RectDrawingWidget } from "./rect-drawing"; import { RectElement } from "../../models/drawings/rect-element"; diff --git a/src/app/cartography/shared/widgets/drawings/rect-drawing.ts b/src/app/cartography/widgets/drawings/rect-drawing.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings/rect-drawing.ts rename to src/app/cartography/widgets/drawings/rect-drawing.ts diff --git a/src/app/cartography/shared/widgets/drawings/text-drawing.spec.ts b/src/app/cartography/widgets/drawings/text-drawing.spec.ts similarity index 98% rename from src/app/cartography/shared/widgets/drawings/text-drawing.spec.ts rename to src/app/cartography/widgets/drawings/text-drawing.spec.ts index dd49bdee..e7ce563d 100644 --- a/src/app/cartography/shared/widgets/drawings/text-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/text-drawing.spec.ts @@ -1,4 +1,4 @@ -import { TestSVGCanvas } from "../../../testing"; +import { TestSVGCanvas } from "../../testing"; import { TextDrawingWidget } from "./text-drawing"; import { Drawing } from "../../models/drawing"; import { TextElement } from "../../models/drawings/text-element"; diff --git a/src/app/cartography/shared/widgets/drawings/text-drawing.ts b/src/app/cartography/widgets/drawings/text-drawing.ts similarity index 100% rename from src/app/cartography/shared/widgets/drawings/text-drawing.ts rename to src/app/cartography/widgets/drawings/text-drawing.ts diff --git a/src/app/cartography/shared/widgets/ethernet-link.ts b/src/app/cartography/widgets/ethernet-link.ts similarity index 100% rename from src/app/cartography/shared/widgets/ethernet-link.ts rename to src/app/cartography/widgets/ethernet-link.ts diff --git a/src/app/cartography/shared/widgets/graph-layout.spec.ts b/src/app/cartography/widgets/graph-layout.spec.ts similarity index 100% rename from src/app/cartography/shared/widgets/graph-layout.spec.ts rename to src/app/cartography/widgets/graph-layout.spec.ts diff --git a/src/app/cartography/shared/widgets/graph-layout.ts b/src/app/cartography/widgets/graph-layout.ts similarity index 100% rename from src/app/cartography/shared/widgets/graph-layout.ts rename to src/app/cartography/widgets/graph-layout.ts diff --git a/src/app/cartography/shared/widgets/interface-label.spec.ts b/src/app/cartography/widgets/interface-label.spec.ts similarity index 98% rename from src/app/cartography/shared/widgets/interface-label.spec.ts rename to src/app/cartography/widgets/interface-label.spec.ts index 84c151bb..2860baab 100644 --- a/src/app/cartography/shared/widgets/interface-label.spec.ts +++ b/src/app/cartography/widgets/interface-label.spec.ts @@ -1,6 +1,6 @@ import { Selection } from "d3-selection"; -import { TestSVGCanvas } from "../../testing"; +import { TestSVGCanvas } from "../testing"; import { Node } from "../models/node"; import { Link } from "../models/link"; import { LinkNode } from "../models/link-node"; diff --git a/src/app/cartography/shared/widgets/interface-label.ts b/src/app/cartography/widgets/interface-label.ts similarity index 100% rename from src/app/cartography/shared/widgets/interface-label.ts rename to src/app/cartography/widgets/interface-label.ts diff --git a/src/app/cartography/shared/widgets/layers.spec.ts b/src/app/cartography/widgets/layers.spec.ts similarity index 98% rename from src/app/cartography/shared/widgets/layers.spec.ts rename to src/app/cartography/widgets/layers.spec.ts index 88c55220..4ab9ec08 100644 --- a/src/app/cartography/shared/widgets/layers.spec.ts +++ b/src/app/cartography/widgets/layers.spec.ts @@ -1,6 +1,6 @@ import { instance, mock, when } from "ts-mockito"; -import { TestSVGCanvas } from "../../testing"; +import { TestSVGCanvas } from "../testing"; import { LayersWidget } from "./layers"; import { Layer } from "../models/layer"; import { LinksWidget } from "./links"; @@ -30,7 +30,7 @@ describe('LayersWidget', () => { when(mockedGraphLayout.getDrawingsWidget()).thenReturn(instance(mockedDrawingsWidget)); widget.graphLayout = instance(mockedGraphLayout); - + const layer_1 = new Layer(); layer_1.index = 1; const layer_2 = new Layer(); diff --git a/src/app/cartography/shared/widgets/layers.ts b/src/app/cartography/widgets/layers.ts similarity index 100% rename from src/app/cartography/shared/widgets/layers.ts rename to src/app/cartography/widgets/layers.ts diff --git a/src/app/cartography/shared/widgets/links.spec.ts b/src/app/cartography/widgets/links.spec.ts similarity index 97% rename from src/app/cartography/shared/widgets/links.spec.ts rename to src/app/cartography/widgets/links.spec.ts index 8b16fd5b..06f48fd9 100644 --- a/src/app/cartography/shared/widgets/links.spec.ts +++ b/src/app/cartography/widgets/links.spec.ts @@ -2,7 +2,7 @@ import { anything, instance, mock, verify } from "ts-mockito"; import { Selection } from "d3-selection"; -import { TestSVGCanvas } from "../../testing"; +import { TestSVGCanvas } from "../testing"; import { Layer } from "../models/layer"; import { LinksWidget } from "./links"; import { Node } from "../models/node"; diff --git a/src/app/cartography/shared/widgets/links.ts b/src/app/cartography/widgets/links.ts similarity index 98% rename from src/app/cartography/shared/widgets/links.ts rename to src/app/cartography/widgets/links.ts index a01f9735..f846296d 100644 --- a/src/app/cartography/shared/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 "../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/cartography/shared/widgets/nodes.spec.ts b/src/app/cartography/widgets/nodes.spec.ts similarity index 97% rename from src/app/cartography/shared/widgets/nodes.spec.ts rename to src/app/cartography/widgets/nodes.spec.ts index f2458482..9283d2de 100644 --- a/src/app/cartography/shared/widgets/nodes.spec.ts +++ b/src/app/cartography/widgets/nodes.spec.ts @@ -1,5 +1,5 @@ -import { TestSVGCanvas } from "../../testing"; +import { TestSVGCanvas } from "../testing"; import { NodesWidget } from "./nodes"; import { Node } from "../models/node"; import { Label } from "../models/label"; diff --git a/src/app/cartography/shared/widgets/nodes.ts b/src/app/cartography/widgets/nodes.ts similarity index 100% rename from src/app/cartography/shared/widgets/nodes.ts rename to src/app/cartography/widgets/nodes.ts diff --git a/src/app/cartography/shared/widgets/serial-link.ts b/src/app/cartography/widgets/serial-link.ts similarity index 100% rename from src/app/cartography/shared/widgets/serial-link.ts rename to src/app/cartography/widgets/serial-link.ts diff --git a/src/app/cartography/shared/widgets/widget.ts b/src/app/cartography/widgets/widget.ts similarity index 100% rename from src/app/cartography/shared/widgets/widget.ts rename to src/app/cartography/widgets/widget.ts diff --git a/src/app/shared/progress-dialog/progress-dialog.component.html b/src/app/common/progress-dialog/progress-dialog.component.html similarity index 100% rename from src/app/shared/progress-dialog/progress-dialog.component.html rename to src/app/common/progress-dialog/progress-dialog.component.html diff --git a/src/app/shared/progress-dialog/progress-dialog.component.scss b/src/app/common/progress-dialog/progress-dialog.component.scss similarity index 100% rename from src/app/shared/progress-dialog/progress-dialog.component.scss rename to src/app/common/progress-dialog/progress-dialog.component.scss diff --git a/src/app/shared/progress-dialog/progress-dialog.component.spec.ts b/src/app/common/progress-dialog/progress-dialog.component.spec.ts similarity index 100% rename from src/app/shared/progress-dialog/progress-dialog.component.spec.ts rename to src/app/common/progress-dialog/progress-dialog.component.spec.ts diff --git a/src/app/shared/progress-dialog/progress-dialog.component.ts b/src/app/common/progress-dialog/progress-dialog.component.ts similarity index 100% rename from src/app/shared/progress-dialog/progress-dialog.component.ts rename to src/app/common/progress-dialog/progress-dialog.component.ts diff --git a/src/app/shared/progress-dialog/progress-dialog.service.spec.ts b/src/app/common/progress-dialog/progress-dialog.service.spec.ts similarity index 100% rename from src/app/shared/progress-dialog/progress-dialog.service.spec.ts rename to src/app/common/progress-dialog/progress-dialog.service.spec.ts diff --git a/src/app/shared/progress-dialog/progress-dialog.service.ts b/src/app/common/progress-dialog/progress-dialog.service.ts similarity index 100% rename from src/app/shared/progress-dialog/progress-dialog.service.ts rename to src/app/common/progress-dialog/progress-dialog.service.ts diff --git a/src/app/progress/progress.component.html b/src/app/common/progress/progress.component.html similarity index 100% rename from src/app/progress/progress.component.html rename to src/app/common/progress/progress.component.html diff --git a/src/app/progress/progress.component.scss b/src/app/common/progress/progress.component.scss similarity index 100% rename from src/app/progress/progress.component.scss rename to src/app/common/progress/progress.component.scss diff --git a/src/app/progress/progress.component.spec.ts b/src/app/common/progress/progress.component.spec.ts similarity index 100% rename from src/app/progress/progress.component.spec.ts rename to src/app/common/progress/progress.component.spec.ts diff --git a/src/app/progress/progress.component.ts b/src/app/common/progress/progress.component.ts similarity index 100% rename from src/app/progress/progress.component.ts rename to src/app/common/progress/progress.component.ts diff --git a/src/app/progress/progress.service.spec.ts b/src/app/common/progress/progress.service.spec.ts similarity index 100% rename from src/app/progress/progress.service.spec.ts rename to src/app/common/progress/progress.service.spec.ts diff --git a/src/app/progress/progress.service.ts b/src/app/common/progress/progress.service.ts similarity index 100% rename from src/app/progress/progress.service.ts rename to src/app/common/progress/progress.service.ts diff --git a/src/app/shared/handlers/project-web-service-handler.spec.ts b/src/app/handlers/project-web-service-handler.spec.ts similarity index 91% rename from src/app/shared/handlers/project-web-service-handler.spec.ts rename to src/app/handlers/project-web-service-handler.spec.ts index a3367a49..a16b8c08 100644 --- a/src/app/shared/handlers/project-web-service-handler.spec.ts +++ b/src/app/handlers/project-web-service-handler.spec.ts @@ -3,12 +3,12 @@ import { inject, TestBed } from "@angular/core/testing"; import { Subject } from "rxjs/Subject"; import { ProjectWebServiceHandler, WebServiceMessage } from "./project-web-service-handler"; -import { NodesDataSource } from "../../cartography/shared/datasources/nodes-datasource"; -import { LinksDataSource } from "../../cartography/shared/datasources/links-datasource"; -import { DrawingsDataSource } from "../../cartography/shared/datasources/drawings-datasource"; -import { Node } from "../../cartography/shared/models/node"; -import { Link } from "../../cartography/shared/models/link"; -import { Drawing } from "../../cartography/shared/models/drawing"; +import { NodesDataSource } from "../cartography/datasources/nodes-datasource"; +import { LinksDataSource } from "../cartography/datasources/links-datasource"; +import { DrawingsDataSource } from "../cartography/datasources/drawings-datasource"; +import { Node } from "../cartography/models/node"; +import { Link } from "../cartography/models/link"; +import { Drawing } from "../cartography/models/drawing"; describe('ProjectWebServiceHandler', () => { diff --git a/src/app/shared/handlers/project-web-service-handler.ts b/src/app/handlers/project-web-service-handler.ts similarity index 77% rename from src/app/shared/handlers/project-web-service-handler.ts rename to src/app/handlers/project-web-service-handler.ts index 25a7003a..da3d5857 100644 --- a/src/app/shared/handlers/project-web-service-handler.ts +++ b/src/app/handlers/project-web-service-handler.ts @@ -1,12 +1,12 @@ import { Injectable } from "@angular/core"; import { Subject } from "rxjs/Subject"; -import { NodesDataSource } from "../../cartography/shared/datasources/nodes-datasource"; -import { LinksDataSource } from "../../cartography/shared/datasources/links-datasource"; -import { DrawingsDataSource } from "../../cartography/shared/datasources/drawings-datasource"; -import { Link } from "../../cartography/shared/models/link"; -import { Node } from "../../cartography/shared/models/node"; -import { Drawing } from "../../cartography/shared/models/drawing"; +import { NodesDataSource } from "../cartography/datasources/nodes-datasource"; +import { LinksDataSource } from "../cartography/datasources/links-datasource"; +import { DrawingsDataSource } from "../cartography/datasources/drawings-datasource"; +import { Link } from "../cartography/models/link"; +import { Node } from "../cartography/models/node"; +import { Drawing } from "../cartography/models/drawing"; export class WebServiceMessage { diff --git a/src/app/local-server/local-server.component.spec.ts b/src/app/local-server/local-server.component.spec.ts index 5c7fd937..4777cc98 100644 --- a/src/app/local-server/local-server.component.spec.ts +++ b/src/app/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 "../shared/services/server.service"; -import { MockedServerService } from "../shared/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/local-server/local-server.component.ts index fd1a8964..131fa8b6 100644 --- a/src/app/local-server/local-server.component.ts +++ b/src/app/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 "../shared/services/server.service"; -import { Server } from "../shared/models/server"; +import { ServerService } from "../services/server.service"; +import { Server } from "../models/server"; @Component({ diff --git a/src/app/shared/models/appliance.ts b/src/app/models/appliance.ts similarity index 100% rename from src/app/shared/models/appliance.ts rename to src/app/models/appliance.ts diff --git a/src/app/shared/models/port.ts b/src/app/models/port.ts similarity index 100% rename from src/app/shared/models/port.ts rename to src/app/models/port.ts diff --git a/src/app/shared/models/project.ts b/src/app/models/project.ts similarity index 100% rename from src/app/shared/models/project.ts rename to src/app/models/project.ts diff --git a/src/app/shared/models/server.ts b/src/app/models/server.ts similarity index 100% rename from src/app/shared/models/server.ts rename to src/app/models/server.ts diff --git a/src/app/shared/models/snapshot.ts b/src/app/models/snapshot.ts similarity index 100% rename from src/app/shared/models/snapshot.ts rename to src/app/models/snapshot.ts diff --git a/src/app/shared/models/version.ts b/src/app/models/version.ts similarity index 100% rename from src/app/shared/models/version.ts rename to src/app/models/version.ts diff --git a/src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html b/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html similarity index 100% rename from src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html rename to src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.html diff --git a/src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts b/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts similarity index 100% rename from src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts rename to src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts diff --git a/src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts b/src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts similarity index 68% rename from src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts rename to src/app/project-map/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts index 81a7051f..2d439b91 100644 --- a/src/app/shared/node-context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts +++ b/src/app/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/shared/models/node'; -import { NodesDataSource } from '../../../../cartography/shared/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/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html b/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html similarity index 100% rename from src/app/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html rename to src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.html diff --git a/src/app/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts b/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts similarity index 100% rename from src/app/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts rename to src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts diff --git a/src/app/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts b/src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts similarity index 66% rename from src/app/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts rename to src/app/project-map/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts index 0b55f258..1ba2458d 100644 --- a/src/app/shared/node-context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts +++ b/src/app/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/shared/models/node'; -import { NodesDataSource } from '../../../../cartography/shared/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/shared/node-context-menu/actions/start-node-action/start-node-action.component.html b/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.html similarity index 100% rename from src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.html rename to src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.html diff --git a/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts b/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts similarity index 100% rename from src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts rename to src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.spec.ts diff --git a/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts similarity index 72% rename from src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts rename to src/app/project-map/node-context-menu/actions/start-node-action/start-node-action.component.ts index f13e7b73..2725e610 100644 --- a/src/app/shared/node-context-menu/actions/start-node-action/start-node-action.component.ts +++ b/src/app/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/shared/models/node"; +import {Server} from "../../../../models/server"; +import {NodeService} from "../../../../services/node.service"; +import {Node} from "../../../../cartography/models/node"; @Component({ @@ -20,7 +20,7 @@ export class StartNodeActionComponent implements OnInit { this.nodeService .start(this.server, this.node) .subscribe((n: Node) => { - + }); } diff --git a/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.html b/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.html similarity index 100% rename from src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.html rename to src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.html diff --git a/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts b/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts similarity index 100% rename from src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts rename to src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.spec.ts diff --git a/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts similarity index 72% rename from src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts rename to src/app/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component.ts index 3885f45d..e7ef2c6e 100644 --- a/src/app/shared/node-context-menu/actions/stop-node-action/stop-node-action.component.ts +++ b/src/app/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/shared/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/shared/node-context-menu/node-context-menu.component.html b/src/app/project-map/node-context-menu/node-context-menu.component.html similarity index 100% rename from src/app/shared/node-context-menu/node-context-menu.component.html rename to src/app/project-map/node-context-menu/node-context-menu.component.html diff --git a/src/app/shared/node-context-menu/node-context-menu.component.scss b/src/app/project-map/node-context-menu/node-context-menu.component.scss similarity index 100% rename from src/app/shared/node-context-menu/node-context-menu.component.scss rename to src/app/project-map/node-context-menu/node-context-menu.component.scss diff --git a/src/app/shared/node-context-menu/node-context-menu.component.spec.ts b/src/app/project-map/node-context-menu/node-context-menu.component.spec.ts similarity index 100% rename from src/app/shared/node-context-menu/node-context-menu.component.spec.ts rename to src/app/project-map/node-context-menu/node-context-menu.component.spec.ts diff --git a/src/app/shared/node-context-menu/node-context-menu.component.ts b/src/app/project-map/node-context-menu/node-context-menu.component.ts similarity index 84% rename from src/app/shared/node-context-menu/node-context-menu.component.ts rename to src/app/project-map/node-context-menu/node-context-menu.component.ts index 4f4ad8ea..0ba8e73d 100644 --- a/src/app/shared/node-context-menu/node-context-menu.component.ts +++ b/src/app/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/shared/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/shared/node-select-interface/node-select-interface.component.html b/src/app/project-map/node-select-interface/node-select-interface.component.html similarity index 100% rename from src/app/shared/node-select-interface/node-select-interface.component.html rename to src/app/project-map/node-select-interface/node-select-interface.component.html diff --git a/src/app/shared/node-select-interface/node-select-interface.component.scss b/src/app/project-map/node-select-interface/node-select-interface.component.scss similarity index 100% rename from src/app/shared/node-select-interface/node-select-interface.component.scss rename to src/app/project-map/node-select-interface/node-select-interface.component.scss diff --git a/src/app/shared/node-select-interface/node-select-interface.component.spec.ts b/src/app/project-map/node-select-interface/node-select-interface.component.spec.ts similarity index 100% rename from src/app/shared/node-select-interface/node-select-interface.component.spec.ts rename to src/app/project-map/node-select-interface/node-select-interface.component.spec.ts diff --git a/src/app/shared/node-select-interface/node-select-interface.component.ts b/src/app/project-map/node-select-interface/node-select-interface.component.ts similarity index 93% rename from src/app/shared/node-select-interface/node-select-interface.component.ts rename to src/app/project-map/node-select-interface/node-select-interface.component.ts index ecc3818f..b47171a9 100644 --- a/src/app/shared/node-select-interface/node-select-interface.component.ts +++ b/src/app/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/shared/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/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts index 7a1ef6d7..9739b7b2 100644 --- a/src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts +++ b/src/app/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 "../../shared/services/toaster.service"; -import { NodeService } from "../../shared/services/node.service"; -import { HttpServer } from "../../shared/services/http-server.service"; -import { SelectionManager } from "../../cartography/shared/managers/selection-manager"; -import { Server } from "../../shared/models/server"; -import { Node } from "../../cartography/shared/models/node"; -import { Project } from "../../shared/models/project"; -import { ProjectService } from "../../shared/services/project.service"; -import { MockedProjectService } from "../../shared/services/project.service.spec"; -import { SettingsService } from "../../shared/services/settings.service"; -import { MockedToasterService } from "../../shared/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/project-map/project-map-shortcuts/project-map-shortcuts.component.ts index 493de4c2..961b69ea 100644 --- a/src/app/project-map/project-map-shortcuts/project-map-shortcuts.component.ts +++ b/src/app/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/shared/managers/selection-manager'; -import { NodeService } from '../../shared/services/node.service'; -import { Server } from '../../shared/models/server'; -import { ToasterService } from '../../shared/services/toaster.service'; -import { Project } from "../../shared/models/project"; -import { ProjectService } from "../../shared/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.ts b/src/app/project-map/project-map.component.ts index ead5949d..ea32c9f5 100644 --- a/src/app/project-map/project-map.component.ts +++ b/src/app/project-map/project-map.component.ts @@ -11,36 +11,36 @@ import 'rxjs/add/observable/fromPromise'; import 'rxjs/add/observable/dom/webSocket'; -import { Project } from '../shared/models/project'; -import { Node } from '../cartography/shared/models/node'; -import { SymbolService } from '../shared/services/symbol.service'; -import { Link } from "../cartography/shared/models/link"; +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 "../shared/services/server.service"; -import { ProjectService } from '../shared/services/project.service'; -import { Server } from "../shared/models/server"; +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 "../shared/services/snapshot.service"; -import { Snapshot } from "../shared/models/snapshot"; -import { ProgressDialogService } from "../shared/progress-dialog/progress-dialog.service"; -import { ProgressDialogComponent } from "../shared/progress-dialog/progress-dialog.component"; -import { Drawing } from "../cartography/shared/models/drawing"; -import { NodeContextMenuComponent } from "../shared/node-context-menu/node-context-menu.component"; -import { Appliance } from "../shared/models/appliance"; -import { NodeService } from "../shared/services/node.service"; -import { Symbol } from "../cartography/shared/models/symbol"; -import { NodeSelectInterfaceComponent } from "../shared/node-select-interface/node-select-interface.component"; -import { Port } from "../shared/models/port"; -import { LinkService } from "../shared/services/link.service"; -import { ToasterService } from '../shared/services/toaster.service'; -import { NodesDataSource } from "../cartography/shared/datasources/nodes-datasource"; -import { LinksDataSource } from "../cartography/shared/datasources/links-datasource"; -import { ProjectWebServiceHandler } from "../shared/handlers/project-web-service-handler"; -import { SelectionManager } from "../cartography/shared/managers/selection-manager"; +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 { 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/shared/datasources/drawings-datasource"; +import { DrawingsDataSource } from "../cartography/datasources/drawings-datasource"; import { Subscription } from "rxjs/Subscription"; -import { SettingsService } from "../shared/services/settings.service"; +import { SettingsService } from "../services/settings.service"; @Component({ diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts index 4b2bc69b..b064dd1e 100644 --- a/src/app/projects/projects.component.ts +++ b/src/app/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 "../shared/models/project"; -import { ProjectService } from "../shared/services/project.service"; -import { Server } from "../shared/models/server"; -import { ServerService } from "../shared/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 "../shared/services/settings.service"; -import { ProgressService } from "../progress/progress.service"; +import { SettingsService, Settings } from "../services/settings.service"; +import { ProgressService } from "../common/progress/progress.service"; @Component({ diff --git a/src/app/raven-error-handler.spec.ts b/src/app/raven-error-handler.spec.ts index 9c295851..ebf92e0c 100644 --- a/src/app/raven-error-handler.spec.ts +++ b/src/app/raven-error-handler.spec.ts @@ -3,7 +3,7 @@ import { PersistenceService } from "angular-persistence"; import * as Raven from 'raven-js'; -import { SettingsService } from "./shared/services/settings.service"; +import { SettingsService } from "./services/settings.service"; import { RavenErrorHandler } from "./raven-error-handler"; import { environment } from "../environments/environment"; diff --git a/src/app/raven-error-handler.ts b/src/app/raven-error-handler.ts index 6e85b8de..6d0bdff3 100644 --- a/src/app/raven-error-handler.ts +++ b/src/app/raven-error-handler.ts @@ -2,7 +2,7 @@ import * as Raven from 'raven-js'; import { ErrorHandler, Inject, Injector } from "@angular/core"; -import { SettingsService } from "./shared/services/settings.service"; +import { SettingsService } from "./services/settings.service"; import { environment } from "../environments/environment"; diff --git a/src/app/servers/servers.component.ts b/src/app/servers/servers.component.ts index d250085b..f9136f40 100644 --- a/src/app/servers/servers.component.ts +++ b/src/app/servers/servers.component.ts @@ -12,8 +12,8 @@ import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; -import { Server } from "../shared/models/server"; -import { ServerService } from "../shared/services/server.service"; +import { Server } from "../models/server"; +import { ServerService } from "../services/server.service"; @Component({ diff --git a/src/app/shared/services/appliance.service.spec.ts b/src/app/services/appliance.service.spec.ts similarity index 100% rename from src/app/shared/services/appliance.service.spec.ts rename to src/app/services/appliance.service.spec.ts diff --git a/src/app/shared/services/appliance.service.ts b/src/app/services/appliance.service.ts similarity index 100% rename from src/app/shared/services/appliance.service.ts rename to src/app/services/appliance.service.ts diff --git a/src/app/shared/services/http-server.service.spec.ts b/src/app/services/http-server.service.spec.ts similarity index 100% rename from src/app/shared/services/http-server.service.spec.ts rename to src/app/services/http-server.service.spec.ts diff --git a/src/app/shared/services/http-server.service.ts b/src/app/services/http-server.service.ts similarity index 100% rename from src/app/shared/services/http-server.service.ts rename to src/app/services/http-server.service.ts diff --git a/src/app/shared/services/indexed-db.service.spec.ts b/src/app/services/indexed-db.service.spec.ts similarity index 100% rename from src/app/shared/services/indexed-db.service.spec.ts rename to src/app/services/indexed-db.service.spec.ts diff --git a/src/app/shared/services/indexed-db.service.ts b/src/app/services/indexed-db.service.ts similarity index 100% rename from src/app/shared/services/indexed-db.service.ts rename to src/app/services/indexed-db.service.ts diff --git a/src/app/shared/services/link.service.spec.ts b/src/app/services/link.service.spec.ts similarity index 97% rename from src/app/shared/services/link.service.spec.ts rename to src/app/services/link.service.spec.ts index f3de5e94..9d529345 100644 --- a/src/app/shared/services/link.service.spec.ts +++ b/src/app/services/link.service.spec.ts @@ -5,7 +5,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; import { getTestServer } from './testing'; diff --git a/src/app/shared/services/link.service.ts b/src/app/services/link.service.ts similarity index 94% rename from src/app/shared/services/link.service.ts rename to src/app/services/link.service.ts index a3bf09e4..ecbf59a2 100644 --- a/src/app/shared/services/link.service.ts +++ b/src/app/services/link.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import 'rxjs/add/operator/map'; import { Server } from "../models/server"; diff --git a/src/app/shared/services/node.service.spec.ts b/src/app/services/node.service.spec.ts similarity index 98% rename from src/app/shared/services/node.service.spec.ts rename to src/app/services/node.service.spec.ts index 2972d8eb..43fe5b37 100644 --- a/src/app/shared/services/node.service.spec.ts +++ b/src/app/services/node.service.spec.ts @@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; import { getTestServer } from './testing'; import { NodeService } from './node.service'; diff --git a/src/app/shared/services/node.service.ts b/src/app/services/node.service.ts similarity index 95% rename from src/app/shared/services/node.service.ts rename to src/app/services/node.service.ts index f3d78459..346e5b7b 100644 --- a/src/app/shared/services/node.service.ts +++ b/src/app/services/node.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Project } from '../models/project'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; @@ -47,7 +47,7 @@ export class NodeService { .put(server, `/projects/${node.project_id}/nodes/${node.node_id}`, { 'x': node.x, 'y': node.y, - 'z': node.z + 'z': node.z }); } diff --git a/src/app/shared/services/project.service.spec.ts b/src/app/services/project.service.spec.ts similarity index 100% rename from src/app/shared/services/project.service.spec.ts rename to src/app/services/project.service.spec.ts diff --git a/src/app/shared/services/project.service.ts b/src/app/services/project.service.ts similarity index 91% rename from src/app/shared/services/project.service.ts rename to src/app/services/project.service.ts index 8be406fa..b32cea85 100644 --- a/src/app/shared/services/project.service.ts +++ b/src/app/services/project.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { Project } from '../models/project'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; -import { Link } from "../../cartography/shared/models/link"; +import { Link } from "../cartography/models/link"; import { Server } from "../models/server"; import { HttpServer } from "./http-server.service"; -import {Drawing} from "../../cartography/shared/models/drawing"; +import {Drawing} from "../cartography/models/drawing"; import { SettingsService } from "./settings.service"; @Injectable() diff --git a/src/app/shared/services/server.service.spec.ts b/src/app/services/server.service.spec.ts similarity index 100% rename from src/app/shared/services/server.service.spec.ts rename to src/app/services/server.service.spec.ts diff --git a/src/app/shared/services/server.service.ts b/src/app/services/server.service.ts similarity index 100% rename from src/app/shared/services/server.service.ts rename to src/app/services/server.service.ts diff --git a/src/app/shared/services/settings.service.spec.ts b/src/app/services/settings.service.spec.ts similarity index 100% rename from src/app/shared/services/settings.service.spec.ts rename to src/app/services/settings.service.spec.ts diff --git a/src/app/shared/services/settings.service.ts b/src/app/services/settings.service.ts similarity index 100% rename from src/app/shared/services/settings.service.ts rename to src/app/services/settings.service.ts diff --git a/src/app/shared/services/snapshot.service.spec.ts b/src/app/services/snapshot.service.spec.ts similarity index 97% rename from src/app/shared/services/snapshot.service.spec.ts rename to src/app/services/snapshot.service.spec.ts index 8cda358f..52f63ee7 100644 --- a/src/app/shared/services/snapshot.service.spec.ts +++ b/src/app/services/snapshot.service.spec.ts @@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; import { getTestServer } from './testing'; import { SnapshotService } from './snapshot.service'; diff --git a/src/app/shared/services/snapshot.service.ts b/src/app/services/snapshot.service.ts similarity index 100% rename from src/app/shared/services/snapshot.service.ts rename to src/app/services/snapshot.service.ts diff --git a/src/app/shared/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts similarity index 97% rename from src/app/shared/services/symbol.service.spec.ts rename to src/app/services/symbol.service.spec.ts index 90a7ad3d..ef815626 100644 --- a/src/app/shared/services/symbol.service.spec.ts +++ b/src/app/services/symbol.service.spec.ts @@ -6,7 +6,7 @@ import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { getTestServer } from './testing'; import { SymbolService } from './symbol.service'; -import { Symbol } from '../../cartography/shared/models/symbol'; +import { Symbol } from '../cartography/models/symbol'; describe('SymbolService', () => { diff --git a/src/app/shared/services/symbol.service.ts b/src/app/services/symbol.service.ts similarity index 95% rename from src/app/shared/services/symbol.service.ts rename to src/app/services/symbol.service.ts index ddeffa4d..5c05ebc5 100644 --- a/src/app/shared/services/symbol.service.ts +++ b/src/app/services/symbol.service.ts @@ -6,7 +6,7 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/observable/forkJoin'; import 'rxjs/add/observable/of'; -import { Symbol } from '../../cartography/shared/models/symbol'; +import { Symbol } from '../cartography/models/symbol'; import { Server } from "../models/server"; import { HttpServer } from "./http-server.service"; diff --git a/src/app/shared/services/testing.ts b/src/app/services/testing.ts similarity index 99% rename from src/app/shared/services/testing.ts rename to src/app/services/testing.ts index f4d24b32..dfc50775 100644 --- a/src/app/shared/services/testing.ts +++ b/src/app/services/testing.ts @@ -6,4 +6,4 @@ export function getTestServer(): Server { server.port = 3080; server.authorization = "none"; return server; -} \ No newline at end of file +} diff --git a/src/app/shared/services/toaster.service.spec.ts b/src/app/services/toaster.service.spec.ts similarity index 100% rename from src/app/shared/services/toaster.service.spec.ts rename to src/app/services/toaster.service.spec.ts diff --git a/src/app/shared/services/toaster.service.ts b/src/app/services/toaster.service.ts similarity index 100% rename from src/app/shared/services/toaster.service.ts rename to src/app/services/toaster.service.ts diff --git a/src/app/shared/services/version.service.spec.ts b/src/app/services/version.service.spec.ts similarity index 96% rename from src/app/shared/services/version.service.spec.ts rename to src/app/services/version.service.spec.ts index 2169b6cb..b3ca1ca2 100644 --- a/src/app/shared/services/version.service.spec.ts +++ b/src/app/services/version.service.spec.ts @@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; -import { Node } from '../../cartography/shared/models/node'; +import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; import { getTestServer } from './testing'; import { VersionService } from './version.service'; diff --git a/src/app/shared/services/version.service.ts b/src/app/services/version.service.ts similarity index 100% rename from src/app/shared/services/version.service.ts rename to src/app/services/version.service.ts diff --git a/src/app/settings/settings.component.spec.ts b/src/app/settings/settings.component.spec.ts index a68e5e41..c9119d26 100644 --- a/src/app/settings/settings.component.spec.ts +++ b/src/app/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 "../shared/services/settings.service"; -import { ToasterService } from "../shared/services/toaster.service"; -import { MockedToasterService } from "../shared/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/settings/settings.component.ts index 4ed1512d..f5f2669f 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { SettingsService } from "../shared/services/settings.service"; -import { ToasterService } from "../shared/services/toaster.service"; +import { SettingsService } from "../services/settings.service"; +import { ToasterService } from "../services/toaster.service"; @Component({ selector: 'app-settings',