fixin and breaking

code/moya-angular/e2e/app.e2e-spec.ts

@@ -9,6 +9,6 @@ describe('moya-angular App', function() {
 
 
   it('should display message saying app works', () => {
   it('should display message saying app works', () => {
     page.navigateTo();
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
+    expect(page.getParagraphText()).toEqual('login works!');
   });
   });
 });
 });

code/moya-angular/src/app/app-routing.module.ts

@@ -11,7 +11,7 @@ const APP_ROUTES: Routes = [
   { path: 'login', component: LoginComponent },
   { path: 'login', component: LoginComponent },
   { path: '', pathMatch: 'full', redirectTo: 'login' },
   { path: '', pathMatch: 'full', redirectTo: 'login' },
   { path: '**', component: LoginComponent }
   { path: '**', component: LoginComponent }
-]; 
+];
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [

code/moya-angular/src/app/app.component.html

@@ -2,7 +2,7 @@
 
 
   <div id="sidebar">
   <div id="sidebar">
 
 
-  <router-outlet name="sidebar"></router-outlet>
+  <router-outlet name="moya-sidebar"></router-outlet>
 
 
   </div>
   </div>
 
 
@@ -15,4 +15,3 @@
       <router-outlet></router-outlet>
       <router-outlet></router-outlet>
     </div>
     </div>
   </div>
   </div>
-  
\ No newline at end of file

code/moya-angular/src/app/app.module.ts

@@ -11,6 +11,7 @@ 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 { SidebarComponent } from './menu/sidebar/sidebar.component';
 import { SidebarComponent } from './menu/sidebar/sidebar.component';
+import { RoleSelectorComponent } from './menu/role-selector/role-selector.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';
@@ -20,6 +21,7 @@ import { NgModule } from '@angular/core';
     LoginComponent,
     LoginComponent,
     AppComponent,
     AppComponent,
     SidebarComponent,
     SidebarComponent,
+    RoleSelectorComponent,
     MoyaLocaleComponent
     MoyaLocaleComponent
   ],
   ],
   imports: [
   imports: [

code/moya-angular/src/app/components/moya-locale/moya-locale.component.scss

@@ -7,7 +7,7 @@
 .disabled-flag {
 .disabled-flag {
   opacity: 0;
   opacity: 0;
   cursor: move;
   cursor: move;
-  border: none;
+  border: 0;
   display: hidden;
   display: hidden;
 }
 }
 
 

code/moya-angular/src/app/menu/admin-menu/admin-menu.component.html

-<sidebar [menu]="menu" styleClass="adminMenu"></sidebar>
+<moya-sidebar [menu]="menu" styleClass="adminMenu"></moya-sidebar>

code/moya-angular/src/app/menu/info-menu/info-menu.component.html

-<sidebar [menu]="menu" styleClass="infoMenu"></sidebar>
+<moya-sidebar [menu]="menu" styleClass="infoMenu"></moya-sidebar>

code/moya-angular/src/app/menu/group-selector-menu/group-selector-menu.component.spec.ts → code/moya-angular/src/app/menu/role-selector/role-selector.component.spec.ts

 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 
-import { GroupSelectorComponent } from './group-selector-menu.component';
+import { RoleSelectorComponent } from './role-selector.component';
 
 
-describe('GroupSelectorComponent', () => {
-  let component: GroupSelectorComponent;
-  let fixture: ComponentFixture<GroupSelectorComponent>;
+describe('RoleSelectorComponent', () => {
+  let component: RoleSelectorComponent;
+  let fixture: ComponentFixture<RoleSelectorComponent>;
 
 
   beforeEach(async(() => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
     TestBed.configureTestingModule({
-      declarations: [ GroupSelectorComponent ]
+      declarations: [ RoleSelectorComponent ]
     })
     })
     .compileComponents();
     .compileComponents();
   }));
   }));
 
 
   beforeEach(() => {
   beforeEach(() => {
-    fixture = TestBed.createComponent(GroupSelectorComponent);
+    fixture = TestBed.createComponent(RoleSelectorComponent);
     component = fixture.componentInstance;
     component = fixture.componentInstance;
     fixture.detectChanges();
     fixture.detectChanges();
   });
   });

