From 49792f6f1f8c748c051c85f5c5f0d6e3ffd62e16 Mon Sep 17 00:00:00 2001 From: joeuhren <46763106+joeuhren@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:40:12 -0700 Subject: [PATCH] Port of the exchanges to bootstrap4 --- views/markets/bittrex.pug | 70 +++++++++++------------ views/markets/bleutrade.pug | 72 +++++++++++------------ views/markets/crex.pug | 74 ++++++++++++------------ views/markets/poloniex.pug | 110 ++++++++++++++++++------------------ views/markets/stex.pug | 68 +++++++++++----------- views/markets/yobit.pug | 74 ++++++++++++------------ 6 files changed, 234 insertions(+), 234 deletions(-) diff --git a/views/markets/bittrex.pug b/views/markets/bittrex.pug index 658adef..ae515ff 100644 --- a/views/markets/bittrex.pug +++ b/views/markets/bittrex.pug @@ -1,35 +1,33 @@ extends menu block market_view - script. - console.log('#{marketdata.data}'); .row .col-md-12 - .panel.panel-default - .panel-heading + .card.card-default + .card-header strong #{settings.locale.bittrex} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} a(href='#') - span.fas.fa-chart-line.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) + span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) table.table.table-bordered.summary-table thead tr th #{settings.locale.mkt_high} th #{settings.locale.mkt_low} th #{settings.locale.mkt_volume} - th.hidden-xs #{settings.locale.mkt_top_bid} - th.hidden-xs #{settings.locale.mkt_top_ask} - th.hidden-xs #{settings.locale.mkt_yesterday} - th.hidden-xs #{settings.locale.mkt_last} + th.d-none.d-sm-block #{settings.locale.mkt_top_bid} + th.d-none.d-sm-block #{settings.locale.mkt_top_ask} + th.d-none.d-sm-block #{settings.locale.mkt_yesterday} + th.d-none.d-sm-block #{settings.locale.mkt_last} th #{settings.locale.mkt_change} tbody tr td #{marketdata.data.summary.High.toFixed(8)} td #{marketdata.data.summary.Low.toFixed(8)} td #{marketdata.data.summary.Volume.toFixed(8)} - td.hidden-xs #{marketdata.data.summary.Bid.toFixed(8)} - td.hidden-xs #{marketdata.data.summary.Ask.toFixed(8)} - td.hidden-xs #{marketdata.data.summary.PrevDay.toFixed(8)} - td.hidden-xs #{marketdata.data.summary.Last.toFixed(8)} + td.d-none.d-sm-block #{marketdata.data.summary.Bid.toFixed(8)} + td.d-none.d-sm-block #{marketdata.data.summary.Ask.toFixed(8)} + td.d-none.d-sm-block #{marketdata.data.summary.PrevDay.toFixed(8)} + td.d-none.d-sm-block #{marketdata.data.summary.Last.toFixed(8)} - var bittrex_change = (100 - ((parseFloat(marketdata.data.summary.PrevDay)/parseFloat(marketdata.data.summary.Last))*100)).toFixed(2); if bittrex_change >= 0 td.success +#{bittrex_change} % @@ -37,15 +35,15 @@ block market_view td.danger #{bittrex_change} % .row .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_buy_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_buy_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr @@ -53,45 +51,45 @@ block market_view =buy.price td =buy.amount - td.hidden-xs + td.d-none.d-sm-block =buy.total .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_sell_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_sell_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr td - =sell.price + =parseFloat(sell.price).toFixed(8) td - =sell.amount - td.hidden-xs - =sell.total + =parseFloat(sell.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(sell.total).toFixed(8) .row .col-md-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_trade_history} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_trade_history} table.table.table-hover.history-table.table-bordered(cellspacing="0") thead tr - th.hidden-xs #{settings.locale.mkt_type} + th.d-none.d-sm-block #{settings.locale.mkt_type} th #{settings.locale.mkt_amount} (#{marketdata.coin}) th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_total} (#{marketdata.exchange}) - th.hidden-xs #{settings.locale.mkt_time_stamp} + th.d-none.d-sm-block #{settings.locale.mkt_time_stamp} tbody each order in marketdata.data.history if order.OrderType == 'BUY' tr.success - td.hidden-xs + td.d-none.d-sm-block =order.OrderType td =order.Quantity.toFixed(8) @@ -99,11 +97,11 @@ block market_view =order.Price.toFixed(8) td =order.Total.toFixed(8) - td.hidden-xs + td.d-none.d-sm-block =order.TimeStamp else tr.danger - td.hidden-xs + td.d-none.d-sm-block =order.OrderType td =order.Quantity.toFixed(8) @@ -111,6 +109,6 @@ block market_view =order.Price.toFixed(8) td =order.Total.toFixed(8) - td.hidden-xs + td.d-none.d-sm-block =order.TimeStamp - .footer-padding + .footer-padding \ No newline at end of file diff --git a/views/markets/bleutrade.pug b/views/markets/bleutrade.pug index 64c025f..4e8ecf0 100644 --- a/views/markets/bleutrade.pug +++ b/views/markets/bleutrade.pug @@ -3,31 +3,31 @@ extends menu block market_view .row .col-md-12 - .panel.panel-default - .panel-heading + .card.card-default + .card-header strong #{settings.locale.bleutrade} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} a(href='#') - span.fas.fa-chart-line.float-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) + span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) table.table.table-bordered.summary-table thead tr th #{settings.locale.mkt_high} th #{settings.locale.mkt_low} th #{settings.locale.mkt_volume} - th.hidden-xs #{settings.locale.mkt_top_bid} - th.hidden-xs #{settings.locale.mkt_top_ask} - th.hidden-xs #{settings.locale.mkt_yesterday} - th.hidden-xs #{settings.locale.mkt_last} + th.d-none.d-sm-block #{settings.locale.mkt_top_bid} + th.d-none.d-sm-block #{settings.locale.mkt_top_ask} + th.d-none.d-sm-block #{settings.locale.mkt_yesterday} + th.d-none.d-sm-block #{settings.locale.mkt_last} th #{settings.locale.mkt_change} tbody tr td #{parseFloat(marketdata.data.summary.High).toFixed(8)} td #{parseFloat(marketdata.data.summary.Low).toFixed(8)} td #{parseFloat(marketdata.data.summary.Volume).toFixed(8)} - td.hidden-xs #{parseFloat(marketdata.data.summary.Bid).toFixed(8)} - td.hidden-xs #{parseFloat(marketdata.data.summary.Ask).toFixed(8)} - td.hidden-xs #{parseFloat(marketdata.data.summary.PrevDay).toFixed(8)} - td.hidden-xs #{parseFloat(marketdata.data.summary.Last).toFixed(8)} + td.d-none.d-sm-block #{parseFloat(marketdata.data.summary.Bid).toFixed(8)} + td.d-none.d-sm-block #{parseFloat(marketdata.data.summary.Ask).toFixed(8)} + td.d-none.d-sm-block #{parseFloat(marketdata.data.summary.PrevDay).toFixed(8)} + td.d-none.d-sm-block #{parseFloat(marketdata.data.summary.Last).toFixed(8)} - var bleutrade_change = (100 - ((parseFloat(marketdata.data.summary.PrevDay)/parseFloat(marketdata.data.summary.Last))*100)).toFixed(2); if bleutrade_change >= 0 td.success +#{bleutrade_change} % @@ -35,15 +35,15 @@ block market_view td.danger #{bleutrade_change} % .row .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_buy_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_buy_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr @@ -51,18 +51,18 @@ block market_view =parseFloat(buy.price).toFixed(8) td =parseFloat(buy.amount).toFixed(8) - td.hidden-xs + td.d-none.d-sm-block =parseFloat(buy.total).toFixed(8) .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_sell_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_sell_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr @@ -70,45 +70,45 @@ block market_view =parseFloat(sell.price).toFixed(8) td =parseFloat(sell.amount).toFixed(8) - td.hidden-xs + td.d-none.d-sm-block =parseFloat(sell.total).toFixed(8) .row .col-md-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_trade_history} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_trade_history} table.table.table-hover.history-table.table-bordered(cellspacing="0") thead tr - th.hidden-xs #{settings.locale.mkt_type} + th.d-none.d-sm-block #{settings.locale.mkt_type} th #{settings.locale.mkt_amount} (#{marketdata.coin}) th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_total} (#{marketdata.exchange}) - th.hidden-xs #{settings.locale.mkt_time_stamp} + th #{settings.locale.mkt_time_stamp} tbody each order in marketdata.data.history if order.OrderType == "BUY" tr.success - td.hidden-xs + td.d-none.d-sm-block =order.OrderType td - =order.Quantity + =order.Quantity.toFixed(8) td - =order.Price + =order.Price.toFixed(8) td - =order.Total - td.hidden-xs + =order.Total.toFixed(8) + td.d-none.d-sm-block =order.TimeStamp else tr.danger - td.hidden-xs + td.d-none.d-sm-block =order.OrderType td - =order.Quantity + =order.Quantity.toFixed(8) td - =order.Price + =order.Price.toFixed(8) td - =order.Total - td.hidden-xs + =order.Total.toFixed(8) + td.d-none.d-sm-block =order.TimeStamp .footer-padding \ No newline at end of file diff --git a/views/markets/crex.pug b/views/markets/crex.pug index ea0d6dd..c4a6916 100644 --- a/views/markets/crex.pug +++ b/views/markets/crex.pug @@ -3,104 +3,104 @@ extends menu block market_view .row .col-md-12 - .panel.panel-default - .panel-heading + .card.card-default + .card-header strong #{settings.locale.crex} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} a(href='#') - span.fas.fa-chart-line.float-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) + span.fas.fa-chart-line.float-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) table.table.table-bordered.summary-table thead tr th #{settings.locale.mkt_high} th #{settings.locale.mkt_low} th #{settings.locale.mkt_volume} - th.hidden-xs #{settings.locale.mkt_top_bid} - th.hidden-xs #{settings.locale.mkt_top_ask} - th.hidden-xs #{settings.locale.mkt_last} + th.d-none.d-sm-block #{settings.locale.mkt_top_bid} + th.d-none.d-sm-block #{settings.locale.mkt_top_ask} + th.d-none.d-sm-block #{settings.locale.mkt_last} tbody tr td #{marketdata.data.summary.high} td #{marketdata.data.summary.low} td #{marketdata.data.summary.volume} - td.hidden-xs #{marketdata.data.summary.bid} - td.hidden-xs #{marketdata.data.summary.ask} - td.hidden-xs #{marketdata.data.summary.last} + td.d-none.d-sm-block #{marketdata.data.summary.bid} + td.d-none.d-sm-block #{marketdata.data.summary.ask} + td.d-none.d-sm-block #{marketdata.data.summary.last} .row .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_buy_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_buy_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr td - =buy.price + =parseFloat(buy.price).toFixed(8) td - =buy.amount - td.hidden-xs - =buy.total + =parseFloat(buy.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(buy.total).toFixed(8) .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_sell_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_sell_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr td - =sell.price + =parseFloat(sell.price).toFixed(8) td - =sell.amount - td.hidden-xs - =sell.total + =parseFloat(sell.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(sell.total).toFixed(8) .row .col-md-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_trade_history} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_trade_history} table.table.table-hover.history-table.table-bordered(cellspacing="0") thead tr - th.hidden-xs #{settings.locale.mkt_type} - th #{settings.locale.mkt_amount} (#{marketdata.coin}) + th.d-none.d-sm-block #{settings.locale.mkt_type} + th #{settings.locale.mkt_amount} (#{marketdata.coin}) th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_total} (#{marketdata.exchange}) - th.hidden-xs #{settings.locale.mkt_time_stamp} + th #{settings.locale.mkt_time_stamp} tbody each order in marketdata.data.history if order.ordertype.toUpperCase() == 'BUY' tr.success - td.hidden-xs - =order.ordertype + td.d-none.d-sm-block + ='market.order.' + order.ordertype.toLowerCase() td =order.amount td =order.price td =order.total - td.hidden-xs + td.d-none.d-sm-block =(new Date(order.timestamp * 1000).toUTCString()) else tr.danger - td.hidden-xs - =order.ordertype + td.d-none.d-sm-block + ='market.order.' + order.ordertype.toLowerCase() td =order.amount td =order.price td =order.total - td.hidden-xs + td.d-none.d-sm-block =(new Date(order.timestamp * 1000).toUTCString()) .footer-padding \ No newline at end of file diff --git a/views/markets/poloniex.pug b/views/markets/poloniex.pug index b8a9fa5..c055b9c 100644 --- a/views/markets/poloniex.pug +++ b/views/markets/poloniex.pug @@ -3,7 +3,7 @@ extends menu block market_view script. $(document).ready(function(){ - $('#summary-panel').hide(); + $('#summary-card').hide(); var ohlc = !{marketdata.data.chartdata} var plot2 = $.jqplot('chart',[ohlc],{ seriesDefaults:{yaxis:'y2axis'}, @@ -43,17 +43,17 @@ block market_view }); }); .row - .hidden-xs.col-md-12 - #chart-panel.panel.panel-default - .panel-heading - strong #{settings.locale.poloniex} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} + .d-none.col-md-12 + #chart-card.card.card-default + .card-header + strong= t('market.market_title',{market : t('exchange.graviex'),coin : marketdata.coin, exchange : marketdata.exchange }) a(href='#') span.fa.fa-th-list.float-right.view-summary.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_view_summary) - .panel-body + .card-body div#chart(style="width:100%;height:300px;") - #summary-panel.panel.panel-default - .panel-heading - strong #{settings.locale.poloniex} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} + #summary-card.card.card-default + .card-header + strong= t('market.market_title',{market : t('exchange.graviex'),coin : marketdata.coin, exchange : marketdata.exchange }) a(href='#') span.fas.fa-chart-line.float-right.view-chart.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_view_chart) table.table.table-bordered.summary-table @@ -62,26 +62,29 @@ block market_view th #{settings.locale.mkt_high} th #{settings.locale.mkt_low} th #{settings.locale.mkt_volume} - th.hidden-xs #{settings.locale.mkt_top_bid} - th.hidden-xs #{settings.locale.mkt_top_ask} - th.hidden-xs #{settings.locale.mkt_last} + th.d-none.d-sm-block #{settings.locale.mkt_top_bid} + th.d-none.d-sm-block #{settings.locale.mkt_top_ask} + th.d-none.d-sm-block #{settings.locale.mkt_yesterday} + th.d-none.d-sm-block #{settings.locale.mkt_last} th #{settings.locale.mkt_change} tbody tr td #{marketdata.data.summary['high24hr']} td #{marketdata.data.summary['low24hr']} td #{marketdata.data.summary['baseVolume']} - td.hidden-xs #{marketdata.data.summary.highestBid} - td.hidden-xs #{marketdata.data.summary.lowestAsk} - td.hidden-xs #{marketdata.data.summary.last} + td.d-none.d-sm-block #{marketdata.data.summary.highestBid} + td.d-none.d-sm-block #{marketdata.data.summary.lowestAsk} + td.d-none.d-sm-block #{marketdata.data.summary.last} if marketdata.data.summary.percentChange.substring(0, 1) == '-' td.danger #{marketdata.data.summary.percentChange} % else td.success #{marketdata.data.summary.percentChange} % - .hidden-md.hidden-lg.col-xs-12 - .panel.panel-default - .panel-heading - strong Poloniex - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} + .d-md-none.d-lg-none.col-xs-12 + .card.card-default + .card-header + strong= t('market.market_title',{market : t('exchange.graviex'),coin : marketdata.coin, exchange : marketdata.exchange }) + a(href='#') + span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title= t('market.no_chart')) table.table.table-bordered.summary-table thead tr @@ -99,82 +102,79 @@ block market_view else td.success #{marketdata.data.summary.percentChange} % .row - .col-md-6 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_buy_orders} - table.table.table-striped.table-bordered.responsive.order-table + .col-md-6.col-xs-12 + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_buy_orders} + table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr - - var total = parseFloat(buy[0]) * parseFloat(buy[1]); - - total = total.toFixed(8); td - =buy[0] + =parseFloat(buy.price).toFixed(8) td - =buy[1].toFixed(8) - td.hidden-xs - =total - .col-md-6 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_sell_orders} - table.table.table-striped.table-bordered.responsive.order-table + =parseFloat(buy.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(buy.total).toFixed(8) + .col-md-6.col-xs-12 + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_sell_orders} + table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr - - var total = parseFloat(sell[0]) * parseFloat(sell[1]); - - total = total.toFixed(8); td - =sell[0] + =parseFloat(sell.price).toFixed(8) td - =sell[1].toFixed(8) - td.hidden-xs - =total + =parseFloat(sell.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(sell.total).toFixed(8) + .row .col-md-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_trade_history} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_trade_history} table.table.table-hover.history-table.table-bordered(cellspacing="0") thead tr - th.hidden-xs Type + th.d-none.d-sm-block #{settings.locale.mkt_type} th #{settings.locale.mkt_amount} (#{marketdata.coin}) th #{settings.locale.mkt_price} (#{marketdata.exchange}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) - th.hidden-xs Time Stamp + th #{settings.locale.mkt_total} (#{marketdata.exchange}) + th #{settings.locale.mkt_time_stamp} tbody each trade in marketdata.data.history if trade.type == 'buy' tr.success - td.hidden-xs BUY + td.d-none.d-sm-blockBUY td =trade.amount td =trade.rate - td.hidden-xs + td.d-none.d-sm-block =trade.total - td.hidden-xs + td.d-none.d-sm-block =trade.date else tr.danger - td.hidden-xs SELL + td.d-none.d-sm-blockSELL td =trade.amount td =trade.rate - td.hidden-xs + td.d-none.d-sm-block =trade.total - td.hidden-xs + td.d-none.d-sm-block =trade.date .footer-padding \ No newline at end of file diff --git a/views/markets/stex.pug b/views/markets/stex.pug index a6aec02..8bf9c58 100644 --- a/views/markets/stex.pug +++ b/views/markets/stex.pug @@ -3,85 +3,85 @@ extends menu block market_view .row .col-md-12 - .panel.panel-default - .panel-heading + .card.card-default + .card-header strong #{settings.locale.stex} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} a(href='#') - span.fas.fa-chart-line.float-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) + span.fas.fa-chart-line.float-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) table.table.table-bordered.summary-table thead tr th #{settings.locale.mkt_high} th #{settings.locale.mkt_low} th #{settings.locale.mkt_volume} - th.hidden-xs #{settings.locale.mkt_top_bid} - th.hidden-xs #{settings.locale.mkt_top_ask} - th.hidden-xs #{settings.locale.mkt_last} + th.d-none.d-sm-block #{settings.locale.mkt_top_bid} + th.d-none.d-sm-block #{settings.locale.mkt_top_ask} + th.d-none.d-sm-block #{settings.locale.mkt_last} tbody tr td #{marketdata.data.summary.high} td #{marketdata.data.summary.low} td #{marketdata.data.summary.volume} - td.hidden-xs #{marketdata.data.summary.bid} - td.hidden-xs #{marketdata.data.summary.ask} - td.hidden-xs #{marketdata.data.summary.last} + td.d-none.d-sm-block #{marketdata.data.summary.bid} + td.d-none.d-sm-block #{marketdata.data.summary.ask} + td.d-none.d-sm-block #{marketdata.data.summary.last} .row .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_buy_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_buy_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr td - =buy.price + =parseFloat(buy.price).toFixed(8) td - =buy.amount - td.hidden-xs - =buy.total + =parseFloat(buy.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(buy.total).toFixed(8) .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_sell_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_sell_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr td - =sell.price + =parseFloat(sell.price).toFixed(8) td - =sell.amount - td.hidden-xs - =sell.total + =parseFloat(sell.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(sell.total).toFixed(8) .row .col-md-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_trade_history} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_trade_history} table.table.table-hover.history-table.table-bordered(cellspacing="0") thead tr - th.hidden-xs #{settings.locale.mkt_type} + th.d-none.d-sm-block #{settings.locale.mkt_type} th #{settings.locale.mkt_amount} (#{marketdata.coin}) th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_total} (#{marketdata.exchange}) - th.hidden-xs #{settings.locale.mkt_time_stamp} + th #{settings.locale.mkt_time_stamp} tbody each order in marketdata.data.history if order.ordertype.toUpperCase() == 'BUY' tr.success - td.hidden-xs + td.d-none.d-sm-block =order.ordertype td =order.amount @@ -89,11 +89,11 @@ block market_view =order.price td =order.total - td.hidden-xs + td.d-none.d-sm-block =(new Date(order.timestamp * 1000).toUTCString()) else tr.danger - td.hidden-xs + td.d-none.d-sm-block =order.ordertype td =order.amount @@ -101,6 +101,6 @@ block market_view =order.price td =order.total - td.hidden-xs + td.d-none.d-sm-block =(new Date(order.timestamp * 1000).toUTCString()) .footer-padding \ No newline at end of file diff --git a/views/markets/yobit.pug b/views/markets/yobit.pug index 0b1c2be..afdb334 100644 --- a/views/markets/yobit.pug +++ b/views/markets/yobit.pug @@ -3,9 +3,13 @@ extends menu block market_view .row .col-md-12 - .panel.panel-default - .panel-heading - strong #{settings.locale.yobit} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours} + .card.card-default + .card-header + strong= t('market.market_title',{ + market : t('exchange.yobit'), + coin : marketdata.coin, + exchange : marketdata.exchange + }) a(href='#') span.fas.fa-chart-line.float-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) table.table.table-bordered.summary-table @@ -13,75 +17,73 @@ block market_view tr th #{settings.locale.mkt_high} th #{settings.locale.mkt_low} - th.hidden-xs #{settings.locale.mkt_top_bid} - th.hidden-xs #{settings.locale.mkt_top_ask} - th.hidden-xs #{settings.locale.mkt_last} + th.d-none.d-sm-block #{settings.locale.mkt_top_bid} + th.d-none.d-sm-block #{settings.locale.mkt_top_ask} + th.d-none.d-sm-block #{settings.locale.mkt_last} tbody tr td #{marketdata.data.summary.high} td #{marketdata.data.summary.low} - td.hidden-xs #{marketdata.data.summary.buy} - td.hidden-xs #{marketdata.data.summary.sell} - td.hidden-xs #{marketdata.data.summary.last} + td.d-none.d-sm-block #{marketdata.data.summary.buy} + td.d-none.d-sm-block #{marketdata.data.summary.sell} + td.d-none.d-sm-block #{marketdata.data.summary.last} .row .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_buy_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_buy_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr td - =buy[0].toFixed(8) + =parseFloat(buy.price).toFixed(8) td - =buy[1].toFixed(8) - td.hidden-xs - - var total = buy[0] * buy[1]; - =total.toFixed(8) + =parseFloat(buy.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(buy.total).toFixed(8) .col-md-6.col-xs-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_sell_orders} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_sell_orders} table.table.table-striped.table-bordered.order-table thead tr th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.hidden-xs #{settings.locale.mkt_total} (#{marketdata.exchange}) + th.d-none.d-sm-block #{settings.locale.mkt_total} (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr td - =sell[0].toFixed(8) + =parseFloat(sell.price).toFixed(8) td - =sell[1].toFixed(8) - td.hidden-xs - - var total = sell[0] * sell[1]; - =total.toFixed(8) + =parseFloat(sell.amount).toFixed(8) + td.d-none.d-sm-block + =parseFloat(sell.total).toFixed(8) .row .col-md-12 - .panel.panel-default - .panel-heading - h3.panel-title #{settings.locale.mkt_trade_history} + .card.card-default + .card-header + h3.card-title #{settings.locale.mkt_trade_history} table.table.table-hover.history-table.table-bordered(cellspacing="0") thead tr - th.hidden-xs #{settings.locale.mkt_type} + th.d-none.d-sm-block #{settings.locale.mkt_type} th #{settings.locale.mkt_amount} (#{marketdata.coin}) th #{settings.locale.mkt_price} (#{marketdata.exchange}) th #{settings.locale.mkt_total} (#{marketdata.exchange}) - th.hidden-xs #{settings.locale.mkt_time_stamp} + th #{settings.locale.mkt_time_stamp} tbody each order in marketdata.data.history if order.type == 'bid' tr.success - td.hidden-xs + td.d-none.d-sm-block =order.type td =order.amount.toFixed(8) @@ -90,11 +92,11 @@ block market_view td - var total = order.amount * order.price; =total.toFixed(8) - td.hidden-xs + td.d-none.d-sm-block =format_unixtime(order.timestamp) else tr.danger - td.hidden-xs + td.d-none.d-sm-block =order.type td =order.amount.toFixed(8) @@ -103,6 +105,6 @@ block market_view td - var total = order.amount * order.price; =total.toFixed(8) - td.hidden-xs + td.d-none.d-sm-block =format_unixtime(order.timestamp) .footer-padding \ No newline at end of file