Merge master with images and style fixes

This commit is contained in:
Andy Tudhope 2019-04-19 10:38:37 +02:00
commit 3a4c70d11f
No known key found for this signature in database
GPG Key ID: 02A3DFA93BF26AD2
12 changed files with 119 additions and 5 deletions

1
CNAME Normal file
View File

@ -0,0 +1 @@
dap.ps

View File

@ -1,7 +1,7 @@
{ {
"name": "discover-dapps", "name": "discover-dapps",
"homepage": "https://status-im.github.io/discover-dapps", "homepage": "https://dap.ps",
"version": "0.2.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@trailofbits/embark-contract-info": "^1.0.0", "@trailofbits/embark-contract-info": "^1.0.0",

View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="900px" height="900px" viewBox="84.5 810.5 900 900" enable-background="new 84.5 810.5 900 900" xml:space="preserve">
<g>
<circle fill="#475493" cx="535.993" cy="1264.794" r="345.105"/>
<g>
<g>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="535.994" y1="1000.116" x2="373.207" y2="1270.211"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="698.714" y1="1270.211" x2="535.994" y2="1196.177"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="373.207" y1="1270.211" x2="535.994" y2="1196.177"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="373.207" y1="1270.211" x2="535.994" y2="1366.386"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="535.994" y1="1000.116" x2="698.714" y2="1270.211"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="535.994" y1="1196.177" x2="535.994" y2="1366.386"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="535.994" y1="1000.116" x2="535.994" y2="1196.177"/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="698.714" y1="1270.211" x2="535.994" y2="1366.386"/>
<polyline fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" points="
535.994,1530.388 373.207,1301.054 535.994,1397.229 "/>
<polyline fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" points="
535.994,1530.388 698.843,1301.054 535.994,1397.229 "/>
<line fill="none" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" x1="535.994" y1="1530.388" x2="535.994" y2="1397.229"/>
</g>
<g>
<g>
<g>
<path fill="#FFFFFF" d="M375.898,1277.325c-4.567,0-8.283-3.716-8.283-8.282s3.716-8.282,8.283-8.282s8.282,3.716,8.282,8.282
S380.465,1277.325,375.898,1277.325z"/>
<path fill="#FFFFFF" d="M375.898,1262.261c3.745,0,6.782,3.036,6.782,6.782s-3.037,6.782-6.782,6.782
c-3.747,0-6.783-3.036-6.783-6.782S372.151,1262.261,375.898,1262.261 M375.898,1259.261c-5.394,0-9.783,4.389-9.783,9.782
s4.389,9.782,9.783,9.782s9.782-4.389,9.782-9.782S381.292,1259.261,375.898,1259.261L375.898,1259.261z"/>
</g>
<g>
<path fill="#FFFFFF" d="M696.087,1277.325c-4.566,0-8.281-3.716-8.281-8.282s3.715-8.282,8.281-8.282
c4.567,0,8.283,3.716,8.283,8.282S700.655,1277.325,696.087,1277.325z"/>
<path fill="#FFFFFF" d="M696.087,1262.261c3.748,0,6.783,3.036,6.783,6.782s-3.035,6.782-6.783,6.782
c-3.746,0-6.781-3.036-6.781-6.782S692.341,1262.261,696.087,1262.261 M696.087,1259.261c-5.394,0-9.781,4.389-9.781,9.782
s4.388,9.782,9.781,9.782c5.395,0,9.783-4.389,9.783-9.782S701.482,1259.261,696.087,1259.261L696.087,1259.261z"/>
</g>
</g>
<g>
<g>
<path fill="#FFFFFF" d="M375.898,1310.963c-4.567,0-8.283-3.715-8.283-8.281s3.716-8.282,8.283-8.282s8.282,3.716,8.282,8.282
S380.465,1310.963,375.898,1310.963z"/>
<path fill="#FFFFFF" d="M375.898,1295.899c3.745,0,6.782,3.036,6.782,6.782c0,3.745-3.037,6.781-6.782,6.781
c-3.747,0-6.783-3.036-6.783-6.781C369.115,1298.936,372.151,1295.899,375.898,1295.899 M375.898,1292.899
c-5.394,0-9.783,4.389-9.783,9.782s4.389,9.781,9.783,9.781s9.782-4.388,9.782-9.781S381.292,1292.899,375.898,1292.899
L375.898,1292.899z"/>
</g>
<g>
<path fill="#FFFFFF" d="M696.087,1310.963c-4.566,0-8.281-3.715-8.281-8.281s3.715-8.282,8.281-8.282
c4.567,0,8.283,3.716,8.283,8.282S700.655,1310.963,696.087,1310.963z"/>
<path fill="#FFFFFF" d="M696.087,1295.899c3.748,0,6.783,3.036,6.783,6.782c0,3.745-3.035,6.781-6.783,6.781
c-3.746,0-6.781-3.036-6.781-6.781C689.306,1298.936,692.341,1295.899,696.087,1295.899 M696.087,1292.899
c-5.394,0-9.781,4.389-9.781,9.782s4.388,9.781,9.781,9.781c5.395,0,9.783-4.388,9.783-9.781
S701.482,1292.899,696.087,1292.899L696.087,1292.899z"/>
</g>
</g>
<g>
<path fill="#FFFFFF" d="M535.994,1372.177c-4.567,0-8.283-3.716-8.283-8.282s3.716-8.282,8.283-8.282
c4.566,0,8.281,3.716,8.281,8.282S540.56,1372.177,535.994,1372.177z"/>
<path fill="#FFFFFF" d="M535.994,1357.112c3.744,0,6.781,3.036,6.781,6.782s-3.037,6.782-6.781,6.782
c-3.746,0-6.783-3.036-6.783-6.782S532.248,1357.112,535.994,1357.112 M535.994,1354.112c-5.394,0-9.783,4.389-9.783,9.782
s4.389,9.782,9.783,9.782c5.394,0,9.781-4.389,9.781-9.782S541.387,1354.112,535.994,1354.112L535.994,1354.112z"/>
</g>
<g>
<path fill="#FFFFFF" d="M535.994,1206.588c-5.74,0-10.411-4.671-10.411-10.411s4.67-10.41,10.411-10.41s10.41,4.67,10.41,10.41
S541.734,1206.588,535.994,1206.588z"/>
<path fill="#FFFFFF" d="M535.994,1187.267c4.92,0,8.91,3.988,8.91,8.91s-3.99,8.911-8.91,8.911
c-4.921,0-8.911-3.989-8.911-8.911S531.072,1187.267,535.994,1187.267 M535.994,1184.267c-6.567,0-11.911,5.343-11.911,11.91
s5.343,11.911,11.911,11.911s11.91-5.344,11.91-11.911S542.561,1184.267,535.994,1184.267L535.994,1184.267z"/>
</g>
<g>
<path fill="#FFFFFF" d="M535.994,1015.103c-5.74,0-10.411-4.67-10.411-10.41s4.67-10.41,10.411-10.41s10.41,4.67,10.41,10.41
S541.734,1015.103,535.994,1015.103z"/>
<path fill="#FFFFFF" d="M535.994,995.782c4.92,0,8.91,3.988,8.91,8.91c0,4.921-3.99,8.91-8.91,8.91
c-4.921,0-8.911-3.989-8.911-8.91C527.083,999.771,531.072,995.782,535.994,995.782 M535.994,992.782
c-6.567,0-11.911,5.343-11.911,11.91s5.343,11.91,11.911,11.91s11.91-5.343,11.91-11.91S542.561,992.782,535.994,992.782
L535.994,992.782z"/>
</g>
<g>
<path fill="#FFFFFF" d="M535.994,1407.639c-5.74,0-10.411-4.67-10.411-10.41s4.67-10.41,10.411-10.41s10.41,4.67,10.41,10.41
S541.734,1407.639,535.994,1407.639z"/>
<path fill="#FFFFFF" d="M535.994,1388.318c4.92,0,8.91,3.989,8.91,8.91s-3.99,8.91-8.91,8.91c-4.921,0-8.911-3.989-8.911-8.91
S531.072,1388.318,535.994,1388.318 M535.994,1385.318c-6.567,0-11.911,5.343-11.911,11.91s5.343,11.91,11.911,11.91
s11.91-5.343,11.91-11.91S542.561,1385.318,535.994,1385.318L535.994,1385.318z"/>
</g>
<g>
<path fill="#FFFFFF" d="M535.994,1535.307c-5.74,0-10.411-4.67-10.411-10.41s4.67-10.41,10.411-10.41s10.41,4.67,10.41,10.41
S541.734,1535.307,535.994,1535.307z"/>
<path fill="#FFFFFF" d="M535.994,1515.986c4.92,0,8.91,3.989,8.91,8.91c0,4.922-3.99,8.91-8.91,8.91
c-4.921,0-8.911-3.988-8.911-8.91C527.083,1519.976,531.072,1515.986,535.994,1515.986 M535.994,1512.986
c-6.567,0-11.911,5.343-11.911,11.91s5.343,11.91,11.911,11.91s11.91-5.343,11.91-11.91S542.561,1512.986,535.994,1512.986
L535.994,1512.986z"/>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -0,0 +1 @@
<svg width="105" height="44" viewBox="0 0 105 44" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>Logo</title><defs><path id="a" d="M0 0h40.473v43.768H0z"/></defs><g fill="none" fill-rule="evenodd"><g><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path d="M27.302 24.204l.07.414.023.164c.294 2.279 1.18 2.945 3.38 3.916.005.002.01.001.014.003l7.977 3.514L20.755 42.47V36.6c0-2.153.13-2.54 2.046-3.596.376-.207.757-.423 1.174-.66l.26-.148c1.193-.636 2.165-1.575 2.882-2.69.026-.04.218-.329.243-.37a1.997 1.997 0 0 1-.411-.298 1.653 1.653 0 0 1-.33-.404c-.627 1.218-1.58 2.248-2.8 2.919l-.296.168c-.411.233-.83.462-1.206.668-2.35 1.295-2.537 2.09-2.537 4.412v5.876L1.602 32.035l7.779-3.393.506-.217c.198-.096.82-.35 1.3-.364.49-.03 1.234.001 1.635.51a3055.9 3055.9 0 0 0 1.112 1.405c.858 1.11 1.98 2.017 3.32 2.561a.099.099 0 0 0 .012.007c.353.144.733.227 1.11.315.078-.149.2-.322.312-.462.081-.101.202-.226.315-.343-.57-.111-1.225-.292-1.735-.536l-.002-.001c-1.018-.483-1.898-1.16-2.574-2.03a.939.939 0 0 1-.09-.12c-.069-.09-.138-.178-.201-.273-.18-.242-.454-.603-.837-1.085-.257-.326-.617-.541-1-.68l.001.002c-.413-.148-.89-.214-1.411-.21-.79.026-1.666.446-1.684.454l-.273.118-.021.008-.708.305c-.005.001-.005.006-.009.008L1.661 30.98 19.764 2.16V14.36c0 2.108-.155 2.569-2.088 3.634a8.262 8.262 0 0 1-.467.233l-.25.123c-.063.028-.123.061-.184.091l-.003.001h-.001c-2.536 1.215-4.307 3.679-4.461 6.554.166.045.418.116.559.159.103.03.259.108.39.178.025-2.657 1.633-4.949 3.956-6.055l.001-.001c.007-.003.012-.002.018-.005a14.2 14.2 0 0 1 .408-.2 9.82 9.82 0 0 0 1.414-.806c.071-.046.13-.095.195-.141.142-.103.275-.208.391-.31.068-.059.13-.114.173-.168.774-.783.926-1.665.926-3.287V2.155L38.9 31.241l-8.015-3.53h-.004c-1.778-.784-2.318-1.44-2.556-3.326-.004-.025-.011-.09-.017-.114-.458-3.015-2.716-5.434-5.682-6.28l-.4-.115a2.256 2.256 0 0 1-.198.442 2.387 2.387 0 0 1-.317.416l.373.083c2.667.65 4.73 2.742 5.218 5.387m13.1 7.62L20.675.227A.49.49 0 0 0 20.258 0a.49.49 0 0 0-.417.227L.071 31.697a.465.465 0 0 0 .168.647l19.77 11.358a.502.502 0 0 0 .496 0l19.728-11.23a.478.478 0 0 0 .225-.29.45.45 0 0 0-.056-.358" fill="#553580" mask="url(#b)"/></g><g opacity=".848" fill="#553580"><path d="M54.1 14.932l-3.991 10.586h.883l.945-2.572h5.057l.944 2.572h.884L54.83 14.932H54.1zm.365 1.07l2.27 6.23h-4.54l2.27-6.23zM65.748 25.607c-2.179 0-3.717-1.457-3.717-3.523v-7.152h.823v7.048c0 1.754 1.157 2.914 2.894 2.914 1.736 0 2.894-1.16 2.894-2.914v-7.048h.822v7.152c0 2.066-1.538 3.523-3.716 3.523M80.285 24.388a3.88 3.88 0 0 1-2.848 1.22 3.874 3.874 0 0 1-2.712-1.086c-.99-.967-1.005-1.903-1.005-4.297 0-2.393.016-3.33 1.005-4.296a3.874 3.874 0 0 1 2.712-1.085c1.904 0 3.366 1.219 3.701 3.091h-.822c-.32-1.456-1.417-2.378-2.88-2.378-.776 0-1.507.282-2.056.818-.776.758-.837 1.575-.837 3.85 0 2.275.061 3.093.837 3.85.549.536 1.28.819 2.057.819.853 0 1.69-.357 2.254-1.026.472-.565.655-1.19.655-2.097v-.951h-2.91v-.714h3.732v1.725c0 1.1-.243 1.888-.883 2.557M89.053 25.607c-2.179 0-3.717-1.457-3.717-3.523v-7.152h.823v7.048c0 1.754 1.157 2.914 2.894 2.914 1.736 0 2.894-1.16 2.894-2.914v-7.048h.822v7.152c0 2.066-1.538 3.523-3.716 3.523M101.388 15.646h-3.199v4.282h3.199c1.385 0 2.391-.684 2.391-2.141 0-1.457-1.006-2.14-2.391-2.14zm2.376 9.872l-2.59-4.877H98.19v4.877h-.823V14.933h4.128c1.767 0 3.107.996 3.107 2.84 0 1.575-.975 2.601-2.497 2.853l2.62 4.892h-.96z"/></g></g></svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 740 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -7,7 +7,7 @@ import supportIcon from '../../common/assets/images/support.svg'
const Footer = () => ( const Footer = () => (
<div className={styles.footer}> <div className={styles.footer}>
<a <a
href="https://get.status.im/chat/public/status-core-dapps" href="https://get.status.im/chat/public/dapps"
className={styles.footerItem} className={styles.footerItem}
> >
<div className={styles.iconWrap}> <div className={styles.iconWrap}>
@ -30,7 +30,10 @@ const Footer = () => (
<p>Submit your favourite DApp now! No permission required.</p> <p>Submit your favourite DApp now! No permission required.</p>
</div> </div>
</div> </div>
<div className={styles.footerItem}> <a
href="https://get.status.im/chat/public/status-core-dapps"
className={styles.footerItem}
>
<div className={styles.iconWrap}> <div className={styles.iconWrap}>
<img src={supportIcon} alt="Support" /> <img src={supportIcon} alt="Support" />
</div> </div>
@ -41,7 +44,7 @@ const Footer = () => (
see if we can help. see if we can help.
</p> </p>
</div> </div>
</div> </a>
</div> </div>
) )

View File

@ -5,6 +5,7 @@ const getDapps = state => state.dapps
const recentDapps = createSelector( const recentDapps = createSelector(
[getDapps], [getDapps],
dapps => [...dapps].sort((a, b) => moment(b.dateAdded).diff(a.dateAdded)),
dapps => dapps =>
[...dapps].filter(dapp => { [...dapps].filter(dapp => {
return ( return (