RanchiMall/exchangemarket
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed incorrect date bug

Browse Source
This commit is contained in:
sairaj mote 2022-04-11 00:06:23 +05:30
parent b50c0c032e
commit 2320a5d404
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
docs/index.html
View File

@ -671,11 +671,23 @@
</div> </div>
</div> </div>
</template> </template>
<script>
/**
* @yaireo/relative-time - javascript function to transform timestamp or date to local relative-time
*
* @version v1.0.0
* @homepage https://github.com/yairEO/relative-time
*/
!function (e, t) { var o = o || {}; "function" == typeof o && o.amd ? o([], t) : "object" == typeof exports && "object" == typeof module ? module.exports = t() : "object" == typeof exports ? exports.RelativeTime = t() : e.RelativeTime = t() }(this, (function () { const e = { year: 31536e6, month: 2628e6, day: 864e5, hour: 36e5, minute: 6e4, second: 1e3 }, t = "en", o = { numeric: "auto" }; function n(e) { e = { locale: (e = e || {}).locale || t, options: { ...o, ...e.options } }, this.rtf = new Intl.RelativeTimeFormat(e.locale, e.options) } return n.prototype = { from(t, o) { const n = t - (o || new Date); for (let t in e) if (Math.abs(n) > e[t] || "second" == t) return this.rtf.format(Math.round(n / e[t]), t) } }, n }));
</script>
<script id="ui_utils"> <script id="ui_utils">
// Global variables // Global variables
const domRefs = {}; const domRefs = {};
let timerId; let timerId;
const currentYear = new Date().getFullYear(); const currentYear = new Date().getFullYear();
const relativeTime = new RelativeTime({ style: 'narrow' });
//Checks for internet connection status //Checks for internet connection status
if (!navigator.onLine) if (!navigator.onLine)
@ -824,18 +836,12 @@
} }
} }
function getFormattedTime(timeString, relative) { function getFormattedTime(time, format) {
try { try {
console.log(timeString) let [day, month, date, year] = new Date(time).toString().split(' '),
const [date, time] = timeString.split('T') minutes = new Date(time).getMinutes(),
const [year, month, day] = date.split('-').map(v => parseInt(v)) hours = new Date(time).getHours(),
let [hours, minutes] = time.split(':').map(v => parseInt(v)) currentTime = new Date().toString().split(' ')
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 - 1]
minutes = minutes < 10 ? `0${minutes}` : minutes minutes = minutes < 10 ? `0${minutes}` : minutes
let finalHours = ``; let finalHours = ``;
@ -847,27 +853,13 @@
finalHours = `${hours}:${minutes}` finalHours = `${hours}:${minutes}`
finalHours = hours >= 12 ? `${finalHours} PM` : `${finalHours} AM` finalHours = hours >= 12 ? `${finalHours} PM` : `${finalHours} AM`
if (relative) { switch (format) {
if (year == currentYear) { case 'date-only':
if ((currentTime.getMonth() + 1) === month) { return `${month} ${date}, ${year}`;
const dateDiff = (parseInt(currentTimeFrag[2]) - parseInt(day)) break;
if (dateDiff === 0) default:
return `${finalHours}`; return `${month} ${date} ${year}, ${finalHours}`;
else if (dateDiff === 1)
return `Yesterday`;
else if (dateDiff > 1 && dateDiff < 8)
return currentTimeFrag[0];
else
return ` ${day} ${monthName}`;
} }
else
return ` ${day} ${monthName}`;
}
else
return `${monthName} ${year}`;
}
else
return `${finalHours}, ${monthName} ${day} ${year}`;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
return time; return time;
@ -1224,7 +1216,7 @@
card.querySelector('.order-card__quantity').textContent = `${quantity} ${asset}` card.querySelector('.order-card__quantity').textContent = `${quantity} ${asset}`
card.querySelector('.order-card__price-type').textContent = type === 'buy' ? 'Max price' : 'Min price' card.querySelector('.order-card__price-type').textContent = type === 'buy' ? 'Max price' : 'Min price'
card.querySelector('.order-card__price').textContent = formatAmount(price) card.querySelector('.order-card__price').textContent = formatAmount(price)
card.querySelector('.order-card__time').textContent = getFormattedTime(time, true) card.querySelector('.order-card__time').textContent = relativeTime.from(time)
return card return card
}, },
transactionCard(transactionDetails = {}) { transactionCard(transactionDetails = {}) {