Commit fd7b24d9 by Tuukka Kivilahti

fixed test and navigation testing

1 parent 52584923
<h1>Moya</h1> <h1>Moya</h1>
<router-outlet></router-outlet> <router-outlet></router-outlet>
<a routerLink="/viplist" routerLinkActive="active">viplist</a>
<a routerLink="/test" routerLinkActive="active">test</a>
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import {Router} from "@angular/router";
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
...@@ -6,5 +7,13 @@ import { Component } from '@angular/core'; ...@@ -6,5 +7,13 @@ import { Component } from '@angular/core';
styleUrls: ['./app.component.css'] styleUrls: ['./app.component.css']
}) })
export class AppComponent { export class AppComponent {
constructor(private router : Router) {
(<any>window).router = router;
}
title = 'app works!'; title = 'app works!';
} }
...@@ -16,7 +16,7 @@ export class ViplistComponent implements OnInit { ...@@ -16,7 +16,7 @@ export class ViplistComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.viplistService.get(); this.vips = this.viplistService.get();
} }
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<ui:define name="headerdata"> <ui:define name="headerdata">
<!-- base href="/MoyaWeb/resources/angular-dist/"></base--> <!-- base href="/MoyaWeb/resources/angular-dist/"></base-->
<base href="/MoyaWeb/angular.jsf#/#/"></base> <base href="/MoyaWeb/angular/"></base>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!