mohiit1502/bookstore-angular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

latest

Browse Source
This commit is contained in:
Le Deng
2017-03-10 11:15:57 -05:00
parent 31a9a862c9
commit 303f6e93ec
8 changed files with 67 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
bookstore-api/.idea/workspace.xml generated
View File

@@ -26,90 +26,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="Book.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="23" column="29" lean-forward="false" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1138#1139#0" expanded="false" />
<element signature="e#1161#1162#0" expanded="false" />
<element signature="e#1188#1189#0" expanded="false" />
<element signature="e#1213#1214#0" expanded="false" />
<element signature="e#1247#1248#0" expanded="false" />
<element signature="e#1275#1276#0" expanded="false" />
<element signature="e#1307#1308#0" expanded="false" />
<element signature="e#1335#1336#0" expanded="false" />
<element signature="e#1377#1378#0" expanded="false" />
<element signature="e#1411#1412#0" expanded="false" />
<element signature="e#1444#1445#0" expanded="false" />
<element signature="e#1473#1474#0" expanded="false" />
<element signature="e#1517#1518#0" expanded="false" />
<element signature="e#1553#1554#0" expanded="false" />
<element signature="e#1589#1590#0" expanded="false" />
<element signature="e#1621#1622#0" expanded="false" />
<element signature="e#1671#1672#0" expanded="false" />
<element signature="e#1713#1714#0" expanded="false" />
<element signature="e#1755#1756#0" expanded="false" />
<element signature="e#1793#1794#0" expanded="false" />
<element signature="e#1855#1856#0" expanded="false" />
<element signature="e#1909#1910#0" expanded="false" />
<element signature="e#1944#1945#0" expanded="false" />
<element signature="e#1975#1976#0" expanded="false" />
<element signature="e#2023#2024#0" expanded="false" />
<element signature="e#2063#2064#0" expanded="false" />
<element signature="e#2098#2099#0" expanded="false" />
<element signature="e#2129#2130#0" expanded="false" />
<element signature="e#2177#2178#0" expanded="false" />
<element signature="e#2217#2218#0" expanded="false" />
<element signature="e#2254#2255#0" expanded="false" />
<element signature="e#2290#2291#0" expanded="false" />
<element signature="e#2345#2346#0" expanded="false" />
<element signature="e#2395#2396#0" expanded="false" />
<element signature="e#2428#2429#0" expanded="false" />
<element signature="e#2457#2458#0" expanded="false" />
<element signature="e#2501#2502#0" expanded="false" />
<element signature="e#2537#2538#0" expanded="false" />
<element signature="e#2568#2569#0" expanded="false" />
<element signature="e#2595#2596#0" expanded="false" />
<element signature="e#2635#2636#0" expanded="false" />
<element signature="e#2667#2668#0" expanded="false" />
<element signature="e#2708#2709#0" expanded="false" />
<element signature="e#2745#2746#0" expanded="false" />
<element signature="e#2805#2806#0" expanded="false" />
<element signature="e#2857#2858#0" expanded="false" />
<element signature="e#2893#2894#0" expanded="false" />
<element signature="e#2925#2926#0" expanded="false" />
<element signature="e#2975#2976#0" expanded="false" />
<element signature="e#3017#3018#0" expanded="false" />
<element signature="e#3052#3053#0" expanded="false" />
<element signature="e#3083#3084#0" expanded="false" />
<element signature="e#3131#3132#0" expanded="false" />
<element signature="e#3171#3172#0" expanded="false" />
<element signature="e#3209#3210#0" expanded="false" />
<element signature="e#3243#3244#0" expanded="false" />
<element signature="e#3297#3298#0" expanded="false" />
<element signature="e#3343#3344#0" expanded="false" />
<element signature="e#3380#3381#0" expanded="false" />
<element signature="e#3416#3417#0" expanded="false" />
<element signature="e#3471#3472#0" expanded="false" />
<element signature="e#3521#3522#0" expanded="false" />
<element signature="e#3554#3555#0" expanded="false" />
<element signature="e#3583#3584#0" expanded="false" />
<element signature="e#3628#3629#0" expanded="false" />
<element signature="e#3664#3665#0" expanded="false" />
<element signature="e#3707#3708#0" expanded="false" />
<element signature="e#3739#3740#0" expanded="false" />
<element signature="e#3796#3797#0" expanded="false" />
<element signature="e#3838#3839#0" expanded="false" />
<element signature="e#3897#3898#0" expanded="false" />
<element signature="e#3938#3939#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BookstoreApplication.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/BookstoreApplication.java">
<provider selected="true" editor-type-id="text-editor">
@@ -235,8 +151,8 @@
<file leaf-file-name="ShoppingCartResource.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShoppingCartResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="74" column="27" lean-forward="false" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
<state relative-caret-position="563">
<caret line="83" column="0" lean-forward="true" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -244,6 +160,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="CartItem.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="33" column="15" lean-forward="false" selection-start-line="33" selection-start-column="15" selection-end-line="33" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -278,7 +204,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/SecurityUtility.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/BookToCartItem.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShippingAddress.java" />
@@ -312,6 +237,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/CartResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShoppingCartResource.java" />
</list>
</option>
@@ -1112,12 +1038,12 @@
<workItem from="1488378219247" duration="650000" />
<workItem from="1488461561430" duration="18419000" />
<workItem from="1488731165185" duration="30270000" />
<workItem from="1489159532831" duration="1369000" />
<workItem from="1489159532831" duration="1705000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="93651000" />
<option name="totallyTimeSpent" value="93987000" />
</component>
<component name="ToolWindowManager">
<frame x="72" y="23" width="1280" height="797" extended-state="0" />
@@ -1141,7 +1067,7 @@
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32907802" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32624114" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32624114" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32907802" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32229403" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1225,13 +1151,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -1626,10 +1545,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="33" column="15" lean-forward="false" selection-start-line="33" selection-start-column="15" selection-end-line="33" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShoppingCartResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="74" column="27" lean-forward="false" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
<state relative-caret-position="563">
<caret line="83" column="0" lean-forward="true" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>

