Merge pull request #11 from ryjo1026/feature-bidding

Completed Bid Button

.gitignore

@@ -1,3 +1,4 @@
+keys.json
 yarn-error.log
 
 ### macOS ###

build/contracts/AssetTracker.json

@@ -24190,10 +24190,10 @@
     "1515": {
       "events": {},
       "links": {},
-      "address": "0x8b78cd6b7aae0b56e924d261497cccfb066433a3",
-      "transactionHash": "0x6f4774c833e1ffc74fdbf33dd18d38adbd381028b1b93218eb93fee5aaffdb86"
+      "address": "0x533e7693b92e0c77cd6c148dcbcc92f47ebbf980",
+      "transactionHash": "0x03afccd571c9f823b5e9567fe99e0f03a814b9416f80ad5280bc1f29c02dda64"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-06-15T14:16:05.675Z"
+  "updatedAt": "2018-06-18T08:54:52.197Z"
 }

build/contracts/Migrations.json

@@ -1378,10 +1378,10 @@
     "1515": {
       "events": {},
       "links": {},
-      "address": "0xb81c028f0e1bc95acd1eef13ebc85eddf1576717",
-      "transactionHash": "0x66bb05af885252d081b2890bed721730336a1f25e62e7d0fa538cabb307e65ab"
+      "address": "0x2681c87b84ef4106f664d946e1b9d05d0362642c",
+      "transactionHash": "0xa9659801f3d61b69cae7484a270a95d9e69f2dd1d8736bed9e7cbf13eac8f400"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-06-15T14:16:05.665Z"
+  "updatedAt": "2018-06-18T08:54:52.185Z"
 }

src/components/Common/Loading.jsx

@@ -49,5 +49,5 @@ export default function Loading({error}) {
   );
 }
 Loading.propTypes = {
-  error: PropTypes.string.isRequired,
+  error: PropTypes.object.isRequired,
 };

src/components/Common/WithWeb3.jsx

