diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 3b664107..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "git.ignoreLimitWarning": true
-}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 33f09529..1c457d8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19668,8 +19668,7 @@
"integrity": "sha512-rnwGcCe6cev5A6eG5UBCQqPmkJVZMCrK+HN1AvUCco0OHD/0asGc9LuLbtkQIyznA6Lzetq/OOcaTOM4KeT11g==",
"requires": {
"underscore": "1.9.1",
- "web3-core-helpers": "1.2.0",
- "websocket": "github:frozeman/WebSocket-Node#6c72925e3f8aaaea8dc8450f97627e85263999f2"
+ "web3-core-helpers": "1.2.0"
},
"dependencies": {
"debug": {
@@ -19735,7 +19734,7 @@
},
"websocket": {
"version": "github:frozeman/WebSocket-Node#6c72925e3f8aaaea8dc8450f97627e85263999f2",
- "from": "github:frozeman/WebSocket-Node#browserifyCompatible",
+ "from": "github:frozeman/WebSocket-Node#6c72925e3f8aaaea8dc8450f97627e85263999f2",
"requires": {
"debug": "^2.2.0",
"nan": "^2.3.3",
diff --git a/public/index.html b/public/index.html
index 6e7adcdf..9f854ba9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -27,7 +27,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
- Inro to Web3.js
+ Intro to Web3.js
diff --git a/src/App.js b/src/App.js
index 534e7776..baacc79b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,14 @@
import React, { Component } from "react";
import web3 from "./web3";
import auction from "./auction";
+
+// Styling
import { Layout } from "./Layout";
import "./App.css";
-import { Button } from "react-bootstrap";
import Typist from 'react-typist';
class App extends Component {
- constructor(props) {
- super(props);
-
- this.state = {
+ state = {
bids: [],
bidders: [],
seller: "",
@@ -19,16 +17,14 @@ class App extends Component {
value: "",
message: ""
};
- }
+
async componentDidMount() {
const bids = await auction.methods.getBids().call();
const seller = await auction.methods.seller().call();
const highestBidder = await auction.methods.getHighestBidder().call();
const bidders = await auction.methods.getBidders().call();
- const auctionValue = await web3.eth.getBalance(
- "0x8B167cf1754005F502774Ffe63857C8C66B5B9f1"
- );
+ const auctionValue = await web3.eth.getBalance(auction.options.address);
this.setState({
bids,
@@ -39,17 +35,17 @@ class App extends Component {
});
}
- onEnter = async event => {
+ onSubmit = async (event) => {
event.preventDefault();
const accounts = await web3.eth.getAccounts();
this.setState({
- message: "Processing..."
+ message: "Confirming transaction..."
});
await auction.methods.submitBid().send({
from: accounts[0],
- valuecd: web3.utils.toWei(this.state.value, "ether")
+ value: web3.utils.toWei(this.state.value, "ether")
});
this.setState({
@@ -60,17 +56,13 @@ class App extends Component {
onClick = async () => {
const accounts = await web3.eth.getAccounts();
- this.setState({
- message: "Picking the highest bidder..."
- });
+ this.setState({ message: 'Awaiting transaction success...' })
await auction.methods.determineWinner().send({
from: accounts[0]
});
- this.setState({
- message: "Sold, to the highest bidder!"
- });
+ this.setState({ message: 'A winner has been picked!' });
};
render() {
@@ -79,18 +71,9 @@ class App extends Component {
Decentralized Auction on Ethereum.
-
-
-
- There are currently {this.state.bidders.length} people entered,
- competing to bid {" "}
- {web3.utils.fromWei(this.state.auctionValue, "ether")} ether.{" "}
-
-
-
-