Skip to content

Commit dcd9f98

Browse files
lsf0lsf0
committed
a little change
1 parent d1aab8b commit dcd9f98

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

‎pack-angular/celerio/pack-angular/web/src/app/entities/entity-list.component.ts.e.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$output.file("web/src/app/entities/${entity.model.var}/${entity.model.var}-list.component.ts")##
2-
import { Component, Input, Output, OnChanges, EventEmitter, SimpleChanges, Inject } from '@angular/core';
2+
import { Component, Input, Output, OnChanges, EventEmitter, SimpleChanges} from '@angular/core';
33
import { Router } from '@angular/router';
44
import { DataTable, LazyLoadEvent } from 'primeng/primeng';
55
import { PageResponse } from "../../support/paging";

‎pack-angular/celerio/pack-angular/web/src/app/entities/entity.service.ts.e.vm‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$output.file("web/src/app/entities/${entity.model.var}/${entity.model.var}.service.ts")##
22
import { Injectable } from '@angular/core';
3-
import { HttpClientModule, HttpClient, HttpResponse, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
3+
import { HttpClient, HttpResponse, HttpErrorResponse } from '@angular/common/http';
44
import { LazyLoadEvent } from 'primeng/primeng';
55
import { MessageService } from '../../service/message.service';
66
import { PageResponse, PageRequestByExample } from '../../support/paging';
@@ -12,8 +12,6 @@ import 'rxjs/add/observable/throw';
1212
@Injectable()
1313
export class ${entity.service.type} {
1414

15-
private options = { headers: new HttpHeaders({ 'Content-Type': 'application/json' }) };
16-
1715
constructor(private http: HttpClient, private messageService : MessageService) {}
1816

1917
/**
@@ -31,9 +29,9 @@ export class ${entity.service.type} {
3129
* Update the passed ${entity.model.var}.
3230
*/
3331
update($entity.model.var : $entity.model.type) : Observable<$entity.model.type> {
34-
let body = JSON.stringify($entity.model.var);
32+
let body = $entity.model.var;
3533

36-
return this.http.put('/api/$entity.model.vars/', body, this.options)
34+
return this.http.put('/api/$entity.model.vars/', body)
3735
.pipe(
3836
map(response => new ${entity.model.type}(response)),
3937
catchError(this.handleError)
@@ -46,14 +44,11 @@ export class ${entity.service.type} {
4644
*/
4745
getPage($entity.model.var : $entity.model.type, event : LazyLoadEvent) : Observable<PageResponse<$entity.model.type>> {
4846
let req = new PageRequestByExample($entity.model.var, event);
49-
let body = JSON.stringify(req);
47+
let body = req;
5048

51-
return this.http.post('/api/$entity.model.vars/page', body, this.options)
49+
return this.http.post<PageResponse<any>>('/api/$entity.model.vars/page', body)
5250
.pipe(
53-
map(response => {
54-
let pr : any = response;
55-
return new PageResponse<$entity.model.type>(pr.totalPages, pr.totalElements, ${entity.model.type}.toArray(pr.content));
56-
}),
51+
map(pr => new PageResponse<$entity.model.type>(pr.totalPages, pr.totalElements, ${entity.model.type}.toArray(pr.content))),
5752
catchError(this.handleError)
5853
);
5954
}
@@ -63,8 +58,8 @@ export class ${entity.service.type} {
6358
* Used by ${entity.model.type}CompleteComponent.
6459
*/
6560
complete(query : string) : Observable<${entity.model.type}[]> {
66-
let body = JSON.stringify({'query': query, 'maxResults': 10});
67-
return this.http.post<any[]>('/api/$entity.model.vars/complete', body, this.options)
61+
let body = {'query': query, 'maxResults': 10};
62+
return this.http.post<any[]>('/api/$entity.model.vars/complete', body)
6863
.pipe(
6964
map(response => ${entity.model.type}.toArray(response)),
7065
catchError(this.handleError)

‎pack-angular/celerio/pack-angular/web/src/app/service/auth.service.ts.p.vm‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$output.file("web/src/app/service/auth.service.ts")##
22

33
import { Injectable } from '@angular/core'
4-
import { HttpClientModule, HttpHeaders, HttpClient, HttpErrorResponse } from '@angular/common/http';
4+
import { HttpParams, HttpClient, HttpErrorResponse } from '@angular/common/http';
55
import { Observable } from 'rxjs/Rx';
66
import { catchError, map } from 'rxjs/operators';
77
import 'rxjs/add/observable/throw';
@@ -20,9 +20,16 @@ export class AuthService {
2020

2121
login(j_username : string, j_password : string) : Observable<boolean> {
2222
console.log("login for " + j_username);
23-
let body = 'j_username=' + j_username + '&j_password=' + j_password + '&submit=Login';
23+
const params = {
24+
j_username: j_username,
25+
j_password: j_password,
26+
submit: 'Login'
27+
};
28+
29+
let body = new HttpParams({fromObject: params});
30+
2431

25-
return this.http.post('/api/login', body, { headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded' }), observe: 'response' })
32+
return this.http.post('/api/login', body, { observe: 'response' })
2633
.pipe(
2734
map(res => res.status == 200),
2835
catchError(this.handleError)

‎quickstart/README.md‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
**Prerequisites:**
33

44
* [Java Development Kit 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
5-
* [Maven 3.3.3](https://maven.apache.org/download.cgi)
6-
* [Angular cli 1.6.3 ](https://github.com/angular/angular-cli#installation) - 1.6.3 is really required to work with Angular 5.0
7-
* [Npm 3.x.x](https://nodejs.org/en/)
8-
* [NodeJS 6.10](https://nodejs.org/en/)
5+
* [Maven 3.5.x](https://maven.apache.org/download.cgi)
6+
* [Angular cli 1.6.3 ](https://github.com/angular/angular-cli#installation) - 1.0.0 is really required to work with Angular 4.0
7+
* [Npm 5.x.x](https://nodejs.org/en/)
8+
* [NodeJS 8.x](https://nodejs.org/en/)
99

1010

1111
### Run these commands to generate and run an Angular 5.0 web app:
@@ -31,10 +31,9 @@ Make sure you wait until spring boot starts and listen on port 8080
3131
**Then from a second console run:**
3232

3333
cd celerio-angular-quickstart/quickstart/web
34-
npm install --save @angular/material @angular/cdk
35-
npm install --save @angular/animations
36-
npm install --save primeng@5.0.2
37-
npm install --save font-awesome
34+
npm i @angular/material @angular/cdk
35+
npm i primeng
36+
npm i font-awesome
3837
ng serve --proxy-config proxy.conf.json
3938

4039
Then open [http://localhost:4200/](http://localhost:4200/)
@@ -91,10 +90,10 @@ The backend listens on port 8080.
9190

9291
The 4 command below install some additional dependencies required by the code generated by Celerio.
9392

94-
npm install --save @angular/material @angular/cdk
95-
npm install --save @angular/animations
96-
npm install --save primeng@5.0.2
97-
npm install --save font-awesome
93+
npm i @angular/material @angular/cdk
94+
npm i primeng
95+
npm i font-awesome
96+
9897

9998
Starts a node server on port 4200 using angular cli. The node server proxies the calls to /api and /img to the
10099
spring boot backend that runs in the first console.
@@ -174,10 +173,10 @@ Here are the command lines (hope it is self explanatory):
174173
rm web/src/app/app.module.ts web/src/app/app.component.* web/src/styles.css
175174
mvn -Pdb,metadata,gen generate-sources
176175
cd web
177-
npm install --save @angular/material @angular/cdk
178-
npm install --save @angular/animations
179-
npm install --save primeng@5.0.2
180-
npm install --save font-awesome
176+
npm i @angular/material @angular/cdk
177+
npm i primeng
178+
npm i font-awesome
179+
181180
ng build --prod
182181
cp dist/* ../src/main/resources/static
183182
cd ..

0 commit comments

Comments
 (0)