- fix whitescreen (after invalid nodes)

- fix translates for listing - add Infrastructure API nodes - add PRIZM to listing page - fix some mobile views issues
blckchnd · Mar 18, 2020 · aa41f8a · aa41f8a
1 parent 5927843
commit aa41f8a
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 41 deletions.
diff --git 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:[email protected]"
+        },
+        {
+            url: "wss://us.nodes.bitshares.ws",
+            region: "Northern America",
+            country: "U.S.A.",
+            operator: "Infrastructure Worker",
+            contact: "email:[email protected]"
+        },
+        {
+            url: "wss://hk.nodes.bitshares.ws",
+            region: "Eastern Asia",
+            country: "Hong Kong",
+            operator: "Infrastructure Worker",
+            contact: "email:[email protected]"
+        },
         {
             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
@@ -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
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -3005,6 +3005,7 @@
             "progress": "Progress",
             "coming_soon": "Coming soon",
             "collecting": "Collecting",
+            "waiting": "Waiting",
             "done": "Collected"
         },
         "texts": {

diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
@@ -2984,6 +2984,7 @@
             "progress": "Прогресс",
             "coming_soon": "Скоро",
             "collecting": "Cбор",
+            "waiting": "Ожидание",
             "done": "Собрано"
         },
         "texts": {

diff --git a/app/assets/stylesheets/themes/_theme-template.scss b/app/assets/stylesheets/themes/_theme-template.scss
@@ -2790,6 +2790,13 @@
 .app-menu {
     flex: 0;
 }
+
+@media only screen and (max-width: 768px) {
+    .app-menu.hidez {
+        display: none;
+    }
+}
+
 .truncated {
     flex: 1;
     min-width: 0; /* or some value */

diff --git a/app/branding.js b/app/branding.js
@@ -361,6 +361,13 @@ export function getListingCoins() {
             account: "rudex-neo",
             goal: 10000,
             votes: 0
+        },
+        {
+            name: "PRIZM",
+            ticker: "PZM",
+            account: "rudex-prizm",
+            goal: 10000,
+            votes: 0
         }
     ];
 }
diff --git a/app/components/Layout/Header.jsx b/app/components/Layout/Header.jsx
@@ -708,7 +708,7 @@ class Header extends React.Component {
                     )}
                 </div>
 
-                <div className="app-menu">
+                <div className="app-menu hidez">
                     <div
                         onClick={this._toggleLanguageMenu}
                         style={{padding: "1.25rem", border: "none"}}

diff --git a/app/components/Listing/CoinCardListing.jsx b/app/components/Listing/CoinCardListing.jsx
@@ -36,6 +36,8 @@ class CoinCardListing extends React.Component {
             this.props.account.get("name");
         } catch (e) {}
 
+        let {coin} = this.props;
+
         return (
             <div className="listingTable__row">
                 <SendModal
@@ -48,13 +50,9 @@ class CoinCardListing extends React.Component {
                             ? this.props.currentAccount
                             : this.props.account
                     }
-                    to_name={
-                        this.props.coin.account
-                            ? this.props.coin.account
-                            : from_name
-                    }
+                    to_name={coin.account ? coin.account : from_name}
                     asset_id={"1.3.5588"}
-                    ticker={this.props.coin.ticker}
+                    ticker={coin.ticker}
                 />
                 <div className="listingAsset">
                     <div className="listingAssetCard">
@@ -65,13 +63,13 @@ class CoinCardListing extends React.Component {
                             <img
                                 className="align-center"
                                 style={{maxWidth: 40}}
-                                src={`${__BASE_URL__}coins-logo/${this.props.coin.ticker.toLowerCase()}.png`}
+                                src={`${__BASE_URL__}coins-logo/${coin.ticker.toLowerCase()}.png`}
                                 alt=""
                             />
                         </div>
                         <div className="listingTable__cell listingTableAssetName align-left nowrap">
-                            {this.props.coin.name} ({this.props.coin.ticker})
-                            {this.props.coin.soon === true ? (
+                            {coin.name} ({coin.ticker})
+                            {coin.soon === true ? (
                                 <Translate
                                     content="listing.table.coming_soon"
                                     style={{float: "right", color: "gold"}}
@@ -86,51 +84,65 @@ class CoinCardListing extends React.Component {
                         <div className="listingAssetInfoData">
                             <div className="listingTable__cell listingTableGoal">
                                 <div className="listingAssetInfoBlock">
-                                    Goal:&nbsp;{" "}
+                                    <Translate content="listing.table.goal" />
+                                    :&nbsp;{" "}
                                 </div>
-                                {this.props.coin.goal}
+                                {coin.goal}
                             </div>
 
                             <div className="listingTable__cell listingTableVotes">
                                 <div className="listingAssetInfoBlock">
-                                    Donates:&nbsp;
+                                    <Translate content="listing.table.donates" />
+                                    :&nbsp;
                                 </div>
-                                {this.props.coin.votes}
-                                <a
-                                    onClick={this.triggerSend.bind(
-                                        this,
-                                        "1.3.5588",
-                                        this.props.coin
-                                    )}
-                                >
-                                    {
-                                        <Icon
-                                            name="transfer"
-                                            title="icons.transfer"
-                                            className="icon-14px"
-                                        />
-                                    }
-                                    &nbsp; Donate
-                                </a>
+                                {coin.votes}
+                                {coin.soon === true ? (
+                                    <a className="coin-soon">
+                                        {
+                                            <Icon
+                                                name="transfer"
+                                                title="icons.transfer"
+                                                className="icon-14px"
+                                            />
+                                        }
+                                        &nbsp; Donate
+                                    </a>
+                                ) : (
+                                    <a
+                                        onClick={this.triggerSend.bind(
+                                            this,
+                                            "1.3.5588",
+                                            coin
+                                        )}
+                                    >
+                                        {
+                                            <Icon
+                                                name="transfer"
+                                                title="icons.transfer"
+                                                className="icon-14px"
+                                            />
+                                        }
+                                        &nbsp; Donate
+                                    </a>
+                                )}
                             </div>
 
                             <div className="listingTable__cell listingTableStatus">
                                 <div className="listingAssetInfoBlock">
-                                    Status:&nbsp;{" "}
+                                    <Translate content="listing.table.status" />
+                                    :&nbsp;{" "}
                                 </div>
-                                {this.props.coin.status === "collecting" ? (
-                                    <Translate content="listing.table.collecting" />
-                                ) : (
-                                    <Translate content="listing.table.done" />
-                                )}
+                                <Translate
+                                    content={"listing.table." + coin.status}
+                                />
                             </div>
                         </div>
 
                         <div className="listingTable__cell listingTableProgress">
                             {
                                 <DonutChart
-                                    votes={this.props.coin.votes_for_percent}
-                                    goal={this.props.coin.goal}
+                                    votes={coin.votes_for_percent}
+                                    goal={coin.goal}
                                 />
                             }
                         </div>

diff --git 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
@@ -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 <CoinCardListing key={i} rank={i + 1} coin={coin} />;
         });
     };

diff --git 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
diff --git 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 <[email protected]>",