From 2b31a59830d80bcfb3aa95b7fd7fcef29c3e6ea3 Mon Sep 17 00:00:00 2001
From: Gaurav Daharia <59254@hexaware.com>
Date: Sun, 19 Sep 2021 15:15:56 +0530
Subject: [PATCH] minor routing changed and css

---
 Angular-UrbanBazaar/angular.json              |  6 ++++--
 Angular-UrbanBazaar/proxy.config.json         | 19 +++++++++++++++++++
 .../app/components/cart/cart.component.css    | 13 +++++--------
 .../app/components/cart/cart.component.html   | 10 +++++-----
 .../app/components/home/home.component.css    |  1 +
 .../src/app/services/cart.service.ts          |  2 +-
 .../src/app/services/member-user.service.ts   |  2 +-
 .../src/app/services/orders.service.ts        |  2 +-
 .../app/services/product-category.service.ts  |  2 +-
 .../src/app/services/product.service.ts       |  2 +-
 .../src/app/services/user.service.ts          |  2 +-
 11 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 Angular-UrbanBazaar/proxy.config.json

diff --git a/Angular-UrbanBazaar/angular.json b/Angular-UrbanBazaar/angular.json
index 063ac34..5e7a85b 100644
--- a/Angular-UrbanBazaar/angular.json
+++ b/Angular-UrbanBazaar/angular.json
@@ -69,10 +69,12 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "Angular-UrbanBazaar:build:production"
+              "browserTarget": "Angular-UrbanBazaar:build:production",
+              "proxyConfig": "proxy.config.json"
             },
             "development": {
-              "browserTarget": "Angular-UrbanBazaar:build:development"
+              "browserTarget": "Angular-UrbanBazaar:build:development",
+              "proxyConfig": "proxy.config.json"
             }
           },
           "defaultConfiguration": "development"
diff --git a/Angular-UrbanBazaar/proxy.config.json b/Angular-UrbanBazaar/proxy.config.json
new file mode 100644
index 0000000..14dded7
--- /dev/null
+++ b/Angular-UrbanBazaar/proxy.config.json
@@ -0,0 +1,19 @@
+{
+    "/products":{
+        "target":"http://10.3.117.7:8002",
+        "secure":false
+    },
+    "/user":{
+        "target":"http://10.3.117.7:8006",
+        "secure":false
+    },
+    "/orders":{
+        "target":"http://10.3.117.7:8003",
+        "secure":false
+    },
+    "/cart":{
+        "target":"http://10.3.117.7:8004",
+        "secure":false
+    }
+
+}
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.css b/Angular-UrbanBazaar/src/app/components/cart/cart.component.css
index cb78379..69ce603 100644
--- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.css
+++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.css
@@ -29,11 +29,8 @@ h4,h6{
     align-items: center;
     
 }
-/* .center .btn{
-    font-size: 14px !important;
-    margin-top: 20px !important;
-    font-weight: 400;
-    padding: 12px 72px;
-    border-radius: 3px !important;
-
-} */
+.CartButtons{
+    border-radius: 15px;
+    border-color:antiquewhite ;
+    background-color: beige;
+}
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.html b/Angular-UrbanBazaar/src/app/components/cart/cart.component.html
index b5224d4..a9bd096 100644
--- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.html
+++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.html
@@ -18,14 +18,14 @@
                             <td>{{c.productname}}</td>
                             <td>{{c.productprice}}</td>
                             <td>
-                                <button class="deleteButton" (click)="removeItem(c)">Delete</button>
+                                <button  class="CartButtons" (click)="removeItem(c)">Delete</button>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="4"></td>
-                            <td><button (click)=emptyCart()>Empty Cart</button></td>
-                            <td><button routerLink='/'>Shop More</button></td>
-                            <td><button>Checkout</button></td>
+                            <td><button (click)=emptyCart() 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>
                         </tr>
                     </tbody>
@@ -46,7 +46,7 @@
                 alt="">
             <h4>Your cart is empty!</h4>
             <h6>Add item to it now</h6>
