From 69e96346f1cf94b7b1b0a3deb17a9b22b7cf2056 Mon Sep 17 00:00:00 2001
From: riya249 <nandiriya123@gmail.com>
Date: Sat, 28 Nov 2020 14:29:41 +0530
Subject: [PATCH 1/5] changes1

---
 src/components/Header/Index.tsx         |  71 +-----------
 src/containers/Home/Home.scss           |   1 +
 src/containers/ListPage/Index.tsx       |  15 ++-
 src/containers/ListPage/ListPage.scss   |   4 +
 src/containers/MyAccount/Index.tsx      | 142 +++++++++++++-----------
 src/containers/MyAccount/MyAccount.scss |  26 ++++-
 src/containers/MyListing/Index.tsx      |  19 +++-
 src/containers/MyListing/MyListing.scss |  10 ++
 8 files changed, 150 insertions(+), 138 deletions(-)

diff --git a/src/components/Header/Index.tsx b/src/components/Header/Index.tsx
index f7dcfce..fa96ef6 100644
--- a/src/components/Header/Index.tsx
+++ b/src/components/Header/Index.tsx
@@ -36,6 +36,7 @@ class Header extends Component {
   };
 
   render() {
+    console.log("check window wallet",window.wallet)
     return (
       <nav className="navbar navbar-expand-md navbar-dark fixed-top bg-dark  navbar-light bg-transparent black custom-menu ">
         <img className="rentDaap-Img" src={Images.path.logocolor} />
@@ -51,65 +52,7 @@ class Header extends Component {
         </button>
         <div className="collapse navbar-collapse" id="main_nav">
           <ul className="navbar-nav">
-            {/* <li className="nav-item dropdown has-megamenu">
-                    <a className="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-expanded="false"> ALL CATEGORIES  </a>
-                      <div className="dropdown-menu megamenu" role="menu">
-                                    <div className="row">
-                                        <div className="col-md-3">
-                                            <div className="col-megamenu">
-                                              <h6 className="title">Title Menu One</h6>
-                                              <ul className="list-unstyled megamenu-box">
-                                                  <li><a href="#">Custom Menu</a></li>
-                                                  <li><a href="#">Custom Menu</a></li>
-                                                  <li><a href="#">Custom Menu</a></li>
-                                                  <li><a href="#">Custom Menu</a></li>
-                                                  <li><a href="#">Custom Menu</a></li>
-                                                  <li><a href="#">Custom Menu</a></li>
-                                              </ul>
-                                            </div>  
-                                        </div>
-                                        <div className="col-md-3">
-                                          <div className="col-megamenu">
-                                            <h6 className="title">Title Menu Two</h6>
-                                                <ul className="list-unstyled megamenu-box">
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                </ul>
-                                            </div>  
-                                        </div>
-                                        <div className="col-md-3">
-                                          <div className="col-megamenu">
-                                            <h6 className="title">Title Menu Three</h6>
-                                                <ul className="list-unstyled megamenu-box">
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                </ul>
-                                            </div>  
-                                        </div>    
-                                        <div className="col-md-3">
-                                          <div className="col-megamenu">
-                                            <h6 className="title">Title Menu Four</h6>
-                                                <ul className="list-unstyled megamenu-box">
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                    <li><a href="#">Custom Menu</a></li>
-                                                </ul>
-                                            </div>  
-                                        </div>
-                                    </div>
-                        </div> 
-                  </li> */}
+            
           </ul>
 
           <ul className="navbar-nav ml-auto">
@@ -160,7 +103,8 @@ class Header extends Component {
             <li className="nav-item">
               <Link className="nav-link" to="/myFav">
                 {" "}
-                <i className="fa fa-heart" aria-hidden="true"></i>{" "}
+                <i className="fa fa-heart" aria-hidden="true"></i>
+                <i className="fa fa-heart-o" style={{color:'FF333F'}}></i>
               </Link>
             </li>
             <li className="nav-item">
@@ -168,12 +112,10 @@ class Header extends Component {
                 className="nav-link btn btn-outline-warning conn-wallet-btn"
                 to="/RentPage"
               >
-                {" "}
-                Rent{" "}
+                Rent
               </Link>
             </li>
             <li className="nav-item">
-              
               {window.wallet ? (
                 <Link
                 className="nav-link btn btn-outline-warning conn-wallet-btn"
@@ -182,8 +124,7 @@ class Header extends Component {
                   delete window.wallet;
                 }}
               >
-                {" "}
-                LOGOUT{" "}
+                LOGOUT
               </Link>
               ) : (
                 <a
diff --git a/src/containers/Home/Home.scss b/src/containers/Home/Home.scss
index 4936e8e..c269262 100755
--- a/src/containers/Home/Home.scss
+++ b/src/containers/Home/Home.scss
@@ -220,6 +220,7 @@ padding-left: 10px;
     }
     .conn-wallet-btn .navbar-nav {
         width: 100%!important;
+        
     }
     .navbar-nav {
         width: 100% !important;
diff --git a/src/containers/ListPage/Index.tsx b/src/containers/ListPage/Index.tsx
index 572e048..6918a31 100644
--- a/src/containers/ListPage/Index.tsx
+++ b/src/containers/ListPage/Index.tsx
@@ -45,6 +45,15 @@ class ListPage extends Component {
                 <br/>
                 <br/>
                 <div className='myListing-wrapper-container'>
+                <div className="list-btn-right">
+                    <Link
+                className="nav-link btn btn-outline-warning conn-wallet-btn"
+                to="/RentPage"
+              >
+               Add New Product on Rent
+              </Link>
+                        </div>
+                        <div className="list-box-mgn">
                     <div className="row">
                     {
                         this.state.allProduct.map(ele => {
@@ -137,6 +146,7 @@ class ListPage extends Component {
                         })
                     }    
                     </div>                
+                    </div>
                 </div>
                 <br/>
             <br/>
@@ -148,11 +158,6 @@ class ListPage extends Component {
                 <br/>
             <br/>
             <br/>
-            <div className='footer-bgd'>
-                <div className='wrapper-container'>
-                    <Footer />
-                </div>
-            </div>
             </div>
             </div>
 
diff --git a/src/containers/ListPage/ListPage.scss b/src/containers/ListPage/ListPage.scss
index 29d10b5..d35d3ff 100755
--- a/src/containers/ListPage/ListPage.scss
+++ b/src/containers/ListPage/ListPage.scss
@@ -35,4 +35,8 @@
     margin-left: 10px;
     margin-right: 10px;
     margin-top: -16px;
+   }
+
+   .list-box-mgn{
+       margin-top: 60px;
    }
\ No newline at end of file
diff --git a/src/containers/MyAccount/Index.tsx b/src/containers/MyAccount/Index.tsx
index 8347479..eb54493 100644
--- a/src/containers/MyAccount/Index.tsx
+++ b/src/containers/MyAccount/Index.tsx
@@ -4,11 +4,13 @@ import NavBar from '../../components/Header/NavBar';
 import Footer from '../../components/Footer/Index';
 import Images from '../../containers/Images/Image';
 //import Responsive from '../../Responsive/Responsive.css';
-import { Col, Container, Row, Card, Tab, Nav, Section, Button } from 'react-bootstrap';
-import {ethers} from 'ethers';
+import { Col, Container, Row, Card, Tab, Nav, Button, Alert } from 'react-bootstrap';
+import { ethers } from 'ethers';
 import { Link } from 'react-router-dom';
 
 
+
+
 class MyAccount extends Component {
     public state: any;
 
@@ -23,8 +25,7 @@ class MyAccount extends Component {
     }
 
     getProduct = async () => {
-        if(window.wallet===undefined)
-        {
+        if (window.wallet === undefined) {
             alert("Wallet not loaded");
             return;
         }
@@ -39,28 +40,26 @@ class MyAccount extends Component {
 
     fetchData = async () => {
         var orders = [];
-        if(window.wallet===undefined)
-        {
+        if (window.wallet === undefined) {
             alert("Wallet not loaded");
             return;
         }
-        const userId = ''+window.wallet.address+'store';
-        orders = ( JSON.parse(localStorage.getItem(JSON.stringify(userId))) );
-        if(orders === null)
+        const userId = '' + window.wallet.address + 'store';
+        orders = (JSON.parse(localStorage.getItem(JSON.stringify(userId))));
+        if (orders === null)
             return;
-        this.setState({ ...this.state, allOrders: orders});
+        this.setState({ ...this.state, allOrders: orders });
     }
 
-    fetchBalance = async() => {
-        if(window.wallet===undefined)
-        {
+    fetchBalance = async () => {
+        if (window.wallet === undefined) {
             alert("Wallet not loaded");
             return;
         }
-        
+
         const balance = await window.provider.getBalance(window.wallet.address);
-        
-        this.setState({balance});
+
+        this.setState({ balance });
     }
 
     async componentDidMount() {
@@ -70,6 +69,8 @@ class MyAccount extends Component {
     }
 
     render() {
+        console.log('allOrders is', this.state.allOrders);
+        
         return (
             <div>
                 <NavBar />
@@ -103,30 +104,29 @@ class MyAccount extends Component {
                                     <Tab.Content>
                                         <Tab.Pane eventKey="first">
                                             <Row>
-                                                <Col lg={12} style={{textAlign: "center"}}>
+                                                <Col lg={12} style={{ textAlign: "center" }}>
                                                     {/*<Card className="text-center" >
                                                         <Card.Body>*/}
-                                                            <Card.Text>
-                                                                <img src={Images.path.defaultProfile} className="img-circle avatar" alt="User avatar" />
-                                                            </Card.Text>
-
-                                                            <Button variant="primary">Change Photo</Button>
-                                                            <br/><br/>
-                                                            
-                                                            <div className="yourwallet ">
-                                                                <h5 className="feature-head text-left"> Account address</h5>
-                                                                <div className="wallet-address">{window.wallet.address}</div>
-                                                             </div>
-                                                             <div className="yourwallet ">
-                                                                <h5 className="feature-head text-left">Balance</h5>
-                                                                <div className="wallet-address">{this.state.balance!==null ? ethers.utils.formatEther(this.state.balance) : "Loading..."} ES</div>
-                                                             </div>
-                                                             <div className="yourwallet ">
-                                                                <h5 className="feature-head text-left">KYC Level</h5>
-                                                              </div>
-                                                        {/*</Card.Body>
-
-                                                        </Card>*/}
+                                                    <Card.Text>
+                                                        <img src={Images.path.defaultProfile} className="img-circle avatar" alt="User avatar" />
+                                                    </Card.Text>
+                                                    <div className="upload-btn-wrapper">
+                                                        <button className="btn-photo">Change Photo</button>
+                                                        <input type="file" name="myfile" />
+                                                    </div>
+                                                    <br /><br />
+
+                                                    <div className="yourwallet ">
+                                                        <h5 className="feature-head text-left"> Account address</h5>
+                                                        <div className="wallet-address">{window.wallet.address}</div>
+                                                    </div>
+                                                    <div className="yourwallet ">
+                                                        <h5 className="feature-head text-left">Balance</h5>
+                                                        <div className="wallet-address">{this.state.balance !== null ? ethers.utils.formatEther(this.state.balance) : "Loading..."} ES</div>
+                                                    </div>
+                                                    <div className="yourwallet ">
+                                                        <h5 className="feature-head text-left">KYC Level</h5>
+                                                    </div>
                                                 </Col>
 
                                             </Row>
@@ -135,31 +135,37 @@ class MyAccount extends Component {
                                         <Tab.Pane eventKey="second">
                                             <Row>
                                                 {
+                                                    this.state.allOrders?.length ? (
                                                     this.state.allOrders.map((ele: React.ReactNode[]) => {
                                                         return <Col lg={4}>
-                                                                    <div className="card-category-container">
-                                                                        <div className="overflow">
-                                                                            <img className="catg-imgs" src="/static/media/itemOne.e8af2a1c.jpg" />
-                                                                        </div>
-                                                                        <div>
-                                                                            <p><Link className='stretched-link catg-body-txt' to={'/Product/'+ele.address}>{ele.title}</Link></p>
-                                                                        </div>
-                                                                        <p className="location-catg list-box-desc">Description: {ele.description}</p>
-                                                                        <div className="catg-body-txt">
-                                                                            <p>Address: {ele.location}</p>
-                                                                        </div>
-                                                                        <div className="catg-body-txt">
-                                                                            <p>Rent: {ele.rent} ES</p>
-                                                                        </div>
-                                                                        <p className="location-catg">Security Fee: {ele.security} ES</p>
-                                                                        <p className="location-catg">Cancellation Fee: {ele.cancellation} ES</p>
-                                                                        <br/>
-                                                                        <p className="location-catg">Booked on: {((new Date(Number(ele.bookingDate))).toString()).split("GMT+0530 (India Standard Time)")}</p> 
-                                                                        <p className="location-catg">Starts on: {((new Date(Number(ele.startDate)*1000)).toString()).split("GMT+0530 (India Standard Time)")}</p>
-                                                                        <p className="location-catg">Ends on: {((new Date(Number(ele.endDate)*1000)).toString()).split("GMT+0530 (India Standard Time)")}</p>                                                     
-                                                                    </div>
-                                                                </Col>
+                                                            <div className="card-category-container">
+                                                                <div className="overflow">
+                                                                    <img className="catg-imgs" src="/static/media/itemOne.e8af2a1c.jpg" />
+                                                                </div>
+                                                                <div>
+                                                                    <p><Link className='stretched-link catg-body-txt' to={'/Product/' + ele.address}>{ele.title}</Link></p>
+                                                                </div>
+                                                                <p className="location-catg list-box-desc">Description: {ele.description}</p>
+                                                                <div className="catg-body-txt">
+                                                                    <p>Address: {ele.location}</p>
+                                                                </div>
+                                                                <div className="catg-body-txt">
+                                                                    <p>Rent: {ele.rent} ES</p>
+                                                                </div>
+                                                                <p className="location-catg">Security Fee: {ele.security} ES</p>
+                                                                <p className="location-catg">Cancellation Fee: {ele.cancellation} ES</p>
+                                                                <br />
+                                                                <p className="location-catg">Booked on: {((new Date(Number(ele.bookingDate))).toString()).split("GMT+0530 (India Standard Time)")}</p>
+                                                                <p className="location-catg">Starts on: {((new Date(Number(ele.startDate) * 1000)).toString()).split("GMT+0530 (India Standard Time)")}</p>
+                                                                <p className="location-catg">Ends on: {((new Date(Number(ele.endDate) * 1000)).toString()).split("GMT+0530 (India Standard Time)")}</p>
+                                                            </div>
+                                                        </Col>
                                                     })
+                                                    ):(
+                                                        <Alert variant="secondary">
+                                                              You have 0 Listing in your account
+                                                            </Alert>
+                                                    )
                                                 }
 
                                             </Row>
@@ -167,14 +173,15 @@ class MyAccount extends Component {
                                         <Tab.Pane eventKey="third">
                                             <Row>
                                                 {
-                                                    this.state.allProduct.map((ele: React.ReactNode[]) => {
-                                                        return <Col lg={4}>
+                                                    this.state.allProduct?.length ? (
+                                                        this.state.allProduct.map((ele: React.ReactNode[]) => {
+                                                            return <Col lg={4}>
                                                                 <div className="card-category-container">
                                                                     <div className="overflow">
                                                                         <img className="catg-imgs" src="/static/media/itemOne.e8af2a1c.jpg" />
                                                                     </div>
                                                                     <div>
-                                                                        <p><Link className='stretched-link catg-body-txt' to={'/MyProduct/'+ele[1]}>{ele[2]}</Link></p>
+                                                                        <p><Link className='stretched-link catg-body-txt' to={'/MyProduct/' + ele[1]}>{ele[2]}</Link></p>
                                                                     </div>
                                                                     <p className="location-catg list-box-desc">Description: {ele[3]}</p>
                                                                     <div className="catg-body-txt">
@@ -185,11 +192,16 @@ class MyAccount extends Component {
                                                                     </div>
                                                                     <p className="location-catg">Security Fee: {ethers.utils.formatEther(ele[6])} ES</p>
                                                                     <p className="location-catg">Cancellation Fee: {ethers.utils.formatEther(ele[7])} ES</p>
-                                                                    <br/>
+                                                                    <br />
                                                                     <p className="location-catg">Listed on: {((new Date(Number(ele[9]))).toString()).split("GMT+0530 (India Standard Time)")}</p>
                                                                 </div>
                                                             </Col>
-                                                    })
+                                                        })
+                                                    ) : (
+                                                            <Alert variant="secondary">
+                                                              You have 0 Listing in your account
+                                                            </Alert>
+                                                        )
                                                 }
                                             </Row>
                                         </Tab.Pane>
diff --git a/src/containers/MyAccount/MyAccount.scss b/src/containers/MyAccount/MyAccount.scss
index 89445da..719c18f 100644
--- a/src/containers/MyAccount/MyAccount.scss
+++ b/src/containers/MyAccount/MyAccount.scss
@@ -58,4 +58,28 @@
 .avatar{
     height: 200px;
     width: 200px;
-}
\ No newline at end of file
+}
+
+.upload-btn-wrapper {
+    position: relative;
+    overflow: hidden;
+    display: inline-block;
+  }
+  
+  .btn-photo{
+    border: 2px solid gray;
+    color: gray;
+    background-color: white;
+    padding: 8px 20px;
+    border-radius: 8px;
+    font-size: 20px;
+    font-weight: bold;
+  }
+  
+  .upload-btn-wrapper input[type=file] {
+    font-size: 100px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    opacity: 0;
+  }
\ No newline at end of file
diff --git a/src/containers/MyListing/Index.tsx b/src/containers/MyListing/Index.tsx
index 64fa5f3..a1ddcb5 100644
--- a/src/containers/MyListing/Index.tsx
+++ b/src/containers/MyListing/Index.tsx
@@ -5,7 +5,7 @@ import Images from '../Images/Image';
 import NavBar from '../../components/Header/NavBar';
 import Footer from '../../components/Footer/Index';
 import Modal from 'react-bootstrap/Modal';
-import { Button } from 'react-bootstrap';
+import { Button , Alert} from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faTrashAlt } from '@fortawesome/free-solid-svg-icons'
@@ -59,10 +59,20 @@ class MyListing extends Component {
                 <br/>
                 <br/>
                 <br/>
+               
                 <div className='myListing-wrapper-container'>
+                <div className="list-btn-right">
+                    <Link
+                className="nav-link btn btn-outline-warning conn-wallet-btn"
+                to="/RentPage"
+              >
+               Add New Product on Rent
+              </Link>
+                        </div>
                     {
+                        this.state.allProduct?.length ?(
                         this.state.allProduct.map((ele: React.ReactNode[]) => {
-                            return <div className='row listing-border position-relative'>
+                            return <div className='row listing-border'>
                                 <div className='r-col-d-4'>
                                     <div className='section1-listing'>
                                         <img className='listing-main-img' src={Images.path.rlTwo} />
@@ -90,6 +100,11 @@ class MyListing extends Component {
                                 </div>
                             </div>
                         })
+                        ):(
+                            <Alert variant="secondary">
+                            You have 0 Listing in your account
+                          </Alert>
+                        )
                     }
                 </div>
                
diff --git a/src/containers/MyListing/MyListing.scss b/src/containers/MyListing/MyListing.scss
index f1e0db8..70131ed 100755
--- a/src/containers/MyListing/MyListing.scss
+++ b/src/containers/MyListing/MyListing.scss
@@ -88,4 +88,14 @@ border-radius: 10px;
 }
 .row.listing-border{
  margin-bottom: 20px;
+ margin-top: 50px;
+}
+
+.list-btn-right{
+    display: flex;
+    justify-content: flex-end;
+}
+
+.nav-link.btn.btn-outline-warning.conn-wallet-btn{
+ padding: 5px;
 }
\ No newline at end of file

From 05968f099fc6df6b6ea762184e4e6cc24a6b9523 Mon Sep 17 00:00:00 2001
From: riya249 <nandiriya123@gmail.com>
Date: Sat, 28 Nov 2020 17:26:54 +0530
Subject: [PATCH 2/5] cganges2

---
 package-lock.json                 | 22 ++++++++++++
 package.json                      |  1 +
 src/components/Header/Index.tsx   | 58 +++++++++++++++++++------------
 src/components/Header/NavBar.scss |  9 +++++
 src/components/Header/NavBar.tsx  | 33 +++++++++++-------
 5 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf56a9b..d40be4b 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -4408,6 +4408,14 @@
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
+    "copy-to-clipboard": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
+      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
+      "requires": {
+        "toggle-selection": "^1.0.6"
+      }
+    },
     "core-js": {
       "version": "3.6.5",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
@@ -11488,6 +11496,15 @@
       "resolved": "https://registry.npmjs.org/react-card-carousel/-/react-card-carousel-1.1.3.tgz",
       "integrity": "sha512-iG3ob0rAZMCrNtvkGvQgOPwfYQ9//R977Sk3/WHpSl9dKn/bkLiTQj/Iyfw5/oKZYL+vvGIvWwu776JFXnTC+A=="
     },
+    "react-copy-to-clipboard": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz",
+      "integrity": "sha512-/2t5mLMMPuN5GmdXo6TebFa8IoFxZ+KTDDqYhcDm0PhkgEzSxVvIX26G20s1EB02A4h2UZgwtfymZ3lGJm0OLg==",
+      "requires": {
+        "copy-to-clipboard": "^3",
+        "prop-types": "^15.5.8"
+      }
+    },
     "react-country-region-selector": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/react-country-region-selector/-/react-country-region-selector-2.1.0.tgz",
@@ -13979,6 +13996,11 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toggle-selection": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+      "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
+    },
     "toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
diff --git a/package.json b/package.json
index c070115..5445938 100755
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "react-bootstrap": "^1.0.0",
     "react-calendar": "^3.0.1",
     "react-card-carousel": "^1.1.3",
+    "react-copy-to-clipboard": "^5.0.2",
     "react-country-region-selector": "^2.1.0",
     "react-date-picker": "^8.0.1",
     "react-datepicker": "^3.1.3",
diff --git a/src/components/Header/Index.tsx b/src/components/Header/Index.tsx
index fa96ef6..fae23a5 100644
--- a/src/components/Header/Index.tsx
+++ b/src/components/Header/Index.tsx
@@ -6,8 +6,8 @@ import Images from "../../containers/Images/Image";
 
 
 
-class Header extends Component { 
-//@ts-ignore
+class Header extends Component {
+  //@ts-ignore
   constructor(props) {
     super(props);
     this.state = {
@@ -36,7 +36,7 @@ class Header extends Component {
   };
 
   render() {
-    console.log("check window wallet",window.wallet)
+    console.log("check window wallet", window.wallet)
     return (
       <nav className="navbar navbar-expand-md navbar-dark fixed-top bg-dark  navbar-light bg-transparent black custom-menu ">
         <img className="rentDaap-Img" src={Images.path.logocolor} />
@@ -52,11 +52,11 @@ class Header extends Component {
         </button>
         <div className="collapse navbar-collapse" id="main_nav">
           <ul className="navbar-nav">
-            
-          </ul>
 
+          </ul>
+         
           <ul className="navbar-nav ml-auto">
-          <li className="nav-item active">
+            <li className="nav-item active">
               {" "}
               <Link className="nav-link" to="/#">
                 Home{" "}
@@ -104,7 +104,7 @@ class Header extends Component {
               <Link className="nav-link" to="/myFav">
                 {" "}
                 <i className="fa fa-heart" aria-hidden="true"></i>
-                <i className="fa fa-heart-o" style={{color:'FF333F'}}></i>
+                <i className="fa fa-heart-o" style={{ color: 'FF333F' }}></i>
               </Link>
             </li>
             <li className="nav-item">
@@ -118,25 +118,37 @@ class Header extends Component {
             <li className="nav-item">
               {window.wallet ? (
                 <Link
-                className="nav-link btn btn-outline-warning conn-wallet-btn"
-                to="/#"
-                onClick={() => {
-                  delete window.wallet;
-                }}
-              >
-                LOGOUT
-              </Link>
-              ) : (
-                <a
                   className="nav-link btn btn-outline-warning conn-wallet-btn"
-                  href="https://eraswap.life/"
-                  target="_blank"
+                  to=""
                 >
-                  {" "}
-                  CONNECT TO WALLET{" "}
-                </a>
+               Connected To: {window.wallet?.address.slice(0, 6)}....{window.wallet?.address.slice(38)}
+                </Link>
+              ):(
+                ''
               )}
-              
+                </li>
+            <li className="nav-item">
+              {window.wallet ? (
+                <Link
+                  className="nav-link btn btn-outline-warning conn-wallet-btn"
+                  to="/#"
+                  onClick={() => {
+                    delete window.wallet;
+                  }}
+                >
+                  LOGOUT
+                </Link>
+              ) : (
+                  <a
+                    className="nav-link btn btn-outline-warning conn-wallet-btn"
+                    href="https://eraswap.life/"
+                    target="_blank"
+                  >
+                    {" "}
+                  CONNECT TO WALLET{" "}
+                  </a>
+                )}
+
             </li>
           </ul>
         </div>
diff --git a/src/components/Header/NavBar.scss b/src/components/Header/NavBar.scss
index 8241ede..e1d57f0 100755
--- a/src/components/Header/NavBar.scss
+++ b/src/components/Header/NavBar.scss
@@ -140,4 +140,13 @@ ul.megamenu-box li a {
     margin-left: 11px;
     color: #ff5d22;
     font-weight: 600;
+}
+
+.wallet-style{
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.wallet-bx{
+    border:1px solid #000000;
 }
\ No newline at end of file
diff --git a/src/components/Header/NavBar.tsx b/src/components/Header/NavBar.tsx
index 3845727..f6e1f0d 100644
--- a/src/components/Header/NavBar.tsx
+++ b/src/components/Header/NavBar.tsx
@@ -3,20 +3,26 @@ import "./NavBar.scss";
 import NavMenu from "../NavMenu/Index";
 import Images from "../../containers/Images/Image";
 import { Link } from "react-router-dom";
-
+import copy from 'copy-to-clipboard';
 
 class NavBar extends Component {
-	public state: any;
-	public setState: any;
+ 
+ 
+  public state: any;
+  public setState: any;
+ 
 
   constructor(props: Readonly<{}>) {
     super(props);
     this.state = {
       showMenu: false,
       isOpen: false,
+      addressCopied: '',
     };
     this.toggleMenu = this.toggleMenu.bind(this);
   }
+
+ 
   toggleMenu = () => {
     this.setState({ showMenu: !this.state.showMenu });
   };
@@ -25,9 +31,13 @@ class NavBar extends Component {
     this.setState({ isOpen: !this.state.isOpen });
   };
 
+
+
   render() {
+    console.log('hgdfhs',this.state.addressCopied)
     return (
       <nav className="navbar navbar-expand-md navbar-dark fixed-top bg-dark  navbar-light black custom-menu ">
+     
         <img className="rentDaap-Img" src={Images.path.logocolor} />
         <button
           className="navbar-toggler"
@@ -40,6 +50,7 @@ class NavBar extends Component {
           <span className="navbar-toggler-icon"></span>
         </button>
         <div className="collapse navbar-collapse" id="main_nav">
+          
           <ul className="navbar-nav">
             {/* <li className="nav-item dropdown has-megamenu">
                     <a className="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-expanded="false"> ALL CATEGORIES  </a>
@@ -101,7 +112,6 @@ class NavBar extends Component {
                         </div> 
                   </li> */}
           </ul>
-
           <ul className="navbar-nav ml-auto">
             <li className="nav-item active">
               {" "}
@@ -164,17 +174,14 @@ class NavBar extends Component {
             </li>
             <li className="nav-item">
               {window.wallet ? (
-                  <Link
+                <Link
                   className="nav-link btn btn-outline-warning conn-wallet-btn"
-                  to="/#"
-                  onClick={() => {
-                    delete window.wallet;
-                  }}
+                  to=""
                 >
-                  {" "}
-                  LOGOUT{" "}
+               Connected To: {window.wallet?.address.slice(0, 6)}....{window.wallet?.address.slice(38)}
                 </Link>
-                ) : (
+                
+              ) : (
                   <a
                     className="nav-link btn btn-outline-warning conn-wallet-btn"
                     href="https://eraswap.life/"
@@ -183,7 +190,7 @@ class NavBar extends Component {
                     {" "}
                     CONNECT TO WALLET{" "}
                   </a>
-              )}
+                )}
             </li>
           </ul>
         </div>

From 32889cfc0faa75144ef0beeb2e9305ca3d02ac6d Mon Sep 17 00:00:00 2001
From: riya249 <nandiriya123@gmail.com>
Date: Sat, 28 Nov 2020 18:25:55 +0530
Subject: [PATCH 3/5] fav

---
 src/containers/FavPage/Index.tsx  | 13 +++++++++----
 src/containers/ListPage/Index.tsx |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/containers/FavPage/Index.tsx b/src/containers/FavPage/Index.tsx
index 60f4691..ac7b620 100644
--- a/src/containers/FavPage/Index.tsx
+++ b/src/containers/FavPage/Index.tsx
@@ -8,7 +8,7 @@ import SideBar from '../../components/SideBar/Index';
 import Footer from '../../components/Footer/Index';
 import { Link } from 'react-router-dom';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Row, Col, Container, Button } from 'react-bootstrap';
+import { Row, Col, Container, Button ,Alert} from 'react-bootstrap';
 import Calendar from 'react-calendar';
 import Modal from 'react-bootstrap/Modal';
 import { faTrashAlt } from '@fortawesome/free-solid-svg-icons';
@@ -72,7 +72,8 @@ export default function FavPage()
                 <br/>
                 <br/><br/>
                 <div className='myListing-wrapper-container'>
-                    {                        
+                    {                     
+                     state.allProduct?.length ? (   
                         state.allProduct.map((ele: React.ReactNode[]) => {
                             return <div className='row listing-border'>
                                 <div className='r-col-d-4'>
@@ -111,13 +112,17 @@ export default function FavPage()
                                             alert("Product removed from favourites, refresh page");
                                             //window.location.reload(false);
                                         }}>
-                                            Remove from Favourites
+                                             <i className="fa fa-heart" style={{ color:'red'}} aria-hidden="true"></i>
                                         </Link>
                                     </div>
                                 </div>
                             </div>
                         })
-                            
+                     ):(
+                        <Alert variant="secondary">
+                        You have no favourites Listed
+                      </Alert>
+                     ) 
                     }
                 </div>
 
diff --git a/src/containers/ListPage/Index.tsx b/src/containers/ListPage/Index.tsx
index 6918a31..c70136c 100644
--- a/src/containers/ListPage/Index.tsx
+++ b/src/containers/ListPage/Index.tsx
@@ -82,7 +82,7 @@ class ListPage extends Component {
                                 <p className='location-catg'>Cancellation Fee: {ethers.utils.formatEther(ele[7])} ES</p>
                                 <p className='location-catg' style={{marginBottom: '0px'}}>Listed on: {((new Date(Number(ele[9]))).toString()).split("GMT+0530 (India Standard Time)")}</p>
                                 <i 
-                                    className="fa fa-heart" 
+                                    className="fa fa-heart-o" 
                                     aria-hidden="true" 
                                     onClick={() => {
                                         const address = ele[1];

From 616cb7b98fc7ad490af5a561c0d6325b9304b979 Mon Sep 17 00:00:00 2001
From: riya249 <nandiriya123@gmail.com>
Date: Sun, 29 Nov 2020 19:06:08 +0530
Subject: [PATCH 4/5] rentingdapp

---
 src/components/Header/Index.tsx                       |  1 -
 src/containers/Product/Index.tsx                      |  6 +++---
 src/containers/Product/Product.scss                   | 10 +++++++++-
 src/containers/SearchedProducts/SearchedProducts.scss |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/Header/Index.tsx b/src/components/Header/Index.tsx
index fae23a5..cac4355 100644
--- a/src/components/Header/Index.tsx
+++ b/src/components/Header/Index.tsx
@@ -104,7 +104,6 @@ class Header extends Component {
               <Link className="nav-link" to="/myFav">
                 {" "}
                 <i className="fa fa-heart" aria-hidden="true"></i>
-                <i className="fa fa-heart-o" style={{ color: 'FF333F' }}></i>
               </Link>
             </li>
             <li className="nav-item">
diff --git a/src/containers/Product/Index.tsx b/src/containers/Product/Index.tsx
index 1aa4370..f84b4e3 100644
--- a/src/containers/Product/Index.tsx
+++ b/src/containers/Product/Index.tsx
@@ -208,11 +208,11 @@ export default function Product()
                 {/* Portfolio Item Heading */}
                 <div className="row">
                     <h1 className="my-4 catg-body-txt">{state.title}</h1>
-                    <i className="fa fa-heart" aria-hidden="true" onClick={handleFav} style={{marginTop: '30px', marginLeft: '30px', color: 'red', fontSize: '35px'}}></i>
+                    <i className="fa fa-heart" aria-hidden="true" onClick={handleFav} style={{marginTop: '30px', marginLeft: '60px', color: 'red', fontSize: '35px'}}></i>
                 </div>
                 
                 {/* Portfolio Item Row */}
-                <div className="row">
+                <div className="row prd-dt-box">
                     <div className="col-md-8">
                         <img className="img-fluid" src={Images.path.rlTwo} alt="" />
                     </div>
@@ -241,7 +241,7 @@ export default function Product()
                 </div>
                 <br/><br/>
                 
-                <div className="row">
+                <div className="row prod-margin">
                     <table className='table'>
                         <tr>
                             <th style={{textAlign: "center"}}>Contract Address</th>
diff --git a/src/containers/Product/Product.scss b/src/containers/Product/Product.scss
index fd00327..20a5df7 100644
--- a/src/containers/Product/Product.scss
+++ b/src/containers/Product/Product.scss
@@ -41,4 +41,12 @@
 .prd-flex{
     display: flex;
     width: 100%;
-}
\ No newline at end of file
+}
+
+.row.prod-margin{
+    margin: 20px 10px 20px -102px;
+}
+
+// .row.prd-dt-box{
+//     margin-left: -112px;
+// }
\ No newline at end of file
diff --git a/src/containers/SearchedProducts/SearchedProducts.scss b/src/containers/SearchedProducts/SearchedProducts.scss
index 3066ad9..e37b1d8 100644
--- a/src/containers/SearchedProducts/SearchedProducts.scss
+++ b/src/containers/SearchedProducts/SearchedProducts.scss
@@ -20,7 +20,7 @@
        display: flex;
        justify-content: space-between;
        color: #FF5D22;
-      margin: 10px 10px 0px 10px;
+      margin: 10px -41px 0px 10px;
    }
    .location-catg{
     color:#A7A7A7;

From 81cb4b41909cf92c4d8df3dcadb383c7e2aecccc Mon Sep 17 00:00:00 2001
From: riya249 <nandiriya123@gmail.com>
Date: Tue, 1 Dec 2020 18:01:19 +0530
Subject: [PATCH 5/5] merge conflict

---
 src/components/ComingSoon/ComingSoon.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ComingSoon/ComingSoon.tsx b/src/components/ComingSoon/ComingSoon.tsx
index 2166465..8e1899b 100644
--- a/src/components/ComingSoon/ComingSoon.tsx
+++ b/src/components/ComingSoon/ComingSoon.tsx
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import './ComingSoon.scss';
 import Images from '../../containers/Images/Image';
 import NavBar from '../Header/NavBar';
-import Responsive from '../../Responsive/Responsive.css';
 import Footer from '../Footer/Index';
 import { Link,Route } from 'react-router-dom';
 
@@ -27,7 +26,7 @@ class ComingSoon extends Component {
                 <div className='comin-soon-container'>
                   <img className='comin-img' src={Images.path.comingsoon} alt='coming-soon' />
                 </div>
-                <h1 className='comimg-txt'>dApp in Making</h1>
+                <h1 className='comimg-txt'>dApp in Makingj</h1>
                 <div className='dwnld-main'>
                 <a href='https://play.google.com/store/apps/details?id=com.eraswaponeapp&hl=en' className ='coming-home'>Download 1DAAP</a>
                 </div>