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 17:32:55 -05:00
parent 0c37fb08c1
commit eee2c66ecf
7 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,14 @@
</provider>
</entry>
</file>
<file leaf-file-name="ShippingResource.java" pinned="false" current-in-tab="false">
<file leaf-file-name="ShippingResource.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705">
<caret line="67" column="55" lean-forward="false" selection-start-line="67" selection-start-column="55" selection-end-line="67" selection-end-column="55" />
<folding />
<state relative-caret-position="153">
<caret line="49" column="50" lean-forward="false" selection-start-line="49" selection-start-column="50" selection-end-line="49" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -148,7 +150,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="BillingAddress.java" pinned="false" current-in-tab="true">
<file leaf-file-name="BillingAddress.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
@@ -228,7 +230,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserPayment.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserBilling.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserShipping.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/UserResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java" />
@@ -237,6 +238,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/CartItem.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShoppingCartResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java" />
</list>
</option>
</component>
@@ -1036,12 +1038,12 @@
<workItem from="1488378219247" duration="650000" />
<workItem from="1488461561430" duration="18419000" />
<workItem from="1488731165185" duration="30270000" />
<workItem from="1489159532831" duration="3942000" />
<workItem from="1489159532831" duration="4235000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="96224000" />
<option name="totallyTimeSpent" value="96517000" />
</component>
<component name="ToolWindowManager">
<frame x="72" y="23" width="1280" height="797" extended-state="0" />
@@ -1065,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" />
@@ -1431,14 +1433,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705">
<caret line="67" column="55" lean-forward="false" selection-start-line="67" selection-start-column="55" selection-end-line="67" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserShipping.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
@@ -1563,5 +1557,15 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="49" column="50" lean-forward="false" selection-start-line="49" selection-start-column="50" selection-end-line="49" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

10
bookstore-api/src/main/java/com/bookstore/resource/ShippingResource.java
View File

@@ -47,6 +47,16 @@ public class ShippingResource {
return new ResponseEntity("Shipping Added(Updated) Successfully!", HttpStatus.OK);
}
@RequestMapping(value = "/getUserShippingList")
public List<UserShipping> getUserShippingList(
Principal principal) {
User user = userService.findByUsername(principal.getName());
List<UserShipping> userShippingList = user.getUserShippingList();
return userShippingList;
}
@RequestMapping(value = "/remove", method = RequestMethod.POST)
public ResponseEntity removeUserShippingPost(
@RequestBody String id,

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

Binary file not shown.

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

Binary file not shown.

8
store-front/src/app/components/order/order.component.html
View File

@@ -14,7 +14,7 @@
<div class="col-xs-4">
<div class="panel panel-default">
<div class="panel-body">
<button type="submit" class="btn btn-warning btn-block">Place your order
<button md-raised-button type="submit " class="btn-block mat-primary">Place your order
</button>
<p style="font-size: smaller">By placing your order, you agree to Le's Bookstore <a href="#">privacy</a> notice and
<a href="#">conditions</a> of use.</p>
@@ -66,7 +66,7 @@
</h4>
</div>
<div class="panel-body ">
<table class="table " *ngIf="not emptyShippingList ">
<table class="table " *ngIf="!emptyShippingList ">
<thead>
<tr>
<th>Available Shipping Address</th>
@@ -79,7 +79,7 @@
{{userShipping.userShippingStreet1}}, {{userShipping.userShippingStreet2}}, {{userShipping.userShippingCity}}, {{userShipping.userShippingState}}
</td>
<td>
<a (click)="setShippingAddress(userShipping) ">use
<a class="pointer" (click)="setShippingAddress(userShipping) ">use
this address</a>
</td>
</tr>
@@ -107,7 +107,7 @@
<div class="form-group ">
<label for="shippingState ">* State</label>
<select id="shippingState " class="form-control " name="shippingAddressState " [(ngModel)]="shippingAddress.shippingAddressState ">
<option value=" " disabled>-- state --</option>
<option value="" disabled>-- state --</option>
<option *ngFor="let state of stateList ">{{state}}
</option>
</select>

35
store-front/src/app/components/order/order.component.ts
View File

@@ -3,6 +3,7 @@ import {AppConst} from '../../constants/app-const';
import {Book} from '../../models/book';
import {Router} from "@angular/router";
import {CartService} from '../../services/cart.service';
import {ShippingService} from '../../services/shipping.service';
import {CartItem} from '../../models/cart-item';
import {ShoppingCart} from '../../models/shopping-cart';
import {ShippingAddress} from '../../models/shipping-address';
@@ -28,9 +29,12 @@ export class OrderComponent implements OnInit {
private userPayment:UserPayment = new UserPayment();
private userShipping:UserShipping = new UserShipping();
private userBilling: UserBilling = new UserBilling();
private userShippingList: UserShipping[] = [];
private selectedTab: number;
private emptyShippingList: boolean = true;
private stateList: string[] = [];
constructor(private router:Router, private cartService: CartService) { }
constructor(private router:Router, private cartService: CartService, private shippingService: ShippingService) { }
onSelect(book:Book) {
this.selectedBook = book;
@@ -61,6 +65,16 @@ export class OrderComponent implements OnInit {
);
}
setShippingAddress(userShipping: UserShipping) {
this.shippingAddress.shippingAddressName = userShipping.userShippingNmae;
this.shippingAddress.shippingAddressStreet1 = userShipping.userShippingStreet1;
this.shippingAddress.shippingAddressStreet2 = userShipping.userShippingStreet2;
this.shippingAddress.shippingAddressCity = userShipping.userShippingCity;
this.shippingAddress.shippingAddressState = userShipping.userShippingState;
this.shippingAddress.shippingAddressCountry = userShipping.userShippingCountry;
this.shippingAddress.shippingAddressZipcode = userShipping.userShippingZipcode;
}
ngOnInit() {
this.getCartItemList();
@@ -74,6 +88,25 @@ export class OrderComponent implements OnInit {
console.log(error.text());
}
);
this.shippingService.getUserShippingList().subscribe(
res=>{
console.log(res.json());
this.userShippingList=res.json();
this.emptyShippingList = false;
},
error=>{
console.log(error.text());
}
);
for (let s in AppConst.usStates) {
this.stateList.push(s);
}
this.billingAddress.billingAddressState="";
this.shippingAddress.shippingAddressState="";
}

10
store-front/src/app/services/shipping.service.ts
View File

@@ -19,6 +19,16 @@ export class ShippingService {
return this.http.post(url, JSON.stringify(shipping), {headers : tokenHeader});
}
getUserShippingList() {
let url = this.serverPath+"/shipping/getUserShippingList";
let tokenHeader = new Headers ({
'Content-Type': 'application/json',
'x-auth-token' : localStorage.getItem("xAuthToken")
});
return this.http.get(url, {headers : tokenHeader});
}
removeShipping(id: number) {
let url = this.serverPath+"/shipping/remove";