-            <button class="shopNow" routerLink='/'>Shop Now</button>
+            <button class="shopNow" routerLink='/home'>Shop Now</button>
         </div>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.css b/Angular-UrbanBazaar/src/app/components/home/home.component.css
index e0e2b2c..340a3f9 100644
--- a/Angular-UrbanBazaar/src/app/components/home/home.component.css
+++ b/Angular-UrbanBazaar/src/app/components/home/home.component.css
@@ -39,4 +39,5 @@ body {
     display: flex;
    justify-content: space-between;
    flex-grow:1;
+   flex-wrap: wrap;
 }
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/services/cart.service.ts b/Angular-UrbanBazaar/src/app/services/cart.service.ts
index 9c57534..56dcc78 100644
--- a/Angular-UrbanBazaar/src/app/services/cart.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/cart.service.ts
@@ -9,7 +9,7 @@ import { Cart } from '../models/cart';
 })
 export class CartService {
 
-  private _url : String = "http://localhost:9000";
+  private _url : String = "http://localhost:4405/cart";
   constructor(private _http : HttpClient) { }
 
   // public showAllOrder():Observable<Cart[]>
diff --git a/Angular-UrbanBazaar/src/app/services/member-user.service.ts b/Angular-UrbanBazaar/src/app/services/member-user.service.ts
index e7ba94e..a5e6fe7 100644
--- a/Angular-UrbanBazaar/src/app/services/member-user.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/member-user.service.ts
@@ -8,7 +8,7 @@ import { MemberUser } from '../models/member-user';
 })
 export class MemberUserService {
 
-  private _url : String = "http://localhost:8001/user";
+  private _url : String = "http://localhost:4405/user";
   
   constructor(private _http : HttpClient) { }
 
diff --git a/Angular-UrbanBazaar/src/app/services/orders.service.ts b/Angular-UrbanBazaar/src/app/services/orders.service.ts
index 749f7ea..5c84bbf 100644
--- a/Angular-UrbanBazaar/src/app/services/orders.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/orders.service.ts
@@ -8,7 +8,7 @@ import { Orders } from '../models/orders';
 })
 export class OrdersService {
 
-  private _url : String = "http://localhost:8003/orders";
+  private _url : String = "http://localhost:4405/orders";
   
   constructor(private _http : HttpClient) { }
   
diff --git a/Angular-UrbanBazaar/src/app/services/product-category.service.ts b/Angular-UrbanBazaar/src/app/services/product-category.service.ts
index c250024..f6730a7 100644
--- a/Angular-UrbanBazaar/src/app/services/product-category.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/product-category.service.ts
@@ -8,7 +8,7 @@ import { ProductCategory } from '../models/product-category';
 })
 export class ProductCategoryService {
 
-  private _url : String = "http://localhost:8002/products";
+  private _url : String = "http://localhost:4405/products";
   
   constructor(private _http : HttpClient) { }
 
diff --git a/Angular-UrbanBazaar/src/app/services/product.service.ts b/Angular-UrbanBazaar/src/app/services/product.service.ts
index 435bbde..b47ae52 100644
--- a/Angular-UrbanBazaar/src/app/services/product.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/product.service.ts
@@ -8,7 +8,7 @@ import {map} from 'rxjs/operators';
   providedIn: 'root'
 })
 export class ProductService {
-  private _url : String = "http://localhost:8002/products";
+  private _url : String = "http://localhost:4405/products";
   search : string;
   
   constructor(private _http : HttpClient) { }
diff --git a/Angular-UrbanBazaar/src/app/services/user.service.ts b/Angular-UrbanBazaar/src/app/services/user.service.ts
index 083caae..eba6ae2 100644
--- a/Angular-UrbanBazaar/src/app/services/user.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/user.service.ts
@@ -9,7 +9,7 @@ import { User } from '../models/user';
 })
 export class UserService {
 
-  private _url : String = "http://localhost:8001/user";
+  private _url : String = "http://localhost:4405/user";
   currentUser : User;
   
   constructor(private _http : HttpClient) { }