@@ -49,7 +49,7 @@ export default function withWeb3(Component) {
     checkConnectionStatus() {
       let network = web3.currentProvider.publicConfigStore._state.networkVersion;
       if (network === '1515') {
-        contractAddress = '0x8b78cd6b7aae0b56e924d261497cccfb066433a3';
+        contractAddress = '0x533e7693b92e0c77cd6c148dcbcc92f47ebbf980';
       } else {
         contractAddress = '0xf02989fe46646f6c45d22d08d5384ae6c515673d';
       }

src/components/Manage/ManageContainer.jsx

@@ -42,15 +42,16 @@ class ManageContiner extends React.Component {
   }
 
   getDataFromDevice(device, id) {
-    // Conver minPrice out of Wei
+    // Conver amounts out of Wei
     let minPriceEther = device[3] / 1000000000000000000;
+    let highestBidEther = device[4] / 1000000000000000000;
     return {
       id: id,
       name: device[0],
       useLength: device[1].toString(),
       location: device[2],
       minPrice: minPriceEther.toString(),
-      highestBid: device[4].toString(),
+      highestBid: highestBidEther.toString(),
       status: device[5],
     };
   }

src/components/Register/RegisterLocationPicker.jsx

@@ -3,6 +3,14 @@ import PropTypes from 'prop-types';
 import {compose, withProps, lifecycle} from 'recompose';
 import {withScriptjs, withGoogleMap, GoogleMap, Marker} from 'react-google-maps';
 
+let keys = {};
+try {
+  keys = require('./keys.json');
+} catch (error) {
+  keys['GOOGLE_MAPS'] =
+  'https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places';
+}
+
 // TODO use best practices instead of recompose (react-google-maps docs are very sloppy)
 export default class RegisterLocationPicker extends React.Component {
   constructor(props, context) {
@@ -16,8 +24,7 @@ export default class RegisterLocationPicker extends React.Component {
 
     this.MapComponent = compose(
         withProps({
-          googleMapURL:
-            'https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places',
+          googleMapURL: keys.GOOGLE_MAPS,
           loadingElement: <div style={{height: '100%'}}/>,
           containerElement: <div style={{height: '600px'}}/>,
           mapElement: <div style={{height: '100%'}}/>,

src/components/Search/SearchContainer.jsx

@@ -92,8 +92,9 @@ export default class SearchContainer extends React.Component {
   }
 
   handleBidAmountChange = (event, device) => {
-    if (event.target.value >= device.minPrice &&
-    device.status) {
+    if (event.target.value >= device.minPrice
+      && event.target.value >= device.highestBid
+      && device.status) {
       this.setState({
         bidAmount: event.target.value,
         submitDisabled: false,
@@ -106,17 +107,29 @@ export default class SearchContainer extends React.Component {
     }
   }
 
+  handleSubmitClicked = () => {
+    const {account, contract, contractAddress} = this.props;
+    contract.at(contractAddress).then((at) => {
+      let device = this.getSelectedDevice();
+      let bidAmountWei = this.state.bidAmount * 1000000000000000000;
+      at.makeBid(device.name, {
+        from: account,
+        value: bidAmountWei});
+    });
+  }
+
   // Takes the array returned from the solidity function an turns it into an object
   getDataFromDevice(device, id) {
-    // Conver minPrice out of Wei
+    // Conver amounts out of Wei
     let minPriceEther = device[3] / 1000000000000000000;
+    let highestBidEther = device[4] / 1000000000000000000;
     return {
       id: id,
       name: device[0],
       useLength: device[1].toString(),
       location: device[2],
       minPrice: minPriceEther.toString(),
-      highestBid: device[4].toString(),
+      highestBid: highestBidEther.toString(),
       status: device[5],
     };
   }
@@ -138,7 +151,6 @@ export default class SearchContainer extends React.Component {
         this.setState({
           data: data,
         });
-        console.log(data);
       });
     });
   }
@@ -167,6 +179,7 @@ export default class SearchContainer extends React.Component {
               deviceData = {this.getSelectedDevice()}
               shortAccount = {this.getShortAccount()}
               onBidAmountChange = {this.handleBidAmountChange}
+              onSubmitClicked = {this.handleSubmitClicked}
               submitDisabled = {this.state.submitDisabled}
               bidDisabled = {this.state.bidDisabled}
               bidAmount = {this.state.bidAmount}

src/components/Search/SearchDeviceInfo.jsx

@@ -35,7 +35,7 @@ export default class SearchDeviceInfo extends React.Component {
               {device.name}
             </Typography>
             <Typography variant="subheading" color="textSecondary" align="left">
-              Minimum Bid Price: {device.minPrice} ether
+              Current Bid: {device.highestBid} ether
             </Typography>
             <TextField
                 id="ticket-amount"
@@ -57,6 +57,7 @@ export default class SearchDeviceInfo extends React.Component {
           <CardActions style={{marginLeft: '25px', marginBottom: '25px'}}>
             <Button variant="raised" color="primary"
               disabled = {this.props.submitDisabled}
+              onClick ={this.props.onSubmitClicked}
               style={{marginTop: '25px', textTransform: 'none'}}>
               Bid {this.props.bidAmount} ether
               with account {this.props.shortAccount}
@@ -67,6 +68,7 @@ export default class SearchDeviceInfo extends React.Component {
   }
 }
 SearchDeviceInfo.propTypes = {
+  onSubmitClicked: PropTypes.func.isRequired,
   submitDisabled: PropTypes.bool.isRequired,
   bidDisabled: PropTypes.bool.isRequired,
   shortAccount: PropTypes.string.isRequired,

src/components/Search/SearchTable.jsx

@@ -32,6 +32,7 @@ export default class SearchTable extends React.Component {
     this.columnData = [
       {id: 'deviceName', numeric: false, disablePadding: false, label: 'Device Name'},
       {id: 'minPrice', numeric: true, disablePadding: false, label: 'Minimum Bid (ether)'},
+      {id: 'highestBid', numeric: true, disablePadding: false, label: 'Current Bid (ether)'},
       {id: 'status', numeric: false, disablePadding: false, label: 'Status'},
     ];
 
@@ -93,6 +94,9 @@ export default class SearchTable extends React.Component {
                       <TableCell numeric>
                         {n.minPrice}
                       </TableCell>
+                      <TableCell numeric>
+                        {n.highestBid}
+                      </TableCell>
                       <TableCell >
                         <div style={statusStyle}>{statusText}</div>
                       </TableCell>