Merge pull request #3 from ranchimall/main

UI
This commit is contained in:
Sai Raj 2021-10-24 18:35:59 +05:30 committed by GitHub
commit f5b7c5cb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 140 additions and 107 deletions

View File

@ -137,12 +137,12 @@ customElements.define('sm-button',
}
attributeChangedCallback(name) {
if (name === 'disabled') {
if (this.hasAttribute('disabled')) {
this.removeAttribute('tabindex');
this.setAttribute('aria-disabled', 'true');
}
else {
} else {
this.setAttribute('tabindex', '0');
this.setAttribute('aria-disabled', 'false');
}
this.setAttribute('aria-disabled', this.hasAttribute('disabled'));
}
}
})

View File

@ -639,7 +639,7 @@ sm-checkbox {
padding: 1rem 1.5rem 1.5rem 1.5rem;
}
#quantity_selector .button {
.quantity-selector .button {
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1;
@ -647,7 +647,8 @@ sm-checkbox {
margin-left: 0.5rem;
}
#quantity_type {
#quantity_type,
#wallet_quantity_type {
font-size: 0.8rem;
padding-right: 0.5rem;
border-right: thin solid rgba(var(--text-color), 0.3);

File diff suppressed because one or more lines are too long

View File

@ -560,14 +560,15 @@ sm-checkbox {
align-self: flex-start;
padding: 1rem 1.5rem 1.5rem 1.5rem;
}
#quantity_selector {
.quantity-selector {
.button {
flex: 1;
padding: 0.5rem 0.6rem;
margin-left: 0.5rem;
}
}
#quantity_type {
#quantity_type,
#wallet_quantity_type {
font-size: 0.8rem;
padding-right: 0.5rem;
border-right: thin solid rgba(var(--text-color), 0.3);

View File

@ -116,20 +116,20 @@
<strip-option value="sell">Sell</strip-option>
</strip-select>
</div>
<sm-input id="get_price" variant="outlined" placeholder="Max price (₹)" type="number" step="0.00001"
<sm-input id="get_price" variant="outlined" placeholder="Max price (₹)" type="number" step="0.01"
required hiderequired animate>
</sm-input>
<sm-input id="get_quantity" variant="outlined" placeholder="Quantity (FLO)" type="number"
step="0.00000001" required hiderequired animate></sm-input>
<sm-input id="get_quantity" variant="outlined" placeholder="Quantity (FLO)" type="number" step="0.0001"
required hiderequired animate></sm-input>
<sm-input id="get_total" variant="outlined" placeholder="Total (₹)" type="number" min="0.01" step="0.01"
required hiderequired animate>
</sm-input>
<div id="quantity_selector" class="flex align-center">
<div id="quantity_selector" class="flex align-center quantity-selector">
<span id="quantity_type">Rupee</span>
<button class="button" value="25">25%</button>
<button class="button" value="50">50%</button>
<button class="button" value="75">75%</button>
<button class="button" value="100">100%</button>
<button class="button" value="0.25">25%</button>
<button class="button" value="0.5">50%</button>
<button class="button" value="0.75">75%</button>
<button class="button" value="1">100%</button>
</div>
<div id="trade_button_wrapper" class="stateful-button-wrapper flex align-center justify-center">
<sm-button id="trade_button" class="uppercase w-100" variant="primary" onclick="tradeFlo()">BUY FLO
@ -224,6 +224,7 @@
</div>
<div class="grid gap-0-5">
<h4>Balance</h4>
<div class="grid gap-1">
<div class="balance-card">
<div class="balance-card__icon">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
@ -245,6 +246,7 @@
<div id="rupee_balance"></div>
</div>
</div>
</div>
</section>
</article>
<footer id="bottom_nav" class="flex align-center hide-on-desktop">
@ -397,6 +399,13 @@
<sm-input id="get_user_amount" variant="outlined" placeholder="Quantity" type="number" min="0.01"
step="0.00001" required hiderequired animate>
</sm-input>
<div id="wallet_quantity_selector" class="flex align-center quantity-selector">
<span id="wallet_quantity_type">Rupee</span>
<button class="button" value="0.25">25%</button>
<button class="button" value="0.5">50%</button>
<button class="button" value="0.75">75%</button>
<button class="button" value="1">100%</button>
</div>
<sm-input id="get_private_key" variant="outlined" placeholder="FLO private key" type="password" required
error-text="Invalid private key" hiderequired animate>
</sm-input>
@ -443,11 +452,11 @@
<span class="available-balance"></span>
</template>
<template id="locked_balance_template">
<div>
<div class="grid">
<span class="label">Locked</span>
<span class="locked-balance"></span>
</div>
<div>
<div class="grid">
<span class="label">Available</span>
<span class="available-balance"></span>
</div>
@ -737,7 +746,7 @@
return new Promise((resolve, reject) => {
buttons[0].onclick = () => {
hidePopup()
reject(null);
return (null);
}
buttons[1].onclick = () => {
const value = getRef('prompt_input').value;
@ -769,21 +778,17 @@
}
}
function getFormattedTime(time, relative) {
function getFormattedTime(timeString, relative) {
try {
if (String(time).indexOf('_'))
time = String(time).split('_')[0]
const intTime = parseInt(time)
if (String(intTime).length < 13)
time *= 1000
let timeFrag = new Date(intTime).toString().split(' '),
day = timeFrag[0],
month = timeFrag[1],
date = timeFrag[2],
year = timeFrag[3],
minutes = new Date(intTime).getMinutes(),
hours = new Date(intTime).getHours(),
currentTime = new Date().toString().split(' ')
const [date, time] = timeString.split('T')
const [year, month, day] = date.split('-').map(v => parseInt(v))
let [hours, minutes] = time.split(':').map(v => parseInt(v))
const currentTime = new Date()
const currentTimeFrag = currentTime.toString().split(' ')
const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
];
const monthName = monthNames[month]
minutes = minutes < 10 ? `0${minutes}` : minutes
let finalHours = ``;
@ -797,25 +802,25 @@
finalHours = hours >= 12 ? `${finalHours} PM` : `${finalHours} AM`
if (relative) {
if (year == currentYear) {
if (currentTime[1] === month) {
const dateDiff = (parseInt(currentTime[2]) - parseInt(date))
if ((currentTime.getMonth() + 1) === month) {
const dateDiff = (parseInt(currentTimeFrag[2]) - parseInt(day))
if (dateDiff === 0)
return `${finalHours}`;
else if (dateDiff === 1)
return `Yesterday`;
else if (dateDiff > 1 && dateDiff < 8)
return currentTime[0];
return currentTimeFrag[0];
else
return ` ${date} ${month}`;
return ` ${day} ${monthName}`;
}
else
return ` ${date} ${month}`;
return ` ${day} ${monthName}`;
}
else
return `${month} ${year}`;
return `${monthName} ${year}`;
}
else
return `${finalHours}, ${month} ${date} ${year}`;
return `${finalHours}, ${monthName} ${day} ${year}`;
} catch (e) {
console.error(e);
return time;
@ -1039,10 +1044,12 @@
function showProcess(id) {
getRef(id).children[0].classList.add('clip')
getRef(id).children[0].disabled = true
getRef(id).append(document.createElement('sm-spinner'))
}
function hideProcess(id) {
getRef(id).children[0].classList.remove('clip')
getRef(id).children[0].disabled = false
getRef(id).querySelector('sm-spinner')?.remove()
}
let tradeType = 'buy'
@ -1064,6 +1071,7 @@
}
getRef('trade_button_wrapper').append(getRef('success_template').content.cloneNode(true))
notify(`Placed ${tradeType} order`, 'success')
refresh()
}
catch (err) {
getRef('trade_button_wrapper').append(getRef('failure_template').content.cloneNode(true))
@ -1086,18 +1094,19 @@
if (e.target.closest('button')) {
const target = e.target.closest('button')
const unitValue = parseFloat(getRef('get_price').value)
const fraction = parseInt(target.value) / 100
const fraction = parseFloat(target.value)
if (tradeType === 'buy') {
getRef('get_total').value = parseFloat((fraction * balance.rupee).toFixed(2))
getRef('get_quantity').value = parseFloat(((balance.rupee * fraction) / unitValue).toFixed(5))
getRef('get_quantity').value = parseFloat(((balance.rupee * fraction) / unitValue).toFixed(4))
} else {
getRef('get_total').value = parseFloat(((fraction * balance.flo) * rate.flo).toFixed(2))
getRef('get_quantity').value = parseFloat((balance.flo * fraction).toFixed(5))
console.log(fraction, balance.flo, floExchangeRate)
getRef('get_total').value = parseFloat((fraction * balance.flo * floExchangeRate).toFixed(2))
getRef('get_quantity').value = parseFloat((balance.flo * fraction).toFixed(4))
}
}
})
getRef('get_price').addEventListener('keyup', e => {
const unitValue = parseFloat(getRef('get_price').value) || rate.flo
const unitValue = parseFloat(getRef('get_price').value) || floExchangeRate
const quantity = parseFloat(getRef('get_quantity').value) || 0
getRef('get_total').value = parseFloat((quantity * unitValue).toFixed(2)) || 0
})
@ -1107,23 +1116,30 @@
})
getRef('get_total').addEventListener('keyup', e => {
const unitValue = parseFloat(getRef('get_price').value)
getRef('get_quantity').value = parseFloat((parseFloat(e.target.value) / unitValue).toFixed(5)) || 0
getRef('get_quantity').value = parseFloat((parseFloat(e.target.value) / unitValue).toFixed(4)) || 0
})
getRef('wallet_actions').addEventListener('click', e => {
if (e.target.closest('.button')) {
const target = e.target.closest('.button')
showPopup('wallet_popup')
const type = target.value
const asset = getRef('wallet_asset_selector').value
getRef('wallet_quantity_type').textContent = asset
getRef('wallet_popup__cta').textContent = `${type} ${asset}`
getRef('wallet_popup__cta').setAttribute('value', type)
getRef('wallet_popup__title').textContent = `${type} ${asset}`
getRef('get_user_amount').setAttribute('step', asset === 'FLO' ? '0.0001' : '0.01')
getRef('get_user_amount').setAttribute('min', asset === 'FLO' ? '0.0001' : '0.01')
if (type === 'withdraw') {
getRef('get_private_key').classList.add('hide-completely')
getRef('wallet_quantity_selector').classList.remove('hide-completely')
getRef('get_private_key').removeAttribute('required')
getRef('get_private_key').removeAttribute('hiderequired')
} else {
getRef('get_private_key').setAttribute('required', '')
getRef('wallet_quantity_selector').classList.add('hide-completely')
getRef('get_private_key').setAttribute('hiderequired', '')
getRef('get_private_key').classList.remove('hide-completely')
}
@ -1173,6 +1189,15 @@
getRef('wallet_form').animate(slideInRight, animOptions)
}
}
getRef('wallet_quantity_selector').addEventListener('click', e => {
// Get latest balance and exchange rate
if (e.target.closest('button')) {
const target = e.target.closest('button')
const asset = getRef('wallet_asset_selector').value.toLowerCase()
const fraction = parseFloat(target.value)
getRef('get_user_amount').value = parseFloat((balance[asset] * fraction).toFixed(asset === "flo" ? 4 : 2))
}
})
getRef('wallet_popup__cta').addEventListener('click', async e => {
const asset = getRef('wallet_asset_selector').value
const type = e.target.getAttribute('value')
@ -1189,9 +1214,9 @@
showWalletResult('success', `Sent ${asset} deposit request`, 'This may take upto 30 mins to reflect in your wallet.')
} else {
if (asset === 'FLO') {
await withdrawFLO(quantity, await proxy.secret)
await withdrawFLO(quantity, proxy.secret)
} else {
await withdrawRupee(quantity, await proxy.secret)
await withdrawRupee(quantity, proxy.secret)
}
showWalletResult('success', `Sent ${asset} withdraw request`, 'This may take upto 30 mins to reflect in your wallet.')
}
@ -1204,7 +1229,6 @@
}
})
const selectedOrders = new Map()
const slideInLeft = [
{
opacity: 0,
@ -1265,6 +1289,8 @@
transform: 'translateY(-1rem)'
},
]
const selectedOrders = new Map()
getRef('orders_list').addEventListener('change', e => {
const animOptions = {
duration: 150,
@ -1287,6 +1313,15 @@
getRef('my_orders_section__header').children[1].animate(slideInLeft, animOptions)
}
} else if (selectedOrders.size === 0 && getRef('my_orders_section__header').children[0].classList.contains('hide-completely')) {
hideMyOrdersOptions()
}
})
function hideMyOrdersOptions() {
const animOptions = {
duration: 150,
easing: 'ease',
fill: 'forwards'
}
getRef('my_orders_section__header').children[1].animate(slideOutRight, animOptions)
.onfinish = () => {
getRef('my_orders_section__header').children[1].classList.add('hide-completely')
@ -1294,7 +1329,6 @@
getRef('my_orders_section__header').children[0].animate(slideInRight, animOptions)
}
}
})
function clearSelection() {
getRef('orders_list').querySelectorAll('sm-checkbox[checked]').forEach(elem => elem.checked = false)
}
@ -1361,6 +1395,7 @@
})
setTimeout(() => {
target.remove()
refresh()
}, 200);
}
})
@ -1375,30 +1410,29 @@
getConfirmation('Cancel all selected orders?').then(async res => {
if (res) {
try {
let proxy_secret = await proxy.secret;
await Promise.all(
selectedOrders.map((type, id) => cancelOrder(type, id, proxy_secret))
)
selectedOrders.forEach((type, id) => {
getRef('orders_list').querySelector(`[data-id="${id}"]`).remove()
})
notify('All selected orders cancelled', 'success')
const proxy_secret = await proxy.secret;
const promises = [...selectedOrders].map(([id, type]) => cancelOrder(type, id, proxy_secret))
await Promise.all(promises)
selectedOrders.clear()
hideMyOrdersOptions()
}
catch (err) {
notify(err.data, 'error')
}
finally {
refresh()
}
}
})
}
function renderUserOrders() {
const { buyOrders, sellOrders, transactions } = accountDetails
let { buyOrders, sellOrders, transactions } = accountDetails
getRef('orders_list').innerHTML = '';
const frag = document.createDocumentFragment()
const ordersType = getRef('my_orders_category_selector').value
if (ordersType === 'open') {
const allOpenOrders = [...(buyOrders || myBuyOrders), ...(sellOrders || mySellOrders)].sort((a, b) => b.time_placed - a.time_placed)
const allOpenOrders = [...buyOrders, ...sellOrders].sort((a, b) => new Date(b.time_placed).getTime() - new Date(a.time_placed).getTime())
allOpenOrders.forEach(order => {
const { id, quantity, minPrice = undefined, maxPrice = undefined, time_placed } = order
const orderDetails = {
@ -1411,13 +1445,13 @@
frag.append(render.orderCard(orderDetails))
})
} else {
(transactions || myTransactions).forEach(transaction => {
const { floID, quantity, unitValue, tx_time, buyer, seller } = transaction
transactions.forEach(transaction => {
const { quantity, unitValue, tx_time, buyer, seller } = transaction
let type, other;
if (seller === floID) {
if (seller === userID) {
type = 'Sold';
other = buyer === floID ? 'MySelf' : buyer;
} else if (buyer === floID) {
other = buyer === userID ? 'MySelf' : buyer;
} else if (buyer === userID) {
type = 'Bought';
other = seller;
} else
@ -1446,7 +1480,7 @@
if (ordersType === 'open') {
try {
const [buyOrders, sellOrders] = await Promise.all([getBuyList(), getSellList()])
const allOpenOrders = [...(buyOrders), ...(sellOrders)].sort((a, b) => b.time_placed - a.time_placed)
const allOpenOrders = [...(buyOrders), ...(sellOrders)].sort((a, b) => new Date(b.time_placed).getTime() - new Date(a.time_placed).getTime())
allOpenOrders.forEach(order => {
const { floID, quantity, minPrice = undefined, maxPrice = undefined, time_placed } = order
const orderDetails = {
@ -1565,7 +1599,6 @@
Reject("Unable to fetch Proxy secret");
}
};
let tmp = localStorage.getItem("proxy_secret");
if (typeof tmp !== "string")
Reject("Unable to fetch Proxy secret");
@ -1580,6 +1613,7 @@
setValues(tmp);
} catch (error) {
Reject("Incorrect Password! Password Required for making transactions");
}
}).catch(_ => Reject("Password Required for making transactions"));
} else
@ -1588,9 +1622,10 @@
}
}
let floExchangeRate = 0
function updateRate() {
getRate().then(rate => {
rate.flo = rate
floExchangeRate = parseFloat(rate)
getRef('flo_rate').textContent = formatAmount(parseFloat(rate))
getRef('get_price').value = parseFloat(parseFloat(rate).toFixed(2))
}).catch(error => console.error(error))
@ -1606,23 +1641,22 @@
account();
}
function showBalance(containerId, availableBalance = 0, lockedBalance = 0) {
getRef(containerId).innerHTML = ''
function showBalance(type, availableBalance = 0, lockedBalance = 0) {
getRef(`${type}_balance`).innerHTML = ''
const templateToClone = lockedBalance ? 'locked_balance_template' : 'net_balance_template';
const card = getRef(templateToClone).content.cloneNode(true)
card.querySelector('.available-balance').textContent = availableBalance
card.querySelector('.available-balance').textContent = type === 'flo' ? parseFloat(availableBalance.toFixed(4)) : formatAmount(availableBalance)
if (lockedBalance) {
card.querySelector('.locked-balance').textContent = lockedBalance
card.querySelector('.locked-balance').textContent = type === 'flo' ? parseFloat(lockedBalance.toFixed(4)) : formatAmount(lockedBalance)
}
getRef(containerId).className = lockedBalance ? 'grid balance-card__amount-wrapper' : ''
getRef(containerId).parentNode.className = `balance-card ${lockedBalance ? 'is-locked' : ''}`
getRef(containerId).append(card)
getRef(`${type}_balance`).className = lockedBalance ? 'grid balance-card__amount-wrapper' : ''
getRef(`${type}_balance`).parentNode.className = `balance-card ${lockedBalance ? 'is-locked' : ''}`
getRef(`${type}_balance`).append(card)
}
const balance = {}
let accountDetails = {}
function account() {
getAccount().then(acc => {
getRef("login_form").classList.add('hide-completely')
@ -1641,14 +1675,14 @@
console.debug("FLO", flo_total, flo_locked, flo_net);
balance.flo = flo_net
showBalance("flo_balance", flo_net, flo_locked)
showBalance("flo", flo_net, flo_locked,)
//Rupee Balance
let rupee_total = acc.rupee_total;
let rupee_locked = acc.buyOrders.reduce((a, x) => a + x.quantity * x.maxPrice, 0);
let rupee_net = rupee_total - rupee_locked;
console.debug("RUPEE", rupee_total, rupee_locked, rupee_net);
balance.rupee = rupee_net
showBalance("rupee_balance", rupee_net, rupee_locked)
showBalance("rupee", rupee_net, rupee_locked)
//My orders
renderUserOrders();
proxy.secret.then(_ => null).catch(_ => null);
@ -1684,10 +1718,7 @@
},
logout() {
getConfirmation('Log out?', {
cancelText: 'Stay',
confirmText: 'Log out'
}).then(res => {
getConfirmation('Log out?', { cancelText: 'Stay', confirmText: 'Log out' }).then(res => {
if (res) {
logout().then(result => {
console.warn(result);