Commit 4b7d9b19 by Tuukka Kivilahti

routetest, for pull

1 parent 39dcfa86
...@@ -29,6 +29,11 @@ ...@@ -29,6 +29,11 @@
"ts-helpers": "^1.1.1", "ts-helpers": "^1.1.1",
"zone.js": "^0.7.2" "zone.js": "^0.7.2"
}, },
"scripts" : {
"prekissa" : "echo \"pre kissa\" ",
"postkissa" : "echo \"post kissa\" ",
"kissa": "node test.js"
},
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "^2.3.1", "@angular/compiler-cli": "^2.3.1",
"@types/jasmine": "2.5.38", "@types/jasmine": "2.5.38",
......
<h1> <h1>Moya</h1>
VIPLIST
</h1>
<moya-viplist>Loading viplist</moya-viplist>
<router-outlet></router-outlet>
...@@ -8,17 +8,29 @@ import { ViplistComponent } from './viplist/viplist.component'; ...@@ -8,17 +8,29 @@ import { ViplistComponent } from './viplist/viplist.component';
import {AlertModule} from "ng2-bootstrap"; import {AlertModule} from "ng2-bootstrap";
import {MoyaRestModule} from "./moya-rest/moya-rest.module"; import {MoyaRestModule} from "./moya-rest/moya-rest.module";
import { RouterModule, Routes } from '@angular/router';
import {TestComponent} from "./test/test.component";
const appRoutes: Routes = [
{ path: 'viplist', component: ViplistComponent },
{ path: 'test', component: TestComponent }
];
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
ViplistComponent ViplistComponent,
TestComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
FormsModule, FormsModule,
HttpModule, HttpModule,
AlertModule.forRoot(), AlertModule.forRoot(),
MoyaRestModule.forRoot() MoyaRestModule.forRoot(),
RouterModule.forRoot(appRoutes)
], ],
providers: [], providers: [],
bootstrap: [AppComponent] bootstrap: [AppComponent]
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<td> <td>
<div> <div>
<div *ngFor="let p of vip.products"> <div *ngFor="let p of vip.products">
<div style="display: inline-block;">{{p.name}}</div> <div style="display: inline-block;">{{p.name}}</div>
<div style="display: inline-block;">{{p.quantity}}</div> <div style="display: inline-block;">{{p.quantity}}</div>
</div> </div>
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
<h:body> <h:body>
<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>
</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!