From 8e5770986f3d6eefe3f3eb20810e44d75c037e42 Mon Sep 17 00:00:00 2001 From: insanity Date: Mon, 4 Jun 2018 15:24:01 +0900 Subject: [PATCH] inprogress --- .../download/download-page-routing.module.ts | 20 ------------------ .../probes/download/download-page.module.ts | 21 ------------------- .../noauth-probe-page-routing.module.ts | 16 -------------- .../noauth-probe/noauth-probe-page.module.ts | 19 ----------------- .../probes/probe-tab-page-routing.module.ts | 7 +++++-- src/app/pages/probes/probe-tab-page.module.ts | 8 ++++++- 6 files changed, 12 insertions(+), 79 deletions(-) delete mode 100644 src/app/pages/probes/download/download-page-routing.module.ts delete mode 100644 src/app/pages/probes/download/download-page.module.ts delete mode 100644 src/app/pages/probes/noauth-probe/noauth-probe-page-routing.module.ts delete mode 100644 src/app/pages/probes/noauth-probe/noauth-probe-page.module.ts diff --git a/src/app/pages/probes/download/download-page-routing.module.ts b/src/app/pages/probes/download/download-page-routing.module.ts deleted file mode 100644 index 4571de5..0000000 --- a/src/app/pages/probes/download/download-page-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { ProbeDownloadPageComponent } from './download-page.component'; - -const routes: Routes = [ - { - path: '', - component: ProbeDownloadPageComponent, - }, - { - path: ':idx', - component: ProbeDownloadPageComponent, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ProbeDownloadPageRoutingModule { } diff --git a/src/app/pages/probes/download/download-page.module.ts b/src/app/pages/probes/download/download-page.module.ts deleted file mode 100644 index a93c2c5..0000000 --- a/src/app/pages/probes/download/download-page.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { UIModule } from '@overflow/shared/ui/ui.module'; -import { ProbeModule } from '@overflow/probe/probe.module'; - -import { ProbeDownloadPageComponent } from './download-page.component'; -import { ProbeDownloadPageRoutingModule } from './download-page-routing.module'; - -@NgModule({ - imports: [ - CommonModule, - UIModule, - ProbeDownloadPageRoutingModule, - ProbeModule - ], - entryComponents: [ - ], - declarations: [ProbeDownloadPageComponent] -}) -export class ProbeDownloadPageModule { } diff --git a/src/app/pages/probes/noauth-probe/noauth-probe-page-routing.module.ts b/src/app/pages/probes/noauth-probe/noauth-probe-page-routing.module.ts deleted file mode 100644 index b6c06f7..0000000 --- a/src/app/pages/probes/noauth-probe/noauth-probe-page-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { NoAuthProbePageComponent } from './noauth-probe-page.component'; - -const routes: Routes = [ - { - path: '', - component: NoAuthProbePageComponent, - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class NoAuthProbePageRoutingModule { } diff --git a/src/app/pages/probes/noauth-probe/noauth-probe-page.module.ts b/src/app/pages/probes/noauth-probe/noauth-probe-page.module.ts deleted file mode 100644 index 0993c8a..0000000 --- a/src/app/pages/probes/noauth-probe/noauth-probe-page.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { NoauthProbeModule } from '@overflow/noauth-probe/noauth-probe.module'; -import { NoAuthProbePageComponent } from './noauth-probe-page.component'; -import { NoAuthProbePageRoutingModule } from './noauth-probe-page-routing.module'; -import { TabbarModule } from '../../../commons/component/layout/tabbar/app.tabbar.module'; - -@NgModule({ - imports: [ - CommonModule, - NoAuthProbePageRoutingModule, - TabbarModule, - NoauthProbeModule, - ], - declarations: [ - NoAuthProbePageComponent, - ] -}) -export class NoAuthProbePageModule { } 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 31b45b4..26c0830 100644 --- a/src/app/pages/probes/probe-tab-page-routing.module.ts +++ b/src/app/pages/probes/probe-tab-page-routing.module.ts @@ -3,6 +3,8 @@ import { Routes, RouterModule } from '@angular/router'; 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'; const routes: Routes = [ { @@ -10,8 +12,9 @@ const routes: Routes = [ component: ProbeTabPageComponent, children: [ { path: 'list', component: ProbeListPageComponent }, - { path: 'noauth', loadChildren: './noauth-probe/noauth-probe-page.module#NoAuthProbePageModule' }, - { path: 'download', loadChildren: './download/download-page.module#ProbeDownloadPageModule' }, + { path: 'noauth', component: NoAuthProbePageComponent }, + { path: 'download', component: ProbeDownloadPageComponent }, + { path: 'download/:idx', component: ProbeDownloadPageComponent }, { path: ':id/info', component: ProbeDetailPageComponent }, // { path: ':id/targets', loadChildren: 'app/pages/targets/targets-page.module#TargetsPageModule'}, { path: ':id/history', component: null }, diff --git a/src/app/pages/probes/probe-tab-page.module.ts b/src/app/pages/probes/probe-tab-page.module.ts index 8e1f886..07de76b 100644 --- a/src/app/pages/probes/probe-tab-page.module.ts +++ b/src/app/pages/probes/probe-tab-page.module.ts @@ -9,6 +9,9 @@ import { ProbeTabPageRoutingModule } from './probe-tab-page-routing.module'; import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.module'; 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 { NoauthProbeModule } from '@overflow/noauth-probe/noauth-probe.module'; @NgModule({ imports: [ @@ -17,11 +20,14 @@ import { ProbeDetailPageComponent } from '@app/pages/probes/probe/probe-detail-p ProbeTabPageRoutingModule, ProbeModule, TabbarModule, + NoauthProbeModule ], declarations: [ ProbeTabPageComponent, ProbeListPageComponent, - ProbeDetailPageComponent + ProbeDetailPageComponent, + NoAuthProbePageComponent, + ProbeDownloadPageComponent ] }) export class ProbeTabPageModule { }