Skip to content

Commit

Permalink
+ add Basic Attention Token (BAT), JustBam (BAM) to Listing vote
Browse files Browse the repository at this point in the history 
+ add link from Vesting page to membership stats
+ hide footer link on other market stats besides volume ranking RuDEX's
+ add Terms for listing to determine the number of Donate tokens
  • Loading branch information
serdrdoor committed Jul 28, 2022
1 parent 06e9b5c commit 009ae29
Show file tree
Hide file tree
Showing 13 changed files with 124 additions and 37 deletions.
Binary file added app/assets/coins-logo/bam.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/coins-logo/bat.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/assets/coins-logo/coins.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ require("file-loader?name=coins-logo/[name].png!./wca.png");
require("file-loader?name=coins-logo/[name].png!./camino.png");
require("file-loader?name=coins-logo/[name].png!./ojx.png");
require("file-loader?name=coins-logo/[name].png!./donr.png");
require("file-loader?name=coins-logo/[name].png!./bat.png");
require("file-loader?name=coins-logo/[name].png!./bam.png");

require("file-loader?name=coins-logo/[name].png!./pzm.png");
10 changes: 10 additions & 0 deletions app/assets/locales/locale-en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3062,6 +3062,16 @@
"t2": "and our teams initiates the listing procedure, that includes gateway creation and set up of the trading pairs for the asset.",
"t3": "Please note that the RuDEX team reserves the right to delist assets to protect our own interests and the interests of our customers."
},
"terms": {
"t1": "If your token is included in the voting section for subsequent listing, then the target amount of DONATE tokens for its implementation will be formed according to the following rule:",
"t2": "The amount is determined by the position in the rating on CoinMarketCap – the higher the rating, the lower the required amount; you can see the target for each range in parentheses.",
"tu1": "1-100 (3000 DONATE)",
"tu2": "101-300 (4000 DONATE)",
"tu3": "301-500 (5000 DONATE)",
"tu4": "500-1000 (7000 DONATE)",
"tu5": "1001 и ниже (10000 DONATE)",
"t3": "For BEP20 / ERC20 / TRC20 tokens the amount is also determined by the list above, however, for those below the top 300, the target amount will be 5000 DONATE."
},
"rules": {
"header": "Checklist for asset listing on RuDEX:",
"rule_1": "Please check ",
Expand Down
10 changes: 10 additions & 0 deletions app/assets/locales/locale-ru.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3081,6 +3081,16 @@
"t2": "сжигаются, а наша команда приступает непосредственно к процедуре листинга, включающей запуск шлюза и настройку торговых пар для данного токена.",
"t3": "Обратите внимание что команда RuDEX оставляет за собой право делистинга токенов с целью защиты собственных интересов и интересов пользователей."
},
"terms": {
"t1": "Если ваш токен будет включен в раздел голосования для последующего листинга, то целевая сумма сбора в токенах DONATE для его осуществления будет формироваться по следующему правилу:",
"t2": "Сумма определяется по месту нахождения в рейтинге на CoinMarketCap – чем рейтинг выше, тем нужная сумма меньше; в скобках указана цель для каждого диапазона.",
"tu1": "1-100 (3000 DONATE)",
"tu2": "101-300 (4000 DONATE)",
"tu3": "301-500 (5000 DONATE)",
"tu4": "500-1000 (7000 DONATE)",
"tu5": "1001 и ниже (10000 DONATE)",
"t3": "Для токенов BEP20 / ERC20/ TRC20 сумма также определяется по списку выше, однако для тех из них, что находятся в рейтинге ниже топ-300, целевая сумма составит 5000 DONATE."
},
"rules": {
"header": "Порядок размещения актива на RuDEX:",
"rule_1": "Изучите ",
Expand Down
16 changes: 8 additions & 8 deletions app/assets/stylesheets/themes/_theme-template.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2820,33 +2820,33 @@ div.customizable-column--selector--dropdown {
padding: 5px;
}

@media only all and (max-width: 1040px) {
@media only all and (max-width: 870px) {
.footer .footer-support {
display: none !important;
}
}

@media only all and (max-width: 920px) {
@media only all and (max-width: 770px) {
.footer .footer-listing {
display: none !important;
}
}

@media only all and (max-width: 840px) {
.footer .logo {
@media only all and (max-width: 690px) {
.footer .footer-audit {
display: none !important;
}
}

@media only all and (max-width: 770px) {
.footer .footer-audit {
@media only all and (max-width: 640px) {
.footer .logo {
display: none !important;
}
}

@media only all and (max-width: 680px) {
@media only all and (max-width: 480px) {
.footer[class*="grid-block"]:not(.ng-hide) {
display: none !important;
//display: none !important;
}
}

Expand Down
32 changes: 24 additions & 8 deletions app/branding.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,23 +466,23 @@ export function getListingCoins() {
ticker: "ZEC",
page: "https://z.cash/",
account: "rudex-zec",
goal: 2000,
goal: 3000,
votes: 0
},
{
name: "ADAMANT Messenger",
ticker: "ADM",
page: "https://adamant.im",
account: "rudex-adamant",
goal: 8000,
goal: 10000,
votes: 0
},
{
name: "Hive",
ticker: "HIVE",
page: "https://hive.io",
account: "rudex-hive",
goal: 3000,
goal: 4000,
votes: 0
},
{
Expand All @@ -498,39 +498,39 @@ export function getListingCoins() {
ticker: "DASH",
page: "https://www.dash.org",
account: "rudex-dash",
goal: 2000,
goal: 3000,
votes: 0
},
{
name: "Dogecoin",
ticker: "DOGE",
page: "https://dogecoin.com",
account: "rudex-dogecoin",
goal: 2000,
goal: 3000,
votes: 0
},
{
name: "Telos",
ticker: "TLOS",
page: "https://www.telos.net",
account: "rudex-telos",
goal: 3000,
goal: 5000,
votes: 0
},
{
name: "Ark",
ticker: "ARK",
page: "https://ark.io",
account: "rudex-ark",
goal: 3000,
goal: 5000,
votes: 0
},
{
name: "Crypto International",
page: "https://cri.network",
ticker: "CRI",
account: "rudex-cri",
goal: 10000,
goal: 5000,
votes: 0
},
{
Expand Down Expand Up @@ -596,6 +596,22 @@ export function getListingCoins() {
account: "rudex-donr",
goal: 5000,
votes: 0
},
{
name: "Basic Attention Token",
ticker: "BAT",
page: "https://basicattentiontoken.org",
account: "rudex-bat",
goal: 3000,
votes: 0
},
{
name: "JustBam",
ticker: "BAM",
page: "https://bam.justbam.money",
account: "rudex-bam",
goal: 5000,
votes: 0
}

//Disabled
Expand Down
8 changes: 8 additions & 0 deletions app/components/Account/AccountVesting.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {Button} from "bitshares-ui-style-guide";
import PaginatedList from "components/Utility/PaginatedList";
import SearchInput from "../Utility/SearchInput";
import counterpart from "counterpart";
import {Link} from "react-router-dom";

class AccountVesting extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -355,6 +356,13 @@ class AccountVesting extends React.Component {
<div className="grid-content vertical">
<Translate component="h1" content="account.vesting.title" />
<Translate content="account.vesting.explain" component="p" />
<Link
to={`/account/${this.props.account.get(
"name"
)}/member-stats`}
>
<Translate content="icons.text.membership_stats" />
</Link>
<div className="header-selector padding">
<SearchInput
onChange={this.onSearch.bind(this)}
Expand Down
16 changes: 8 additions & 8 deletions app/components/Layout/Footer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ class Footer extends React.Component {
src={`${__BASE_URL__}images/android.png`}
/>
</a>
<a
{/*<a
style={{
padding: "0 0.5rem",
borderLeft:
Expand All @@ -638,8 +638,8 @@ class Footer extends React.Component {
}}
src={`${__BASE_URL__}images/coinmarketcap.png`}
/>
</a>
<a
</a>*/}
{/*<a
style={{
padding: "0 0.5rem",
borderLeft:
Expand All @@ -658,8 +658,8 @@ class Footer extends React.Component {
}}
src={`${__BASE_URL__}images/coinranking.png`}
/>
</a>
<a
</a>*/}
{/*<a
style={{
padding: "0 0.5rem",
borderLeft:
Expand All @@ -678,8 +678,8 @@ class Footer extends React.Component {
}}
src={`${__BASE_URL__}images/coinpaprika.png`}
/>
</a>
<a
</a>*/}
{/*<a
style={{
padding: "0 0.5rem",
borderLeft:
Expand All @@ -698,7 +698,7 @@ class Footer extends React.Component {
}}
src={`${__BASE_URL__}images/coin.png`}
/>
</a>
</a>*/}
</div>
</div>

Expand Down
19 changes: 8 additions & 11 deletions app/components/Listing/CoinCardListing.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,16 @@ class CoinCardListing extends React.Component {
{coin.soon === true ? (
<Button
className={"coin-soon"}
onClick={this.triggerSend.bind(
this,
"1.3.2",
coin
)}
disabled
>
<Translate content="listing.donate" />
<Icon
style={{
margin: "-3px 0 0px 0px"
}}
name="donate"
title="listing.modal.header2"
className="icon-14x"
/>
</Button>
) : (
<Button
Expand All @@ -132,11 +134,6 @@ class CoinCardListing extends React.Component {
name="donate"
title="listing.modal.header2"
className="icon-14x"
onClick={this.triggerSend.bind(
this,
"1.3.2",
coin
)}
/>
{/*<Translate content="listing.donate"/>*/}
</Button>
Expand Down
6 changes: 5 additions & 1 deletion app/components/Listing/ListingPage.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,11 @@ body .listing_button .ant-btn[disabled]:hover {
fill: white;
}

.listingTable__cell button.ant-btn {
.buttonDonate .icon > svg path {
fill: white;
}
.listingTable__cell button.ant-btn,
.buttonDonate {
display: block;
padding: 5px 20px;

Expand Down
40 changes: 40 additions & 0 deletions app/components/Listing/ListingPage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import IntlStore from "../../stores/IntlStore";

import LoadingIndicator from "../LoadingIndicator";
import {connect} from "alt-react";
import Icon from "../Icon/Icon";

class ListingPage extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -355,6 +356,16 @@ class ListingPage extends React.Component {
>
{this.data.donateTokenName}
</span>
<Button className={"buttonDonate"}>
<Icon
style={{
margin: "-3px 0 0px 0px"
}}
name="donate"
title="listing.modal.header2"
className="icon-14x"
/>
</Button>
<Translate content="listing.texts.text4.t4" />
</p>

Expand All @@ -370,6 +381,35 @@ class ListingPage extends React.Component {
<Translate content="listing.texts.text5.t3" />
</p>

<p
style={{
fontWeight: "bold"
}}
>
<Translate content="listing.texts.terms.t1" />
</p>
<p>
<Translate content="listing.texts.terms.t2" />
</p>
<p>
<Translate content="listing.texts.terms.tu1" />
</p>
<p>
<Translate content="listing.texts.terms.tu2" />
</p>
<p>
<Translate content="listing.texts.terms.tu3" />
</p>
<p>
<Translate content="listing.texts.terms.tu4" />
</p>
<p>
<Translate content="listing.texts.terms.tu5" />
</p>
<p>
<Translate content="listing.texts.terms.t3" />
</p>

<h3>
<Translate content="listing.texts.rules.header" />
</h3>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RuDEX3-light",
"version": "3.3.220713",
"version": "3.3.220728",
"description": "Advanced wallet interface for the Graphene financial blockchain.",
"homepage": "https://github.com/blckchnd/rudex-ui",
"author": "RuDEX Team <[email protected]>",
Expand Down

0 comments on commit 009ae29

Please sign in to comment.