Merge branch 'master' into docker

Author: kazi-imran

src/main/frontend/app/components/customer_details.js

@@ -216,9 +216,20 @@ class CustomerDetails extends Component {
       <div className="container">
 
 
-         <PageHeader>
-            Customer Id : {this.props.customerId}
-          </PageHeader>
+            <div className="row">
+            <div className="col-md-4" style={{paddingLeft: 100}}>
+            <h3>Customer Id : {this.props.customerId}</h3>
+              </div>
+             
+            <div className="col-md-8 text-right" style={{paddingRight: 100, paddingTop: 20}}>
+           
+            <h4>
+            <button  className="btn-link" onClick={this.props.history.goBack}>Go Back</button>
+            </h4>
+           
+              </div>
+            </div>
+         
 
 
 

src/main/frontend/app/components/customers_index.js

@@ -53,10 +53,10 @@ class CustomerIndex extends Component {
       .props
       .fetchCustomers(this.state.pageSize, this.state.page);
     this.setState({doReload: false});
-    stompClient.register([			
-			{route: '/topic/newCustomer', callback: this.refreshCurrentPage},
-			{route: '/topic/deleteCustomer', callback: this.refreshCurrentPage}
-		]);
+    // stompClient.register([			
+		// 	{route: '/topic/newCustomer', callback: this.refreshCurrentPage},
+		// 	{route: '/topic/deleteCustomer', callback: this.refreshCurrentPage}
+		// ]);
 
   }
 

src/main/frontend/app/navigation/header_navi.js

@@ -5,12 +5,15 @@ import {Link} from 'react-router-dom';
 
 export const Header = () => (
     <header>
-      <nav>
-        <ul>
+      <nav className="navbar  navbar-inverse">
+      <div className="container-fluid">
+        <ul className="nav navbar-nav">
           <li><Link to='/'>Home</Link></li>
           <li><Link to='/customers' replace={true} >Customers</Link></li>
 
         </ul>
+      
+      </div>
       </nav>
     </header>
   )