From aa41f8abae08691a325692e7532766cd1fce9412 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Wed, 18 Mar 2020 16:10:29 +0300 Subject: [PATCH] - fix whitescreen (after invalid nodes) - fix translates for listing - add Infrastructure API nodes - add PRIZM to listing page - fix some mobile views issues --- app/api/apiConfig.js | 21 +++++ app/assets/coins-logo/coins.js | 2 + app/assets/coins-logo/pzm.png | Bin 0 -> 5415 bytes app/assets/locales/locale-en.json | 1 + app/assets/locales/locale-ru.json | 1 + .../stylesheets/themes/_theme-template.scss | 7 ++ app/branding.js | 7 ++ app/components/Layout/Header.jsx | 2 +- app/components/Listing/CoinCardListing.jsx | 86 ++++++++++-------- app/components/Listing/ListingPage.css | 12 +++ app/components/Listing/ListingPage.jsx | 1 + app/components/Settings/AccessSettings.jsx | 2 +- package-lock.json | 2 +- package.json | 2 +- 14 files changed, 105 insertions(+), 41 deletions(-) create mode 100644 app/assets/coins-logo/pzm.png diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index be1fb955a5..123569e842 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -194,6 +194,27 @@ export const settingsAPIs = { operator: "Witness: delegate-zhaomu", contact: "telegram:lzmlam;wechat:lzmlam" }, + { + url: "wss://eu.nodes.bitshares.ws", + region: "Western Europe", + country: "Germany", + operator: "Infrastructure Worker", + contact: "email:info@blockchainprojectsbv.com" + }, + { + url: "wss://us.nodes.bitshares.ws", + region: "Northern America", + country: "U.S.A.", + operator: "Infrastructure Worker", + contact: "email:info@blockchainprojectsbv.com" + }, + { + url: "wss://hk.nodes.bitshares.ws", + region: "Eastern Asia", + country: "Hong Kong", + operator: "Infrastructure Worker", + contact: "email:info@blockchainprojectsbv.com" + }, { url: "wss://api.bts.mobi/ws", region: "Northern America", diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js index 415a3777d9..bd7d2cca8d 100644 --- a/app/assets/coins-logo/coins.js +++ b/app/assets/coins-logo/coins.js @@ -9,3 +9,5 @@ require("file-loader?name=coins-logo/[name].png!./neo.png"); require("file-loader?name=coins-logo/[name].png!./ltc.png"); require("file-loader?name=coins-logo/[name].png!./doge.png"); require("file-loader?name=coins-logo/[name].png!./dash.png"); + +require("file-loader?name=coins-logo/[name].png!./pzm.png"); diff --git a/app/assets/coins-logo/pzm.png b/app/assets/coins-logo/pzm.png new file mode 100644 index 0000000000000000000000000000000000000000..a033fa8dbf0ecd3c048e9dda19393ba4933e9271 GIT binary patch literal 5415 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 -
+
@@ -65,13 +63,13 @@ class CoinCardListing extends React.Component {
- {this.props.coin.name} ({this.props.coin.ticker}) - {this.props.coin.soon === true ? ( + {coin.name} ({coin.ticker}) + {coin.soon === true ? (
- Goal: {" "} + + : {" "}
- {this.props.coin.goal} + {coin.goal}
- Donates:  + + : 
- {this.props.coin.votes} - - { - - } -   Donate - + {coin.votes} + {coin.soon === true ? ( + + { + + } +   Donate + + ) : ( + + { + + } +   Donate + + )}
- Status: {" "} + + : {" "}
- {this.props.coin.status === "collecting" ? ( - - ) : ( - - )} +
{ }
diff --git a/app/components/Listing/ListingPage.css b/app/components/Listing/ListingPage.css index 1c8e3da3a3..e0590b70ab 100644 --- a/app/components/Listing/ListingPage.css +++ b/app/components/Listing/ListingPage.css @@ -212,6 +212,18 @@ body .listing_button .ant-btn[disabled]:hover { border-radius: 3px; } +@media only screen and (max-width: 768px) { + .listingTable__cell.listingTableVotes a { + position: absolute; + right: 100px; + } +} + +.coin-soon { + border: 1px solid grey !important; + color: grey !important; +} + .listingTable__cell.listingTableVotes a:hover { border-color: #1652f0; } diff --git a/app/components/Listing/ListingPage.jsx b/app/components/Listing/ListingPage.jsx index b07c07a96a..af9ac4ed1e 100644 --- a/app/components/Listing/ListingPage.jsx +++ b/app/components/Listing/ListingPage.jsx @@ -404,6 +404,7 @@ class ListingPage extends React.Component { coin.votes_for_percent = coin.votes < coin.goal ? coin.votes : coin.goal; coin.status = coin.votes < coin.goal ? "collecting" : "done"; + coin.soon == true ? (coin.status = "waiting") : coin.soon; return ; }); }; diff --git a/app/components/Settings/AccessSettings.jsx b/app/components/Settings/AccessSettings.jsx index f95ff80a2a..fa57eb04aa 100644 --- a/app/components/Settings/AccessSettings.jsx +++ b/app/components/Settings/AccessSettings.jsx @@ -10,7 +10,7 @@ import Icon from "../Icon/Icon"; import LoadingButton from "../Utility/LoadingButton"; import {Switch, Button} from "bitshares-ui-style-guide"; import NodeSelector from "../Utility/NodeSelector"; - +import counterpart from "counterpart"; const autoSelectionUrl = "wss://fake.automatic-selection.com"; function isTestNet(url) { diff --git a/package-lock.json b/package-lock.json index 62fc1df770..2374d1a273 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "RuDEX3-light", - "version": "3.3.200315", + "version": "3.3.200318", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c5393eea94..5b6b430376 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "RuDEX3-light", - "version": "3.3.200315", + "version": "3.3.200318", "description": "Reference UI to showcase all features of the BitShares blockchain.", "homepage": "https://github.com/bitshares/bitshares-ui", "author": "BitShares UI Worker ",