KMPARDS · riya249 · Nov 28, 2020 · Nov 28, 2020 · Nov 28, 2020 · Nov 29, 2020
diff --git a/package-lock.json b/package-lock.json
diff --git 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/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>

diff --git 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 = {
@@ -39,6 +39,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} />
@@ -54,10 +55,13 @@ class Header extends Component {
         </button>
         <div className="collapse navbar-collapse" id="main_nav">
           <ul className="navbar-nav">
+
           </ul>
 
+
+
           <ul className="navbar-nav ml-auto">
-          <li className="nav-item active">
+            <li className="nav-item active">
               {" "}
               <Link className="nav-link" to="/#">
                 Home{" "}
@@ -99,42 +103,51 @@ 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>
               </Link>
             </li>
             <li className="nav-item">
               <Link
                 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"
-                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
@@ -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;
 }
diff --git 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>

diff --git 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';
@@ -70,8 +70,10 @@ export default function FavPage()
                 <br/>
                 <br/><br/>
                 <div className='myListing-wrapper-container'>
-                    {                        
-                        state.allProduct.map((ele: any) => {
+
+                    {                     
+                     state.allProduct?.length ? (   
+                        state.allProduct.map((ele: React.ReactNode[]) => {
                             return <div className='row listing-border'>
                                 <div className='r-col-d-4'>
                                     <div className='section1-listing'>
@@ -118,13 +120,20 @@ 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>
+
                                         </Button>
+
                                     </div>
                                 </div>
                             </div>
                         })
-
+                     ):(
+                        <Alert variant="secondary">
+                        You have no favourites Listed
+                      </Alert>
+                     ) 
                     }
                 </div>
 

diff --git 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
@@ -58,6 +58,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: any) => {
@@ -86,7 +95,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];
@@ -151,6 +160,7 @@ class ListPage extends Component {
                         })
                     }    
                     </div>                
+                    </div>
                 </div>
                 <br/>
             <br/>
@@ -162,11 +172,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
@@ -35,4 +35,8 @@
     margin-left: 10px;
     margin-right: 10px;
     margin-top: -16px;
+   }
+
+   .list-box-mgn{
+       margin-top: 60px;
    }