diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 28815a58..3d406538 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,11 +4,16 @@ import { RouterModule, Routes } from '@angular/router'; import { ProjectMapComponent } from './project-map/project-map.component'; import { ServersComponent } from "./servers/servers.component"; import { ProjectsComponent } from "./projects/projects.component"; +import { DefaultLayoutComponent } from "./default-layout/default-layout.component"; const routes: Routes = [ - { path: '', redirectTo: '/servers', pathMatch: 'full' }, - { path: 'servers', component: ServersComponent }, - { path: 'server/:server_id/projects', component: ProjectsComponent }, + { path: '', component: DefaultLayoutComponent, + children: [ + { path: '', redirectTo: 'servers', pathMatch: 'full'}, + { path: 'servers', component: ServersComponent }, + { path: 'server/:server_id/projects', component: ProjectsComponent } + ] + }, { path: 'server/:server_id/project/:project_id', component: ProjectMapComponent }, ]; diff --git a/src/app/app.component.html b/src/app/app.component.html index 76bc0610..0680b43f 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,19 +1 @@ - - - - diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fc84d493..93e47692 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -20,6 +20,7 @@ import { SymbolService } from "./services/symbol.service"; import { ServerService } from "./services/server.service"; import { IndexedDbService } from "./services/indexed-db.service"; import { HttpServer } from "./services/http-server.service"; +import { DefaultLayoutComponent } from './default-layout/default-layout.component'; @NgModule({ @@ -30,6 +31,7 @@ import { HttpServer } from "./services/http-server.service"; ServersComponent, ServerCreateModalComponent, ProjectsComponent, + DefaultLayoutComponent, ], imports: [ NgbModule.forRoot(), diff --git a/src/app/default-layout/default-layout.component.css b/src/app/default-layout/default-layout.component.css new file mode 100644 index 00000000..e69de29b diff --git a/src/app/default-layout/default-layout.component.html b/src/app/default-layout/default-layout.component.html new file mode 100644 index 00000000..76bc0610 --- /dev/null +++ b/src/app/default-layout/default-layout.component.html @@ -0,0 +1,19 @@ + + + + + diff --git a/src/app/default-layout/default-layout.component.spec.ts b/src/app/default-layout/default-layout.component.spec.ts new file mode 100644 index 00000000..a28c5e44 --- /dev/null +++ b/src/app/default-layout/default-layout.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DefaultLayoutComponent } from './default-layout.component'; + +describe('DefaultLayoutComponent', () => { + let component: DefaultLayoutComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DefaultLayoutComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DefaultLayoutComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/default-layout/default-layout.component.ts b/src/app/default-layout/default-layout.component.ts new file mode 100644 index 00000000..536ede72 --- /dev/null +++ b/src/app/default-layout/default-layout.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-default-layout', + templateUrl: './default-layout.component.html', + styleUrls: ['./default-layout.component.css'] +}) +export class DefaultLayoutComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}