diff --git a/src/app/pages/probes/probe-tab-page-routing.module.ts b/src/app/pages/probes/probe-tab-page-routing.module.ts index c3a2092..3d652ff 100644 --- a/src/app/pages/probes/probe-tab-page-routing.module.ts +++ b/src/app/pages/probes/probe-tab-page-routing.module.ts @@ -4,7 +4,7 @@ import { ProbeTabPageComponent } from './probe-tab-page.component'; import { ProbeListPageComponent } from '@app/pages/probes/probe/probe-list-page.component'; import { ProbeDetailPageComponent } from '@app/pages/probes/probe/probe-detail-page.component'; import { NoAuthProbePageComponent } from '@app/pages/probes/noauth-probe/noauth-probe-page.component'; -import { ProbeDownloadPageComponent } from '@app/pages/probes/download/download-page.component'; +import { ProbeDownloadPageComponent } from '../../pages/probes/download/download-page.component'; const routes: Routes = [ { @@ -16,12 +16,14 @@ const routes: Routes = [ { path: 'download', component: ProbeDownloadPageComponent }, { path: 'download/:idx', component: ProbeDownloadPageComponent }, { path: ':id/info', component: ProbeDetailPageComponent }, + { path: ':id/target', loadChildren: '../../pages/targets/target-page.module#TargetPageModule' }, { path: ':id/history', component: null }, - { path: 'target', loadChildren: '../pages/target/target-page.module#TargetPageModule'}, ] }, ]; +// D:\project\overFlow\member_webapp\src\app\pages\targets\target-page.module.ts + @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] diff --git a/src/app/pages/probes/probe-tab-page.component.ts b/src/app/pages/probes/probe-tab-page.component.ts index 2408f6e..a11de44 100644 --- a/src/app/pages/probes/probe-tab-page.component.ts +++ b/src/app/pages/probes/probe-tab-page.component.ts @@ -41,8 +41,7 @@ export class ProbeTabPageComponent implements OnDestroy { default: this.tabs = [ { label: 'INFO', routerLink: ['/probe/', parsedUrl, 'info'] }, - // { label: 'TARGETS', path: ['/probe/', parsedUrl, 'target'] }, - { label: 'TARGETS', routerLink: ['/target/list'], queryParams: {probe: parsedUrl}}, + { label: 'TARGETS', routerLink: ['/probe/', parsedUrl, 'target'] }, { label: 'HISTORY', path: ['/probe/', parsedUrl, 'history'], disabled: true }, ]; break; diff --git a/src/app/pages/target/target-detail-page.component.html b/src/app/pages/targets/target-detail-page.component.html similarity index 100% rename from src/app/pages/target/target-detail-page.component.html rename to src/app/pages/targets/target-detail-page.component.html diff --git a/src/app/pages/target/target-detail-page.component.ts b/src/app/pages/targets/target-detail-page.component.ts similarity index 100% rename from src/app/pages/target/target-detail-page.component.ts rename to src/app/pages/targets/target-detail-page.component.ts diff --git a/src/app/pages/target/target-list-page.component.html b/src/app/pages/targets/target-list-page.component.html similarity index 100% rename from src/app/pages/target/target-list-page.component.html rename to src/app/pages/targets/target-list-page.component.html diff --git a/src/app/pages/target/target-list-page.component.ts b/src/app/pages/targets/target-list-page.component.ts similarity index 100% rename from src/app/pages/target/target-list-page.component.ts rename to src/app/pages/targets/target-list-page.component.ts diff --git a/src/app/pages/target/target-page-routing.module.ts b/src/app/pages/targets/target-page-routing.module.ts similarity index 100% rename from src/app/pages/target/target-page-routing.module.ts rename to src/app/pages/targets/target-page-routing.module.ts diff --git a/src/app/pages/target/target-page.component.html b/src/app/pages/targets/target-page.component.html similarity index 100% rename from src/app/pages/target/target-page.component.html rename to src/app/pages/targets/target-page.component.html diff --git a/src/app/pages/target/target-page.component.spec.ts b/src/app/pages/targets/target-page.component.spec.ts similarity index 100% rename from src/app/pages/target/target-page.component.spec.ts rename to src/app/pages/targets/target-page.component.spec.ts diff --git a/src/app/pages/target/target-page.component.ts b/src/app/pages/targets/target-page.component.ts similarity index 100% rename from src/app/pages/target/target-page.component.ts rename to src/app/pages/targets/target-page.component.ts diff --git a/src/app/pages/target/target-page.module.ts b/src/app/pages/targets/target-page.module.ts similarity index 100% rename from src/app/pages/target/target-page.module.ts rename to src/app/pages/targets/target-page.module.ts