Commit ed3f0265 by Linnea Samila

renamed left-menu to sidebar

1 parent 7c896eb8
<div id="top-container"> <div id="top-container">
<div id="left-menu"> <div id="sidebar">
<router-outlet name="left-menu"></router-outlet> <router-outlet name="sidebar"></router-outlet>
</div> </div>
......
...@@ -21,6 +21,4 @@ export class AppComponent { ...@@ -21,6 +21,4 @@ export class AppComponent {
}); });
} }
} }
...@@ -12,7 +12,7 @@ import {OldMoyaComponent} from './pages/old-moya/old-moya.component'; ...@@ -12,7 +12,7 @@ import {OldMoyaComponent} from './pages/old-moya/old-moya.component';
import {TestComponent} from './test/test.component'; import {TestComponent} from './test/test.component';
import {AdminMenuComponent} from './menu/admin-menu/admin-menu.component'; import {AdminMenuComponent} from './menu/admin-menu/admin-menu.component';
import {TopMenuComponent} from './menu/top-menu/top-menu.component'; import {TopMenuComponent} from './menu/top-menu/top-menu.component';
import {LeftMenuComponent} from './menu/left-menu/left-menu.component'; import { SidebarComponent } from './menu/sidebar/sidebar.component';
import {InfoMenuComponent} from './menu/info-menu/info-menu.component'; import {InfoMenuComponent} from './menu/info-menu/info-menu.component';
import {UserMenuComponent} from './menu/user-menu/user-menu.component'; import {UserMenuComponent} from './menu/user-menu/user-menu.component';
import {UserComponent} from './pages/user/user.component'; import {UserComponent} from './pages/user/user.component';
...@@ -34,7 +34,7 @@ const appRoutes: Routes = [ ...@@ -34,7 +34,7 @@ const appRoutes: Routes = [
{ {
path: 'user', path: 'user',
children: [ children: [
{path: '', component: UserMenuComponent, outlet: 'left-menu'}, {path: '', component: UserMenuComponent, outlet: 'sidebar'},
{path: '', pathMatch: 'full', component: UserComponent}, {path: '', pathMatch: 'full', component: UserComponent},
{path: 'old', component: OldMoyaComponent}, {path: 'old', component: OldMoyaComponent},
] ]
...@@ -42,7 +42,7 @@ const appRoutes: Routes = [ ...@@ -42,7 +42,7 @@ const appRoutes: Routes = [
{ {
path: 'info', path: 'info',
children: [ children: [
{path: '', component: InfoMenuComponent, outlet: 'left-menu'}, {path: '', component: InfoMenuComponent, outlet: 'sidebar'},
{path: '', pathMatch: 'full', component: OldMoyaComponent}, {path: '', pathMatch: 'full', component: OldMoyaComponent},
{path: 'old', component: OldMoyaComponent}, {path: 'old', component: OldMoyaComponent},
{path: 'viplist', component: ViplistComponent}, {path: 'viplist', component: ViplistComponent},
...@@ -51,7 +51,7 @@ const appRoutes: Routes = [ ...@@ -51,7 +51,7 @@ const appRoutes: Routes = [
{ {
path: 'admin', path: 'admin',
children: [ children: [
{path: '', component: AdminMenuComponent, outlet: 'left-menu'}, {path: '', component: AdminMenuComponent, outlet: 'sidebar'},
{path: '', pathMatch: 'full', component: AdminComponent}, {path: '', pathMatch: 'full', component: AdminComponent},
{path: 'old', component: OldMoyaComponent}, {path: 'old', component: OldMoyaComponent},
] ]
...@@ -68,7 +68,7 @@ const appRoutes: Routes = [ ...@@ -68,7 +68,7 @@ const appRoutes: Routes = [
OldMoyaComponent, OldMoyaComponent,
TestComponent, TestComponent,
TopMenuComponent, TopMenuComponent,
LeftMenuComponent, SidebarComponent,
AdminMenuComponent, AdminMenuComponent,
InfoMenuComponent, InfoMenuComponent,
UserMenuComponent, UserMenuComponent,
......
<left-menu [menu]="menu" styleClass="adminMenu"></left-menu> <sidebar [menu]="menu" styleClass="adminMenu"></sidebar>
<left-menu [menu]="menu" styleClass="infoMenu"></left-menu> <sidebar [menu]="menu" styleClass="infoMenu"></sidebar>
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { LeftMenuComponent } from './left-menu.component'; import { SidebarComponent } from './sidebar.component';
describe('LeftMenuComponent', () => { describe('SidebarComponent', () => {
let component: LeftMenuComponent; let component: SidebarComponent;
let fixture: ComponentFixture<LeftMenuComponent>; let fixture: ComponentFixture<SidebarComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ LeftMenuComponent ] declarations: [ SidebarComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(LeftMenuComponent); fixture = TestBed.createComponent(SidebarComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
......
...@@ -2,11 +2,11 @@ import {Component, OnInit, Input} from '@angular/core'; ...@@ -2,11 +2,11 @@ import {Component, OnInit, Input} from '@angular/core';
import {MenuGroup} from '../models/menu-group.model'; import {MenuGroup} from '../models/menu-group.model';
@Component({ @Component({
selector: 'left-menu', selector: 'sidebar',
templateUrl: './left-menu.component.html', templateUrl: './sidebar.component.html',
styleUrls: ['./left-menu.component.scss'] styleUrls: ['./sidebar.component.scss']
}) })
export class LeftMenuComponent implements OnInit { export class SidebarComponent implements OnInit {
@Input() @Input()
menu: MenuGroup[]; menu: MenuGroup[];
......
<left-menu [menu]="menu" styleClass="userMenu"></left-menu> <sidebar [menu]="menu" styleClass="userMenu"></sidebar>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!