Remove base components and project-detail modules.

This commit is contained in:
kunw 2017-02-13 19:11:46 +08:00
parent 4a48bbb418
commit f27d2e41fa
7 changed files with 15 additions and 49 deletions

View File

@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { BaseComponent } from './base.component';
import { HarborShellComponent } from './harbor-shell/harbor-shell.component';
import { DashboardComponent } from '../dashboard/dashboard.component';
import { ProjectComponent } from '../project/project.component';
@ -13,7 +13,7 @@ import { LogComponent } from '../log/log.component';
const baseRoutes: Routes = [
{
path: 'harbor', component: BaseComponent,
path: 'harbor', component: HarborShellComponent,
children: [
{ path: 'dashboard', component: DashboardComponent },
{ path: 'projects', component: ProjectComponent }

View File

@ -1 +0,0 @@
<harbor-shell></harbor-shell>

View File

@ -1,9 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'base',
templateUrl: 'base.component.html'
})
export class BaseComponent {
}

View File

@ -3,13 +3,11 @@ import { SharedModule } from '../shared.module';
import { DashboardModule } from '../dashboard/dashboard.module';
import { ProjectModule } from '../project/project.module';
import { ProjectDetailModule } from '../project/project-detail/project-detail.module';
import { NavigatorComponent } from './navigator/navigator.component';
import { GlobalSearchComponent } from './global-search/global-search.component';
import { FooterComponent } from './footer/footer.component';
import { HarborShellComponent } from './harbor-shell/harbor-shell.component';
import { BaseComponent } from './base.component';
import { BaseRoutingModule } from './base-routing.module';
@ -18,17 +16,15 @@ import { BaseRoutingModule } from './base-routing.module';
SharedModule,
DashboardModule,
ProjectModule,
ProjectDetailModule,
BaseRoutingModule
],
declarations: [
BaseComponent,
NavigatorComponent,
GlobalSearchComponent,
FooterComponent,
HarborShellComponent
],
exports: [ BaseComponent ]
exports: [ HarborShellComponent ]
})
export class BaseModule {

View File

@ -1,27 +0,0 @@
import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared.module';
import { ProjectDetailComponent } from './project-detail.component';
import { RepositoryComponent } from '../../repository/repository.component';
import { ReplicationComponent } from '../../replication/replication.component';
import { MemberComponent } from '../../member/member.component';
import { LogComponent } from '../../log/log.component';
import { RouterModule } from '@angular/router';
@NgModule({
imports: [
SharedModule,
RouterModule
],
declarations: [
ProjectDetailComponent,
RepositoryComponent,
ReplicationComponent,
MemberComponent,
LogComponent
],
exports: [ ProjectDetailComponent ]
})
export class ProjectDetailModule {}

View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { BaseComponent } from '../base/base.component';
import { HarborShellComponent} from '../base/harbor-shell/harbor-shell.component';
import { ProjectComponent } from './project.component';
import { ProjectDetailComponent } from './project-detail/project-detail.component';
@ -12,7 +12,7 @@ import { LogComponent } from '../log/log.component';
const projectRoutes: Routes = [
{ path: 'harbor',
component: BaseComponent,
component: HarborShellComponent,
children: [
{ path: 'projects', component: ProjectComponent },
{

View File

@ -1,7 +1,10 @@
import { NgModule } from '@angular/core';
import { SharedModule } from '../shared.module';
import { ProjectDetailModule } from './project-detail/project-detail.module';
import { RepositoryModule } from '../repository/repository.module';
import { ReplicationModule } from '../replication/replication.module';
import { MemberModule} from '../member/member.module';
import { LogModule } from '../log/log.module';
import { ProjectComponent } from './project.component';
import { CreateProjectComponent } from './create-project/create-project.component';
@ -15,7 +18,10 @@ import { ProjectRoutingModule } from './project-routing.module';
@NgModule({
imports: [
SharedModule,
ProjectDetailModule,
RepositoryModule,
ReplicationModule,
MemberModule,
LogModule,
ProjectRoutingModule
],
declarations: [
@ -23,7 +29,8 @@ import { ProjectRoutingModule } from './project-routing.module';
CreateProjectComponent,
SearchProjectComponent,
FilterProjectComponent,
ListProjectComponent
ListProjectComponent,
ProjectDetailComponent
],
exports: [ ListProjectComponent ]
})