dexorder/web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status timezone sync

Browse Source
This commit is contained in:
Tim
2024-04-23 22:16:01 -04:00
parent e74c7320a0
commit b681fb5324
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/components/Status.vue
View File

@@ -2,7 +2,7 @@
<div>
<v-data-table :headers="datatableHeaders" :items="orders" item-value="id"
item-selectable="selectable" :show-select="false" :show-expand="true">
<template v-slot:item.start="{ value }">{{ dateString(value) }}</template>
<template v-slot:item.start="{ value }">{{ timestampString(value) }}</template>
<template v-slot:item.input="{ item }">
<span v-if="item.order.amountIsInput">
<span v-if="item.state > OrderState.Signing">
@@ -114,18 +114,22 @@
</span>
</suspense>
</td>
<td class="text-left">
<span class="mx-3">{{ describeTrancheTime(item, true, t) }}</span>
<span class="mx-3">{{ describeTrancheTime(item, false, t) }}</span>
<span class="mx-3" v-if="t.marketOrder">market order</span>
<line-price class="mx-3" v-if="!t.marketOrder"
:base="item.token0" :quote="item.token1"
:b="t.minIntercept" :m="t.minSlope" :is-min="true"
:buy="item.order.tokenIn===item.token1" :show-btn="true"/>
<line-price class="mx-3" v-if="!t.marketOrder"
:base="item.token0" :quote="item.token1"
:b="t.maxIntercept" :m="t.maxSlope" :is-min="false"
:buy="item.order.tokenIn===item.token1" :show-btn="true"/>
<td class="d-flex align-center text-left">
<div class="text-right">
<div class="mx-3">{{ describeTrancheTime(item, true, t) }}</div>
<div class="mx-3">{{ describeTrancheTime(item, false, t) }}</div>
</div>
<div>
<div class="mx-3" v-if="t.marketOrder">market order</div>
<line-price class="mx-3" v-if="!t.marketOrder"
:base="item.token0" :quote="item.token1"
:b="t.minIntercept" :m="t.minSlope" :is-min="true"
:buy="item.order.tokenIn===item.token1" :show-btn="true"/>
<line-price class="mx-3" v-if="!t.marketOrder"
:base="item.token0" :quote="item.token1"
:b="t.maxIntercept" :m="t.maxSlope" :is-min="false"
:buy="item.order.tokenIn===item.token1" :show-btn="true"/>
</div>
</td>
</tr>
</tbody>
@@ -144,7 +148,7 @@ import {useStore} from "@/store/store";
import {computed, defineAsyncComponent, ref} from "vue";
import Btn from "@/components/Btn.vue"
import {cancelOrder, PendingOrderState, useWalletStore} from "@/blockchain/wallet.js";
import {dateString} from "@/misc.js";
import {timestampString} from "@/misc.js";
import {isOpen, OrderState} from "@/blockchain/orderlib.js";
import Pulse from "@/components/Pulse.vue";
@@ -243,8 +247,8 @@ const orders = computed(()=>{
/*
o.tranches = o.tranches.map((tranche)=>{
const t = {...tranche}
// t.startTime = t.startTimeIsRelative ? intervalString(t.startTime) : dateString(t.startTime)
// t.endTime = t.endTimeIsRelative ? intervalString(t.endTime) : dateString(t.endTime)
// t.startTime = t.startTimeIsRelative ? intervalString(t.startTime) : timestampString(t.startTime)
// t.endTime = t.endTimeIsRelative ? intervalString(t.endTime) : timestampString(t.endTime)
return t
})
*/
@@ -278,12 +282,12 @@ function describeTrancheTime(st, isStart, t) {
if( isStart && t.startTime > 0 ) {
const started = t.startTimeIsRelative ? st.start + t.startTime : t.startTime
result += started*1000 < Date.now() ? 'Activated ' : 'Activates '
result += dateString(started) + ' '
result += timestampString(started) + ' '
}
if( !isStart && t.endTime < 4294967295 ) {
const ended = t.endTimeIsRelative ? st.start + t.endTime : t.endTime
result += ended*1000 < Date.now() ? 'Expired ' : 'Expires '
result += dateString(ended)
result += ended*1000 < Date.now() ? 'Ended ' : 'Ending '
result += timestampString(ended)
}
return result
}