Skip to content

Production Build #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
achiko wants to merge 2 commits into
base: DutchAuction-Prod
Choose a base branch
from
Open

Production Build #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91bd4a
Ui fixes
achiko Dec 21, 2018
7469865
Production Build
achiko Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_BLOCKCHAIN_HOST=https://ropsten.infura.io/WIBVWLVEl1CmowJkZ55q
REACT_APP_TOKEN_CONTRACT_ADDRESS=0xa7ad2eb469769a57873e9be5768247f0839dc091
REACT_APP_AUCTION_CONTRACT_ADDRESS=0xe75c794d3b70d25c03105d7e1b66d220167225d7
REACT_APP_POMISSORYTOKEN_CONTRACT_ADDRESS=0x9b48a13fb09c9243a2c93a4a784fbbe281dd28e1
REACT_APP_BLOCKCHAIN_HOST=https://mainnet.infura.io/WIBVWLVEl1CmowJkZ55q
REACT_APP_TOKEN_CONTRACT_ADDRESS=0x7e2c620312f49476efd3e316f834dc0e22c62ad1
REACT_APP_AUCTION_CONTRACT_ADDRESS=0xb57bff5fa73175fc2e4312c37873c9df80359e23
REACT_APP_POMISSORYTOKEN_CONTRACT_ADDRESS=0x0348b55abd6e1a99c6ebc972a6a4582ec0bceb5c
8 changes: 4 additions & 4 deletions .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_BLOCKCHAIN_HOST=https://ropsten.infura.io/WIBVWLVEl1CmowJkZ55q
REACT_APP_TOKEN_CONTRACT_ADDRESS=0xa7ad2eb469769a57873e9be5768247f0839dc091
REACT_APP_AUCTION_CONTRACT_ADDRESS=0xe75c794d3b70d25c03105d7e1b66d220167225d7
REACT_APP_POMISSORYTOKEN_CONTRACT_ADDRESS=0x9b48a13fb09c9243a2c93a4a784fbbe281dd28e1
REACT_APP_BLOCKCHAIN_HOST=https://mainnet.infura.io/WIBVWLVEl1CmowJkZ55q
REACT_APP_TOKEN_CONTRACT_ADDRESS=0x7e2c620312f49476efd3e316f834dc0e22c62ad1
REACT_APP_AUCTION_CONTRACT_ADDRESS=0xb57bff5fa73175fc2e4312c37873c9df80359e23
REACT_APP_POMISSORYTOKEN_CONTRACT_ADDRESS=0x0348b55abd6e1a99c6ebc972a6a4582ec0bceb5c
2 changes: 1 addition & 1 deletion .env.ropsten
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_BLOCKCHAIN_HOST=https://ropsten.infura.io/WIBVWLVEl1CmowJkZ55q
REACT_APP_TOKEN_CONTRACT_ADDRESS=0xa7ad2eb469769a57873e9be5768247f0839dc091
REACT_APP_AUCTION_CONTRACT_ADDRESS=0xe3d1197e87e7b3cd356be47d5960b86d7b4675b4
REACT_APP_AUCTION_CONTRACT_ADDRESS=0xe75c794d3b70d25c03105d7e1b66d220167225d7
REACT_APP_POMISSORYTOKEN_CONTRACT_ADDRESS=0x9b48a13fb09c9243a2c93a4a784fbbe281dd28e1
2 changes: 1 addition & 1 deletion src/components/Layout/Sections/Claim.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class Claim extends Component {
ref={this.input}
name="address"
onChange={this.campaignHashChanged}
placeholder="Campaign hash" />
placeholder="Address hash" />

<button onClick={this.claimBonusTokensClicked}>CLAIM BONUS TOKENS</button>

Expand Down
15 changes: 14 additions & 1 deletion src/components/MarketingAdmin/Admin.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,14 +305,27 @@ class Admin extends Component {
<NotificationContainer />

<div className="container">


<br/>
<div className="row">

<div className="col">
<h1> Marketing Admin </h1>
<p>Account : {this.state.ethereumAddress} </p>
</div>

<div className="col">
<h3>
<a href="https://blog.superdao.io/kittiefight-community-driven-dutch-auction-tutorial-ether-reward-competition-a371cafade91">
Marketing Dashboard Tutorial
</a>
</h3>
</div>

</div>



{/* { Get My refferal Link } */}
<div className="row" id="section4">
<br/>
Expand Down
15 changes: 9 additions & 6 deletions src/components/Sticky/StickyHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,21 @@ class StickyHeader extends Component {
{/* </div> */}
</div>

<div className="col-md-2 stickyButton">

{/* <div className="d-flex justify-content-start"> */}
{/* <button onClick={this.goToBidSection} className="float-left"> BID </button> */}
{/* </div> */}

<div className="col-md-1 stickyButton">
<Link to="#section4">
<div className="anchoButton">
BID
</div>
</Link>
</div>

<div className="col-md-1 stickyButton">
<a href='#/marketingadmin'>
<div className="anchoButton">
Dashboard
</div>
</a>
</div>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions src/context/AppProvider.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class AppProvider extends Component {
walletIsMetamask: false,
networkName: '',
statesLoaded: false,
auctionStartDateClock : Date.parse('2018-12-20T20:00:00Z'),
auctionStartDateClock : Date.parse('2018-12-21T14:00:00Z'),
auctionTimeremaining: 0,
promissoryTokenLastPrice: 0,
ethereumLastPrice : 0,
Expand Down Expand Up @@ -272,8 +272,8 @@ class AppProvider extends Component {
if(softcapReached) {
networkLaunchDay = _nowDate.setDate( _nowDate.getDate() + 45 );
}
console.log('NETWORK LAUNCH DAY : ', networkLaunchDay);
console.log('----------------------------------------');
// console.log('NETWORK LAUNCH DAY : ', networkLaunchDay);
// console.log('----------------------------------------');

await this.setState({ networkLaunchDay: networkLaunchDay });
await this.setState({ startBlock });
Expand Down