code/moya-angular/src/app/menu/group-selector-menu/group-selector-menu.component.ts → code/moya-angular/src/app/menu/role-selector/role-selector.component.ts

 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
 
 
 @Component({
 @Component({
-  selector: 'moya-group-selector-menu',
-  templateUrl: './group-selector-menu.component.html',
-  styleUrls: ['./group-selector-menu.component.scss']
+  selector: 'moya-role-selector',
+  templateUrl: './role-selector.component.html',
+  styleUrls: ['./role-selector.component.scss']
 })
 })
-export class GroupSelectorComponent implements OnInit {
+export class RoleSelectorComponent implements OnInit {
 
 
   constructor() { }
   constructor() { }
 
 

code/moya-angular/src/app/menu/sidebar/sidebar.component.html

@@ -5,7 +5,7 @@
   <h2>Lippukauppa</h2>
   <h2>Lippukauppa</h2>
   </header>
   </header>
 
 
-  <moya-group-selector-menu></moya-group-selector-menu>
+  <moya-role-selector></moya-role-selector>
 
 
   <nav id="leftNav">
   <nav id="leftNav">
 
 

code/moya-angular/src/app/menu/sidebar/sidebar.component.ts

@@ -2,10 +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: 'sidebar',
+  selector: 'moya-sidebar',
   templateUrl: './sidebar.component.html',
   templateUrl: './sidebar.component.html',
   styleUrls: ['./sidebar.component.scss']
   styleUrls: ['./sidebar.component.scss']
 })
 })
+
 export class SidebarComponent implements OnInit {
 export class SidebarComponent implements OnInit {
 
 
   @Input()
   @Input()
@@ -15,10 +16,10 @@ export class SidebarComponent implements OnInit {
   styleClass: string;
   styleClass: string;
 
 
   constructor() {
   constructor() {
-
   }
   }
 
 
   ngOnInit() {
   ngOnInit() {
+    console.log('sidebar component');
   }
   }
 
 
 }
 }

code/moya-angular/src/app/menu/left-menu/left-menu.module.ts → code/moya-angular/src/app/menu/sidebar/sidebar.module.ts

 import { NgModule } from '@angular/core';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { LeftMenuComponent } from './left-menu.component';
+import { SidebarComponent } from './sidebar.component';
 import { RouterModule } from '@angular/router';
 import { RouterModule } from '@angular/router';
+import { RoleSelectorComponent} from './../role-selector/role-selector.component';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
     RouterModule
     RouterModule
   ],
   ],
-  declarations: [LeftMenuComponent],
+  declarations: [SidebarComponent],
   exports : [
   exports : [
-    LeftMenuComponent
+    SidebarComponent
   ]
   ]
 })
 })
-export class LeftMenuModule { }
+export class SidebarModule { }

code/moya-angular/src/app/menu/user-menu/user-menu.component.html

-<sidebar [menu]="menu" styleClass="userMenu"></sidebar>
+<moya-sidebar [menu]="menu" styleClass="userMenu"></moya-sidebar>

code/moya-angular/src/app/pages/admin/admin-routing.module.ts

@@ -5,7 +5,7 @@ import { Routes, RouterModule } from '@angular/router';
 import { AdminComponent } from './admin.component';
 import { AdminComponent } from './admin.component';
 
 
 const routes: Routes = [
 const routes: Routes = [
-  { path: '', component: AdminMenuComponent, outlet: 'left-menu' },
+  { path: '', component: AdminMenuComponent, outlet: 'moya-sidebar' },
   { path: '', pathMatch: 'full', component: AdminComponent },
   { path: '', pathMatch: 'full', component: AdminComponent },
   { path: 'old', component: OldMoyaComponent }
   { path: 'old', component: OldMoyaComponent }
 ];
 ];

code/moya-angular/src/app/pages/admin/admin.module.ts

@@ -4,13 +4,13 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminComponent } from './admin.component';
 import { AdminComponent } from './admin.component';
-import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
+import { SidebarModule } from '../../menu/sidebar/sidebar.module';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
     AdminRoutingModule,
     AdminRoutingModule,
-    LeftMenuModule,
+    SidebarModule,
     OldMoyaModule
     OldMoyaModule
   ],
   ],
   declarations: [AdminComponent, AdminMenuComponent]
   declarations: [AdminComponent, AdminMenuComponent]

code/moya-angular/src/app/pages/info/info-routing.module.ts

@@ -6,7 +6,7 @@ import { Routes, RouterModule } from '@angular/router';
 import { InfoComponent } from './info.component';
 import { InfoComponent } from './info.component';
 
 
 const routes: Routes = [
 const routes: Routes = [
-  { path: '', component: InfoMenuComponent, outlet: 'left-menu' },
+  { path: '', component: InfoMenuComponent, outlet: 'moya-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 }

code/moya-angular/src/app/pages/info/info.module.ts

@@ -5,13 +5,13 @@ import { CommonModule } from '@angular/common';
 import { InfoRoutingModule } from './info-routing.module';
 import { InfoRoutingModule } from './info-routing.module';
 import { InfoComponent } from './info.component';
 import { InfoComponent } from './info.component';
 import { InfoMenuComponent } from '../../menu/info-menu/info-menu.component';
 import { InfoMenuComponent } from '../../menu/info-menu/info-menu.component';
-import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
+import { SidebarModule } from '../../menu/sidebar/sidebar.module';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
     InfoRoutingModule,
     InfoRoutingModule,
-    LeftMenuModule,
+    SidebarModule,
     OldMoyaModule
     OldMoyaModule
   ],
   ],
   declarations: [InfoComponent, InfoMenuComponent, ViplistComponent]
   declarations: [InfoComponent, InfoMenuComponent, ViplistComponent]

code/moya-angular/src/app/pages/login/login-routing.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { Routes, RouterModule } from '@angular/router';
 import { LoginComponent } from './login.component';
 import { LoginComponent } from './login.component';
 
 
-const routes: Routes = [ 
+const routes: Routes = [
   { path: '', component: LoginComponent }
   { path: '', component: LoginComponent }
 ];
 ];
 
 

code/moya-angular/src/app/pages/login/login.module.ts

@@ -2,7 +2,7 @@ import { LoginRoutingModule } from './login-routing.module';
 import { NgModule } from '@angular/core';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { LoginComponent } from './login.component';
 import { LoginComponent } from './login.component';
-import { TopMenuComponent } from '../../menu/top-menu/top-menu.component';
+import { RoleSelectorComponent } from '../../menu/role-selector/role-selector.component';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [

code/moya-angular/src/app/pages/user/user-routing.module.ts

@@ -6,9 +6,9 @@ import { UserComponent } from './user.component';
 
 
 const routes: Routes = [
 const routes: Routes = [
   { path: '', pathMatch: 'full', component: UserComponent },
   { path: '', pathMatch: 'full', component: UserComponent },
-  { path: '', component: UserMenuComponent, outlet: 'left-menu' },
+  { path: '', component: UserMenuComponent, outlet: 'moya-sidebar' },
   { path: 'old', component: OldMoyaComponent }
   { path: 'old', component: OldMoyaComponent }
-  
+
 ];
 ];
 
 
 @NgModule({
 @NgModule({

code/moya-angular/src/app/pages/user/user.module.ts

@@ -6,14 +6,14 @@ import { CommonModule } from '@angular/common';
 import { UserRoutingModule } from './user-routing.module';
 import { UserRoutingModule } from './user-routing.module';
 import { UserComponent } from './user.component';
 import { UserComponent } from './user.component';
 import { UserMenuComponent } from '../../menu/user-menu/user-menu.component';
 import { UserMenuComponent } from '../../menu/user-menu/user-menu.component';
-import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
+import { SidebarModule } from '../../menu/sidebar/sidebar.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
     UserRoutingModule,
     UserRoutingModule,
-    LeftMenuModule,
+    SidebarModule,
     OldMoyaModule,
     OldMoyaModule,
     TranslateModule.forRoot()
     TranslateModule.forRoot()
   ],
   ],

code/moya-angular/src/index.html

 <!doctype html>
 <!doctype html>
 <html>
 <html>
-<head>
-  <meta charset="utf-8">
-  <title>MoyaAngular</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <base href="/MoyaNG/">
+  <head>
+    <meta charset="utf-8">
+    <title>MoyaAngular</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <base href="/MoyaNG/">
 
 
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-<body>
-  <moya-root>Welcome to new MOYA</moya-root>
-</body>
+    <link rel="icon" type="image/x-icon" href="favicon.ico">
+  </head>
+  <body>
+    <moya-root>Welcome to new MOYA</moya-root>
+  </body>
 </html>
 </html>