Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…gn-to-noweb3-available (Feature) Apply new design to "No Web3 Available" section
- Loading branch information
Showing
25 changed files
with
586 additions
and
31 deletions.
There are no files selected for viewing
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Large diffs are not rendered by default.
Oops, something went wrong.
65 changes: 65 additions & 0 deletions
65
src/assets/stylesheets/v2.0/components/_ButtonMetamask.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
$btn-ButtonMetamask-height: 58px !default; | ||
|
||
.btn-ButtonMetamask { | ||
align-items: center; | ||
background: none; | ||
border: none; | ||
cursor: pointer; | ||
display: flex; | ||
flex-shrink: 0; | ||
height: $btn-ButtonMetamask-height; | ||
outline: none; | ||
padding: 0; | ||
|
||
.sw-NoWeb3_ButtonsContainer & { | ||
margin-bottom: 25px; | ||
|
||
@media (min-width: $breakpoint-md) { | ||
margin-bottom: 0; | ||
} | ||
} | ||
|
||
&:active { | ||
opacity: 0.6; | ||
} | ||
} | ||
|
||
.btn-ButtonMetamask_Icon { | ||
@include image-retina('#{ $base-images-path }/ButtonMetamask/mm', 'png'); | ||
background-position: 50% 50%; | ||
background-repeat: no-repeat; | ||
background-size: cover; | ||
height: $btn-ButtonMetamask-height; | ||
position: relative; | ||
width: 53px; | ||
z-index: 5; | ||
} | ||
|
||
.btn-ButtonMetamask_TextContainer { | ||
background-color: #f68c24; | ||
border-radius: 3px; | ||
color: #fff; | ||
display: flex; | ||
flex-direction: column; | ||
height: 40px; | ||
justify-content: center; | ||
margin-left: -10px; | ||
padding: 0 15px; | ||
position: relative; | ||
text-align: left; | ||
z-index: 1; | ||
} | ||
|
||
.btn-ButtonMetamask_TopText { | ||
font-size: 9px; | ||
font-weight: 400; | ||
line-height: 1.2; | ||
letter-spacing: 1.8px; | ||
text-transform: uppercase; | ||
} | ||
|
||
.btn-ButtonMetamask_BottomText { | ||
font-size: 15px; | ||
font-weight: 700; | ||
line-height: 1.2; | ||
} |
65 changes: 65 additions & 0 deletions
65
src/assets/stylesheets/v2.0/components/_ButtonNiftyWallet.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
$btn-ButtonNiftyWallet-height: 58px !default; | ||
|
||
.btn-ButtonNiftyWallet { | ||
align-items: center; | ||
background: none; | ||
border: none; | ||
cursor: pointer; | ||
display: flex; | ||
flex-shrink: 0; | ||
height: $btn-ButtonNiftyWallet-height; | ||
outline: none; | ||
padding: 0; | ||
|
||
.sw-NoWeb3_ButtonsContainer & { | ||
margin-bottom: 25px; | ||
|
||
@media (min-width: $breakpoint-md) { | ||
margin-bottom: 0; | ||
} | ||
} | ||
|
||
&:active { | ||
opacity: 0.6; | ||
} | ||
} | ||
|
||
.btn-ButtonNiftyWallet_Icon { | ||
@include image-retina('#{ $base-images-path }/ButtonNiftyWallet/nw-icon', 'png'); | ||
background-position: 50% 50%; | ||
background-repeat: no-repeat; | ||
background-size: cover; | ||
height: $btn-ButtonNiftyWallet-height; | ||
position: relative; | ||
width: 64px; | ||
z-index: 5; | ||
} | ||
|
||
.btn-ButtonNiftyWallet_TextContainer { | ||
background-color: #5e2b99; | ||
border-radius: 3px; | ||
color: #fff; | ||
display: flex; | ||
flex-direction: column; | ||
height: 40px; | ||
justify-content: center; | ||
margin-left: -20px; | ||
padding: 0 15px 0 30px; | ||
position: relative; | ||
text-align: left; | ||
z-index: 1; | ||
} | ||
|
||
.btn-ButtonNiftyWallet_TopText { | ||
font-size: 9px; | ||
font-weight: 400; | ||
line-height: 1.2; | ||
letter-spacing: 1.8px; | ||
text-transform: uppercase; | ||
} | ||
|
||
.btn-ButtonNiftyWallet_BottomText { | ||
font-size: 15px; | ||
font-weight: 700; | ||
line-height: 1.2; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
$sw-NoWeb3_InfoIcon-height: 88px !default; | ||
$sw-NoWeb3_Button-height: 40px !default; | ||
|
||
.sw-NoWeb3 { | ||
height: 100%; | ||
} | ||
|
||
.sw-NoWeb3_Background { | ||
@include image-retina('#{ $base-images-path }/NoWeb3/background', 'jpg'); | ||
background-position: 50% 50%; | ||
background-repeat: no-repeat; | ||
background-size: cover; | ||
bottom: 0; | ||
left: 0; | ||
overflow: hidden; | ||
position: fixed; | ||
right: 0; | ||
top: 0; | ||
z-index: 1; | ||
} | ||
|
||
.sw-NoWeb3_Container { | ||
align-items: center; | ||
background-color: rgba(#404040, 0.5); | ||
display: flex; | ||
height: 100%; | ||
justify-content: center; | ||
min-height: fit-content; | ||
padding: 10px; | ||
position: relative; | ||
z-index: 12; | ||
} | ||
|
||
.sw-NoWeb3_Block { | ||
background-color: #fff; | ||
border-radius: 5px; | ||
max-width: 580px; | ||
min-height: fit-content; | ||
padding: 20px; | ||
|
||
@media (min-width: $breakpoint-sm) { | ||
padding: 40px 40px 30px 40px; | ||
} | ||
} | ||
|
||
.sw-NoWeb3_InfoIcon { | ||
background-image: url('#{ $base-images-path }/NoWeb3/info.svg'); | ||
background-position: 50% 50%; | ||
background-repeat: no-repeat; | ||
background-size: cover; | ||
height: $sw-NoWeb3_InfoIcon-height; | ||
margin: 0 auto 40px; | ||
width: $sw-NoWeb3_InfoIcon-height; | ||
} | ||
|
||
.sw-NoWeb3_Title { | ||
color: #333; | ||
font-size: 24px; | ||
font-weight: 400; | ||
line-height: 1.2; | ||
margin-bottom: 24px; | ||
text-align: center; | ||
} | ||
|
||
.sw-NoWeb3_Description { | ||
color: #333; | ||
font-size: 14px; | ||
font-weight: 400; | ||
line-height: 1.71; | ||
margin: 0 0 45px; | ||
text-align: center; | ||
|
||
a { | ||
color: $brand-primary; | ||
text-decoration: none; | ||
|
||
&:hover { | ||
text-decoration: underline; | ||
} | ||
} | ||
} | ||
|
||
.sw-NoWeb3_ButtonsContainer { | ||
align-items: center; | ||
display: flex; | ||
flex-direction: column; | ||
justify-content: space-between; | ||
|
||
@media (min-width: $breakpoint-md) { | ||
flex-direction: row; | ||
} | ||
} | ||
|
||
.sw-NoWeb3_Button { | ||
border-radius: 3px; | ||
border: 1px solid $brand-primary; | ||
color: $brand-primary; | ||
font-size: 15px; | ||
font-weight: 700; | ||
height: $sw-NoWeb3_Button-height; | ||
line-height: $sw-NoWeb3_Button-height; | ||
padding: 0 15px; | ||
text-align: left; | ||
text-decoration: none; | ||
|
||
&:active { | ||
opacity: 0.6; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import React from 'react' | ||
|
||
export const ButtonMetamask = ({ onClick, extraClassName = '', disabled }) => ( | ||
<button className={`btn-ButtonMetamask ${extraClassName}`} disabled={disabled} onClick={onClick} type="button"> | ||
<span className="btn-ButtonMetamask_Icon" /> | ||
<span className="btn-ButtonMetamask_TextContainer"> | ||
<span className="btn-ButtonMetamask_TopText">Download</span> | ||
<span className="btn-ButtonMetamask_BottomText">Metamask</span> | ||
</span> | ||
</button> | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import React from 'react' | ||
|
||
export const ButtonNiftyWallet = ({ onClick, extraClassName = '', disabled }) => ( | ||
<button className={`btn-ButtonNiftyWallet ${extraClassName}`} disabled={disabled} onClick={onClick} type="button"> | ||
<span className="btn-ButtonNiftyWallet_Icon" /> | ||
<span className="btn-ButtonNiftyWallet_TextContainer"> | ||
<span className="btn-ButtonNiftyWallet_TopText">Download</span> | ||
<span className="btn-ButtonNiftyWallet_BottomText">Nifty Wallet</span> | ||
</span> | ||
</button> | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,53 @@ | ||
import React, { Component } from 'react' | ||
import { ButtonMetamask } from '../Common/ButtonMetamask' | ||
import { ButtonNiftyWallet } from '../Common/ButtonNiftyWallet' | ||
|
||
export default class NoWeb3 extends Component { | ||
goToURL = theURL => { | ||
window.open(theURL, '_blank') | ||
} | ||
|
||
render() { | ||
return ( | ||
<div> | ||
<section className="home"> | ||
<div className="container"> | ||
<div className="st-StepContent_Info"> | ||
<div className="st-StepContentInfo_InfoText"> | ||
<h1 className="st-StepContent_InfoTitle"> | ||
Wallet not found, or access to Ethereum account not granted | ||
</h1> | ||
<p className="st-StepContent_InfoDescription"> | ||
If{' '} | ||
<a | ||
href="https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid" | ||
target="blank" | ||
> | ||
a Wallet | ||
</a>{' '} | ||
extension is installed on your web browser, please verify that the access to Ethereum account has been | ||
granted and is available for the corresponding domain. Check Token Wizard GitHub for{' '} | ||
<a href="https://github.com/poanetwork/token-wizard/wiki" target="blank"> | ||
the instruction | ||
</a>. | ||
</p> | ||
</div> | ||
<section className="sw-NoWeb3"> | ||
<div className="sw-NoWeb3_Background background-blur" /> | ||
<div className="sw-NoWeb3_Container"> | ||
<div className="sw-NoWeb3_Block"> | ||
<div className="sw-NoWeb3_InfoIcon" /> | ||
<h1 className="sw-NoWeb3_Title">Wallet not found, or access to your Ethereum account was not granted.</h1> | ||
<p className="sw-NoWeb3_Description"> | ||
If a wallet extension is installed on your web browser, please verify that access to your Ethereum account | ||
has been granted and that it's available for this domain.<br /> | ||
<strong>Need more help?</strong> | ||
<br /> | ||
<a href="https://poanet.zendesk.com/hc/en-us/categories/360000586593-Wallets" target="blank"> | ||
Wallets HowTo | ||
</a>{' '} | ||
-{' '} | ||
<a href="https://github.com/poanetwork/token-wizard/wiki" target="blank"> | ||
Token Wizard Wiki | ||
</a> | ||
</p> | ||
<div className="sw-NoWeb3_ButtonsContainer"> | ||
<ButtonMetamask | ||
onClick={() => { | ||
this.goToURL('https://metamask.io/') | ||
}} | ||
/> | ||
<ButtonNiftyWallet | ||
onClick={() => { | ||
this.goToURL( | ||
'https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid?hl=en' | ||
) | ||
}} | ||
/> | ||
<a className="sw-NoWeb3_Button" href="/"> | ||
Cancel | ||
</a> | ||
</div> | ||
</div> | ||
</section> | ||
</div> | ||
</div> | ||
</section> | ||
) | ||
} | ||
} |
Submodule token-wizard-test-automation
updated
27 files
+2 −3 | .gitignore | |
+1 −1 | entity/Logger.js | |
+16 −17 | entity/User.js | |
+1 −0 | package-lock.json | |
+2 −2 | package.json | |
+5 −6 | pages/ContributionPage.js | |
+19 −63 | pages/CrowdsalePage.js | |
+6 −5 | pages/ManagePage.js | |
+9 −70 | pages/Page.js | |
+0 −160 | pages/PublishPage.js | |
+260 −282 | pages/ReservedTokensPage.js | |
+8 −199 | pages/TierPage.js | |
+2 −14 | pages/WizardStep1.js | |
+131 −222 | pages/WizardStep2.js | |
+230 −299 | pages/WizardStep3.js | |
+0 −7 | public/resrvedAddressesTestFails.csv | |
+6 −19 | scenarios/scenarioMintedSimple.json | |
+0 −329,042 | temp/result.log | |
+3 −3 | test/e2eDutch.js | |
+1 −1 | test/e2eDutchMincap.js | |
+420 −553 | test/e2eDutchUI.js | |
+1 −1 | test/e2eDutchWhitelist.js | |
+1 −1 | test/e2eMintedMincap.js | |
+477 −1,358 | test/e2eMintedUI.js | |
+1 −1 | test/e2eMintedWhitelist.js | |
+0 −29 | utils/Utils.js | |
+1 −5 | utils/constants.js |
Oops, something went wrong.