Commit 2bccadf0 by Linnea Samila

renamed left-menu to sidebar

1 parent 004889b3
<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>
......
...@@ -19,6 +19,4 @@ export class AppComponent { ...@@ -19,6 +19,4 @@ export class AppComponent {
}); });
} }
} }
...@@ -10,7 +10,7 @@ import { FormsModule } from '@angular/forms'; ...@@ -10,7 +10,7 @@ import { FormsModule } from '@angular/forms';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { MoyaLocaleComponent } from './components/moya-locale/moya-locale.component'; import { MoyaLocaleComponent } from './components/moya-locale/moya-locale.component';
import { TopMenuComponent } from './menu/top-menu/top-menu.component'; import { SidebarComponent } from './menu/sidebar/sidebar.component';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { LoginComponent } from './pages/login/login.component'; import { LoginComponent } from './pages/login/login.component';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
...@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core'; ...@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
declarations: [ declarations: [
LoginComponent, LoginComponent,
AppComponent, AppComponent,
TopMenuComponent, SidebarComponent,
MoyaLocaleComponent MoyaLocaleComponent
], ],
imports: [ imports: [
......
<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!