From 6c9377cd16d9895ecd9bb3bdba5045efdc4589fc Mon Sep 17 00:00:00 2001 From: Gowrisankar J g <59323@hexaware.com> Date: Thu, 30 Sep 2021 12:50:49 +0530 Subject: [PATCH] cart updated --- .../app/components/cart/cart.component.html | 6 +- .../src/app/components/cart/cart.component.ts | 76 ++--- .../app/components/home/home.component.html | 10 +- .../src/app/components/home/home.component.ts | 47 ++- .../page-nav-bar/page-nav-bar.component.html | 2 +- .../userprofile/userprofile.component.css | 6 + .../userprofile/userprofile.component.html | 165 +++++----- Angular-UrbanBazaar/src/app/models/cart.ts | 2 +- .../controller/CartController.java | 2 + .../com/example/urbanbazaar/model/User.java | 2 + .../repository/CartRepository.java | 3 +- .../repository/UserRepository.java | 1 - UB_CartServiceProxy/.gitignore | 33 -- .../.mvn/wrapper/MavenWrapperDownloader.java | 117 ------- .../.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 - UB_CartServiceProxy/bin/.gitignore | 33 -- .../.mvn/wrapper/MavenWrapperDownloader.class | Bin 5438 -> 0 bytes .../bin/.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes .../bin/.mvn/wrapper/maven-wrapper.properties | 2 - UB_CartServiceProxy/bin/mvnw | 310 ------------------ UB_CartServiceProxy/bin/mvnw.cmd | 182 ---------- UB_CartServiceProxy/bin/pom.xml | 56 ---- .../urbanbazaar/ServletInitializer.class | Bin 1448 -> 0 bytes .../UbCartServiceProxyApplication.class | Bin 1228 -> 0 bytes .../controller/CartController.class | Bin 2934 -> 0 bytes .../com/example/urbanbazaar/model/Cart.class | Bin 3325 -> 0 bytes .../repository/CartRepository.class | Bin 1310 -> 0 bytes .../src/main/resources/application.properties | 11 - .../UbCartServiceProxyApplicationTests.class | Bin 1115 -> 0 bytes UB_CartServiceProxy/mvnw | 310 ------------------ UB_CartServiceProxy/mvnw.cmd | 182 ---------- UB_CartServiceProxy/pom.xml | 56 ---- .../urbanbazaar/ServletInitializer.java | 13 - .../UbCartServiceProxyApplication.java | 13 - .../controller/CartController.java | 56 ---- .../com/example/urbanbazaar/model/Cart.java | 58 ---- .../repository/CartRepository.java | 17 - .../src/main/resources/application.properties | 11 - .../UbCartServiceProxyApplicationTests.java | 13 - .../controller/OrderController.java | 3 +- .../src/main/resources/application.properties | 2 +- .../UbProductServiceProxyApplication.java | 36 +- .../controller/ProductController.java | 4 +- .../example/urbanbazaar/model/Product.java | 2 +- .../repository/ProductRepository.java | 6 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data/product_data.json | 9 + .../src/main/resources/product_data.json | 10 + 49 files changed, 231 insertions(+), 1640 deletions(-) delete mode 100644 UB_CartServiceProxy/.gitignore delete mode 100644 UB_CartServiceProxy/.mvn/wrapper/MavenWrapperDownloader.java delete mode 100644 UB_CartServiceProxy/.mvn/wrapper/maven-wrapper.jar delete mode 100644 UB_CartServiceProxy/.mvn/wrapper/maven-wrapper.properties delete mode 100644 UB_CartServiceProxy/bin/.gitignore delete mode 100644 UB_CartServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class delete mode 100644 UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar delete mode 100644 UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.properties delete mode 100644 UB_CartServiceProxy/bin/mvnw delete mode 100644 UB_CartServiceProxy/bin/mvnw.cmd delete mode 100644 UB_CartServiceProxy/bin/pom.xml delete mode 100644 UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class delete mode 100644 UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbCartServiceProxyApplication.class delete mode 100644 UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/CartController.class delete mode 100644 UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/Cart.class delete mode 100644 UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/CartRepository.class delete mode 100644 UB_CartServiceProxy/bin/src/main/resources/application.properties delete mode 100644 UB_CartServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbCartServiceProxyApplicationTests.class delete mode 100644 UB_CartServiceProxy/mvnw delete mode 100644 UB_CartServiceProxy/mvnw.cmd delete mode 100644 UB_CartServiceProxy/pom.xml delete mode 100644 UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/ServletInitializer.java delete mode 100644 UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/UbCartServiceProxyApplication.java delete mode 100644 UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java delete mode 100644 UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java delete mode 100644 UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/repository/CartRepository.java delete mode 100644 UB_CartServiceProxy/src/main/resources/application.properties delete mode 100644 UB_CartServiceProxy/src/test/java/com/example/urbanbazaar/UbCartServiceProxyApplicationTests.java create mode 100644 UB_ProductServiceProxy/src/main/resources/data/product_data.json create mode 100644 UB_ProductServiceProxy/src/main/resources/product_data.json diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.html b/Angular-UrbanBazaar/src/app/components/cart/cart.component.html index a93fe44..2eadaef 100644 --- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.html +++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.html @@ -8,7 +8,7 @@ S.No ProductName ProductPrice - + Quantity Action @@ -19,7 +19,9 @@ {{c.product.productprice}} {{c.quantity}} - +   +   + diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts index 4b966ad..32ca5d8 100644 --- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts +++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts @@ -15,18 +15,25 @@ export class CartComponent implements OnInit { totalPrice: number = 0; username: String = ''; authcode: String = ''; + constructor(private cartService: CartService, private route: Router) {} ngOnInit(): void { this.username = window.sessionStorage.getItem('username'); this.authcode = window.sessionStorage.getItem('authcode'); - if (this.authcode !== null) { + if (this.authcode != null) { this.uid = window.sessionStorage.getItem('user_id'); } + this.reloadCartData(); + } + + public reloadCartData() { this.cartService.getCartByUser(this.uid).subscribe((data1) => { this.cartNo = data1.length; this.cartItems = data1; - console.log(this.cartItems); + this.cartItems.forEach(element => { + console.log(element); + }); this.cartItems.forEach((i, index) => { this.totalPrice = this.totalPrice + i.price; }); @@ -44,7 +51,7 @@ export class CartComponent implements OnInit { }; console.log(qty, amount); this.cartItems.forEach((i, index) => { - if (i.cartid == cid) { + if (i.cart_id == cid) { this.cartItems[index].quantity = qty; this.cartItems[index].price = amount; } @@ -55,58 +62,33 @@ export class CartComponent implements OnInit { }); } - public decreaseQty(cid: number, quantity: number, price: number) { + decreaseQty(cid:number,quantity:number,price:number) { this.totalPrice = 0; - console.log('Decrease Quantity'); - let amount: number = price - price / quantity; - let qty: number = quantity - 1; - let cart: Cart = { - quantity: qty, - price: amount, - }; - console.log(quantity, qty, price, amount); - this.cartItems.forEach((i, index) => { - if (i.cartid == cid) { + console.log("Decrease Quantity") + let amount:number = (price*quantity)-price; + let qty:number = quantity - 1; + let cart:Cart = { + quantity : qty, + price : amount + } + console.log(quantity,qty,price,amount); + this.cartItems.forEach((i,index) => { + if (i.cart_id == cid) { this.cartItems[index].quantity = qty; this.cartItems[index].price = amount; } - }); - this.cartService.editCartItem(cart, cid).subscribe((data) => {}); - this.cartItems.forEach((i, index) => { + }) + this.cartService.editCartItem(cart,cid).subscribe(data => { + }) + this.cartItems.forEach((i,index) => { this.totalPrice = this.totalPrice + i.price; - }); + }) } - public deleteCartItems(cid: number) { + public deleteCartItem(cid: number) { this.totalPrice = 0; - this.cartService.deleteCartItem(cid).subscribe((data) => { - this.cartItems.forEach((i, index) => { - if (i.cartid == cid) { - this.cartItems.splice(index, 1); - } - }); - this.cartService.getCartByUser(this.uid).subscribe((data1) => { - this.cartNo = data1.length; - this.cartItems = data1; - console.log(this.cartItems); - this.cartItems.forEach((i, index) => { - this.totalPrice = this.totalPrice + i.price; - }); - }); - }); - } - - public onLogout() { - if (this.authcode != null) { - this.authcode = null; - this.username = null; - window.sessionStorage.removeItem('username'); - window.sessionStorage.removeItem('user_id'); - window.sessionStorage.removeItem('authcode'); - window.sessionStorage.removeItem('isLoggedIn'); - this.cartNo = 0; - this.route.navigateByUrl('/home'); - } + this.cartService.deleteCartItem(cid).subscribe(); + this.reloadCartData(); } public emptyCartForUser() { diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.html b/Angular-UrbanBazaar/src/app/components/home/home.component.html index 594e8d2..93a2fde 100644 --- a/Angular-UrbanBazaar/src/app/components/home/home.component.html +++ b/Angular-UrbanBazaar/src/app/components/home/home.component.html @@ -1,10 +1,12 @@   + background-color: white; border-color: forestgreen;" class="EditProfile" (click)=EditProfile()> + Edit Profile   - -

+   + + +

diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.ts b/Angular-UrbanBazaar/src/app/components/home/home.component.ts index e9693f2..e873464 100644 --- a/Angular-UrbanBazaar/src/app/components/home/home.component.ts +++ b/Angular-UrbanBazaar/src/app/components/home/home.component.ts @@ -11,9 +11,9 @@ import { Cart } from 'src/app/models/cart'; styleUrls: ['./home.component.css'], }) export class HomeComponent implements OnInit { - uid:any = 0; - username:any = ''; - authcode:any = ''; + uid: any = 0; + username: String = ''; + authcode: String = ''; public products: Product[]; public Searchedproducts: Product[]; searchValue: string = ''; @@ -28,16 +28,20 @@ export class HomeComponent implements OnInit { this.router.navigateByUrl('/showCart'); } - addCart(productPrice: number, pid: number) { + public addCart(productPrice: number, pid: number) { let cartData: Cart = { - quantity : 1, - price: productPrice - } - this.cartservice.postCart(cartData, this.uid, pid); - alert("Added "+pid+" with price "+productPrice); + quantity: 1, + price: productPrice, + }; + this.cartservice.postCart(cartData, this.uid, pid).subscribe( + ()=> alert('Added ' + pid + ' with price ' + productPrice) + ); + console.log('Added ' + pid + ' with price ' + productPrice); + console.log(cartData); + // alert('Added ' + pid + ' with price ' + productPrice); } - searchProduct() { + public searchProduct() { if (this.searchValue == '') { this.Searchedproducts = this.products; } else { @@ -46,17 +50,20 @@ export class HomeComponent implements OnInit { ); } } + EditProfile() { - this.router.navigateByUrl('/user-profile-details'); + this.router.navigateByUrl('/userprofile'); } + Members() { this.router.navigateByUrl('/memberlist'); } + ngOnInit(): void { - this.username = window.sessionStorage.getItem("username"); - this.authcode = window.sessionStorage.getItem("authcode"); + this.username = window.sessionStorage.getItem('username'); + this.authcode = window.sessionStorage.getItem('authcode'); if (this.authcode !== null) { - this.uid = window.sessionStorage.getItem("user_id"); + this.uid = window.sessionStorage.getItem('user_id'); } this.productservice.showAllProduct().subscribe((res) => { @@ -64,4 +71,16 @@ export class HomeComponent implements OnInit { this.Searchedproducts = res; }); } + + public onLogout() { + if (this.authcode != null) { + this.authcode = null; + this.username = null; + window.sessionStorage.removeItem("username"); + window.sessionStorage.removeItem("user_id"); + window.sessionStorage.removeItem("authcode"); + window.sessionStorage.removeItem("isLoggedIn"); + this.router.navigateByUrl("/login"); + } + } } diff --git a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html index 7ebff71..6c184b7 100644 --- a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html +++ b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html @@ -1,5 +1,5 @@