From 190058907a844c5d47ad37787cee1b956eafb9d2 Mon Sep 17 00:00:00 2001 From: Le Deng Date: Sat, 11 Mar 2017 16:44:57 -0500 Subject: [PATCH] latest --- .../add-new-book/add-new-book.component.html | 2 +- bookstore-api/.idea/workspace.xml | 104 +++++++++--------- .../com/bookstore/resource/BookResource.java | 14 +++ .../com/bookstore/resource/BookResource.class | Bin 5445 -> 6235 bytes .../book-list/book-list.component.html | 2 +- .../book-list/book-list.component.ts | 32 ++++-- .../components/book-list/data-filter.pipe.ts | 2 +- .../components/nav-bar/nav-bar.component.html | 4 +- .../components/nav-bar/nav-bar.component.ts | 31 +++++- store-front/src/app/services/book.service.ts | 8 ++ 10 files changed, 132 insertions(+), 67 deletions(-) diff --git a/admin-portal/src/app/components/add-new-book/add-new-book.component.html b/admin-portal/src/app/components/add-new-book/add-new-book.component.html index 2ae5606..6d2de23 100644 --- a/admin-portal/src/app/components/add-new-book/add-new-book.component.html +++ b/admin-portal/src/app/components/add-new-book/add-new-book.component.html @@ -99,7 +99,7 @@ - + Image   diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml index 877f7e8..071577f 100644 --- a/bookstore-api/.idea/workspace.xml +++ b/bookstore-api/.idea/workspace.xml @@ -60,26 +60,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -90,16 +70,39 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -179,7 +182,6 @@ @@ -209,7 +212,7 @@ - - - + @@ -1039,14 +1042,14 @@ - + - + @@ -1069,7 +1072,7 @@ - @@ -1197,14 +1200,6 @@ - - - - - - - - @@ -1403,14 +1398,6 @@ - - - - - - - - @@ -1549,8 +1536,27 @@ - - + + + + + + + + + + + + + + + + + + + + + diff --git a/bookstore-api/src/main/java/com/bookstore/resource/BookResource.java b/bookstore-api/src/main/java/com/bookstore/resource/BookResource.java index 37fe20d..cf9b839 100644 --- a/bookstore-api/src/main/java/com/bookstore/resource/BookResource.java +++ b/bookstore-api/src/main/java/com/bookstore/resource/BookResource.java @@ -132,4 +132,18 @@ public class BookResource { return new ResponseEntity("Remove Success!", HttpStatus.OK); } + @RequestMapping(value="/searchBook", method = RequestMethod.POST) + public List searchBook( + @RequestBody String keyword, + Principal principal + ) { + if (principal != null) { + String username = principal.getName(); + User user = userService.findByUsername(username); + } + + List bookList = bookService.blurrySearch(keyword); + + return bookList; + } } diff --git a/bookstore-api/target/classes/com/bookstore/resource/BookResource.class b/bookstore-api/target/classes/com/bookstore/resource/BookResource.class index f3efe6bf2d47c080449b1ac006bf1047eeca3ed2..a040d7799d1befa72524e34c67cdb6dd6b7c0094 100644 GIT binary patch delta 2254 zcmb7^c~n$o7{-71g5Fs^5QRWYJ(8G-;%HeRq?VR#MkZP2+6W_zEHlo4hApI(mZ@d8 zOtZ};HOtgA6)V$BCEIMZvITA5mvcJ(*XjK(!{Ej_HRsIxZSV3t?{fF%9PU?l;GZ2k zfdTyC!N*)TeYxAqJ+-K=7rhi7=! z!+M_6Xf|lE(ZeR5*J86iZgKH~m#u8mp|^XfXNSIi(c&eGmpASCGa+$}L7v@cX4-?T zl+8yI(-V@S0e_^pY-lJ{ZZOF9C#BYnnChSI_eBH6HIZO-t#4!`SXCSh`zs21HNDhS z2P=Fdg3;;%16NHn5UKK41`Mq7K<$iBq{P4-ZZPnM|KkwHp}Yj?BnTzgGh zpD|WrYTb*yx@|w@6|~JP?7yrjsd)@koXt5FI~A`G*3^!egL)`-vD@NR#U5Uhs1DN# ze^sfks9G?WD)zF^KIrP4wVwuq#J*vDx1ZM)2Y5r#kNy^KD&FF4JINjGl*c=YJPvB{ zuHrr3SA4)ggP!(om1!?FlkMH^H1CIsk2s{2KDHa(9qT^PD#@e66(N5~x8eR^MW7^0 z@hOKa4l6$6bBiw&U(%>JLO^kpa*MANU-OOPTfS3#&kqLeMg=NE(*xa#YKn^k(P);% zkBXl(&ht3m;%CJ#{Hpkk-wnDKhbnzK-_h#O$_bvto(37M)LBYd8mKOGikfB5GP2SH z?37?t$bH`~2(H4z60t7iYViW=Vo~*OB-c2w)`?Y-@YQ$MGMa>mTqg%5k4?d@ zmtbS$#)a`Wi!E+&lG0J$$BNmwaTrm?GeOn>6Pd(~qMMQ+&wlxji%KB~ z5M9xJ*fB)c#)+%}?z-zNP$SPWjWFOnc+-ybkfEK07|8Q%;Cv>DDTBGFjFVpspoA<^K#2 zY(2nK$~6NCHb8>ve)Z&R!K|l;!A3cmG>4Tn8tZFEEk>-uQL1!0C0QJdm48#GRLL$x z*hx@IT2}|Z$4Saeywcpd`Mb$0B*l}I6sw_E^z=ZOr|>(?={u#-MszUUcZOiAjuDw8 z1E9Tj(L{Q0=gjT&tmiCyeOlTv7-o|qqt=3Z{a$!468QMV}u zx@5ZjZ=zNp=$tMW<2JHp_t{5!pL*(Y3`h6b{%&@V-CeS_6o1aYtoxNX delta 1670 zcmb7@`&U#|6vsbzX7J41If_826|`WvTCD{NR-jfYC2CK##7Cu>(=fr<00RR=m`(Yr z?A=Yn>}fBvmjtO;S!op6yR3d_^@IOFKln>O)oPzRbO*@Rs#$CHIs4qb&v$?K{+?fE z43?#j|9SWbP{ofn<#dH8W;-WUp|eDt;j9~{`u+&y z`kkerXh9X#nhGivuW9y?u$b$#hNd{bhRzGW&Krt1HE;2@lWP~&?x)vc^7=?;q%sj{ zZm6tlZ;LlK%SJx1cj&VSR3w`l%)VdqE(bKzn65aeImCcPk#opjxf2U zsZ^=O)M!iJU^o;=Qz}C%m+AZQ84|MdnMPqTL-yljJ>NaMfD6Z*1;v-Xik&GDCc~07 zr|ckBubVPUthoTDGFz<91aJ`-i)V2Oa{_`p)5*^}X3cVb%BxA6ux<&|Y-cX>L~r?Q zp@vJz;cPZ=8S~}J3L2?p0ZMEg3#IBH%fw&A<)XuloXHhjiA|4WU&YmO3o`T!tl3?| zVz-oiEMckeHD}jy9sad)O{UHaSe<|^mlL7-J3AFC+@?&C$ySJ7&o$- zH4;0~FQ0Fc|EiP#nV-d4=D0*p<)0LyCkkpu5Z&t$-QyA6uQ$T;OYC@aefa=>AB(4D5p1_x-GoK;=2etrg1zpI zrzRugumqZ?;yVpuldDK=cr=?bj3O;sNSYd)!ATWv4>M4km?%#z3svkv6-(B1$%A5A mX&XiwJ+jo8j)r`aU`A#-*6!L4x4?YyJH^kmCC9v=+y4TSm;Czx diff --git a/store-front/src/app/components/book-list/book-list.component.html b/store-front/src/app/components/book-list/book-list.component.html index b4f5681..be5c2ff 100644 --- a/store-front/src/app/components/book-list/book-list.component.html +++ b/store-front/src/app/components/book-list/book-list.component.html @@ -18,7 +18,7 @@
- Filter by Title: + Filter by Description:
diff --git a/store-front/src/app/components/book-list/book-list.component.ts b/store-front/src/app/components/book-list/book-list.component.ts index 9a6e518..4857081 100644 --- a/store-front/src/app/components/book-list/book-list.component.ts +++ b/store-front/src/app/components/book-list/book-list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import {Book} from "../../models/book"; import {BookService} from "../../services/book.service"; -import {Router} from "@angular/router"; +import {Params, ActivatedRoute,Router} from "@angular/router"; import {Http} from "@angular/http"; import {AppConst} from '../../constants/app-const'; @@ -19,16 +19,8 @@ export class BookListComponent implements OnInit { private bookList: Book[]; private serverPath = AppConst.serverPath; - constructor(private bookService:BookService, private router: Router, private http: Http) { - this.bookService.getBookList().subscribe( - res => { - console.log(res.json()); - this.bookList=res.json(); - }, - err => { - console.log(err); - } - ); + constructor(private bookService:BookService, private router: Router, private http: Http, private route:ActivatedRoute) { + } onSelect(book:Book) { @@ -38,6 +30,24 @@ export class BookListComponent implements OnInit { ngOnInit() { + + this.route.queryParams.subscribe(params => { + if (params['bookList']){ + console.log("filtered book list"); + this.bookList = JSON.parse(params['bookList']); + } else { + this.bookService.getBookList().subscribe( + res => { + console.log(res.json()); + this.bookList=res.json(); + }, + err => { + console.log(err); + } + ); + } + + }); } } diff --git a/store-front/src/app/components/book-list/data-filter.pipe.ts b/store-front/src/app/components/book-list/data-filter.pipe.ts index 151bb45..2bf7c25 100644 --- a/store-front/src/app/components/book-list/data-filter.pipe.ts +++ b/store-front/src/app/components/book-list/data-filter.pipe.ts @@ -8,7 +8,7 @@ export class DataFilterPipe implements PipeTransform { transform(array: any[], query: string): any { if (query) { - return _.filter(array, row=>row.title.indexOf(query) > -1); + return _.filter(array, row=>row.description.indexOf(query) > -1); } return array; } diff --git a/store-front/src/app/components/nav-bar/nav-bar.component.html b/store-front/src/app/components/nav-bar/nav-bar.component.html index 381fb74..3962992 100644 --- a/store-front/src/app/components/nav-bar/nav-bar.component.html +++ b/store-front/src/app/components/nav-bar/nav-bar.component.html @@ -9,9 +9,9 @@