Skip to content

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

add scrollable instructions and new logo

parent 23ebf975
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 24 deletions
src/App.css
View file @ 29620e5f
@font-face {
font-family: 'LeveloLineBold'; /*a name to be used later*/
src: url('./fonts/LoveloLineBold.otf'); /*URL to font*/
}
.App {
text-align: center;
background-size: 100%;
......@@ -42,7 +47,7 @@
clear: both;
z-index: 1;
height:25vh;
opacity: 0.75;
opacity: 0.9;
-moz-user-select: -moz-none;
-khtml-user-select: none;
-webkit-user-select: none;
......
src/App.js
View file @ 29620e5f
......@@ -7,8 +7,6 @@ import unicorn from './images/unicornNoBackground.png';
import ethLogo from './images/ethLogo.png';
const localweb3 = new Web3(window.web3.currentProvider);
//console.log(localweb3);
console.log(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';
......@@ -24,6 +22,7 @@ localweb3.eth.getAccounts().then(function(result, error){
});
class App extends Component {
constructor(props){
super(props)
......@@ -33,9 +32,9 @@ class App extends Component {
currentMaskAddress: addr,
minimumTokensPurchased: null,
minimumEthPurchased: null,
invariant: null,
marketEth: null,
marketTokens: null,
invariant: 0,
marketEth: 0,
marketTokens: 0,
tokenBuyRate: 0,
ethBuyRate: 0,
tokenCost: 0, //eth price of tokens
......@@ -52,18 +51,32 @@ class App extends Component {
}
componentWillMount(){
this.getMetaMaskAddress();
this.checkNetwork();
this.getMaskAddress();
this.getInvarient();
this.getMarketEth();
this.getMarketTokens();
this.getAccountInfo();
this.getContractInfo();
}
componentDidMount(){
this.getTokenBalance();
this.getEthBalance();
this.getAllowance();
}
getAccountInfo(){
setTimeout(() => {
this.getEthBalance();
this.getTokenBalance();
this.getAllowance();
}, 1000);
}
getContractInfo(){
setTimeout(() => {
this.ethBuyRate(0.1);
this.tokenBuyRate(0.1);
}, 1000);
}
checkNetwork() {
......@@ -95,7 +108,7 @@ class App extends Component {
function(err, txHash) {})
}
getMaskAddress() {
getMetaMaskAddress() {
var self = this;
localweb3.eth.getAccounts().then(function(result, error){
......@@ -124,7 +137,7 @@ class App extends Component {
// })
tokenContract.methods.balanceOf(this.state.currentMaskAddress).call(function(error, balance) {
var amount = (balance/10**6);
var amount = balance/10**6;
self.setState({tokenBalance: amount});
});
}
......@@ -196,6 +209,7 @@ class App extends Component {
if(buyTokensInput && buyTokensInput !== 0){
this.setState({ minimumTokensPurchased: buyTokensInput });
this.tokenBuyRate(buyTokensInput);
this.getEthBalance();
this.getTokenBalance();
}
}
......@@ -205,6 +219,8 @@ class App extends Component {
if(buyEthInput && buyEthInput !== 0){
this.setState({ minimumEthPurchased: buyEthInput });
this.ethBuyRate(buyEthInput);
this.getEthBalance();
this.getTokenBalance();
}
}
......
src/components/menus/Instructions.css
View file @ 29620e5f
......@@ -8,8 +8,10 @@
text-shadow: 2px 2px 10px #2daae0;
margin-left: 35vw;
margin-right: 1vw;
height: 55vh;
-webkit-transition-duration: 0.4s;
transition-duration: 0.4s;
overflow-y: scroll;
} .instructions:hover{
color: rgb(216, 169, 236);
text-shadow: 1px 1px 5px #ff69f0;
......
src/components/misc/Title.css
View file @ 29620e5f
@font-face {
font-family: 'LeveloLineBold'; /*a name to be used later*/
src: url('../../fonts/LoveloLineBold.otf'); /*URL to font*/
}
.title {
font-family: 'LeveloLineBold';
/*font-family: Optima, sans-serif;*/
position: fixed;
font-size: 10vh;
margin-top: 1vh;
margin-top: 2vh;
margin-left: 2vh;
float: left;
text-shadow: 3px 3px 10px #f29ae1;
......@@ -9,31 +16,37 @@
font-weight: bold;
-webkit-text-stroke-width: 1px;
-webkit-text-stroke-color: rgb(180, 81, 179);
}.title:hover{
color: rgb(122, 251, 255);
text-shadow: 3px 3px 10px #2daae0;
font-weight: bold;
-webkit-text-stroke-width: 2px;
-webkit-text-stroke-color: rgb(22, 177, 210);
}
/* entire container, keeps perspective */
.titled-container {
perspective: 1000px;
position: fixed;
perspective: 800px;
/*border: 2px solid rgb(207, 9, 158);*/
}
/* flip the pane when hovered */
.titled-container:hover .title, .titled-container.hover .title {
.titled-container:hover > .title{
transform: rotateX(180deg);
color: rgb(122, 251, 255);
text-shadow: 3px 3px 10px #2daae0;
font-weight: bold;
-webkit-text-stroke-width: 2px;
-webkit-text-stroke-color: rgb(22, 177, 210);
}
.titled-container, .front, .back {
width: 1vh;
height: 0.1vh;
width: 26vw;
height: 11vh;
}
.front, .back {
width: 0.1vh;
height: 0.001vh;
}
/* flip speed goes here */
.title {
transition: 1s;
transition: 2.5s;
transform-style: preserve-3d;
position: relative;
}
......
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