Commit 806c9c54 by Tuukka Kivilahti

Merge branch 'feature/routing' into 'master'

Feature/routing

See merge request !398
2 parents 091de5de 08aa64f6
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
import { LoginComponent } from './pages/login/login.component'; import { LoginComponent } from './pages/login/login.component';
import { InfoComponent } from './pages/info/info.component'; import { InfoComponent } from './pages/info/info.component';
...@@ -16,7 +16,8 @@ const APP_ROUTES: Routes = [ ...@@ -16,7 +16,8 @@ const APP_ROUTES: Routes = [
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forRoot( RouterModule.forRoot(
APP_ROUTES APP_ROUTES,
{ preloadingStrategy: PreloadAllModules }
) )
], ],
exports: [ exports: [
......
...@@ -9,6 +9,6 @@ import { TopMenuComponent } from '../../menu/top-menu/top-menu.component'; ...@@ -9,6 +9,6 @@ import { TopMenuComponent } from '../../menu/top-menu/top-menu.component';
CommonModule, CommonModule,
LoginRoutingModule LoginRoutingModule
], ],
declarations: [ LoginComponent, TopMenuComponent ] declarations: []
}) })
export class LoginModule { } export class LoginModule { }
<span i18n>This is testfile</span>
<br />
<br />
<br />
<h1 i18n>Counter value</h1>
{{counter}}
<p i18n>{counter, plural, =0 {not pressed} =1 {pressed once} other {pressed many times}} </p>
<button (click)="addOne()" i18n>ADD ONE</button>
<span i18n>This is testfile</span>
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { TestComponent } from './test.component';
describe('TestComponent', () => {
let component: TestComponent;
let fixture: ComponentFixture<TestComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ TestComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(TestComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import {Component, OnInit, Input} from '@angular/core';
@Component({
selector: 'moya-test',
templateUrl: './test.component.html',
styleUrls: ['./test.component.scss']
})
export class TestComponent implements OnInit {
@Input() counter: number;
constructor() {
this.counter = 0;
}
ngOnInit() {
}
addOne() {
this.counter++;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!