Skip to content

I
interface
Commit 5da82f37 authored by Callil Capuozzo's avatar Callil Capuozzo
Browse files
Options

fixes 

React dev errors
parent b0c4f2da
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 13 deletions
src/App.css
View file @ 5da82f37
......@@ -20,7 +20,7 @@ input{
}
p{
/* margin: .25rem; */
margin: 0;
}
a{
......@@ -34,8 +34,8 @@ a:hover{
.pa2 {
padding: 2.5rem;
padding-top: 1.5rem;
padding-bottom: 1.5rem;
/* padding-top: 1.5rem; */
/* padding-bottom: 1.5rem; */
}
.title{
......@@ -118,7 +118,7 @@ input[type=number]::-webkit-outer-spin-button {
.rate p{
margin: 0px;
padding: 0px;
padding: .25rem;
}
.info{
......@@ -231,3 +231,15 @@ input[type=number]::-webkit-outer-spin-button {
.f-a{
cursor: pointer;
}
.About p{
/* margin: .5rem; */
}
.expand p{
margin-top: .5rem;
margin-bottom: .5rem;
/* margin-before: 1em;
margin-after: 1em;
margin-start: 0px;
margin-end: 0px; */
}
src/App.js
View file @ 5da82f37
......@@ -653,7 +653,7 @@ class App extends Component {
{this.state.interaction === 'input' ?
<section className="swap grey-bg border pa2">
<a href="#" role="button" onClick={() => {this.purchaseTokens()}}>
<a role="button" onClick={() => {this.purchaseTokens()}}>
<b>{"I want to swap " + this.state.input + " " + this.state.inputToken.value + " for " + this.state.output/10**18 + " " + this.state.outputToken.value}</b>
</a>
{/* <button> Approve </button> */}
......@@ -672,8 +672,8 @@ class App extends Component {
<p>Uniswap is a trustless, decentralized exchange for Ether and ERC20 tokens</p>
<p>Uniswap exchange uses a "Market Maker" mechanism, where liquidity providers store a reserve of ETH and ERC20 tokens within an Ethereum smart contract. An exchange rate is set between the tokens and ETH based on the relative availibility of each token. Arbitrage ensures that the rate will be the same as on other exchanges. Buyers who send Token 1 to the smart contract will receive back Token 2 at the current rate. A small fee is paid from the buyer to the liquidity providers to incentive participation.</p>
<p>A full writeup will be available soon. Until then, here is some more info on Market Makers:</p>
<a target="_blank" href="https://www.reddit.com/r/ethereum/comments/55m04x/lets_run_onchain_decentralized_exchanges_the_way/">https://www.reddit.com/r/ethereum/comments/55m04x/lets_run_onchain_decentralized_exchanges_the_way/</a>
<a target="_blank" href="http://vitalik.ca/general/2017/06/22/marketmakers.html">http://vitalik.ca/general/2017/06/22/marketmakers.html</a>
<a target="_blank" rel="noopener noreferrer" href="https://www.reddit.com/r/ethereum/comments/55m04x/lets_run_onchain_decentralized_exchanges_the_way/">https://www.reddit.com/r/ethereum/comments/55m04x/lets_run_onchain_decentralized_exchanges_the_way/</a>
<a target="_blank" rel="noopener noreferrer" href="http://vitalik.ca/general/2017/06/22/marketmakers.html">http://vitalik.ca/general/2017/06/22/marketmakers.html</a>
<p>Please reach out if you would like to get involved or support the project.</p>
<p>Email: <a href="mailto:hayden@uniswap.io">hayden@uniswap.io</a></p>
<p>ETH Address: 0x4779721CaC18A46DbCF148f2Dd7A8E6cc1F90078</p>
......
src/components/ConnectionHelper.js
View file @ 5da82f37
......@@ -33,7 +33,7 @@ function ConnectionHelper(props) {
return (
<div className="grey-bg connection border pa2">
<p>Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. <a onClick={() => {props.toggleAbout()}} className="f-a" >How it works ↘</a><br /><br />
You’ll need to add the UNI tokens to Metamask. <a target="_blank" href="http://metamask.consensyssupport.happyfox.com/kb/article/4-managing-tokens">Here’s a step by step guide.</a><br />
You’ll need to add the UNI tokens to Metamask. <a target="_blank" rel="noopener noreferrer" href="http://metamask.consensyssupport.happyfox.com/kb/article/4-managing-tokens">Here’s a step by step guide.</a><br />
Add UNI with <a href="">0x350E5DD084ecF271e8d3531D4324443952F47756</a>.</p>
<a className="f-a" onClick={() => props.onCloseHelper()}>I've added the token</a>
</div>
......@@ -42,7 +42,7 @@ function ConnectionHelper(props) {
return (
<div className="grey-bg connection border pa2">
<p>Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. <a onClick={() => {props.toggleAbout()}} className="f-a" >How it works</a>.<br /><br />
You’ll need to add the SWAP tokens to Metamask. <a target="_blank" href="http://metamask.consensyssupport.happyfox.com/kb/article/4-managing-tokens">Here’s a step by step guide.</a><br />
You’ll need to add the SWAP tokens to Metamask. <a target="_blank" rel="noopener noreferrer" href="http://metamask.consensyssupport.happyfox.com/kb/article/4-managing-tokens">Here’s a step by step guide.</a><br />
Add UNI with <a href="">0x8B2A87F8243f23C33fb97E23a21Ae8EDB3b71AcA</a>.</p>
<a className="f-a" onClick={() => props.onCloseHelper()}>I've added the token</a>
</div>
......@@ -50,7 +50,7 @@ function ConnectionHelper(props) {
} else if (props.interaction === "error1") {
return (
<div className="grey-bg connection border pa2">
<p>You can't swap a token for itself! 😂</p>
<p>You can't swap a token for itself! <span role="img" aria-label="Crying">😂</span></p>
</div>
)
} else if (props.interaction === "submitted") {
......@@ -62,7 +62,7 @@ function ConnectionHelper(props) {
} else if (props.input > props.balance/10**18 && props.inputToken.value === 'ETH') {
return (
<div className="grey-bg red connection border pa2">
<p>This account doesn't have enough balance to make this transaction! Get more {props.inputToken.value} with the <a target="_blank" href="https://faucet.rinkeby.io/">Rinkeby Faucet.</a></p>
<p>This account doesn't have enough balance to make this transaction! Get more {props.inputToken.value} with the <a target="_blank" rel="noopener noreferrer" href="https://faucet.rinkeby.io/">Rinkeby Faucet.</a></p>
</div>
)
} else if (props.input > props.balance/10**18) {
......
src/components/NetworkStatus.js
View file @ 5da82f37
......@@ -8,7 +8,7 @@ function NetworkStatus(props) {
if (isConnected && props.interaction !== 'disconnected'){
return (
<div className="connection border pa2 green">
<a target="_blank" href={'https://rinkeby.etherscan.io/search?q=' + props.address}>{props.address}</a>
<a target="_blank" rel="noopener noreferrer" href={'https://rinkeby.etherscan.io/search?q=' + props.address}>{props.address}</a>
<p>●</p>
</div>
)
......
src/components/Transactions.js
View file @ 5da82f37
......@@ -5,7 +5,7 @@ function Transactions(props) {
<div className="connection">
<ol>
{props.transactions.map((t) =>
<li key={t.toString()}><p><a target="_blank" href={'https://rinkeby.etherscan.io/search?q=' + t}>{t}</a></p></li>
<li key={t.toString()}><p><a target="_blank" rel="noopener noreferrer" href={'https://rinkeby.etherscan.io/search?q=' + t}>{t}</a></p></li>
)}
</ol>
</div>
......
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