From 2fd289f8e4e211eb26752d04d8d9b394ab78470f Mon Sep 17 00:00:00 2001 From: cyuamber Date: Thu, 26 Sep 2019 16:53:28 +0800 Subject: [PATCH] feat:adjust the file schema of components related to service instances Change-Id: I18f1674601536a59313528bb1e01fd6b4fffd4fd Issue-ID: USECASEUI-307 Signed-off-by: cyuamber --- usecaseui-portal/src/app/app.module.ts | 8 ++++---- .../services-list}/ccvpn-creation/ccvpn-creation.component.css | 4 ++-- .../services-list}/ccvpn-creation/ccvpn-creation.component.html | 0 .../ccvpn-creation/ccvpn-creation.component.spec.ts | 0 .../services-list}/ccvpn-creation/ccvpn-creation.component.ts | 2 +- .../services-list}/ccvpn-detail/ccvpn-detail.component.css | 4 ++-- .../services-list}/ccvpn-detail/ccvpn-detail.component.html | 0 .../services-list}/ccvpn-detail/ccvpn-detail.component.spec.ts | 0 .../services-list}/ccvpn-detail/ccvpn-detail.component.ts | 2 +- .../services-list}/e2e-creation/e2e-creation.component.css | 0 .../services-list}/e2e-creation/e2e-creation.component.html | 0 .../services-list}/e2e-creation/e2e-creation.component.less | 4 ++-- .../services-list}/e2e-creation/e2e-creation.component.spec.ts | 0 .../services-list}/e2e-creation/e2e-creation.component.ts | 2 +- .../services/services-list}/e2e-detail/e2e-detail.component.html | 0 .../services/services-list}/e2e-detail/e2e-detail.component.less | 4 ++-- .../services-list}/e2e-detail/e2e-detail.component.spec.ts | 0 .../services/services-list}/e2e-detail/e2e-detail.component.ts | 2 +- 18 files changed, 16 insertions(+), 16 deletions(-) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-creation/ccvpn-creation.component.css (97%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-creation/ccvpn-creation.component.html (100%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-creation/ccvpn-creation.component.spec.ts (100%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-creation/ccvpn-creation.component.ts (99%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-detail/ccvpn-detail.component.css (97%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-detail/ccvpn-detail.component.html (100%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-detail/ccvpn-detail.component.spec.ts (100%) rename usecaseui-portal/src/app/views/{ => services/services-list}/ccvpn-detail/ccvpn-detail.component.ts (99%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-creation/e2e-creation.component.css (100%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-creation/e2e-creation.component.html (100%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-creation/e2e-creation.component.less (96%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-creation/e2e-creation.component.spec.ts (100%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-creation/e2e-creation.component.ts (99%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-detail/e2e-detail.component.html (100%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-detail/e2e-detail.component.less (95%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-detail/e2e-detail.component.spec.ts (100%) rename usecaseui-portal/src/app/{shared/components => views/services/services-list}/e2e-detail/e2e-detail.component.ts (98%) diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts index 885bba67..092f82b4 100644 --- a/usecaseui-portal/src/app/app.module.ts +++ b/usecaseui-portal/src/app/app.module.ts @@ -48,12 +48,12 @@ import { PerformanceComponent } from './views/performance/performance.component' import { PerformanceVnfComponent } from './views/performance/performance-vnf/performance-vnf.component'; import { PerformanceVmComponent } from './views/performance/performance-vm/performance-vm.component'; import { CcvpnNetworkComponent } from './views/ccvpn-network/ccvpn-network.component'; -import { CcvpnDetailComponent } from './views/ccvpn-detail/ccvpn-detail.component'; -import { CcvpnCreationComponent } from './views/ccvpn-creation/ccvpn-creation.component'; +import { CcvpnDetailComponent } from './views/services/services-list/ccvpn-detail/ccvpn-detail.component'; +import { CcvpnCreationComponent } from './views/services/services-list/ccvpn-creation/ccvpn-creation.component'; import { DetailsComponent } from './shared/components/details/details.component'; import { GraphiclistComponent } from './shared/components/graphiclist/graphiclist.component'; -import { E2eCreationComponent } from './shared/components/e2e-creation/e2e-creation.component'; +import { E2eCreationComponent } from './views/services/services-list/e2e-creation/e2e-creation.component'; import { BarComponent } from './shared/components/charts/bar/bar.component'; import { LineComponent } from './shared/components/charts/line/line.component'; @@ -68,7 +68,7 @@ import { HomesService } from './core/services/homes.service'; import { onboardService } from './core/services/onboard.service'; import { networkHttpservice } from './core/services/networkHttpservice.service'; import { PerformanceDetailsComponent } from './shared/components/performance-details/performance-details.component'; -import { E2eDetailComponent } from './shared/components/e2e-detail/e2e-detail.component'; +import { E2eDetailComponent } from './views/services/services-list/e2e-detail/e2e-detail.component'; import { CustomerComponent } from './shared/components/customer/customer.component'; import { ManagemencsService } from './core/services/managemencs.service'; import { FcapsComponent } from './views/fcaps/fcaps.component'; diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.css b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.css similarity index 97% rename from usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.css rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.css index 23d05259..8ea1b621 100644 --- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.css +++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.css @@ -44,14 +44,14 @@ hr { display: inline-block; width: 35px; height: 35px; - background:url("../../../assets/images/Return-icon.png") no-repeat!important; + background:url("../../../../../assets/images/Return-icon.png") no-repeat!important; background-size: 100%!important; border-radius:4px; color: #D7D7D7; cursor: pointer; } .model .back:hover{ - background: url("../../../assets/images/Return-icon-active.png")!important; + background: url("../../../../../assets/images/Return-icon-active.png")!important; background-size: 100%!important; } .top-title h3.title { diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.html b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.html similarity index 100% rename from usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.html rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.html diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.spec.ts similarity index 100% rename from usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.spec.ts rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.spec.ts diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts similarity index 99% rename from usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts index b0d464f3..5a94e484 100644 --- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts +++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts @@ -15,7 +15,7 @@ */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import * as d3 from 'd3'; -import { ServiceListService } from '../../core/services/serviceList.service'; +import { ServiceListService } from '../../../../core/services/serviceList.service'; @Component({ selector: 'app-ccvpn-creation', diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.css b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.css similarity index 97% rename from usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.css rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.css index 2de3c1cc..8d005d40 100644 --- a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.css +++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.css @@ -58,14 +58,14 @@ hr { display: inline-block; width: 35px; height: 35px; - background:url("../../../assets/images/Return-icon.png") no-repeat!important; + background:url("../../../../../assets/images/Return-icon.png") no-repeat!important; background-size: 100%!important; border-radius:4px; color: #D7D7D7; cursor: pointer; } .model .back:hover{ - background: url("../../../assets/images/Return-icon-active.png")!important; + background: url("../../../../../assets/images/Return-icon-active.png")!important; background-size: 100%!important; } .top-title h3.title { diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.html b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.html similarity index 100% rename from usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.html rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.html diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.spec.ts similarity index 100% rename from usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.spec.ts rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.spec.ts diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.ts similarity index 99% rename from usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.ts rename to usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.ts index e8110fda..a253b044 100644 --- a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.ts +++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.ts @@ -14,7 +14,7 @@ limitations under the License. */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { ServiceListService } from '../../core/services/serviceList.service'; +import { ServiceListService } from '../../../../core/services/serviceList.service'; import * as d3 from 'd3'; @Component({ diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.css b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.css similarity index 100% rename from usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.css rename to usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.css diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.html b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.html similarity index 100% rename from usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.html rename to usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.html diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.less b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.less similarity index 96% rename from usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.less rename to usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.less index 2964dad9..3679079e 100644 --- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.less +++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.less @@ -59,14 +59,14 @@ hr { display: inline-block; width: 35px; height: 35px; - background:url("../../../../assets/images/Return-icon.png") no-repeat!important; + background:url("../../../../../assets/images/Return-icon.png") no-repeat!important; background-size: 100%!important; border-radius:4px; color: #D7D7D7; cursor: pointer; } .back:hover{ - background: url("../../../../assets/images/Return-icon-active.png")!important; + background: url("../../../../../assets/images/Return-icon-active.png")!important; background-size: 100%!important; } .top-title h3.title { diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.spec.ts similarity index 100% rename from usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.spec.ts rename to usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.spec.ts diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts similarity index 99% rename from usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.ts rename to usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts index accc6dbb..f1df9636 100644 --- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.ts +++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts @@ -14,7 +14,7 @@ limitations under the License. */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { ServiceListService } from '../../../core/services/serviceList.service'; +import { ServiceListService } from '../../../../core/services/serviceList.service'; import * as d3 from 'd3'; @Component({ diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.html b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.html similarity index 100% rename from usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.html rename to usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.html diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.less b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.less similarity index 95% rename from usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.less rename to usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.less index bada5991..ad28a518 100644 --- a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.less +++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.less @@ -45,14 +45,14 @@ hr { display: inline-block; width: 35px; height: 35px; - background:url("../../../../assets/images/Return-icon.png") no-repeat!important; + background:url("../../../../../assets/images/Return-icon.png") no-repeat!important; background-size: 100%!important; border-radius:4px; color: #D7D7D7; cursor: pointer; } .back:hover{ - background: url("../../../../assets/images/Return-icon-active.png")!important; + background: url("../../../../../assets/images/Return-icon-active.png")!important; background-size: 100%!important; } .top-title h3.title { diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.spec.ts similarity index 100% rename from usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.spec.ts rename to usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.spec.ts diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts similarity index 98% rename from usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.ts rename to usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts index 9f38ffa5..50f63b3e 100644 --- a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.ts +++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts @@ -15,7 +15,7 @@ */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { ServiceListService } from '../../../core/services/serviceList.service'; +import { ServiceListService } from '../../../../core/services/serviceList.service'; import * as d3 from 'd3'; @Component({ -- 2.16.6