Update content of files

This commit is contained in:
GitHub Action 2022-12-28 10:59:32 +00:00
parent c6d6da4704
commit eb98fbda3a
3 changed files with 112 additions and 8 deletions

View file

@ -15,7 +15,7 @@
<link href="/css/font-roboto.css?1" rel="stylesheet" type="text/css"> <link href="/css/font-roboto.css?1" rel="stylesheet" type="text/css">
<link href="/css/bootstrap.min.css?3" rel="stylesheet"> <link href="/css/bootstrap.min.css?3" rel="stylesheet">
<link href="/css/bootstrap-extra.css?2" rel="stylesheet"> <link href="/css/bootstrap-extra.css?2" rel="stylesheet">
<link href="/css/auction.css?45" rel="stylesheet"> <link href="/css/auction.css?46" rel="stylesheet">
</head> </head>
<body class="emoji_image no-transition"> <body class="emoji_image no-transition">
@ -38,9 +38,9 @@
<script src="/js/main-aj.js?67"></script> <script src="/js/main-aj.js?67"></script>
<script src="/js/jquery-ex.js?14"></script> <script src="/js/jquery-ex.js?14"></script>
<script src="/js/qr-code-styling.js?1"></script> <script src="/js/qr-code-styling.js?1"></script>
<script src="/js/auction.js?48"></script> <script src="/js/auction.js?49"></script>
<script>ajInit({"version":414,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script> <script>ajInit({"version":416,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script id="aj_script">Aj._useScrollHack=true; <script id="aj_script">Aj._useScrollHack=true;
Main.init(); Main.init();
</script> </script>

View file

@ -1218,6 +1218,11 @@ a.tm-menu-link:focus {
color: #ff5863; color: #ff5863;
background-color: rgba(255, 88, 99, .1); background-color: rgba(255, 88, 99, .1);
} }
.table-cell-status-thin.tm-status-taken,
.tm-section-header-status.tm-status-taken {
color: #ff9953;
background-color: rgba(255, 153, 83, .1);
}
.tm-section-header .tm-dropdown { .tm-section-header .tm-dropdown {
margin-left: 5px; margin-left: 5px;
} }
@ -1497,6 +1502,9 @@ a.tm-menu-link:focus {
.tm-table .tm-status-unavail { .tm-table .tm-status-unavail {
color: #ff5863; color: #ff5863;
} }
.tm-table .tm-status-taken {
color: #ff9953;
}
.tm-nowrap { .tm-nowrap {
text-overflow: ellipsis; text-overflow: ellipsis;
@ -1750,6 +1758,10 @@ a.tm-table-action-link:hover {
.tm-bid-info-text:empty { .tm-bid-info-text:empty {
display: none; display: none;
} }
.tm-offer-info-text {
padding-top: 8px;
padding-bottom: 8px;
}
.tm-list-item-hint { .tm-list-item-hint {
--line-height: 17px; --line-height: 17px;
font-size: 13px; font-size: 13px;
@ -2969,6 +2981,11 @@ a.tm-table-action-link:hover {
--line-height: 19px; --line-height: 19px;
padding: 2px 20px 10px; padding: 2px 20px 10px;
} }
.tm-offer-info-text {
--line-height: 18px;
padding-top: 9px;
padding-bottom: 9px;
}
.tm-list-item-hint { .tm-list-item-hint {
--line-height: 19px; --line-height: 19px;
padding: 0 20px 10px; padding: 0 20px 10px;

View file

@ -45,11 +45,13 @@ var Main = {
}, },
initForm: function(form) { initForm: function(form) {
var $form = $(form); var $form = $(form);
$('.form-control:has(+.form-control-hint)', $form).on('keyup change input', Main.eUpdateFieldHint);
$('.js-amount-input', $form).on('keyup change input', Main.eUpdateAmountField); $('.js-amount-input', $form).on('keyup change input', Main.eUpdateAmountField);
$('.js-amount-input', $form).trigger('input'); $('.js-amount-input', $form).trigger('input');
}, },
destroyForm: function(form) { destroyForm: function(form) {
var $form = $(form); var $form = $(form);
$('.form-control:has(+.form-control-hint)', $form).off('keyup change input', Main.eUpdateFieldHint);
$('.js-amount-input', $form).off('keyup change input', Main.eUpdateAmountField); $('.js-amount-input', $form).off('keyup change input', Main.eUpdateAmountField);
}, },
updateTime: function() { updateTime: function() {
@ -286,6 +288,11 @@ var Main = {
return float_value; return float_value;
} }
}, },
eUpdateFieldHint: function(e) {
var $fieldEl = $(this);
var has_value = $fieldEl.value().length > 0;
$('+.form-control-hint', $fieldEl).toggle(has_value);
},
eUpdateAmountField: function(e) { eUpdateAmountField: function(e) {
var $fieldEl = $(this); var $fieldEl = $(this);
var minValue = $fieldEl.attr('data-min') || null; var minValue = $fieldEl.attr('data-min') || null;
@ -312,7 +319,7 @@ var Main = {
} }
has_decimal = true; has_decimal = true;
new_value += decPoint; new_value += decPoint;
} else if (char >= '0' && char <= '9' && (!has_decimal || decimal_len < decimals)) { } else if (char >= '0' && char <= '9' && chars_len < 12 && (!has_decimal || decimal_len < decimals)) {
new_value += char; new_value += char;
if (has_decimal) decimal_len++; if (has_decimal) decimal_len++;
else chars_len++; else chars_len++;
@ -364,9 +371,6 @@ var Main = {
return formatNumber(value, dec.length, '.', field_format ? '' : ','); return formatNumber(value, dec.length, '.', field_format ? '' : ',');
}, },
wrapUsdAmount: function(value, field_format) { wrapUsdAmount: function(value, field_format) {
if (!value) {
return '';
}
value = Math.round(value * Aj.state.tonRate * 100) / 100; value = Math.round(value * Aj.state.tonRate * 100) / 100;
return formatNumber(value, (value % 1) && value < 1000 ? 2 : 0, '.', field_format ? '' : ','); return formatNumber(value, (value % 1) && value < 1000 ? 2 : 0, '.', field_format ? '' : ',');
}, },
@ -564,6 +568,8 @@ var Auction = {
var cont = Aj.ajContainer; var cont = Aj.ajContainer;
$(cont).on('click.curPage', '.js-place-bid-btn', Auction.ePlaceBid); $(cont).on('click.curPage', '.js-place-bid-btn', Auction.ePlaceBid);
$(cont).on('submit.curPage', '.js-place-bid-form', Auction.ePlaceBidSubmit); $(cont).on('submit.curPage', '.js-place-bid-form', Auction.ePlaceBidSubmit);
$(cont).on('click.curPage', '.js-make-offer-btn', Auction.eMakeOffer);
$(cont).on('submit.curPage', '.js-make-offer-form', Auction.eMakeOfferSubmit);
$(cont).on('click.curPage', '.js-buy-now-btn', Auction.eBuyNow); $(cont).on('click.curPage', '.js-buy-now-btn', Auction.eBuyNow);
$(cont).on('click.curPage', '.js-subscribe-btn', Auction.eSubscribe); $(cont).on('click.curPage', '.js-subscribe-btn', Auction.eSubscribe);
$(cont).on('click.curPage', '.js-unsubscribe-btn', Auction.eUnsubscribe); $(cont).on('click.curPage', '.js-unsubscribe-btn', Auction.eUnsubscribe);
@ -572,6 +578,9 @@ var Auction = {
state.$bidPopup = $('.js-place-bid-popup'); state.$bidPopup = $('.js-place-bid-popup');
state.$bidForm = $('.js-place-bid-form'); state.$bidForm = $('.js-place-bid-form');
Main.initForm(state.$bidForm); Main.initForm(state.$bidForm);
state.$makeOfferPopup = $('.js-make-offer-popup');
state.$makeOfferForm = $('.js-make-offer-form');
Main.initForm(state.$makeOfferForm);
state.needUpdate = true; state.needUpdate = true;
state.updLastReq = +Date.now(); state.updLastReq = +Date.now();
state.updStateTo = setTimeout(Auction.updateState, Main.UPDATE_PERIOD); state.updStateTo = setTimeout(Auction.updateState, Main.UPDATE_PERIOD);
@ -592,7 +601,8 @@ var Auction = {
Aj.apiRequest('updateAuction', { Aj.apiRequest('updateAuction', {
type: Aj.state.type, type: Aj.state.type,
username: Aj.state.username, username: Aj.state.username,
lt: Aj.state.auctionLastLt lt: Aj.state.auctionLastLt,
lv: Aj.state.auctionLastVer
}, function(result) { }, function(result) {
if (result.html) { if (result.html) {
$('.js-main-content').html(result.html); $('.js-main-content').html(result.html);
@ -600,6 +610,9 @@ var Auction = {
if (result.lt) { if (result.lt) {
Aj.state.auctionLastLt = result.lt; Aj.state.auctionLastLt = result.lt;
} }
if (result.lv) {
Aj.state.auctionLastVer = result.lv;
}
if (Aj.state.needUpdate) { if (Aj.state.needUpdate) {
Aj.state.updStateTo = setTimeout(Auction.updateState, Main.UPDATE_PERIOD); Aj.state.updStateTo = setTimeout(Auction.updateState, Main.UPDATE_PERIOD);
} }
@ -687,6 +700,76 @@ var Auction = {
} }
}); });
}, },
eMakeOffer: function(e) {
e.stopImmediatePropagation();
e.preventDefault();
Aj.apiRequest('initOfferRequest', {
type: Aj.state.type,
username: Aj.state.username
}, function(result) {
if (result.error) {
return showAlert(result.error);
}
Aj.state.offerFeeMin = result.min_fee;
Aj.state.$makeOfferForm.field('id').value(result.req_id);
var eUpdateOfferFee = function(e) {
var amount = Main.amountFieldValue(Aj.state.$makeOfferForm, 'amount_value');
var mult = Aj.state.offerFeeMult;
var fee = Math.ceil(amount * mult);
var fee_val = Math.max(Aj.state.offerFeeMin, Math.min(fee, Aj.state.offerFeeMax));
Aj.state.offerFee = fee_val;
$('.js-amount_fee', Aj.state.$makeOfferForm).html(Main.wrapTonAmount(fee_val));
};
openPopup(Aj.state.$makeOfferPopup, {
onOpen: function() {
Aj.state.$makeOfferForm.reset();
var $amountField = Aj.state.$makeOfferForm.field('amount_value');
$amountField.on('keyup change input', eUpdateOfferFee);
$amountField.trigger('input').focusAndSelect();
},
onClose: function() {
var $amountField = Aj.state.$makeOfferForm.field('amount_value');
$amountField.off('keyup change input', eUpdateOfferFee);
}
});
});
},
eMakeOfferSubmit: function(e) {
e.preventDefault();
var $form = $(this);
var item_title = Aj.state.itemTitle;
var req_id = $form.field('id').value();
var amount = Main.amountFieldValue($form, 'amount_value');
if (amount === false) {
$form.field('amount_value').focus();
return;
}
closePopup(Aj.state.$makeOfferPopup);
QR.showPopup({
request: {
method: 'getOfferLink',
params: {
id: req_id,
amount: amount
}
},
title: l('WEB_POPUP_QR_OFFER_HEADER'),
description: l('WEB_POPUP_QR_OFFER_TEXT', {
amount: '<span class="icon-before icon-ton-text js-amount_fee">' + Main.wrapTonAmount(Aj.state.offerFee) + '</span>'
}),
qr_label: item_title,
tk_label: l('WEB_POPUP_QR_OFFER_TK_BUTTON'),
terms_label: l('WEB_POPUP_QR_PROCEED_TERMS'),
onDataUpdate: function(data) {
$('.js-amount_fee', this).html(Main.wrapTonAmount(data.fee));
},
onConfirm: function(by_server) {
if (by_server) {
showAlert(l('WEB_OFFER_REQUEST_MADE'));
}
}
});
},
eSubscribe: function(e) { eSubscribe: function(e) {
if (!Login.checkAuth(e)) { if (!Login.checkAuth(e)) {
return false; return false;
@ -1421,6 +1504,7 @@ var QR = {
data: null, data: null,
request: null, request: null,
onConfirm: null, onConfirm: null,
onDataUpdate: null,
onExpire: null onExpire: null
}, options); }, options);
var ua = (navigator.userAgent || '').toLowerCase(), var ua = (navigator.userAgent || '').toLowerCase(),
@ -1475,6 +1559,9 @@ var QR = {
if (expTimeout = $popup.data('expTimeout')) { if (expTimeout = $popup.data('expTimeout')) {
clearTimeout(expTimeout); clearTimeout(expTimeout);
} }
if (options.onDataUpdate) {
options.onDataUpdate.call($popup.get(0), data);
}
if (data.expire_after) { if (data.expire_after) {
expTimeout = setTimeout(onExpire, data.expire_after * 1000); expTimeout = setTimeout(onExpire, data.expire_after * 1000);
$popup.data('expTimeout', expTimeout); $popup.data('expTimeout', expTimeout);