T_____________T

This commit is contained in:
insanity 2018-01-31 16:03:21 +09:00
parent 198d9a24c6
commit 7237decc09
13 changed files with 112 additions and 13 deletions

View File

@ -0,0 +1,15 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SubMenubarComponent } from 'app/commons/layouts/sub-menubar/sub-menubar.component';
import { MaterialModule } from 'app/commons/ui/material/material.module';
@NgModule({
imports: [
CommonModule,
MaterialModule
],
declarations: [
SubMenubarComponent
]
})
export class SubMenubarModule { }

View File

@ -9,8 +9,8 @@ const routes: Routes = [
children: [ children: [
{ path: '', redirectTo: 'home' }, { path: '', redirectTo: 'home' },
{ path: 'home', loadChildren: './home/home-page.module#HomePageModule' }, { path: 'home', loadChildren: './home/home-page.module#HomePageModule' },
{ path: 'probe', loadChildren: './probes/probes-page.module#ProbesPageModule' }, { path: 'probes', loadChildren: './probes/probes-page.module#ProbesPageModule' },
{ path: 'probe', loadChildren: './probe/probe-page.module#ProbePageModule' },
{ path: 'discovery', loadChildren: './discovery/discovery-page.module#DiscoveryPageModule' }, { path: 'discovery', loadChildren: './discovery/discovery-page.module#DiscoveryPageModule' },
{ path: 'map', loadChildren: './infra/infra-page.module#InfraPageModule' }, { path: 'map', loadChildren: './infra/infra-page.module#InfraPageModule' },
] ]

View File

@ -26,7 +26,7 @@
<of-header [sidenav]="sidenav" [drawer]="drawer" [sidebar]="sidenav2" [matDrawerShow]="matDrawerShow" style="z-index: 500"></of-header> <of-header [sidenav]="sidenav" [drawer]="drawer" [sidebar]="sidenav2" [matDrawerShow]="matDrawerShow" style="z-index: 500"></of-header>
<perfect-scrollbar style="height: calc(100% - 33px);"> <perfect-scrollbar style="height: calc(100% - 33px);">
<div style="height: 100%; padding: 0px 10px 0px 10px"> <div style="height: 100%;">
<router-outlet #route="outlet"></router-outlet> <router-outlet #route="outlet"></router-outlet>
</div> </div>
</perfect-scrollbar> </perfect-scrollbar>

View File

@ -15,6 +15,7 @@ import {
PerfectScrollbarConfigInterface PerfectScrollbarConfigInterface
} from 'ngx-perfect-scrollbar'; } from 'ngx-perfect-scrollbar';
import { NotificationComponent } from 'app/packages/notification/notification.component'; import { NotificationComponent } from 'app/packages/notification/notification.component';
import { SubMenubarModule } from 'app/commons/layouts/sub-menubar/sub-menubar.module';
const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
suppressScrollX: true suppressScrollX: true
@ -28,7 +29,8 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
CovalentModule, CovalentModule,
MaterialModule, MaterialModule,
PerfectScrollbarModule, PerfectScrollbarModule,
FlexLayoutModule FlexLayoutModule,
SubMenubarModule
], ],
declarations: [ declarations: [
PagesComponent, PagesComponent,

View File

@ -0,0 +1,23 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ProbePageComponent } from './probe-page.component';
import { ListComponent as ProbeListComponent } from 'app/packages/probe/component/list/list.component';
import { ListComponent as NoauthListComponent } from 'app/packages/noauth/component/list/list.component';
import { DownloadComponent } from 'app/packages/probe/component/download/download.component';
import { DetailComponent as ProbeDetailComponent } from 'app/packages/probe/component/detail/detail.component';
const routes: Routes = [
{
path: '',
component: ProbePageComponent,
children: [
{ path: '', component: ProbeListComponent },
]
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class ProbesPageRoutingModule { }

View File

@ -0,0 +1,6 @@
<div>
<of-sub-menubar [tabs]="tabs"></of-sub-menubar>
<div style="padding: 15px">
<router-outlet>이거슨 detail</router-outlet>
</div>
</div>

View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ProbePageComponent } from './probe-page.component';
describe('ProbeComponent', () => {
let component: ProbePageComponent;
let fixture: ComponentFixture<ProbePageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ProbePageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ProbePageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'of-pages-probe',
templateUrl: './probe-page.component.html',
styleUrls: ['./probe-page.component.scss']
})
export class ProbePageComponent {
tabs2 = [
{ label: 'Info', path: '/probe/' },
{ label: 'Targets', path: '/target' },
{ label: 'History', path: '/probe/history' },
];
constructor() { }
}

View File

@ -0,0 +1,19 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ProbePageComponent } from './probe-page.component';
import { ProbesPageRoutingModule } from './probe-page-routing.module';
import { MaterialModule } from 'app/commons/ui/material/material.module';
import { ProbeModule } from 'app/packages/probe/probe.module';
@NgModule({
imports: [
CommonModule,
ProbesPageRoutingModule,
MaterialModule,
ProbeModule,
],
declarations: [
ProbePageComponent,
]
})
export class ProbePageModule { }

View File

@ -12,7 +12,6 @@ const routes: Routes = [
component: ProbesPageComponent, component: ProbesPageComponent,
children: [ children: [
{ path: '', component: ProbeListComponent }, { path: '', component: ProbeListComponent },
{ path: 'detail/:id', component: ProbeDetailComponent },
{ path: 'noauth', component: NoauthListComponent }, { path: 'noauth', component: NoauthListComponent },
{ path: 'download', component: DownloadComponent }, { path: 'download', component: DownloadComponent },
] ]

View File

@ -13,12 +13,6 @@ export class ProbesPageComponent {
{ label: 'Download', path: '/probes/download' }, { label: 'Download', path: '/probes/download' },
]; ];
// tabs2 = [
// { label: 'Info', path: '/probe/' },
// { label: 'Targets', path: '/target' },
// { label: 'History', path: '/probe/history' },
// ];
constructor() { } constructor() { }
} }

View File

@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ProbesPageComponent } from './probes-page.component'; import { ProbesPageComponent } from './probes-page.component';
import { ProbesPageRoutingModule } from './probes-page-routing.module'; import { ProbesPageRoutingModule } from './probes-page-routing.module';
import { SubMenubarComponent } from 'app/commons/layouts/sub-menubar/sub-menubar.component';
import { MaterialModule } from 'app/commons/ui/material/material.module'; import { MaterialModule } from 'app/commons/ui/material/material.module';
import { ProbeModule } from 'app/packages/probe/probe.module'; import { ProbeModule } from 'app/packages/probe/probe.module';
import { NoauthModule } from 'app/packages/noauth/noauth.module'; import { NoauthModule } from 'app/packages/noauth/noauth.module';
@ -17,7 +16,6 @@ import { NoauthModule } from 'app/packages/noauth/noauth.module';
], ],
declarations: [ declarations: [
ProbesPageComponent, ProbesPageComponent,
SubMenubarComponent
] ]
}) })
export class ProbesPageModule { } export class ProbesPageModule { }