1
bookstore-api/src/main/java/com/bookstore/domain/CartItem.java
View File

@@ -31,6 +31,7 @@ public class CartItem implements Serializable {
@ManyToOne
@JoinColumn(name = "shopping_cart_id")
@JsonIgnore
private ShoppingCart shoppingCart;
@ManyToOne

14
bookstore-api/src/main/java/com/bookstore/resource/ShoppingCartResource.java
View File

@@ -62,8 +62,8 @@ public class ShoppingCartResource {
}
@RequestMapping("/getCart")
public List<CartItem> shoppingCart(Principal principal) {
@RequestMapping("/getCartItemList")
public List<CartItem> getCartItemList(Principal principal) {
User user = userService.findByUsername(principal.getName());
ShoppingCart shoppingCart = user.getShoppingCart();
@@ -74,4 +74,14 @@ public class ShoppingCartResource {
return cartItemList;
}
@RequestMapping("/getShoppingCart")
public ShoppingCart getShoppingCart(Principal principal) {
User user = userService.findByUsername(principal.getName());
ShoppingCart shoppingCart = user.getShoppingCart();
shoppingCartService.updateShoppingCart(shoppingCart);
return shoppingCart;
}
}

BIN
bookstore-api/target/classes/com/bookstore/domain/CartItem.class
View File

Binary file not shown.

BIN
bookstore-api/target/classes/com/bookstore/resource/ShoppingCartResource.class
View File

Binary file not shown.

4
store-front/src/app/components/shopping-cart/shopping-cart.component.html
View File

@@ -66,9 +66,9 @@
<div class="row">
<hr/>
<h4 class="col-xs-12 text-right"><Strong style="font-size: large">Total Price (<span
th:text="${#lists.size(cartItemList)}"></span> items): </Strong><span
>{{cartItemNumber}}</span> items): </Strong><span
style="color: #db3208; font-size: large;">$<span
th:text="${shoppingCart.grandTotal}"></span></span></h4>
></span>{{shoppingCart.grandTotal}}</span></h4>
</div>
</div>
</div>

18
store-front/src/app/components/shopping-cart/shopping-cart.component.ts
View File

@@ -4,7 +4,7 @@ import {Book} from '../../models/book';
import {Router} from "@angular/router";
import {CartService} from '../../services/cart.service';
import {CartItem} from '../../models/cart-item';
import {ShoppingCart} from '../../models/shopping-cart';
@Component({
selector: 'app-shopping-cart',
@@ -15,6 +15,8 @@ export class ShoppingCartComponent implements OnInit {
private serverPath = AppConst.serverPath;
private selectedBook: Book;
private cartItemList: CartItem[] = [];
private cartItemNumber: number;
private shoppingCart: ShoppingCart = new ShoppingCart();
constructor(private router:Router, private cartService: CartService) { }
@@ -24,15 +26,25 @@ export class ShoppingCartComponent implements OnInit {
}
ngOnInit() {
this.cartService.getCart().subscribe(
this.cartService.getCartItemList().subscribe(
res=>{
console.log(res.json());
this.cartItemList = res.json();
this.cartItemNumber = this.cartItemList.length;
},
error=>{
console.log(error.text());
}
);
this.cartService.getShoppingCart().subscribe(
res=>{
console.log(res.json());
this.shoppingCart=res.json();
},
error=>{
console.log(error.text());
}
);
}
}

13
store-front/src/app/services/cart.service.ts
View File

@@ -19,8 +19,17 @@ export class CartService {
return this.http.post(url, cartItemInfo, {headers : tokenHeader});
}
getCart() {
let url = AppConst.serverPath+"/cart/getCart";
getCartItemList() {
let url = AppConst.serverPath+"/cart/getCartItemList";
let tokenHeader = new Headers ({
'x-auth-token' : localStorage.getItem("xAuthToken")
});
return this.http.get(url, {headers : tokenHeader});
}
getShoppingCart() {
let url = AppConst.serverPath+"/cart/getShoppingCart";
let tokenHeader = new Headers ({
'x-auth-token' : localStorage.getItem("xAuthToken")