Skip to content

I
interface
Commit d0c9ec58 authored by Hayden Adams's avatar Hayden Adams
Browse files
Options

prompt metamask install

parent 841aac8a
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 36 deletions
package.json
View file @ d0c9ec58
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"metamask-logo": "^2.1.3",
"ramda": "^0.25.0", "ramda": "^0.25.0",
"react": "^16.1.1", "react": "^16.1.1",
"react-dom": "^16.1.1", "react-dom": "^16.1.1",
......
src/App.css
View file @ d0c9ec58
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
.exchange-buyEthInput, .exchange-buyTokensInput{ .exchange-buyEthInput, .exchange-buyTokensInput{
width: 10vw; width: 10vw;
height: 4.5vh; height: 4.2vh;
text-align: center; text-align: center;
color: rgb(209, 151, 245); color: rgb(209, 151, 245);
vertical-align: middle; vertical-align: middle;
...@@ -176,11 +176,11 @@ ...@@ -176,11 +176,11 @@
.exchange-buyEthButton, .exchange-buyTokensButton{ .exchange-buyEthButton, .exchange-buyTokensButton{
position: fixed; position: fixed;
font-size: 2.5vh; font-size: 1.55vw;
width: 7vw; width: 7vw;
text-shadow: 3px 3px 10px #1c5f7c; text-shadow: 3px 3px 10px #1c5f7c;
margin-top: 10px; margin-top: 10px;
height: 4.5vh; height: 4.2vh;
text-align: center; text-align: center;
color: rgb(220, 160, 245); color: rgb(220, 160, 245);
text-shadow: 1px 1px 5px #ff69f0; text-shadow: 1px 1px 5px #ff69f0;
......
src/App.js
View file @ d0c9ec58
...@@ -6,30 +6,32 @@ import Instructions from './components/menus/Instructions'; ...@@ -6,30 +6,32 @@ import Instructions from './components/menus/Instructions';
import unicorn from './images/unicornNoBackground.png'; import unicorn from './images/unicornNoBackground.png';
import ethLogo from './images/ethLogo.png'; import ethLogo from './images/ethLogo.png';
const localweb3 = new Web3(window.web3.currentProvider); var localweb3;
var uniswapABI = [{"constant":false,"inputs":[{"name":"tokenAmount","type":"uint256"}],"name":"ownerTokenWithdraw","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"tokenAmount","type":"uint256"}],"name":"ownerTokenDeposit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ethAmount","type":"uint256"}],"name":"ownerEthWithdraw","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"sellQuantity","type":"uint256"},{"name":"minimumEth","type":"uint256"},{"name":"timeout","type":"uint256"}],"name":"tokenToEth","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalTokenQuantity","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"minimumTokens","type":"uint256"},{"name":"timeout","type":"uint256"}],"name":"ethToTokens","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"initialTokenQuantity","type":"uint256"}],"name":"initiateUniswap","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"totalEthQuantity","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tokenAddress","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"invariant","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"ownerEthDeposit","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"_tokenAddress","type":"address"}],"payable":true,"stateMutability":"payable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"tokensPurchased","type":"uint256"},{"indexed":false,"name":"ethSpent","type":"uint256"}],"name":"TokenPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"ethPurchased","type":"uint256"},{"indexed":false,"name":"tokensSpent","type":"uint256"}],"name":"EthPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"}]
var uniswapAddress = '0x60e5f3cd0381c501971b6fbbddaa49cfd58a4fa1';
var uniswapContract = new localweb3.eth.Contract(uniswapABI, uniswapAddress);
var tokenABI = [{"constant":true,"inputs":[],"name":"mintingFinished","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_amount","type":"uint256"}],"name":"mint","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"finishMinting","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[],"name":"MintFinished","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}] class App extends Component {
var tokenAddress = '0xca9901076d02f89794262869aad1340bd45d8489'; constructor(props){
var tokenContract = new localweb3.eth.Contract(tokenABI, tokenAddress); super(props)
var addr = "0x6D9ba242E3D6aE3f909c1cCFF20ed4fcF3482EFe"; localweb3 = new Web3(window.web3.currentProvider);
localweb3.eth.getAccounts().then(function(result, error){
addr = result[0];
});
var uniswapABI = [{"constant":false,"inputs":[{"name":"tokenAmount","type":"uint256"}],"name":"ownerTokenWithdraw","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"tokenAmount","type":"uint256"}],"name":"ownerTokenDeposit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ethAmount","type":"uint256"}],"name":"ownerEthWithdraw","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"sellQuantity","type":"uint256"},{"name":"minimumEth","type":"uint256"},{"name":"timeout","type":"uint256"}],"name":"tokenToEth","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalTokenQuantity","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"minimumTokens","type":"uint256"},{"name":"timeout","type":"uint256"}],"name":"ethToTokens","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"initialTokenQuantity","type":"uint256"}],"name":"initiateUniswap","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"totalEthQuantity","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tokenAddress","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"invariant","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"ownerEthDeposit","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"_tokenAddress","type":"address"}],"payable":true,"stateMutability":"payable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"tokensPurchased","type":"uint256"},{"indexed":false,"name":"ethSpent","type":"uint256"}],"name":"TokenPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"ethPurchased","type":"uint256"},{"indexed":false,"name":"tokensSpent","type":"uint256"}],"name":"EthPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"}]
const uniswapAddress = '0x60e5f3cd0381c501971b6fbbddaa49cfd58a4fa1';
const uniContract = new localweb3.eth.Contract(uniswapABI, uniswapAddress);
var tokenABI = [{"constant":true,"inputs":[],"name":"mintingFinished","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_amount","type":"uint256"}],"name":"mint","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"finishMinting","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[],"name":"MintFinished","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]
const tokenAddress = '0xca9901076d02f89794262869aad1340bd45d8489';
const tokContract = new localweb3.eth.Contract(tokenABI, tokenAddress);
class App extends Component {
constructor(props){ this.state = {uniswapAddress: '0x60e5f3cd0381c501971b6fbbddaa49cfd58a4fa1',
super(props) tokenAddress: '0xca9901076d02f89794262869aad1340bd45d8489',
this.state = {ethBalance: 0, uniswapContract: uniContract,
tokenContract: tokContract,
ethBalance: 0,
tokenBalance: 0, tokenBalance: 0,
tokenAllowance: null, tokenAllowance: null,
currentMaskAddress: addr, currentMaskAddress: '0x0000000000000000000000000000000000000000',
minimumTokensPurchased: null, minimumTokensPurchased: null,
minimumEthPurchased: null, minimumEthPurchased: null,
invariant: 0, invariant: 0,
...@@ -41,13 +43,20 @@ class App extends Component { ...@@ -41,13 +43,20 @@ class App extends Component {
ethCost: 0, //token price of eth ethCost: 0, //token price of eth
tokenFee: 0, tokenFee: 0,
ethFee: 0, ethFee: 0,
networkMessage: '' networkMessage: '',
locked: false
} }
this.onBuyEthInputChange = this.onBuyEthInputChange.bind(this); this.onBuyEthInputChange = this.onBuyEthInputChange.bind(this);
this.onBuyTokensInputChange = this.onBuyTokensInputChange.bind(this); this.onBuyTokensInputChange = this.onBuyTokensInputChange.bind(this);
this.tokenBuyRate = this.tokenBuyRate.bind(this); this.tokenBuyRate = this.tokenBuyRate.bind(this);
this.ethBuyRate = this.ethBuyRate.bind(this); this.ethBuyRate = this.ethBuyRate.bind(this);
// this.isMetaMaskLocked = this.isMetaMaskLocked.bind(this);
} }
componentWillMount(){ componentWillMount(){
...@@ -56,12 +65,11 @@ class App extends Component { ...@@ -56,12 +65,11 @@ class App extends Component {
this.getInvarient(); this.getInvarient();
this.getMarketEth(); this.getMarketEth();
this.getMarketTokens(); this.getMarketTokens();
this.getAccountInfo();
this.getContractInfo();
} }
componentDidMount(){ componentDidMount(){
this.getAccountInfo();
this.getContractInfo();
} }
getAccountInfo(){ getAccountInfo(){
...@@ -74,8 +82,8 @@ class App extends Component { ...@@ -74,8 +82,8 @@ class App extends Component {
getContractInfo(){ getContractInfo(){
setTimeout(() => { setTimeout(() => {
this.ethBuyRate(0.1); this.ethBuyRate(1);
this.tokenBuyRate(0.1); this.tokenBuyRate(1);
}, 1000); }, 1000);
} }
...@@ -103,7 +111,7 @@ class App extends Component { ...@@ -103,7 +111,7 @@ class App extends Component {
} }
approveAllowance(value) { approveAllowance(value) {
tokenContract.methods.approve(uniswapAddress, value).send( this.state.tokenContract.methods.approve(this.uniswapAddress, value).send(
{from: this.state.currentMaskAddress}, {from: this.state.currentMaskAddress},
function(err, txHash) {}) function(err, txHash) {})
} }
...@@ -113,7 +121,14 @@ class App extends Component { ...@@ -113,7 +121,14 @@ class App extends Component {
localweb3.eth.getAccounts().then(function(result, error){ localweb3.eth.getAccounts().then(function(result, error){
var address = result[0]; var address = result[0];
self.setState({currentMaskAddress: address}) if (address === undefined) {
console.log('MetaMask locked');
alert('Found MetaMask but no account. Please unlock MetaMask and refresh')
}
else {
self.setState({currentMaskAddress: address})
}
}); });
} }
...@@ -136,7 +151,7 @@ class App extends Component { ...@@ -136,7 +151,7 @@ class App extends Component {
// self.setState({tokenBalance: amount}); // self.setState({tokenBalance: amount});
// }) // })
tokenContract.methods.balanceOf(this.state.currentMaskAddress).call(function(error, balance) { this.state.tokenContract.methods.balanceOf(this.state.currentMaskAddress).call(function(error, balance) {
var amount = balance/10**6; var amount = balance/10**6;
self.setState({tokenBalance: amount}); self.setState({tokenBalance: amount});
}); });
...@@ -145,7 +160,7 @@ class App extends Component { ...@@ -145,7 +160,7 @@ class App extends Component {
getAllowance() { getAllowance() {
var self = this; var self = this;
tokenContract.methods.allowance(this.state.currentMaskAddress, uniswapAddress).call().then(function(result, error){ this.state.tokenContract.methods.allowance(this.state.currentMaskAddress, this.uniswapAddress).call().then(function(result, error){
var amount = result/10**6 var amount = result/10**6
self.setState({tokenAllowance: amount}); self.setState({tokenAllowance: amount});
}) })
...@@ -154,7 +169,7 @@ class App extends Component { ...@@ -154,7 +169,7 @@ class App extends Component {
getInvarient() { getInvarient() {
var self = this; var self = this;
uniswapContract.methods.invariant().call().then(function(result, error){ this.state.uniswapContract.methods.invariant().call().then(function(result, error){
self.setState({invariant: result}); self.setState({invariant: result});
}) })
} }
...@@ -162,7 +177,7 @@ class App extends Component { ...@@ -162,7 +177,7 @@ class App extends Component {
getMarketEth() { getMarketEth() {
var self = this var self = this
uniswapContract.methods.totalEthQuantity().call().then(function(result, error){ this.state.uniswapContract.methods.totalEthQuantity().call().then(function(result, error){
self.setState({marketEth: result}); self.setState({marketEth: result});
}) })
} }
...@@ -170,7 +185,7 @@ class App extends Component { ...@@ -170,7 +185,7 @@ class App extends Component {
getMarketTokens() { getMarketTokens() {
var self = this var self = this
uniswapContract.methods.totalTokenQuantity().call().then(function(result, error){ this.state.uniswapContract.methods.totalTokenQuantity().call().then(function(result, error){
self.setState({marketTokens: result}); self.setState({marketTokens: result});
}) })
} }
...@@ -183,7 +198,7 @@ class App extends Component { ...@@ -183,7 +198,7 @@ class App extends Component {
var time = blockInfo.timestamp; var time = blockInfo.timestamp;
var maxTime = time + 300; //current block time + 5mins var maxTime = time + 300; //current block time + 5mins
uniswapContract.methods.ethToTokens(minTokens, maxTime).send( self.state.uniswapContract.methods.ethToTokens(minTokens, maxTime).send(
{from: self.state.currentMaskAddress, value: self.state.tokenCost*10**18}, {from: self.state.currentMaskAddress, value: self.state.tokenCost*10**18},
function(err, txHash) {}) function(err, txHash) {})
}); });
...@@ -199,7 +214,7 @@ class App extends Component { ...@@ -199,7 +214,7 @@ class App extends Component {
var time = blockInfo.timestamp; var time = blockInfo.timestamp;
var maxTime = time + 300; //current block time + 5mins var maxTime = time + 300; //current block time + 5mins
uniswapContract.methods.tokenToEth(tokensSold, minWei, maxTime).send( self.state.uniswapContract.methods.tokenToEth(tokensSold, minWei, maxTime).send(
{from: self.state.currentMaskAddress}, {from: self.state.currentMaskAddress},
function(err, txHash) {}) function(err, txHash) {})
}); });
......
src/components/menus/Instructions.css
View file @ d0c9ec58
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
text-shadow: 2px 2px 10px #2daae0; text-shadow: 2px 2px 10px #2daae0;
margin-left: 35vw; margin-left: 35vw;
margin-right: 1vw; margin-right: 1vw;
height: 55vh; max-height: 55vh;
-webkit-transition-duration: 0.5s; -webkit-transition-duration: 0.5s;
transition-duration: 0.5s; transition-duration: 0.5s;
overflow-y: scroll; overflow-y: scroll;
......
src/components/misc/Splashscreen.css 0 → 100644
View file @ d0c9ec58
.install-metamask {
width: 100vw;
top: 70vh;
position: fixed;
font-family: Optima, sans-serif;
font-size: 26px;
text-align: center;
}
.install-metamask a {
}
src/components/misc/Splashscreen.js 0 → 100644
View file @ d0c9ec58
import React, { Component } from 'react';
import './Splashscreen.css';
var ModelViewer = require('metamask-logo')
// To render with fixed dimensions:
var viewer = ModelViewer({
// Dictates whether width & height are px or multiplied
// pxNotRatio: true,
// width: 500,
// height: 400,
pxNotRatio: false,
width: 1,
height: 0.7,
// To make the face follow the mouse.
followMouse: true,
// head should slowly drift (overrides lookAt)
// slowDrift: true,
})
var metamaskLink = 'https://metamask.io';
class Splashscreen extends Component{
render() {
return (
<div className="install-metamask">
Uniswap requires MetaMask to connect to the Ethereum blockchain.<br/><br/>
<a href="https://metamask.io"> {metamaskLink} </a>
</div>
);
}
}
export default Splashscreen;
src/index.css
View file @ d0c9ec58
...@@ -2,4 +2,5 @@ body { ...@@ -2,4 +2,5 @@ body {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: sans-serif; font-family: sans-serif;
overflow: hidden;
} }
src/index.js
View file @ d0c9ec58
...@@ -2,9 +2,20 @@ import React from 'react'; ...@@ -2,9 +2,20 @@ import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import './index.css'; import './index.css';
import App from './App'; import App from './App';
import Splashscreen from './components/misc/Splashscreen'
import registerServiceWorker from './registerServiceWorker'; import registerServiceWorker from './registerServiceWorker';
function Detect(props) {
const metamask = props.metamask;
if(typeof metamask === 'undefined') {
return <Splashscreen />
}
else {
return <App />
}
}
ReactDOM.render( ReactDOM.render(
<App />, document.getElementById('root') <Detect metamask={window.web3} />, document.getElementById('root')
); );
registerServiceWorker(); registerServiceWorker();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment