Skip to content

Commit

Permalink
+ add XMR gateway
Browse files Browse the repository at this point in the history 
+ Bots to Top instead Lottery
+ some fixes
+ link for check charting_library_original change
  • Loading branch information
serdrdoor committed Jan 15, 2021
1 parent d50e46d commit 0354143
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 23 deletions.
Binary file added app/assets/asset-symbols/rudex.xmr.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.
5 changes: 3 additions & 2 deletions app/assets/asset-symbols/symbols.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require("file-loader?name=asset-symbols/[name].png!./bts.png");
//require("file-loader?name=asset-symbols/silver.png!./silver.png");

// rudex assets
require("file-loader?name=asset-symbols/[name].png!./donate.png");
require("file-loader?name=asset-symbols/[name].png!./ppy.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.usdt.png");
Expand All @@ -23,6 +22,7 @@ require("file-loader?name=asset-symbols/[name].png!./rudex.smoke.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.wls.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.pzm.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.nbs.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.xmr.png");

require("file-loader?name=asset-symbols/[name].png!./rudex.dgb.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.gbg.png");
Expand All @@ -40,7 +40,8 @@ require("file-loader?name=asset-symbols/[name].png!./rudex.rub.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.oil.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.xau.png");

//Lottery
//RuDEX others
require("file-loader?name=asset-symbols/[name].png!./donate.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.lottery.png");

// 3rd party assets
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/components/_exchange.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,7 @@ input[type="number"]::-webkit-outer-spin-button {

.mymarkets-list {
padding: 0;
margin-bottom: 15px;
font-size: 0.75rem;
.table > thead tr th {
font-size: 0.75rem;
Expand Down
19 changes: 13 additions & 6 deletions app/branding.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export function getMyMarketsQuotes() {
"RUDEX.SMOKE",
"RUDEX.PZM",
"RUDEX.NBS",
"RUDEX.XMR",

//RuDEX MPA-s
"RUDEX.XBS",
Expand Down Expand Up @@ -217,11 +218,12 @@ export function getFeaturedMarkets(quotes = []) {
["BTS", "RUDEX.BTC"],
["BTS", "RUDEX.USDT"],
["BTS", "RUDEX.ETH"],
["BTS", "RUDEX.XMR"],
["BTS", "RUDEX.EOS"],
["BTS", "RUDEX.GOLOS"],
["BTS", "RUDEX.STEEM"],
["BTS", "RUDEX.WLS"],
["BTS", "RUDEX.SMOKE"], //MPA
["BTS", "RUDEX.SMOKE"], //USDT

/*["RUBLE", "BTS"],
["RUBLE", "PPY"],
Expand All @@ -233,8 +235,10 @@ export function getFeaturedMarkets(quotes = []) {
["RUBLE", "RUDEX.STEEM"],
["RUBLE", "RUDEX.WLS"],
["RUBLE", "RUDEX.SMOKE"],
["RUBLE", "RUDEX.RUB"], */ //USDT
["RUDEX.USDT", "BTS"],
["RUBLE", "RUDEX.RUB"], */ [
"RUDEX.USDT",
"BTS"
],
["RUDEX.USDT", "PPY"],
["RUDEX.USDT", "RUDEX.NBS"],
["RUDEX.USDT", "RUDEX.BTC"],
Expand All @@ -245,7 +249,9 @@ export function getFeaturedMarkets(quotes = []) {
["RUDEX.USDT", "RUDEX.WLS"],
["RUDEX.USDT", "RUDEX.SMOKE"],
["RUDEX.USDT", "RUDEX.PZM"],
["RUDEX.USDT", "RUDEX.XMR"],
//["RUDEX.USDT", "RUBLE"],

["RUDEX.USDT", "RUDEX.XBS"], //MPA
["RUDEX.USDT", "RUDEX.XBT"], //MPA
["RUDEX.USDT", "RUDEX.OIL"], //MPA
Expand All @@ -258,13 +264,14 @@ export function getFeaturedMarkets(quotes = []) {
["RUDEX.BTC", "RUDEX.NBS"],
["RUDEX.BTC", "RUDEX.USDT"],
["RUDEX.BTC", "RUDEX.ETH"],
["RUDEX.BTC", "RUDEX.XMR"],
["RUDEX.BTC", "RUDEX.EOS"],
["RUDEX.BTC", "RUDEX.GOLOS"],
["RUDEX.BTC", "RUDEX.STEEM"],
["RUDEX.BTC", "RUDEX.WLS"],
["RUDEX.BTC", "RUDEX.SMOKE"],
["RUDEX.BTC", "DONATE"],
["RUDEX.BTC", "RUDEX.LOTTERY"],
//["RUDEX.BTC", "RUDEX.LOTTERY"],
//["RUDEX.BTC", "RUBLE"],
["RUDEX.BTC", "RUDEX.XBT"] //MPA
].filter(a => {
Expand Down Expand Up @@ -348,13 +355,13 @@ export function getConfigurationAsset() {
export function getListingCoins() {
return [
//soon: true, (for TON example)
{
/* {
name: "Monero",
ticker: "XMR",
account: "rudex-monero",
goal: 5000,
votes: 0
},
},*/
{
name: "Litecoin",
ticker: "LTC",
Expand Down
2 changes: 2 additions & 0 deletions app/components/Account/AccountOverview.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class AccountOverview extends React.Component {
"RUDEX.WLS",
"RUDEX.SMOKE",
"RUDEX.PZM",
"RUDEX.NBS",
"RUDEX.XMR",

"RUDEX.GRC",
"RUDEX.GBG",
Expand Down
11 changes: 10 additions & 1 deletion app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,16 @@ class RuDexGatewayDepositRequest extends React.Component {
// This is a client that uses unique deposit addresses to select the output
clipboardText = receive_address.address;
deposit_address_fragment = (
<span>{receive_address.address}</span>
<span
style={{
wordBreak: "break-word",
lineHeight: "1.5em",
marginTop: "15px",
display: "block"
}}
>
{receive_address.address}
</span>
);
}
withdraw_memo_prefix = "";
Expand Down
4 changes: 2 additions & 2 deletions app/components/DepositWithdraw/rudex/raido/RaidoDepositRequest.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ class RaidoDepositRequest extends React.Component {
"gateway.rudex.buy_crypto.you_give_placeholder"
)}
style={{
backgroundImage: `url(\/images\/raido-payment-${this.state.raido.give_raw.toLowerCase()}.png)`
backgroundImage: `url(${__BASE_URL__}images\/raido-payment-${this.state.raido.give_raw.toLowerCase()}.png)`
}}
/>
</div>
Expand All @@ -675,7 +675,7 @@ class RaidoDepositRequest extends React.Component {
"gateway.rudex.buy_crypto.you_get_placeholder"
)}
style={{
backgroundImage: `url(\/asset-symbols\/rudex.${this.state.raido.get.toLowerCase()}.png)`
backgroundImage: `url(${__BASE_URL__}asset-symbols\/rudex.${this.state.raido.get.toLowerCase()}.png)`
}}
/>
<span
Expand Down
8 changes: 7 additions & 1 deletion app/components/DepositWithdraw/rudex/raido/RaidoPaymentMethod.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ class RaidoPaymentMethod extends React.Component {
onClick={this.props.onClick()}
/>
{title}
<img src={"/images/raido-payment-" + payment_id + ".png"} />
<img
src={
`${__BASE_URL__}images/raido-payment-` +
payment_id +
".png"
}
/>
</label>
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions app/components/Layout/Footer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ class Footer extends React.Component {
style={{
height: "22px"
}}
src={"/images/google-play.png"}
src={`${__BASE_URL__}images/google-play.png`}
/>
</a>
<a
Expand All @@ -631,7 +631,7 @@ class Footer extends React.Component {
style={{
height: "22px"
}}
src={"/images/coinmarketcap.png"}
src={`${__BASE_URL__}images/coinmarketcap.png`}
/>
</a>
</div>
Expand Down
9 changes: 4 additions & 5 deletions app/components/Layout/MenuDataStructure.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ class MenuDataStructure {
allItems.account,
allItems.market,
allItems.explorer,
/*allItems.bots*/
allItems.lottery
allItems.bots
];
}

Expand Down Expand Up @@ -260,8 +259,8 @@ class MenuDataStructure {
target: "/bots",
icon: "robot",
text: "header.bots",
inHeaderBehavior: MenuItemType.Dynamic,
inDropdownBehavior: MenuItemType.Always
inHeaderBehavior: MenuItemType.Always,
inDropdownBehavior: MenuItemType.WhenNotInHeader
}),
listing: state => ({
includePattern: ["/listing"],
Expand Down Expand Up @@ -296,7 +295,7 @@ class MenuDataStructure {
target: "/lottery",
icon: "lottery",
text: "header.lottery",
inHeaderBehavior: MenuItemType.WhenAccount,
inHeaderBehavior: MenuItemType.Dynamic,
inDropdownBehavior: MenuItemType.Always
}),
follow: state => ({
Expand Down
5 changes: 3 additions & 2 deletions charting_library/install-charting-library.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ function getMD5Digest(file) {
var outputFilePath = path.join(__dirname, "charting_library.zip");
const outputFile = fs.createWriteStream(outputFilePath);

http.get("https://bitshares.org/assets/charting_library.zip", (response) => {
response.pipe(outputFile);
//http.get("https://bitshares.org/assets/charting_library.zip", (response) => {=
http.get("https://files.rudex.org/rudex/charting_library_original.zip", (response) => {
response.pipe(outputFile);
}).on("error", (err) => {
console.error("Failed to download charting_library archive");
console.error(err);
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.201112",
"version": "3.3.210115",
"description": "Advanced wallet interface for the BitShares financial blockchain.",
"homepage": "https://github.com/blckchnd/rudex-ui",
"author": "RuDEX Team <[email protected]>",
Expand Down

0 comments on commit 0354143

Please sign in to comment.