diff --git a/Angular-UrbanBazaar/proxy.config.json b/Angular-UrbanBazaar/proxy.config.json
index deccd64..1a87c9c 100644
--- a/Angular-UrbanBazaar/proxy.config.json
+++ b/Angular-UrbanBazaar/proxy.config.json
@@ -1,19 +1,21 @@
 {
-    "/products":{
-        "target":"http://10.3.117.7:8007",
-        "secure":false
+    "/user": {
+        "target": "http://localhost:8500",
+        "secure": false
     },
-    "/user":{
-        "target":"http://10.3.117.7:8008",
-        "secure":false
+
+    "/products": {
+        "target": "http://10.3.117.7:8501",
+        "secure": false
     },
-    "/orders":{
-        "target":"http://10.3.117.7:8009",
-        "secure":false
+
+    "/orders": {
+        "target": "http://10.3.117.7:8009",
+        "secure": false
     },
-    "/cart":{
-        "target":"http://10.3.117.7:8010",
-        "secure":false
+    "/cart": {
+        "target": "http://10.3.117.7:8504",
+        "secure": false
     }
 
 }
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/app-routing.module.ts b/Angular-UrbanBazaar/src/app/app-routing.module.ts
index 72e214b..f8944c5 100644
--- a/Angular-UrbanBazaar/src/app/app-routing.module.ts
+++ b/Angular-UrbanBazaar/src/app/app-routing.module.ts
@@ -6,20 +6,22 @@ import { CartComponent } from './components/cart/cart.component';
 import { HomeComponent } from './components/home/home.component';
 import { MemberlistComponent } from './components/memberlist/memberlist.component';
 import { UserProfileDetailsComponent } from './components/user-profile-details/user-profile-details.component';
+import { UserprofileComponent } from './components/userprofile/userprofile.component';
 
 const routes: Routes = [
   { path: '', component: LoginComponent},
   { path: 'login', component: LoginComponent},
   { path: 'signup', component: SignUpComponent},
+  { path: 'home', component: HomeComponent,
+    // children: [
+    //   { path: 'userprofile', component: UserProfileDetailsComponent, outlet: 'user'},
+    //   { path: 'memberlist', component: MemberlistComponent, outlet: 'member'}
+    // ]
+  },
   { path: 'user-profile-details', component: UserProfileDetailsComponent},
+  { path: 'userprofile', component: UserprofileComponent},
   { path: 'memberlist', component: MemberlistComponent},
   { path: 'showCart', component: CartComponent},
-  { path: 'home', component: HomeComponent,
-    children: [
-      { path: 'user-profile-details', component: UserProfileDetailsComponent, outlet: 'user'},
-      { path: 'memberlist', component: MemberlistComponent, outlet: 'member'}
-    ]
-  }
 ];
 
 @NgModule({
diff --git a/Angular-UrbanBazaar/src/app/app.module.ts b/Angular-UrbanBazaar/src/app/app.module.ts
index ac81ea0..fd5d930 100644
--- a/Angular-UrbanBazaar/src/app/app.module.ts
+++ b/Angular-UrbanBazaar/src/app/app.module.ts
@@ -18,6 +18,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
 import { LoginComponent } from './auth/login/login.component';
 import { SignUpComponent } from './auth/sign-up/sign-up.component';
 import { MemberlistComponent } from './components/memberlist/memberlist.component';
+import { UserprofileComponent } from './components/userprofile/userprofile.component';
 
 @NgModule({
   declarations: [
@@ -29,6 +30,7 @@ import { MemberlistComponent } from './components/memberlist/memberlist.componen
     LoginComponent,
     SignUpComponent,
     MemberlistComponent,
+    UserprofileComponent,
   ],
   imports: [
     BrowserModule,
diff --git a/Angular-UrbanBazaar/src/app/auth/login/login.component.ts b/Angular-UrbanBazaar/src/app/auth/login/login.component.ts
index 15838b1..e2d3eb8 100644
--- a/Angular-UrbanBazaar/src/app/auth/login/login.component.ts
+++ b/Angular-UrbanBazaar/src/app/auth/login/login.component.ts
@@ -34,6 +34,12 @@ export class LoginComponent implements OnInit {
     this.temp.subscribe((v) => {
       if (v.userpassword == this.password.value) {
         this.temp.subscribe((v) => (this._userService.currentUser = v));
+
+        window.sessionStorage.setItem("username", v.userfirstname);
+        window.sessionStorage.setItem("user_id", String(v.userid));
+        window.sessionStorage.setItem("authcode", btoa(v.userfirstname + ":" + v.userpassword));
+        window.sessionStorage.setItem("isLoggedIn", "true");
+        
         this.router.navigateByUrl('/home');
         alert('Login Successfull !!');
       } else {
diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.html b/Angular-UrbanBazaar/src/app/components/cart/cart.component.html
index a9bd096..a93fe44 100644
--- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.html
+++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="cartdetails.length !=0">
+<ng-container *ngIf="cartNo != 0">
     <div class="container">
         <div class="card-table">
             <div class="card-product">
@@ -8,25 +8,26 @@
                             <th>S.No</th>
                             <th>ProductName</th>
                             <th>ProductPrice</th>
-                            
+
                             <th>Action</th>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr *ngFor="let c of cartdetails; let i = index">
+                        <tr *ngFor="let i = index; let c of cartItems">
                             <td>{{i+1}}</td>
-                            <td>{{c.productname}}</td>
-                            <td>{{c.productprice}}</td>
+                            <td>{{c.product.productname}}</td>
+                            <td>{{c.product.productprice}}</td>
+                            <td>{{c.quantity}}</td>
                             <td>
-                                <button  class="CartButtons" (click)="removeItem(c)">Delete</button>
+                                <button class="CartButtons" (click)="deleteCartItems(c.cartid)">Delete</button>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="4"></td>
-                            <td><button (click)=emptyCart() class="CartButtons">Empty Cart</button></td>
+                            <td><button (click)=emptyCartForUser() class="CartButtons">Empty Cart</button></td>
                             <td><button routerLink='/home' class="CartButtons">Shop More</button></td>
                             <td><button class="CartButtons">Checkout</button></td>
-                            <td><strong>Grand Total : Rs.{{grandTotal}}</strong></td>
+                            <td><strong>Grand Total : Rs.{{totalPrice}}</strong></td>
                         </tr>
                     </tbody>
                 </div>
@@ -35,15 +36,14 @@
     </div>
 </ng-container>
 
-<ng-container *ngIf="cartdetails.length==0">
+<ng-container *ngIf="cartNo == 0">
     <div class="container">
         <div class="card">
             <h5 class="card-title">My Cart</h5>
         </div>
 
         <div class="center">
-            <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT9q9U7YaUc27iaqP1bbyD3g6GSLqlRmAFbeQ&usqp=CAU"
-                alt="">
+            <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT9q9U7YaUc27iaqP1bbyD3g6GSLqlRmAFbeQ&usqp=CAU" alt="">
             <h4>Your cart is empty!</h4>
             <h6>Add item to it now</h6>
             <button class="shopNow" routerLink='/home'>Shop Now</button>
diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
index 993a34b..4b966ad 100644
--- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
+++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
@@ -1,37 +1,115 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Router } from '@angular/router';
 import { Cart } from 'src/app/models/cart';
-import { User } from 'src/app/models/user';
 import { CartService } from 'src/app/services/cart.service';
 
 @Component({
   selector: 'app-cart',
   templateUrl: './cart.component.html',
-  styleUrls: ['./cart.component.css']
+  styleUrls: ['./cart.component.css'],
 })
 export class CartComponent implements OnInit {
+  cartNo: number = 0;
+  cartItems: Cart[];
+  uid: any = 0;
+  totalPrice: number = 0;
+  username: String = '';
+  authcode: String = '';
+  constructor(private cartService: CartService, private route: Router) {}
 
-  public cartdetails:any =[];
-  public grandTotal!: number;
-  
-  constructor(private cartservice:CartService) { 
-    // this.cartdetails = this.cartservice.showAllOrder();
+  ngOnInit(): void {
+    this.username = window.sessionStorage.getItem('username');
+    this.authcode = window.sessionStorage.getItem('authcode');
+    if (this.authcode !== null) {
+      this.uid = window.sessionStorage.getItem('user_id');
+    }
+    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;
+      });
+    });
   }
 
-  ngOnInit(): void {
-    this.cartservice.getProducts()
-    .subscribe(res=>{
-        this.cartdetails = res;
-        this.grandTotal = this.cartservice.getTotalPrice();
-    })
+  public increaseQty(cid: number, quantity: number, discountPrice: number) {
+    this.totalPrice = 0;
+    console.log('Increase Quantity');
+    let qty: number = quantity + 1;
+    let amount: number = discountPrice * qty;
+    let cart: Cart = {
+      quantity: qty,
+      price: amount,
+    };
+    console.log(qty, amount);
+    this.cartItems.forEach((i, index) => {
+      if (i.cartid == cid) {
+        this.cartItems[index].quantity = qty;
+        this.cartItems[index].price = amount;
+      }
+    });
+    this.cartService.editCartItem(cart, cid).subscribe((data) => {});
+    this.cartItems.forEach((i, index) => {
+      this.totalPrice = this.totalPrice + i.price;
+    });
+  }
+
+  public 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) {
+        this.cartItems[index].quantity = qty;
+        this.cartItems[index].price = amount;
+      }
+    });
+    this.cartService.editCartItem(cart, cid).subscribe((data) => {});
+    this.cartItems.forEach((i, index) => {
+      this.totalPrice = this.totalPrice + i.price;
+    });
   }
-  removeItem(item:any){
-    this.cartservice.removeCartItem(item);
+
+  public deleteCartItems(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;
+        });
+      });
+    });
   }
 
-  emptyCart()
-  {
-    this.cartservice.removeAllCart();
+  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');
+    }
   }
 
+  public emptyCartForUser() {
+    this.cartService.deleteCartByUser(this.uid);
+  }
 }
diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.css b/Angular-UrbanBazaar/src/app/components/home/home.component.css
index 340a3f9..fe8162c 100644
--- a/Angular-UrbanBazaar/src/app/components/home/home.component.css
+++ b/Angular-UrbanBazaar/src/app/components/home/home.component.css
@@ -5,39 +5,41 @@ body {
     padding-bottom: 10px;
 }
 
-.showCart{
-    margin-left: 1250px;
+.showCart {
+    align-self: flex-end;
     border-radius: 15px;
     padding: 10px;
     margin-top: 10px;
     border-color: antiquewhite;
 }
 
-.AddToCart{
+.AddToCart {
     border-radius: 10px;
     border-color: antiquewhite;
     color: rgb(0, 0, 0);
     background-color: rgb(248, 229, 247);
     font-weight: 600;
 }
-.card{
+
+.card {
     max-width: 300px;
     border-width: 1px;
-    border-color:antiquewhite;
+    border-color: antiquewhite;
     text-align: center;
     margin-top: 12px;
     font-family: Arial, Helvetica, sans-serif;
     border-radius: 12px;
-    box-shadow: 0.5em; 
+    box-shadow: 0.5em;
 }
 
 .price {
     color: grey;
     font-size: 16px;
-  }
-.cardParent{
+}
+
+.cardParent {
     display: flex;
-   justify-content: space-between;
-   flex-grow:1;
-   flex-wrap: wrap;
+    justify-content: space-between;
+    flex-grow: 1;
+    flex-wrap: wrap;
 }
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.html b/Angular-UrbanBazaar/src/app/components/home/home.component.html
index 24358e8..594e8d2 100644
--- a/Angular-UrbanBazaar/src/app/components/home/home.component.html
+++ b/Angular-UrbanBazaar/src/app/components/home/home.component.html
@@ -10,14 +10,15 @@
         <input class="form-control mr-sm-2" type="text" [(ngModel)]="searchValue" id="searchValue" [ngModelOptions]="{standalone: true}" placeholder="Search" aria-label="Search">
         <button class="btn btn-outline-success my-2 my-sm-0" type="submit" (click)="searchProduct()">Search</button>
     </form>
+
     <button class="showCart" (click)="showCart()">Show Cart</button>
 
     <div class="cardParent">
         <div class="card" *ngFor="let i of Searchedproducts">
-            <img src="{{i.productimage}}" style="width:85%">
+            <img src="{{i.productimage}}" style="width:70%">
             <h5>{{i.productname}}</h5>
             <p class="price">Rs. {{i.productprice}} <br> Weight: {{i.productweight}} Kg</p>
-            <p><button class="AddToCart" (click)=addCart(i)>Add to Cart</button></p>
+            <p><button class="AddToCart" (click)=addCart(i.productprice,i.productid)>Add to Cart</button></p>
         </div>
     </div>
 </body>
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.ts b/Angular-UrbanBazaar/src/app/components/home/home.component.ts
index 075dd8d..e9693f2 100644
--- a/Angular-UrbanBazaar/src/app/components/home/home.component.ts
+++ b/Angular-UrbanBazaar/src/app/components/home/home.component.ts
@@ -3,6 +3,7 @@ import { ProductService } from './../../services/product.service';
 import { Product } from './../../models/product';
 import { Router } from '@angular/router';
 import { CartService } from 'src/app/services/cart.service';
+import { Cart } from 'src/app/models/cart';
 
 @Component({
   selector: 'app-home',
@@ -10,6 +11,9 @@ import { CartService } from 'src/app/services/cart.service';
   styleUrls: ['./home.component.css'],
 })
 export class HomeComponent implements OnInit {
+  uid:any = 0;
+  username:any = '';
+  authcode:any = '';
   public products: Product[];
   public Searchedproducts: Product[];
   searchValue: string = '';
@@ -24,8 +28,13 @@ export class HomeComponent implements OnInit {
     this.router.navigateByUrl('/showCart');
   }
 
-  addCart(item: any) {
-    this.cartservice.addtoCart(item);
+  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);
   }
 
   searchProduct() {
@@ -44,6 +53,12 @@ export class HomeComponent implements OnInit {
     this.router.navigateByUrl('/memberlist');
   }
   ngOnInit(): void {
+    this.username = window.sessionStorage.getItem("username");
+    this.authcode = window.sessionStorage.getItem("authcode");
+    if (this.authcode !== null) {
+      this.uid = window.sessionStorage.getItem("user_id");
+    }
+
     this.productservice.showAllProduct().subscribe((res) => {
       this.products = res;
       this.Searchedproducts = res;
diff --git a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.css b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.css
index 0474392..8095fbe 100644
--- a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.css
+++ b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.css
@@ -1,99 +1,112 @@
 @import url("//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css");
-.navbar-icon-top .navbar-nav .nav-link > .fa {
-  position: relative;
-  width: 36px;
-  font-size: 24px;
+.navbar-icon-top .navbar-nav .nav-link>.fa {
+    position: relative;
+    width: 36px;
+    font-size: 24px;
 }
-.navbar-icon-top .navbar-nav .nav-link > .fa > .badge {
-  font-size: 0.75rem;
-  position: absolute;
-  right: 0;
-  font-family: sans-serif;
+
+.navbar-icon-top .navbar-nav .nav-link>.fa>.badge {
+    font-size: 0.75rem;
+    position: absolute;
+    right: 0;
+    font-family: sans-serif;
 }
-.navbar-icon-top .navbar-nav .nav-link > .fa {
-  top: 3px;
-  line-height: 12px;
+
+.navbar-icon-top .navbar-nav .nav-link>.fa {
+    top: 3px;
+    line-height: 12px;
 }
-.navbar-icon-top .navbar-nav .nav-link > .fa > .badge {
-  top: -10px;
+
+.navbar-icon-top .navbar-nav .nav-link>.fa>.badge {
+    top: -10px;
 }
+
 @media (min-width: 576px) {
-  .navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link {
-    text-align: center;
-    display: table-cell;
-    height: 70px;
-    vertical-align: middle;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-  .navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link > .fa {
-    display: block;
-    width: 48px;
-    margin: 2px auto 4px auto;
-    top: 0;
-    line-height: 24px;
-  }
-  .navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link > .fa > .badge {
-    top: -7px;
-  }
+    .navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link {
+        text-align: center;
+        display: table-cell;
+        height: 70px;
+        vertical-align: middle;
+        padding-top: 0;
+        padding-bottom: 0;
+    }
+    .navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link>.fa {
+        display: block;
+        width: 48px;
+        margin: 2px auto 4px auto;
+        top: 0;
+        line-height: 24px;
+    }
+    .navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link>.fa>.badge {
+        top: -7px;
+    }
 }
+
 @media (min-width: 768px) {
-  .navbar-icon-top.navbar-expand-md .navbar-nav .nav-link {
-    text-align: center;
-    display: table-cell;
-    height: 70px;
-    vertical-align: middle;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-  .navbar-icon-top.navbar-expand-md .navbar-nav .nav-link > .fa {
-    display: block;
-    width: 48px;
-    margin: 2px auto 4px auto;
-    top: 0;
-    line-height: 24px;
-  }
-  .navbar-icon-top.navbar-expand-md .navbar-nav .nav-link > .fa > .badge {
-    top: -7px;
-  }
+    .navbar-icon-top.navbar-expand-md .navbar-nav .nav-link {
+        text-align: center;
+        display: table-cell;
+        height: 70px;
+        vertical-align: middle;
+        padding-top: 0;
+        padding-bottom: 0;
+    }
+    .navbar-icon-top.navbar-expand-md .navbar-nav .nav-link>.fa {
+        display: block;
+        width: 48px;
+        margin: 2px auto 4px auto;
+        top: 0;
+        line-height: 24px;
+    }
+    .navbar-icon-top.navbar-expand-md .navbar-nav .nav-link>.fa>.badge {
+        top: -7px;
+    }
 }
+
 @media (min-width: 992px) {
-  .navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link {
-    text-align: center;
-    display: table-cell;
-    height: 70px;
-    vertical-align: middle;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-  .navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link > .fa {
-    display: block;
-    width: 48px;
-    margin: 2px auto 4px auto;
-    top: 0;
-    line-height: 24px;
-  }
-  .navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link > .fa > .badge {
-    top: -7px;
-  }
+    .navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link {
+        text-align: center;
+        display: table-cell;
+        height: 70px;
+        vertical-align: middle;
+        padding-top: 0;
+        padding-bottom: 0;
+    }
+    .navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link>.fa {
+        display: block;
+        width: 48px;
+        margin: 2px auto 4px auto;
+        top: 0;
+        line-height: 24px;
+    }
+    .navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link>.fa>.badge {
+        top: -7px;
+    }
 }
+
 @media (min-width: 1200px) {
-  .navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link {
-    text-align: center;
-    display: table-cell;
-    height: 70px;
-    vertical-align: middle;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-  .navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link > .fa {
-    display: block;
-    width: 48px;
-    margin: 2px auto 4px auto;
-    top: 0;
-    line-height: 24px;
-  }
-  .navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link > .fa > .badge {
-    top: -7px;
-  }
+    .navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link {
+        text-align: center;
+        display: table-cell;
+        height: 70px;
+        vertical-align: middle;
+        padding-top: 0;
+        padding-bottom: 0;
+    }
+    .navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link>.fa {
+        display: block;
+        width: 48px;
+        margin: 2px auto 4px auto;
+        top: 0;
+        line-height: 24px;
+    }
+    .navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link>.fa>.badge {
+        top: -7px;
+    }
+}
+
+.text-button {
+    border: 0px;
+    color: #000;
+    background-color: aliceblue;
 }
\ No newline at end of file
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 b008910..7ebff71 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,18 +1,19 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
     <a class="navbar-brand" href="#">Urban Bazaar</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+        <span class="navbar-toggler-icon"></span>
+    </button>
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
             <li class="nav-item active">
-                <a class="nav-link" href="/home">Home <span class="sr-only">(current)</span></a>
+                <!-- <a class="nav-link" (click)="clickedHome()">Home</a> -->
+                <button class="text-button" (click)="clickedHome()">Home</button>
             </li>
 
             <li class="nav-item active">
-                <a class="nav-link" href="/user-profile-details">
-          Profile <span class="sr-only">(current)</span></a>
+                <a class="nav-link" href="/userprofile">
+                    Profile <span class="sr-only">(current)</span></a>
             </li>
         </ul>
     </div>
diff --git a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts
index 8eee1a5..ecdbd53 100644
--- a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts
+++ b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-page-nav-bar',
@@ -6,10 +7,27 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./page-nav-bar.component.css']
 })
 export class PageNavBarComponent implements OnInit {
+  uid:any = 0;
+  username:any = '';
+  authcode:any = '';
+  isLoggedIn: String = '';
 
-  constructor() { }
+  constructor(private router: Router) { }
 
   ngOnInit(): void {
+    this.isLoggedIn = window.sessionStorage.getItem("isLoggedIn");
+    this.username = window.sessionStorage.getItem("username");
+    this.authcode = window.sessionStorage.getItem("authcode");
+    if (this.authcode !== null) {
+      this.uid = window.sessionStorage.getItem("user_id");
+    }
+  }
+
+  clickedHome() {
+    if(this.isLoggedIn=='true')
+      this.router.navigateByUrl('/home');
+    else if(this.isLoggedIn=='false')
+      this.router.navigateByUrl('/login');
   }
 
 }
diff --git a/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.css b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.html b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.html
new file mode 100644
index 0000000..0f94eba
--- /dev/null
+++ b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.html
@@ -0,0 +1,93 @@
+<div class="row container user_Form">
+    <div class="col-12">
+        <form [formGroup]='userForm' (submit)='onUserFormSubmit()'>
+            <div class="row userData">
+                <div class="col-12">
+                    <h5>Personal Information</h5>
+                    <br>
+                    <h6>Name</h6>
+                    <input type="text" placeholder="Enter Name" formControlName="name" />
+                    <div *ngIf="userForm.controls['name'].invalid && (userForm.controls['name'].touched || userForm.controls['name'].dirty)">
+                        <p>Invalid Name</p>
+                    </div>
+                    <BR>
+                    <BR>
+                    <h6>Username</h6>
+                    <input type="text" placeholder="Enter Username" formControlName="username" />
+                    <div *ngIf="userForm.controls['username'].invalid && (userForm.controls['username'].touched || userForm.controls['username'].dirty)">
+                        <p>Invalid Username</p>
+                    </div>
+                    <BR>
+                    <BR>
+                    <h6>Mobile Number</h6>
+                    <input type="text" placeholder="Enter Mobile Number" formControlName="mobileNumber" />
+                    <div *ngIf="userForm.controls['mobileNumber'].invalid && (userForm.controls['mobileNumber'].touched || userForm.controls['mobileNumber'].dirty)">
+                        <p>Invalid Mobile Number</p>
+                    </div>
+                    <BR>
+                    <BR>
+                    <h6>Email</h6>
+                    <input type="email" placeholder="Enter Email Id" formControlName="emailId" />
+                    <div *ngIf="userForm.controls['emailId'].invalid && (userForm.controls['emailId'].touched || userForm.controls['emailId'].dirty)">
+                        <p>Invalid Email</p>
+                    </div>
+                </div>
+            </div>
+            <BR>
+            <BR>
+            <div class="row userData">
+                <div class="col-12">
+                    <h5>Location Details</h5>
+                    <br>
+                    <h6>Address</h6>
+                    <input type="text" placeholder="Enter Address" formControlName="address" />
+                    <div *ngIf="userForm.controls['address'].invalid && (userForm.controls['address'].touched || userForm.controls['address'].dirty)">
+                        <p>Invalid Address</p>
+                    </div>
+                    <BR>
+                    <BR>
+                    <div class="row">
+                        <div class="col-6">
+                            <h6>City</h6>
+                            <input type="text" placeholder="Enter City" formControlName="city" />
+                            <div *ngIf="userForm.controls['city'].invalid && (userForm.controls['city'].touched || userForm.controls['city'].dirty)">
+                                <p>Invalid City</p>
+                            </div>
+                            <BR>
+                            <BR>
+                        </div>
+                        <div class="col-6">
+                            <h6>State</h6>
+                            <input type="text" placeholder="Enter State" formControlName="state" />
+                            <div *ngIf="userForm.controls['state'].invalid && (userForm.controls['state'].touched || userForm.controls['state'].dirty)">
+                                <p>Invalid State</p>
+                            </div>
+                            <BR>
+                            <BR>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-6">
+                            <h6>Country</h6>
+                            <input type="text" placeholder="Enter Country" formControlName="country" />
+                            <div *ngIf="userForm.controls['country'].invalid && (userForm.controls['country'].touched || userForm.controls['country'].dirty)">
+                                <p>Invalid Country</p>
+                            </div>
+                        </div>
+                        <div class="col-6">
+                            <h6>PinCode</h6>
+                            <input type="text" placeholder="Enter Pin Code" formControlName="pinCode" />
+                            <div *ngIf="userForm.controls['pinCode'].invalid && (userForm.controls['pinCode'].touched || userForm.controls['pinCode'].dirty)">
+                                <p>Invalid PinCode</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <BR>
+            <BR>
+            <button [disabled]='!userForm.valid'>Submit</button>
+        </form>
+        <br><br><br>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.spec.ts b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.spec.ts
new file mode 100644
index 0000000..1c6a52f
--- /dev/null
+++ b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserprofileComponent } from './userprofile.component';
+
+describe('UserprofileComponent', () => {
+  let component: UserprofileComponent;
+  let fixture: ComponentFixture<UserprofileComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ UserprofileComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserprofileComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.ts b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.ts
new file mode 100644
index 0000000..abab0d9
--- /dev/null
+++ b/Angular-UrbanBazaar/src/app/components/userprofile/userprofile.component.ts
@@ -0,0 +1,94 @@
+import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { User } from 'src/app/models/user';
+import { CartService } from 'src/app/services/cart.service';
+import { UserService } from 'src/app/services/user.service';
+
+@Component({
+  selector: 'app-userprofile',
+  templateUrl: './userprofile.component.html',
+  styleUrls: ['./userprofile.component.css'],
+})
+export class UserprofileComponent implements OnInit {
+  cartNo: number = 0;
+  uid: any = 0;
+  username: String = '';
+  authcode: String = '';
+  user: User;
+  userForm: FormGroup;
+
+  constructor(
+    private cartService: CartService,
+    private userService: UserService,
+    private route: Router
+  ) {
+    this.userForm = new FormGroup({
+      username: new FormControl(''),
+      lastname: new FormControl(''),
+      mobileNumber: new FormControl(''),
+      emailId: new FormControl(''),
+      address: new FormControl(''),
+      city: new FormControl(''),
+      state: new FormControl(''),
+      pinCode: new FormControl(''),
+    });
+  }
+
+  ngOnInit(): void {
+    this.username = window.sessionStorage.getItem('username');
+    this.authcode = window.sessionStorage.getItem('authcode');
+    if (this.authcode !== null) {
+      this.uid = window.sessionStorage.getItem('user_id');
+      this.userService.getUserById(this.uid).subscribe((data) => {
+        this.user = data;
+        this.userForm = new FormGroup({
+          username: new FormControl(this.user.userfirstname, Validators.required),
+          lastname: new FormControl(this.user.userlastname, Validators.required),
+          mobileNumber: new FormControl(
+            this.user.userphone,
+            Validators.required
+          ),
+          emailId: new FormControl(this.user.useremail, Validators.required),
+          address: new FormControl(this.user.useraddress, Validators.required),
+          city: new FormControl(this.user.usercity, Validators.required),
+          state: new FormControl(this.user.userstate, Validators.required),
+          pinCode: new FormControl(this.user.userzip, Validators.required),
+        });
+      });
+    }
+    this.cartService.getCartByUser(this.uid).subscribe((data1) => {
+      this.cartNo = data1.length;
+    });
+  }
+
+  onUserFormSubmit() {
+    let user: User = {
+      userid: this.uid,
+      userfirstname: this.userForm.value.username,
+      userlastname: this.userForm.value.lastname,
+      userpassword: this.uid.password,
+      userphone: this.userForm.value.mobileNumber,
+      useremail: this.userForm.value.emailId,
+      useraddress: this.userForm.value.address,
+      useraddress2: this.userForm.value.address,
+      usercity: this.userForm.value.city,
+      userstate: this.userForm.value.state,
+      userzip: this.userForm.value.pinCode,
+    };
+    this.userService.updateUser(user);
+  }
+
+  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');
+    }
+  }
+}
diff --git a/Angular-UrbanBazaar/src/app/models/cart.ts b/Angular-UrbanBazaar/src/app/models/cart.ts
index bdee54b..12b8411 100644
--- a/Angular-UrbanBazaar/src/app/models/cart.ts
+++ b/Angular-UrbanBazaar/src/app/models/cart.ts
@@ -1,10 +1,10 @@
-export class Cart {
-  public cartid: number;
-  public userid: number;
-  public orderid: number;
-  public productname: string;
-  public productprice: number;
-  public quantity: number;
+import { Product } from './product';
+import { User } from './user';
 
-  constructor() {}
+export class Cart {
+  cartid?: number;
+  user?: User;
+  product?: Product;
+  quantity: number;
+  price: number;
 }
diff --git a/Angular-UrbanBazaar/src/app/services/cart.service.ts b/Angular-UrbanBazaar/src/app/services/cart.service.ts
index 93c28e1..dec47eb 100644
--- a/Angular-UrbanBazaar/src/app/services/cart.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/cart.service.ts
@@ -1,55 +1,38 @@
 import { HttpClient } from '@angular/common/http';
-import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { Cart } from '../models/cart';
 
 @Injectable({
   providedIn: 'root',
 })
 export class CartService {
-  public cartListItem: any = [];
-  public productList = new BehaviorSubject<any>([]);
-
-  private _url: String = 'http://localhost:4405/cart';
+  private _url: String = 'http://localhost:8504/cart';
 
   constructor(private _http: HttpClient) {}
 
-  getProducts() {
-    return this.productList.asObservable();
-  }
-
-  setProduct(product: any) {
-    this.cartListItem.push(...product);
-    this.productList.next(product);
+  public postCart(cart: Cart, uid: number, pid: number): Observable<Cart> {
+    let cart_post_api = this._url + '/addCartItem/' + uid + '/' + pid;
+    return this._http.post<Cart>(cart_post_api, cart);
   }
 
-  addtoCart(product: any) {
-    this.cartListItem.push(product);
-    this.productList.next(this.cartListItem);
-    this.getTotalPrice();
-    // console.log(this.cartListItem);
+  public getCartByUser(uid: number): Observable<Cart[]> {
+    let cart_get_api = this._url + '/getCartByUser/' + uid;
+    return this._http.get<Cart[]>(cart_get_api);
   }
 
-  getTotalPrice(): number {
-    let grandTotal = 0;
-    this.cartListItem.map((a: any) => {
-      grandTotal += a.productprice;
-    });
-    return grandTotal;
+  public editCartItem(cart: Cart, cid: number): Observable<any> {
+    let cart_get_api = this._url + '/editCartItem/' + cid;
+    return this._http.put<any>(cart_get_api, cart);
   }
 
-  removeCartItem(product: any) {
-    this.cartListItem.map((a: any, index: any) => {
-      if (product.productid === a.productid) {
-        this.cartListItem.splice(index, 1);
-      }
-    });
-    this.productList.next(this.cartListItem);
+  public deleteCartItem(cid: number): Observable<any> {
+    let cart_delete_api = this._url + '/deleteCartItem/' + cid;
+    return this._http.delete<any>(cart_delete_api);
   }
 
-  removeAllCart() {
-    this.cartListItem = [];
-    this.productList.next(this.cartListItem);
+  public deleteCartByUser(uid: number): Observable<any> {
+    let cart_delete_api = this._url + '/deleteAll/' + uid;
+    return this._http.delete<any>(cart_delete_api);
   }
 }
diff --git a/Angular-UrbanBazaar/src/app/services/product.service.ts b/Angular-UrbanBazaar/src/app/services/product.service.ts
index c65e976..6266f6c 100644
--- a/Angular-UrbanBazaar/src/app/services/product.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/product.service.ts
@@ -7,7 +7,7 @@ import { Product } from '../models/product';
   providedIn: 'root',
 })
 export class ProductService {
-  private _url: String = 'http://localhost:8007/products';
+  private _url: String = 'http://localhost:8501/products';
   search: string;
 
   constructor(private _http: HttpClient) {}
@@ -16,7 +16,8 @@ export class ProductService {
     return this._http.get<any>(this._url + '/showAllProducts');
   }
 
-  public searchProduct(name: string): Observable<Product[]> {
-    return this._http.get<Product[]>(this._url + '/searchProduct/' + name);
+  public findProduct(pid: number): Observable<Product> {
+    return this._http.get<Product>(this._url + '/findProduct/' + pid);
   }
+
 }
diff --git a/Angular-UrbanBazaar/src/app/services/user.service.ts b/Angular-UrbanBazaar/src/app/services/user.service.ts
index 5270436..345b71b 100644
--- a/Angular-UrbanBazaar/src/app/services/user.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/user.service.ts
@@ -25,6 +25,11 @@ export class UserService {
     return this._http.get<User>(this._url + 'findUserById/' + userid);
   }
 
+  public getUserById(uid: number): Observable<User> {
+    let user_getId_api = this._url + '/findUserById/' + uid;
+    return this._http.get<User>(user_getId_api);
+  }
+
   public updateUser(user: User) {
     return this._http.put(this._url + 'update/', user);
   }
diff --git a/CartProxyServer/.gitignore b/CartProxyServer/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/CartProxyServer/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/CartProxyServer/.mvn/wrapper/MavenWrapperDownloader.java b/CartProxyServer/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..e76d1f3
--- /dev/null
+++ b/CartProxyServer/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/CartProxyServer/.mvn/wrapper/maven-wrapper.jar b/CartProxyServer/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
Binary files /dev/null and b/CartProxyServer/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/CartProxyServer/.mvn/wrapper/maven-wrapper.properties b/CartProxyServer/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..abd303b
--- /dev/null
+++ b/CartProxyServer/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/CartProxyServer/mvnw b/CartProxyServer/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/CartProxyServer/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/CartProxyServer/mvnw.cmd b/CartProxyServer/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/CartProxyServer/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/CartProxyServer/pom.xml b/CartProxyServer/pom.xml
new file mode 100644
index 0000000..dbff52d
--- /dev/null
+++ b/CartProxyServer/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.5.5</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.example</groupId>
+	<artifactId>CartProxyServer</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>CartProxyServer</name>
+	<description>UrbanBazaar - Online Grocery Shop</description>
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/CartProxyServerApplication.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/CartProxyServerApplication.java
new file mode 100644
index 0000000..318fadd
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/CartProxyServerApplication.java
@@ -0,0 +1,13 @@
+package com.example.urbanbazaar;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CartProxyServerApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(CartProxyServerApplication.class, args);
+	}
+
+}
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/controller/CartController.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/controller/CartController.java
new file mode 100644
index 0000000..122fdfa
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/controller/CartController.java
@@ -0,0 +1,67 @@
+package com.example.urbanbazaar.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.example.urbanbazaar.model.Cart;
+import com.example.urbanbazaar.repository.CartRepository;
+import com.example.urbanbazaar.repository.ProductRepository;
+import com.example.urbanbazaar.repository.UserRepository;
+
+@RestController
+public class CartController {
+
+	@Autowired
+	private CartRepository cartRepository;
+	@Autowired
+	private ProductRepository productRepository;
+	@Autowired
+	private UserRepository userRepository;
+	
+	@PostMapping("/addCartItem/{uid}/{pid}")
+	public Cart postCart(@PathVariable("uid") Long uid, @PathVariable("pid") Long pid, @RequestBody Cart cart) {
+		List<Cart> cartItems = cartRepository.findByUserAndProduct(uid,pid);
+		if (cartItems.size() > 0) {
+			Cart cartDB = cartItems.get(0);
+			cartDB.setQuantity(cartDB.getQuantity()+cart.getQuantity());
+			cartDB.setPrice(cartDB.getProduct().getProductprice()*(cartDB.getQuantity()));
+			return cartRepository.save(cartDB);
+		}
+		else {
+			cart.setUser(userRepository.getById(uid));
+			cart.setProduct(productRepository.getById(pid));
+			return cartRepository.save(cart);
+		}
+	}
+	
+	@GetMapping("/getCartByUser/{uid}")
+	public List<Cart> getCartByUser(@PathVariable("uid") Long uid) {
+		return cartRepository.getCartByUserId(uid);
+	}
+	
+	@PutMapping("/editCartItem/{cid}")
+	public Cart editCartItem(@RequestBody Cart cart, @PathVariable("cid") Long cid) {
+		Cart cartDB = cartRepository.getById(cid);
+		cartDB.setQuantity(cart.getQuantity());
+		cartDB.setPrice(cart.getPrice());
+		return cartRepository.save(cartDB);
+	}
+	
+	@DeleteMapping("/deleteCartItem/{cid}")
+	public void deleteCartItem(@PathVariable("cid") Long cid) {
+		cartRepository.deleteById(cid);
+	}
+	
+	@DeleteMapping("/deleteAll/{uid}")
+	public void deleteCartByUser(@PathVariable("uid") Long uid) {
+		cartRepository.deleteCartByUser(uid);
+	}
+}
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/model/Cart.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/model/Cart.java
new file mode 100644
index 0000000..91a7ff3
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/model/Cart.java
@@ -0,0 +1,56 @@
+package com.example.urbanbazaar.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+public class Cart {
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long cart_id;
+	
+	@OneToOne
+	private User user;
+	
+	@OneToOne
+	private Product product;
+	
+	private Integer quantity;
+	private Double price;
+	
+	public Long getCart_id() {
+		return cart_id;
+	}
+	public void setCart_id(Long cart_id) {
+		this.cart_id = cart_id;
+	}
+	public User getUser() {
+		return user;
+	}
+	public void setUser(User user) {
+		this.user = user;
+	}
+	public Product getProduct() {
+		return product;
+	}
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+	public Integer getQuantity() {
+		return quantity;
+	}
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+	public Double getPrice() {
+		return price;
+	}
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+}
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/model/Product.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/model/Product.java
new file mode 100644
index 0000000..b1b947d
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/model/Product.java
@@ -0,0 +1,71 @@
+package com.example.urbanbazaar.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Product {
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long productid;
+	private String productname;
+	private Double productprice;
+	private Double productweight;
+	private String productshortdesc;
+	private String productlongdesc;
+	private String productimage;
+	private Integer productcategoryid;
+	
+	public Long getProductid() {
+		return productid;
+	}
+	public void setProductid(Long productid) {
+		this.productid = productid;
+	}
+	public String getProductname() {
+		return productname;
+	}
+	public void setProductname(String productname) {
+		this.productname = productname;
+	}
+	public Double getProductprice() {
+		return productprice;
+	}
+	public void setProductprice(Double productprice) {
+		this.productprice = productprice;
+	}
+	public Double getProductweight() {
+		return productweight;
+	}
+	public void setProductweight(Double productweight) {
+		this.productweight = productweight;
+	}
+	public String getProductshortdesc() {
+		return productshortdesc;
+	}
+	public void setProductshortdesc(String productshortdesc) {
+		this.productshortdesc = productshortdesc;
+	}
+	public String getProductlongdesc() {
+		return productlongdesc;
+	}
+	public void setProductlongdesc(String productlongdesc) {
+		this.productlongdesc = productlongdesc;
+	}
+	public String getProductimage() {
+		return productimage;
+	}
+	public void setProductimage(String productimage) {
+		this.productimage = productimage;
+	}
+	public Integer getProductcategoryid() {
+		return productcategoryid;
+	}
+	public void setProductcategoryid(Integer productcategoryid) {
+		this.productcategoryid = productcategoryid;
+	}
+	
+}
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/model/User.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/model/User.java
new file mode 100644
index 0000000..df0a4ae
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/model/User.java
@@ -0,0 +1,92 @@
+package com.example.urbanbazaar.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long userid;
+	private String userfirstname;
+	private String userlastname;
+	private String userpassword;
+	private String useremail;
+	private String usercity;
+	private String userstate;
+	private String userzip;
+	private String userphone;
+	private String useraddress;
+	private String useraddress2;
+	
+	public Long getUserid() {
+		return userid;
+	}
+	public void setUserid(Long userid) {
+		this.userid = userid;
+	}
+	public String getUserfirstname() {
+		return userfirstname;
+	}
+	public void setUserfirstname(String userfirstname) {
+		this.userfirstname = userfirstname;
+	}
+	public String getUserlastname() {
+		return userlastname;
+	}
+	public void setUserlastname(String userlastname) {
+		this.userlastname = userlastname;
+	}
+	public String getUserpassword() {
+		return userpassword;
+	}
+	public void setUserpassword(String userpassword) {
+		this.userpassword = userpassword;
+	}
+	public String getUseremail() {
+		return useremail;
+	}
+	public void setUseremail(String useremail) {
+		this.useremail = useremail;
+	}
+	public String getUsercity() {
+		return usercity;
+	}
+	public void setUsercity(String usercity) {
+		this.usercity = usercity;
+	}
+	public String getUserstate() {
+		return userstate;
+	}
+	public void setUserstate(String userstate) {
+		this.userstate = userstate;
+	}
+	public String getUserzip() {
+		return userzip;
+	}
+	public void setUserzip(String userzip) {
+		this.userzip = userzip;
+	}
+	public String getUserphone() {
+		return userphone;
+	}
+	public void setUserphone(String userphone) {
+		this.userphone = userphone;
+	}
+	public String getUseraddress() {
+		return useraddress;
+	}
+	public void setUseraddress(String useraddress) {
+		this.useraddress = useraddress;
+	}
+	public String getUseraddress2() {
+		return useraddress2;
+	}
+	public void setUseraddress2(String useraddress2) {
+		this.useraddress2 = useraddress2;
+	}
+	
+}
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/CartRepository.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/CartRepository.java
new file mode 100644
index 0000000..5ad3b81
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/CartRepository.java
@@ -0,0 +1,20 @@
+package com.example.urbanbazaar.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import com.example.urbanbazaar.model.Cart;
+
+public interface CartRepository extends JpaRepository<Cart, Long> {
+		
+	@Query("select c from Cart c join c.user u where u.userid=?1")
+	List<Cart> getCartByUserId(Long uid);
+
+	@Query("select c from Cart c join c.user u join c.product p where u.userid=?1 and p.productid=?2")
+	List<Cart> findByUserAndProduct(Long uid, Long pid);
+	
+	@Query(value="delete from cart where UserID=?1", nativeQuery=true)
+	public void deleteCartByUser(Long uid);
+}
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/ProductRepository.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/ProductRepository.java
new file mode 100644
index 0000000..f7ffe6e
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/ProductRepository.java
@@ -0,0 +1,18 @@
+package com.example.urbanbazaar.repository;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import com.example.urbanbazaar.model.Product;
+
+public interface ProductRepository extends JpaRepository<Product, Long> {
+	
+	@Query("select p FROM Product p WHERE p.productname=:name")
+	public List<Product> searchByName(@Param("name") String name);
+	
+	@Query(value="Delete from Product where ProductID=?1", nativeQuery=true)
+	public void deleteByProductId(Long id);
+
+}
\ No newline at end of file
diff --git a/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/UserRepository.java b/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/UserRepository.java
new file mode 100644
index 0000000..ac2261a
--- /dev/null
+++ b/CartProxyServer/src/main/java/com/example/urbanbazaar/repository/UserRepository.java
@@ -0,0 +1,11 @@
+package com.example.urbanbazaar.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.urbanbazaar.model.User;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+
+	public User findByuserfirstname(String username);
+}
+
diff --git a/CartProxyServer/src/main/resources/application.properties b/CartProxyServer/src/main/resources/application.properties
new file mode 100644
index 0000000..f8a6d12
--- /dev/null
+++ b/CartProxyServer/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+server.port=8504
+
+spring.datasource.url=jdbc:mysql://localhost:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.username=testuser
+spring.datasource.password=Password123
+
+server.servlet.context-path=/cart
+
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+
+spring.jpa.hibernate.ddl-auto=update
+spring.jackson.serialization.fail-on-empty-beans=false
+
+spring.jpa.properties.hibernate.format_sql=true
\ No newline at end of file
diff --git a/CartProxyServer/src/test/java/com/example/urbanbazaar/CartProxyServerApplicationTests.java b/CartProxyServer/src/test/java/com/example/urbanbazaar/CartProxyServerApplicationTests.java
new file mode 100644
index 0000000..e7eef81
--- /dev/null
+++ b/CartProxyServer/src/test/java/com/example/urbanbazaar/CartProxyServerApplicationTests.java
@@ -0,0 +1,13 @@
+package com.example.urbanbazaar;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CartProxyServerApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}
diff --git a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
index ddeac63..81dfa3c 100644
--- a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
+++ b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
@@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.DeleteMapping;
 //>>>>>>> fb2720ddac9edea8fcd3eac8052c4a5bac31e6f0
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -33,6 +35,14 @@ public class CartController {
 		repo.save(cartItem);
 	}
 	
+	@PutMapping("/cartItem/{cid}")
+	public Cart editCartItem(@RequestBody Cart cart, @PathVariable("cid") int cid) {
+		Cart cartDB = repo.getById(cid);
+		cartDB.setQuantity(cart.getQuantity());
+//		cartDB.setPrice(cart.getPrice());
+		return repo.save(cartDB);
+	}
+	
 	@DeleteMapping("/deleteCartItem/{cart_id}")
 	public void deleteCartItemForUserId(int cart_id) {
 		repo.deleteById(cart_id);
diff --git a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java
index 5f0dc24..207a4d2 100644
--- a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java
+++ b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java
@@ -11,9 +11,7 @@ public class Cart {
 	@Id
 	private int cartid;
 	private int userid;
-	private int orderid;
-	private String productname;
-	private int productprice;
+	private int productid;
 	private int quantity;
 	
 	public Cart() {}
@@ -34,28 +32,12 @@ public class Cart {
 		this.userid = userid;
 	}
 
-	public int getOrderid() {
-		return orderid;
+	public int getProductid() {
+		return productid;
 	}
 
-	public void setOrderid(int orderid) {
-		this.orderid = orderid;
-	}
-
-	public String getProductname() {
-		return productname;
-	}
-
-	public void setProductname(String productname) {
-		this.productname = productname;
-	}
-	
-	public int getProductprice() {
-		return productprice;
-	}
-
-	public void setProductprice(int productprice) {
-		this.productprice = productprice;
+	public void setProductid(int productid) {
+		this.productid = productid;
 	}
 
 	public int getQuantity() {
@@ -66,13 +48,11 @@ public class Cart {
 		this.quantity = quantity;
 	}
 
-	public Cart(int cartid, int userid, int orderid, String productname, int quantity) {
+	public Cart(int cartid, int userid, int productid, int quantity) {
 		super();
 		this.cartid = cartid;
 		this.userid = userid;
-		this.orderid = orderid;
-		this.productname = productname;
+		this.productid = productid;
 		this.quantity = quantity;
 	}
-
 }
diff --git a/UB_CartServiceProxy/src/main/resources/application.properties b/UB_CartServiceProxy/src/main/resources/application.properties
index 3a5e5ef..e7b31fa 100644
--- a/UB_CartServiceProxy/src/main/resources/application.properties
+++ b/UB_CartServiceProxy/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-server.port=8010
+server.port=8503
 
-spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.url=jdbc:mysql://10.3.117.23:3306/grocery_db?createDatabaseIfNotExist=true
 spring.datasource.username=testuser
 spring.datasource.password=Password123
 
diff --git a/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java b/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
index 3388341..8e9f73e 100644
--- a/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
+++ b/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.example.urbanbazaar.model.Product;
 import com.example.urbanbazaar.repository.ProductRepository;
-@CrossOrigin(origins = "http://localhost:63871")
+//@CrossOrigin(origins = "http://localhost:63871")
 
 @RestController
 public class ProductController {
@@ -37,6 +37,11 @@ public class ProductController {
 		}
 	}
 	
+	@GetMapping("/findProduct/{product_id}")
+	public void findProductById(@PathVariable int product_id) {
+		repo.getById(product_id);
+	}
+	
 	@DeleteMapping("/deleteProduct/{product_id}")
 	public void deleteProductById(@PathVariable int product_id) {
 		repo.deleteByProductId(product_id);
diff --git a/UB_ProductServiceProxy/src/main/resources/application.properties b/UB_ProductServiceProxy/src/main/resources/application.properties
index 238be34..733a2d5 100644
--- a/UB_ProductServiceProxy/src/main/resources/application.properties
+++ b/UB_ProductServiceProxy/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-server.port=8007
+server.port=8501
 
-spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.url=jdbc:mysql://10.3.117.23:3306/grocery_db?createDatabaseIfNotExist=true
 spring.datasource.username=testuser
 spring.datasource.password=Password123
 
diff --git a/grocery_db_tables.sql b/grocery_db_tables.sql
index 7bb496d..c52ee8f 100644
--- a/grocery_db_tables.sql
+++ b/grocery_db_tables.sql
@@ -154,25 +154,6 @@ select * from members;
 
 -----------------------------------------------------------------------------------------
 
--- Cart Table Schema
-CREATE TABLE IF NOT EXISTS `cart` (
-    `CartID` int NOT NULL AUTO_INCREMENT,
-	`ProductID` int(12) NOT NULL,
-	`UserID` int NOT NULL,
-	`ProductCategoryID` int(11) NOT NULL,
-	PRIMARY KEY (`CartID`),
-	FOREIGN KEY (`ProductCategoryID`) REFERENCES productcategories(`CategoryID`),
-	FOREIGN KEY (`UserID`) REFERENCES users(`UserID`)
-);
-
-ALTER TABLE cart AUTO_INCREMENT = 1000;
-
-insert into cart values (1001, 1002, 101, 2);
-
-select * from cart;
-
------------------------------------------------------------------------------------------
-
 drop user if exists 'testuser';
 
 CREATE USER 'testuser' IDENTIFIED BY 'Password123';
diff --git a/performance-with-spring-boot b/performance-with-spring-boot
new file mode 160000
index 0000000..bdacbd8
--- /dev/null
+++ b/performance-with-spring-boot
@@ -0,0 +1 @@
+Subproject commit bdacbd8558d8d163383270cdf20400dd474467b4