Skip to content

Commit

Permalink
Added login-message button to click thru to markets page; tweaked log…
Browse files Browse the repository at this point in the history 
…in-message wording
  • Loading branch information
@tinybike
tinybike committed Sep 6, 2016
1 parent 590fc55 commit 992d093
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 24 deletions.
8 changes: 4 additions & 4 deletions build/components.jsx
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/styles.css
View file

Large diffs are not rendered by default.

39 changes: 20 additions & 19 deletions src/modules/login-message/components/login-message-page.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/

import React, { PropTypes } from 'react';
import Link from '../../link/components/link';
import SiteHeader from '../../site/components/site-header';
import SiteFooter from '../../site/components/site-footer';

Expand All @@ -12,46 +13,44 @@ const LoginMessagePage = (p) => (

<div className="page-content">
<div className="l-container">
<h1>Welcome to Augur Beta Test V2. Please note this important information:</h1>
<p>This is a BETA TEST in advance of the Augur Project's V1 launch. There are bugs. There are features being
<h1>Welcome to Augur's beta test v2!</h1>
<p>This is a beta test in advance of Augur's live release. There are bugs. There are features being
added, improved, and re-designed. There are a few hundred enhancements scheduled to be added in the next few
months. Your thoughtful feedback now is essential. Please use the feedback button at the bottom right of
every page to submit your feedback, or feel free to send an email to
<a className="link" href="mailto:hugs@augur.net?subject=Beta Testing feedback">hugs@augur.net</a>.
every page to submit your feedback, or feel free to send an email to <a className="link" href="mailto:hugs@augur.net?subject=Beta Testing feedback">hugs@augur.net</a>.
From your submissions, the development team will coordinate fixes and new features. Changes and fixes will be
displayed when you log in again.
</p>
<h2>Important Information:</h2>
<ol>
<li>
Because Augur is a completely DECENTRALIZED system, if you lose your Log-In credentials it
is impossible to recover them. Please
<a className="link" href="http://blog.augur.net/faq/how-do-i-savebackup-my-wallet/">take
Because Augur is a <b>completely decentralized</b> system, if you lose your login credentials it
is impossible to recover them. Please <a className="link" href="http://blog.augur.net/faq/how-do-i-savebackup-my-wallet/">take
appropriate measures</a> to protect the safety of your password, and create a way to
recover your credentials if you forget them.
</li>
<li>
Do not send real ETH to your Augur account while we are testing. Each account will be given
10,000 testnet ETH tokens for beta testing. Note that testnet ETH has no value except for testing:
Do not send real Ether (ETH) to your Augur account while we are testing! Each account will be given
10,000 testnet ETH tokens for beta testing. Please note that testnet ETH has no value except for testing:
it is merely an on-contract IOU (a token) for testnet Ether.
</li>
<li>
REP is a unique and important part of the Augur trading platform. If you own REP tokens, you must visit
the site periodically to fulfill your reporting obligations. During Beta Testing, each new account will receive 47 "TEST" REP (they have no value except
for testing). Each reporting cycle will last 2 days. Every two-day cycle will consist of a commit phase, a
reveal phase, and a challenge phase. Because the test cycle is dramatically compressed (the main net
cycle will be 60 days long) it is recommended that users visit the site at least every 2 days to
maintain your REP and simulate “real money” trading, resolution, and reporting conditions. Learn
<a className="link" href="https://www.youtube.com/watch?v=sCms-snzHk4">how Augur's Reputation tokens
Reputation (REP) is a unique and important part of the Augur trading platform. If you own REP tokens, you must visit
the site periodically to fulfill your reporting obligations. During beta testing, each new account will
receive 47 testnet REP (they have no value except for testing). Each reporting cycle will last 2 days. Every
two-day cycle will consist of a commit phase, a reveal phase, and a challenge phase. Because the test
cycle is dramatically compressed (the main net cycle will be 60 days long) it is recommended that
users visit the site at least every 2 days to maintain your REP and simulate “real money” trading,
resolution, and reporting conditions. Learn <a className="link" href="https://www.youtube.com/watch?v=sCms-snzHk4">how Augur's Reputation tokens
work</a>.
</li>
<li>
The site is only as fast as Ethereum blocks are mined. However, it is important to know that all orders
are placed into order books according to best price, and in the order in which they are received. (This
preserves price/time priority in Augur markets.)
are placed into order books according to best price, and in the order in which they are received. This
preserves price/time priority in Augur's markets.
</li>
</ol>
<h2>Augur beta status:</h2>
<h2>Status:</h2>
<p>The following issues have been refined as of Sep 1, 2016:</p>
1/
2/
Expand All @@ -60,6 +59,8 @@ const LoginMessagePage = (p) => (
1/
2/
3/
<br />
<Link className="lets-do-this-button" {...p.siteHeader.marketsLink} >Let's do this!</Link>
</div>
</div>

Expand Down
106 changes: 106 additions & 0 deletions src/modules/login-message/less/login-message.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
padding-left: 40px;
}

.l-container {
padding: 2em;
}

.link {
color: @color-primary-active;

Expand All @@ -22,5 +26,107 @@
text-decoration: underline;
}
}

.lets-do-this-button {
font-family: 'Roboto', Arial, sans-serif;
color: #fff;
background-color: #43505c;
font-size: 2vmin;
text-align: center;
margin-top: 1em;
padding: 0 1em;
display: inline-block;
height: 2.8em;
line-height: 2.8em;
border: 0;
border-radius: 1px;
white-space: nowrap;
text-transform: uppercase;
}
.lets-do-this-button:hover {
color: #fff;
background-color: #32323a;
text-decoration: none;
}
}
}


.site-header {
position: fixed; z-index: 9;
top: 0; left: 0;
width: 100%; height: @site-header-height;
background: white;

.site-nav {
display: flex;
padding: 0 2vmin;
border-bottom: 3px solid @color-dark-hover;
font-size: 2.5vmin;
.l-container();

.spacer {
width:100%;
}

.site-nav-link {
display: block;
height: @site-header-height;
line-height: @site-header-height;
padding: 0 2vw;
white-space: nowrap;

> *:not(:last-child) {
margin-right: 0.8em;
}

&:hover, &:active {
background: @color-light-hover;
}

&.active {
background: @color-dark-hover;
color: @color-light-normal;
}

&:focus {
text-shadow: 0 0 @color-light-normal;
}

&.augur {
font-family: CoreMellow;
font-size: 2em;
font-weight: 700;
}

&.positions {
}

&.transactions {
&.working {
&:not(.active) {
animation-name: site-header-item-bg;
animation-duration: 0.7s;
animation-iteration-count: infinite;
animation-direction: alternate;
}
}
strong {
margin-left: 0 !important;
margin-right: 1.5vw !important;
&:last-child {
margin-right: 0 !important;
}
}

.link-text {
white-space: nowrap;
}
}

strong {
font-weight: 900;
}
}
}
}

0 comments on commit 992d093

Please sign in to comment.