Finish trade UI

This commit is contained in:
liangping
2021-11-28 20:47:08 +08:00
parent a4ce55f36d
commit 273d382b87
4 changed files with 513 additions and 461 deletions
+249 -261
View File
@@ -14,277 +14,266 @@
@show="loadBalance"
>
<template #modal-header="" />
<b-overlay
:show="channels.length === 0"
rounded="sm"
>
<template #overlay>
<div class="text-center">
<p>
IBC Module is not enabled.
</p>
</div>
</template>
<validation-observer ref="simpleRules">
<b-form>
<b-row>
<b-col>
<b-form-group
label="Sender"
label-for="Account"
<validation-observer ref="simpleRules">
<b-form>
<b-row>
<b-col>
<b-form-group
label="Sender"
label-for="Account"
>
<b-input-group class="mb-25">
<b-input-group-prepend is-text>
<b-avatar
:src="account?account.logo:''"
size="18"
variant="light-primary"
rounded
/>
</b-input-group-prepend>
<b-form-input
:value="account?account.addr:address"
readonly
/>
</b-input-group>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Available Token"
label-for="Token"
>
<validation-provider
#default="{ errors }"
rules="required"
name="Token"
>
<b-form-select
v-model="token"
@change="tokenChange"
>
<template #first>
<b-form-select-option
value=""
>
-- Please select a token --
</b-form-select-option>
</template>
<b-form-select-option
v-for="item in balance"
:key="item.denom"
:value="item.denom"
>
{{ format(item) }}
</b-form-select-option>
</b-form-select>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Amount"
label-for="Amount"
>
<validation-provider
v-slot="{ errors }"
rules="required|regex:^([0-9\.]+)$"
name="amount"
>
<b-input-group class="mb-25">
<b-input-group-prepend is-text>
<b-avatar
:src="account?account.logo:''"
size="18"
variant="light-primary"
rounded
/>
</b-input-group-prepend>
<b-form-input
:value="account?account.addr:address"
readonly
/>
</b-input-group>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Available Token"
label-for="Token"
>
<validation-provider
#default="{ errors }"
rules="required"
name="Token"
>
<b-form-select
v-model="token"
@change="tokenChange"
>
<template #first>
<b-form-select-option
value=""
>
-- Please select a token --
</b-form-select-option>
</template>
<b-form-select-option
v-for="item in balance"
:key="item.denom"
:value="item.denom"
>
{{ format(item) }}
</b-form-select-option>
</b-form-select>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Amount"
label-for="Amount"
>
<validation-provider
v-slot="{ errors }"
rules="required|regex:^([0-9\.]+)$"
name="amount"
>
<b-input-group class="mb-25">
<b-form-input
id="Amount"
v-model="amount"
:state="errors.length > 0 ? false:null"
placeholder="Input a number"
type="number"
/>
<b-input-group-append is-text>
{{ printDenom() }}
</b-input-group-append>
</b-input-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Destination"
label-for="destination"
>
<validation-provider
#default="{ errors }"
rules="required"
name="destination"
>
<v-select
v-model="destination"
name="destination"
:options="destinationOptions"
placeholder="Select a channel"
/>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Recipient"
label-for="Recipient"
>
<validation-provider
#default="{ errors }"
rules="required"
name="recipient"
>
<b-input-group class="mb-25">
<b-form-input
id="Recipient"
v-model="recipient"
:state="errors.length > 0 ? false:null"
:placeholder="placeholder"
/>
</b-input-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Fee"
label-for="Fee"
>
<validation-provider
v-slot="{ errors }"
rules="required|integer"
name="fee"
>
<b-input-group>
<b-form-input v-model="fee" />
<b-input-group-append>
<b-form-select
v-model="feeDenom"
:options="feeDenoms"
value-field="denom"
text-field="denom"
/>
</b-input-group-append>
</b-input-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
<b-col cols="12">
<b-form-group>
<b-form-checkbox
v-model="advance"
name="advance"
value="true"
>
<small>Advance</small>
</b-form-checkbox>
</b-form-group>
</b-col>
</b-row>
<b-row v-if="advance">
<b-col cols="12">
<b-form-group
label="Gas"
label-for="gas"
>
<validation-provider
v-slot="{ errors }"
name="gas"
>
<b-form-input
id="gas"
v-model="gas"
id="Amount"
v-model="amount"
:state="errors.length > 0 ? false:null"
placeholder="Input a number"
type="number"
/>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
<b-col cols="12">
<b-form-group
label="Memo"
label-for="Memo"
<b-input-group-append is-text>
{{ printDenom() }}
</b-input-group-append>
</b-input-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Destination"
label-for="destination"
>
<validation-provider
#default="{ errors }"
rules="required"
name="destination"
>
<validation-provider
v-slot="{ errors }"
name="memo"
>
<v-select
v-model="destination"
name="destination"
:options="destinationOptions"
placeholder="Select a channel"
/>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Recipient"
label-for="Recipient"
>
<validation-provider
#default="{ errors }"
rules="required"
name="recipient"
>
<b-input-group class="mb-25">
<b-form-input
id="Memo"
v-model="memo"
max="2"
id="Recipient"
v-model="recipient"
:state="errors.length > 0 ? false:null"
:placeholder="placeholder"
/>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Wallet"
label-for="wallet"
</b-input-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Fee"
label-for="Fee"
>
<validation-provider
v-slot="{ errors }"
rules="required|integer"
name="fee"
>
<validation-provider
v-slot="{ errors }"
rules="required"
name="wallet"
<b-input-group>
<b-form-input v-model="fee" />
<b-input-group-append>
<b-form-select
v-model="feeDenom"
:options="feeDenoms"
value-field="denom"
text-field="denom"
/>
</b-input-group-append>
</b-input-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
<b-col cols="12">
<b-form-group>
<b-form-checkbox
v-model="advance"
name="advance"
value="true"
>
<small>Advance</small>
</b-form-checkbox>
</b-form-group>
</b-col>
</b-row>
<b-row v-if="advance">
<b-col cols="12">
<b-form-group
label="Gas"
label-for="gas"
>
<validation-provider
v-slot="{ errors }"
name="gas"
>
<b-form-input
id="gas"
v-model="gas"
type="number"
/>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
<b-col cols="12">
<b-form-group
label="Memo"
label-for="Memo"
>
<validation-provider
v-slot="{ errors }"
name="memo"
>
<b-form-input
id="Memo"
v-model="memo"
max="2"
/>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
<b-row>
<b-col>
<b-form-group
label="Wallet"
label-for="wallet"
>
<validation-provider
v-slot="{ errors }"
rules="required"
name="wallet"
>
<b-form-radio-group
v-model="wallet"
stacked
class="demo-inline-spacing"
>
<b-form-radio-group
<b-form-radio
v-model="wallet"
stacked
class="demo-inline-spacing"
name="wallet"
value="keplr"
class="d-none d-md-block"
>
<b-form-radio
v-model="wallet"
name="wallet"
value="keplr"
class="d-none d-md-block"
>
Keplr
</b-form-radio>
<b-form-radio
v-model="wallet"
name="wallet"
value="ledgerUSB"
>
<small>Ledger(USB)</small>
</b-form-radio>
<b-form-radio
v-model="wallet"
name="wallet"
value="ledgerBle"
class="mr-0"
>
<small>Ledger(Bluetooth)</small>
</b-form-radio>
</b-form-radio-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
</b-form>
</validation-observer>
{{ error }}
</b-overlay></b-modal>
Keplr
</b-form-radio>
<b-form-radio
v-model="wallet"
name="wallet"
value="ledgerUSB"
>
<small>Ledger(USB)</small>
</b-form-radio>
<b-form-radio
v-model="wallet"
name="wallet"
value="ledgerBle"
class="mr-0"
>
<small>Ledger(Bluetooth)</small>
</b-form-radio>
</b-form-radio-group>
<small class="text-danger">{{ errors[0] }}</small>
</validation-provider>
</b-form-group>
</b-col>
</b-row>
</b-form>
</validation-observer>
{{ error }}
</b-modal>
</div>
</template>
@@ -292,7 +281,7 @@
import { ValidationProvider, ValidationObserver } from 'vee-validate'
import {
BModal, BRow, BCol, BInputGroup, BInputGroupAppend, BFormInput, BAvatar, BFormGroup, BFormSelect, BFormSelectOption,
BForm, BFormRadioGroup, BFormRadio, BInputGroupPrepend, BFormCheckbox, BOverlay,
BForm, BFormRadioGroup, BFormRadio, BInputGroupPrepend, BFormCheckbox,
} from 'bootstrap-vue'
import {
required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
@@ -324,7 +313,6 @@ export default {
BFormRadio,
BFormCheckbox,
vSelect,
BOverlay,
ValidationProvider,
ValidationObserver,
+101 -82
View File
@@ -1,46 +1,43 @@
<template>
<div>
<dl class="d-none">
<dt>Available {{ computeAccounts }}</dt>
<dd class="d-flex justify-content-between mt-1">
<feather-icon
v-b-modal.trading-deposte-window
icon="PlusSquareIcon"
/>
<span> {{ available }} {{ type === 0 ? target: base }} </span>
</dd>
</dl>
<dl>
<dt>Price</dt>
<dd class="d-flex justify-content-end mt-1 align-items-end font-weight-bolder">
1&nbsp;<small class="text-muted mx-10"> {{ base }} </small>&nbsp;{{ price }}&nbsp;<small class="text-muted mx-10">{{ target }}</small>
</dd>
</dl>
<dl>
<dt>Swap Fee</dt>
<dd class="d-flex justify-content-end mt-1 font-weight-bolder">
{{ fee }}%
</dd>
</dl>
<b-form-group>
<b-card
bg-variant="light-secondary"
text-variant="black"
>
<div class="d-flex justify-content-between">
<span>Amount</span>
<small class="text-muted">Available {{ available }} {{ type === 0 ? target: base }}
<span class="font-weight-bolder">Balance </span>
<span>
<feather-icon
v-b-modal.trading-deposte-window
icon="PlusSquareIcon"
/></small>
class="text-primary"
/>
<small> {{ available }} {{ type === 0 ? target: base }} </small>
</span>
</div>
<div class="d-flex justify-content-between mt-1">
<span class="font-weight-bolder">Price</span>
<span>{{ price }}&nbsp;<small class="text-muted mx-10">{{ target }} </small>&nbsp;1&nbsp;<small class="text-muted mx-10"> {{ base }}</small>&nbsp;</span>
</div>
<div class="d-flex justify-content-between mt-1">
<span class="font-weight-bolder">Swap Fee</span>
<span>{{ fee }}%</span>
</div>
</b-card>
<b-form-group>
<div>
<span>Quantity</span>
</div>
<b-input-group class="input-group-merge">
<b-form-input
id="amount"
v-model="amount"
type="number"
placeholder="Amount"
placeholder="Quantity"
@change="changeAmount()"
/>
<b-input-group-append is-text>
{{ type === 0 ? target: base }}
{{ base }}
</b-input-group-append>
</b-input-group>
<b-alert
@@ -54,19 +51,29 @@
</b-form-group>
<b-form-group>
<div class="d-flex justify-content-between">
<span>Total</span>
<small class="text-muted">${{ localPrice }}</small>
<span>Volume</span>
<span>
<small
v-if="localPrice > 0"
class="text-muted mr-1"
>${{ localPrice }}</small>
<feather-icon
id="popover-trading-setting"
icon="SettingsIcon"
class="text-primary"
/>
</span>
</div>
<b-input-group class="input-group-merge">
<b-form-input
id="total"
v-model="total"
type="number"
placeholder="Total"
placeholder="Volume"
@change="changeTotal()"
/>
<b-input-group-append is-text>
{{ type === 1 ? target: base }}
{{ target }}
</b-input-group-append>
</b-input-group>
<b-alert
@@ -78,39 +85,48 @@
</div>
</b-alert>
</b-form-group>
<b-form-group class="d-none">
<label>
Slippage Tolerance
</label>
<div>
<b-form-radio
v-model="slippage"
value="0.01"
button
button-variant="outline-secondary"
>
1%
</b-form-radio>
<b-form-radio
v-model="slippage"
value="0.025"
button
block
class="px-1"
button-variant="outline-secondary"
>
2.5%
</b-form-radio>
<b-form-radio
v-model="slippage"
value="0.05"
button
button-variant="outline-secondary"
>
5%
</b-form-radio>
</div>
</b-form-group>
<b-popover
target="popover-trading-setting"
placement="left"
triggers="hover"
boundary="scrollParent"
boundary-padding="0"
class="px-0"
>
<b-form-group>
<label>
Slippage Tolerance
</label>
<div>
<b-form-radio
v-model="slippage"
value="0.01"
button
button-variant="outline-secondary"
>
1%
</b-form-radio>
<b-form-radio
v-model="slippage"
value="0.025"
button
block
class="px-1"
button-variant="outline-secondary"
>
2.5%
</b-form-radio>
<b-form-radio
v-model="slippage"
value="0.05"
button
button-variant="outline-secondary"
>
5%
</b-form-radio>
</div>
</b-form-group>
</b-popover>
<b-form-group
label="Signer"
label-for="wallet"
@@ -147,6 +163,7 @@
<b-button
v-if="address"
block
:disabled="type === 0? total > available : amount > available"
:variant="type === 0 ? 'success': 'danger'"
@click="sendTx()"
>
@@ -164,7 +181,10 @@
</b-form-group>
<b-alert
variant="danger"
show
:show="dismissCountDown"
dismissible
@dismissed="dismissCountDown=0"
@dismiss-count-down="countDownChanged"
>
<div class="alert-body">
{{ error }}
@@ -189,7 +209,7 @@
<script>
import {
BFormInput, BButton, BAlert, BFormGroup, BInputGroup, BInputGroupAppend, BFormRadio, BFormRadioGroup,
BFormInput, BButton, BAlert, BFormGroup, BInputGroup, BInputGroupAppend, BFormRadio, BFormRadioGroup, BCard, BPopover,
} from 'bootstrap-vue'
import FeatherIcon from '@/@core/components/feather-icon/FeatherIcon.vue'
import {
@@ -203,10 +223,12 @@ export default {
components: {
BAlert,
BButton,
BCard,
BFormInput,
BFormRadio,
BFormRadioGroup,
BFormGroup,
BPopover,
BInputGroup,
BInputGroupAppend,
FeatherIcon,
@@ -241,6 +263,8 @@ export default {
wallet: 'keplr',
// base: '',
// target: '',
dismissSecs: 15,
dismissCountDown: 0,
}
},
computed: {
@@ -256,7 +280,7 @@ export default {
return p1 && p2 ? (p1.usd / p2.usd).toFixed(4) : '-'
},
localPrice() {
const p1 = this.$store.state.chains.quotes[this.type === 1 ? this.target : this.base]
const p1 = this.$store.state.chains.quotes[this.target]
return p1 && this.total > 0 ? (p1.usd * this.total).toFixed(2) : '-'
},
computeAccounts() {
@@ -280,10 +304,7 @@ export default {
return 0
},
fee() {
if (this.pool) {
return percent(this.pool.poolParams.swapFee)
}
return '-'
return percent(this.pool?.poolParams?.swapFee || '')
},
},
created() {
@@ -318,18 +339,10 @@ export default {
formatAvailable() {
},
changeAmount() {
if (this.type === 0) {
this.total = this.amount / this.price
} else {
this.total = this.amount * this.price
}
this.total = parseFloat((this.amount * this.price).toFixed(6))
},
changeTotal() {
if (this.type === 0) {
this.amount = this.total * this.price
} else {
this.amount = this.total / this.price
}
this.amount = parseFloat((this.total / this.price).toFixed(6))
},
async sendTx() {
const tokenOutDenom = this.pool.poolAssets[this.type === 0 ? 0 : 1].token.denom
@@ -356,10 +369,12 @@ export default {
if (txMsgs.length === 0) {
this.error = 'No delegation found'
this.dismissCountDown = this.dismissSecs
return ''
}
if (!this.accountNumber) {
this.error = 'Account number should not be empty!'
this.dismissCountDown = this.dismissSecs
return ''
}
@@ -406,11 +421,15 @@ export default {
// })
}).catch(e => {
this.error = e
this.dismissCountDown = this.dismissSecs
})
// Send tokens
// return client.sendTokens(this.address, this.recipient, sendCoins, this.memo)
return ''
},
countDownChanged(dismissCountDown) {
this.dismissCountDown = dismissCountDown
},
},
}
</script>