From 890f21369ccb6625fc6465bb1d6c043ccf8cb02b Mon Sep 17 00:00:00 2001 From: toanpham96 Date: Thu, 16 Nov 2023 15:28:12 +0700 Subject: [PATCH 01/13] update --- app/App.vue | 26 +++---- app/assets/images/favicon-dark.png | Bin 0 -> 683 bytes app/assets/images/favicon-dark.svg | 4 ++ app/assets/images/logo-tomoissuer.svg | 53 ++++----------- app/assets/scss/components/_footer.scss | 64 ++++++++++-------- app/assets/scss/components/_header.scss | 2 +- app/assets/scss/components/_login.scss | 4 +- app/assets/scss/components/_search.scss | 4 +- app/assets/scss/components/_token.scss | 16 ++--- app/assets/scss/components/_welcome.scss | 1 + app/assets/scss/elements/_buttons.scss | 16 ++--- app/assets/scss/elements/_elements.scss | 2 +- app/assets/scss/elements/_fields.scss | 19 ++++-- app/assets/scss/elements/_tables.scss | 4 +- app/assets/scss/elements/_typography.scss | 6 +- app/assets/scss/settings/_colors.scss | 24 ++++--- app/components/Login.vue | 4 +- app/components/Token.vue | 2 +- app/components/Welcome.vue | 10 +-- app/components/accounts/ListToken.vue | 6 +- app/components/applying/ConfirmToken.vue | 4 +- app/components/applying/CreateToken.vue | 24 +++---- .../bridgeToken/ConfirmBridgeToken.vue | 4 +- .../bridgeToken/CreateBridgeToken.vue | 2 +- app/components/applytomo/TomoZApplication.vue | 10 +-- app/components/applytomo/TomoZCondition.vue | 8 +-- app/components/applytomo/TomoZConfirm.vue | 2 +- app/components/applytomox/TomoXCondition.vue | 2 +- app/components/applytomox/TomoXConfirm.vue | 8 +-- app/components/burn/BurnToken.vue | 2 +- app/components/deposit/DepositConfirm.vue | 4 +- app/components/deposit/DepositFee.vue | 12 ++-- app/components/donate/ConfirmDonate.vue | 4 +- app/components/donate/DonateToken.vue | 14 ++-- app/components/reissue/Reissue.vue | 2 +- index-prod.html | 20 ++++-- index.html | 38 +++++++---- 37 files changed, 225 insertions(+), 202 deletions(-) create mode 100644 app/assets/images/favicon-dark.png create mode 100644 app/assets/images/favicon-dark.svg diff --git a/app/App.vue b/app/App.vue index eaa3212..2b8ea6e 100644 --- a/app/App.vue +++ b/app/App.vue @@ -6,12 +6,12 @@ toggleable="lg" type="light" class="tomo-header" - variant="white"> + >
+ alt="logo vicissuer"/> Balance: - {{ balance }} TOMO + {{ balance }} VIC
- TomoIssuer © {{ (new Date()).getFullYear() }} - + VICIssuer © {{ (new Date()).getFullYear() }} -
    -
    • + target="_blank"> -->
    • -
    • -
    • --> +
diff --git a/app/assets/images/favicon-dark.png b/app/assets/images/favicon-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7482c779f8896ead7828073a3505e79a9b56b2 GIT binary patch literal 683 zcmeAS@N?(olHy`uVBq!ia0vp^#z1Vs!3HGNmoQ8MQk(@Ik;M!QVyYm_=ozH)0Vv2= z9OUlAu5W|G;eX(wj8*<(hZZfDcc2a-Y@{O~Xt#+|m%Y|+a@no5& zZmj%w^S0mC`~Lf{*wf=*t8{%Y_p~2Qbo#Y5Lg#_L-y=$qeVqCiWqkK;$vtiJmwPgYmBQnm?;VZj`FZB}PXDE|bPb;y+h3uBJZGl<5nb3K zVi<79I`H)VnTzLasXwHjbH3?-#p=0JFJ3>zAI0}VI--4})!ND5U+EgF7H*Jh{(p4> zdxG$XUH|5stG#ZT^|UYKY(=Q)sxM3A zGJfbCS1wey6P@VBFfIKVTSQlTk+FvR(465>D>~aBd14B+%)etL!CyCv + + + diff --git a/app/assets/images/logo-tomoissuer.svg b/app/assets/images/logo-tomoissuer.svg index e495d32..f2ca613 100644 --- a/app/assets/images/logo-tomoissuer.svg +++ b/app/assets/images/logo-tomoissuer.svg @@ -1,40 +1,13 @@ - - - - - - Asset 55 - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff --git a/app/assets/scss/components/_footer.scss b/app/assets/scss/components/_footer.scss index c4d65dd..9ed5e9e 100644 --- a/app/assets/scss/components/_footer.scss +++ b/app/assets/scss/components/_footer.scss @@ -8,6 +8,8 @@ align-items: flex-end; } .tomo-copyright { + color: $color-sig; + font-weight: 600; } .tomo-meta-links { padding-top: 15px; @@ -17,39 +19,45 @@ } li { display: inline-block; - padding: 0px 25px; + padding: 0px 16px; position: relative; + &:first-child{ + padding-left: 0; + } @include media-breakpoint-down(md) { padding: 2px 10px; } - &::after { - content: ""; - background: $color-text-gray; - width: 1px; - height: 15px; - position: absolute; - right: 0; - margin-top: 4px; - @include media-breakpoint-down(md) { - height: 12px; - margin-top: 5px; - } - } - &:first-child { - @include media-breakpoint-up(lg) { - padding-left: 0; - } - } - &:last-child { - @include media-breakpoint-up(lg) { - padding-right: 0; - } - &::after { - display: none; - } - } + // &::after { + // content: ""; + // background: $color-text-gray; + // width: 1px; + // height: 15px; + // position: absolute; + // right: 0; + // margin-top: 4px; + // @include media-breakpoint-down(md) { + // height: 12px; + // margin-top: 5px; + // } + // } + // &:first-child { + // @include media-breakpoint-up(lg) { + // padding-left: 0; + // } + // } + // &:last-child { + // @include media-breakpoint-up(lg) { + // padding-right: 0; + // } + // &::after { + // display: none; + // } + // } a { - color: $color-text-gray; + color: $color-sig; + border-bottom: 1px solid $color-border-default; + padding-bottom: 3px; + text-transform: uppercase; &:hover { color: $color-text-violet; } diff --git a/app/assets/scss/components/_header.scss b/app/assets/scss/components/_header.scss index 1abbca6..fae04a3 100644 --- a/app/assets/scss/components/_header.scss +++ b/app/assets/scss/components/_header.scss @@ -1,6 +1,6 @@ // Style CSS Header .tomo-header { - box-shadow: $boxshadow-default; + background-color: $background-primary; .tmp-btn-transparent { a.nav-link { @include transit; diff --git a/app/assets/scss/components/_login.scss b/app/assets/scss/components/_login.scss index a37e6ad..1acc353 100644 --- a/app/assets/scss/components/_login.scss +++ b/app/assets/scss/components/_login.scss @@ -19,7 +19,6 @@ margin-bottom: 15px; } a { - border-radius: $boderradius-default; color: $color-text-gray; border: 0; display: flex; @@ -31,6 +30,7 @@ margin: 2px; max-width: 250px; padding: 2em 1em; + border: 1px solid transparent; @include media-breakpoint-only(md) { width: 60%; margin: 0 auto!important; @@ -50,7 +50,7 @@ &.active, &:hover { background: #fff; - box-shadow: $boxshadow-default; + border-color: $background-blue; } &.active { font-weight: 500; diff --git a/app/assets/scss/components/_search.scss b/app/assets/scss/components/_search.scss index 7b06a7e..9808cb6 100644 --- a/app/assets/scss/components/_search.scss +++ b/app/assets/scss/components/_search.scss @@ -59,8 +59,8 @@ } .autocomplete-results { background: #fff; - border-radius: 0 0 10px 10px; - box-shadow: $boxshadow-default; + border-radius: 0; + box-shadow: 0 !important; list-style: none; margin: 0; max-height: 268px; diff --git a/app/assets/scss/components/_token.scss b/app/assets/scss/components/_token.scss index 0133772..8cee10a 100644 --- a/app/assets/scss/components/_token.scss +++ b/app/assets/scss/components/_token.scss @@ -10,8 +10,8 @@ margin-top: 1em; } .btn-group .btn-link { - border-radius: $boderradius-default; - box-shadow: $boxshadow-default; + // border-radius: $boderradius-default; + // box-shadow: $boxshadow-default; margin-left: 30px; display: flex; align-items: center; @@ -30,8 +30,8 @@ width: 100%; @include fsz(16); @include media-breakpoint-up(lg) { - border-radius: $boderradius-default; - box-shadow: $boxshadow-default; + // border-radius: $boderradius-default; + // box-shadow: $boxshadow-default; padding: 1.5em 0; } li { @@ -45,7 +45,7 @@ .apply-trc { background: $background-blue; @include fsz(14); - border-radius: 30px; + // border-radius: 30px; padding: 2px 10px; color: #fff; margin-left: 5px; @@ -53,7 +53,7 @@ .apply-tomoz { background: $background-violet; @include fsz(14); - border-radius: 30px; + // border-radius: 30px; padding: 2px 10px; color: #fff; margin-left: 7px; @@ -67,8 +67,8 @@ } .box-item { background: #fff; - border-radius: $boderradius-default; - box-shadow: $boxshadow-default; + // border-radius: $boderradius-default; + // box-shadow: $boxshadow-default; padding: 1.2em; height: 100%; p { diff --git a/app/assets/scss/components/_welcome.scss b/app/assets/scss/components/_welcome.scss index 3d4073e..133a069 100644 --- a/app/assets/scss/components/_welcome.scss +++ b/app/assets/scss/components/_welcome.scss @@ -220,6 +220,7 @@ margin-top: 0.5em; a { color: $color-text-blue !important; + border-bottom: 2px solid $color-border-default; } } .tomo-logo { diff --git a/app/assets/scss/elements/_buttons.scss b/app/assets/scss/elements/_buttons.scss index 4fcbe8e..4bea059 100755 --- a/app/assets/scss/elements/_buttons.scss +++ b/app/assets/scss/elements/_buttons.scss @@ -4,7 +4,7 @@ input[type="reset"], input[type="submit"] { @include fsz(14); border: 0px; - border-radius: 50%; + border-radius: 0; padding: .6em 1em; &:active, @@ -25,7 +25,7 @@ button { background: $background-blue; border: 2px solid $background-blue; color: $color-text-white!important; - border-radius: 30px; + border-radius: 0 !important; display: flex; align-items: center; justify-content: center; @@ -73,7 +73,7 @@ input { background: $background-blue; border: 2px solid $background-blue; color: $color-text-white!important; - border-radius: 30px; + border-radius: 0 !important; display: flex; align-items: center; justify-content: center; @@ -102,7 +102,7 @@ input { background: transparent; border: 2px solid $background-blue; color: $color-text-blue!important; - border-radius: 30px; + border-radius: 0 !important; display: flex; align-items: center; justify-content: center; @@ -132,7 +132,7 @@ input { background: $background-blue; border: 2px solid $background-blue; color: $color-text-white!important; - border-radius: 10px; + // border-radius: 10px; display: flex; align-items: center; justify-content: center; @@ -161,7 +161,7 @@ input { background: $background-violet; border: 2px solid $background-violet; color: $color-text-white!important; - border-radius: 30px; + border-radius: 0 !important; display: flex; align-items: center; justify-content: center; @@ -187,7 +187,7 @@ input { background: transparent; border: 2px solid $background-violet; color: $color-text-violet!important; - border-radius: 30px; + border-radius: 0 !important; display: flex; align-items: center; justify-content: center; @@ -220,7 +220,7 @@ input { background: $background-blue; border: 2px solid $background-blue; color: $color-text-white!important; - border-radius: 30px; + border-radius: 0 !important; display: flex; align-items: center; justify-content: center; diff --git a/app/assets/scss/elements/_elements.scss b/app/assets/scss/elements/_elements.scss index 2ce5e30..158bf5c 100755 --- a/app/assets/scss/elements/_elements.scss +++ b/app/assets/scss/elements/_elements.scss @@ -10,7 +10,7 @@ html { body { @include fsz(14); - background-color: #ffffff; + background-color: $background-default; color: $color-text-default; font-family: $font-quicksand; } diff --git a/app/assets/scss/elements/_fields.scss b/app/assets/scss/elements/_fields.scss index f831127..75ab599 100755 --- a/app/assets/scss/elements/_fields.scss +++ b/app/assets/scss/elements/_fields.scss @@ -16,8 +16,8 @@ input[type="color"], textarea { background-color: $background-white; color: $color-text-default; - border-radius: $boderradius-default; - box-shadow: $boxshadow-default; + border-radius: 0; + // box-shadow: $boxshadow-default; border: none; display: block; width: 100%; @@ -44,12 +44,23 @@ textarea { color: #ccc; } } +.form-control:focus{ + border-color: $color-border-default; + box-shadow: 0 !important; +} // Style input radio .custom-control-input:checked ~ .custom-control-label::before { - border-color: #01b2c8; - background-color: #01b2c8; + border-color: $background-blue; + background-color: $background-blue; +} +.custom-control-input:focus ~ .custom-control-label::before { + box-shadow: unset !important; +} +.custom-control-input:not(:disabled):active ~ .custom-control-label::before{ + background: transparent; + border: $background-blue; } //template style form diff --git a/app/assets/scss/elements/_tables.scss b/app/assets/scss/elements/_tables.scss index 12c0277..698363e 100755 --- a/app/assets/scss/elements/_tables.scss +++ b/app/assets/scss/elements/_tables.scss @@ -19,8 +19,8 @@ table, .tomo_main_table { @include media-breakpoint-up(lg) { background: $background-white; - border-radius: $boderradius-default; - box-shadow: $boxshadow-default; + // border-radius: $boderradius-default; + // box-shadow: $boxshadow-default; padding: 1em; } tbody { diff --git a/app/assets/scss/elements/_typography.scss b/app/assets/scss/elements/_typography.scss index f7bbf1f..95588a6 100755 --- a/app/assets/scss/elements/_typography.scss +++ b/app/assets/scss/elements/_typography.scss @@ -62,7 +62,7 @@ .tmp-title-large { @include fsz-cha(28,24,24); font-family: $font-baijam; - color: $color-text-default; + color: $color-sig; font-weight: 650; &.oranges { color: $color-text-oranges; @@ -81,7 +81,7 @@ .tmp-title-big { @include fsz-cha(55, 45,25); font-family: $font-baijam; - color: $color-text-default; + color: $color-sig; font-weight: 650; &.oranges { color: $color-text-oranges; @@ -107,6 +107,6 @@ } .custom-checkmark { - color: #00bad1; + color: $background-blue; font-size: 20px; } \ No newline at end of file diff --git a/app/assets/scss/settings/_colors.scss b/app/assets/scss/settings/_colors.scss index 601c7b4..1104ce5 100644 --- a/app/assets/scss/settings/_colors.scss +++ b/app/assets/scss/settings/_colors.scss @@ -1,14 +1,18 @@ // Text color setting -$color-link-default: #0093FF; -$color-link-default-active: #1384D7; -$color-text-default: #464555; +$color-link-default: #675C51; +$color-link-default-active: #675C51; +$color-text-default: #6B6B6B; $color-text-gray: #464555; $color-text-white: #ffffff; -$color-text-oranges: #FF4696; -$color-text-blue: #00bad1; +$color-text-oranges: #141414; +$color-text-blue: #675C51; $color-text-violet: #5565c7; $color-text-yellow: #ffaf01; +$color-sig: #141414; +$color-border-default: #AFA9A1; + + .text-gray { color: $color-text-gray; } @@ -29,15 +33,17 @@ $color-text-yellow: #ffaf01; } //background color setting -$background-default: #F3F6FC; +$background-default: #E0DED8; $background-transparent: transparent; $background-white: #ffffff; -$background-oranges: #FF4696; -$background-blue: #00bad1; -$background-blue-active: #0699AC; +$background-oranges: #141414; +$background-blue: #766B60; +$background-blue-active: #766B60; $background-violet: #5565c7; $background-violet-active: #3D4DAC; +$background-primary: #EBE9E5; + diff --git a/app/components/Login.vue b/app/components/Login.vue index 31ffb47..32c058c 100644 --- a/app/components/Login.vue +++ b/app/components/Login.vue @@ -100,7 +100,7 @@ m/44'/889'/0'/0 - with TomoChain App (on Ledger). + with Viction App (on Ledger).
@@ -197,7 +197,7 @@ m/44'/889'/0'/0 - for TomoChain path. + for Viction path.
diff --git a/app/components/Token.vue b/app/components/Token.vue index 754203f..5534d46 100644 --- a/app/components/Token.vue +++ b/app/components/Token.vue @@ -257,7 +257,7 @@

  • TRC-21 fee fund

    - {{ formatNumber(poolingFee) }} TOMO + {{ formatNumber(poolingFee) }} VIC Deposit more diff --git a/app/components/Welcome.vue b/app/components/Welcome.vue index 7a4b480..cf8f5ff 100644 --- a/app/components/Welcome.vue +++ b/app/components/Welcome.vue @@ -1,7 +1,7 @@ diff --git a/app/components/applying/ConfirmToken.vue b/app/components/applying/ConfirmToken.vue index 766e2ed..3dc25b2 100644 --- a/app/components/applying/ConfirmToken.vue +++ b/app/components/applying/ConfirmToken.vue @@ -37,7 +37,7 @@ Est. Issuance Fee - ~{{ txFee }} TOMO + ~{{ txFee }} VIC Code review @@ -204,7 +204,7 @@ export default { self.account = await self.getAccount() if (self.balance.isLessThan(self.txFee)) { self.loading = false - self.$toasted.show('Not enough TOMO', { type: 'error' }) + self.$toasted.show('Not enough VIC', { type: 'error' }) } else { // const compiledContract = await axios.post('/api/token/compileContract', { // name: self.tokenName, diff --git a/app/components/applying/CreateToken.vue b/app/components/applying/CreateToken.vue index d9b7079..d514814 100644 --- a/app/components/applying/CreateToken.vue +++ b/app/components/applying/CreateToken.vue @@ -15,7 +15,7 @@ type="text" autocomplete="off" maxlength="20" - placeholder="Please use only Latin letters and numbers, e.g. “TomoChain”" + placeholder="Please use only Latin letters and numbers, e.g. “Viction”" @input="onChangeName" @change="onChangeName"/>
    - Please use only Latin letters and numbers, e.g. “TomoChain” + Please use only Latin letters and numbers, e.g. Viction --> @@ -46,7 +46,7 @@ autocomplete="off" type="text" maxlength="5" - placeholder="Please use only Latin letters and numbers, e.g. “TOMO”" + placeholder="Please use only Latin letters and numbers, e.g. “VIC”" @input="onChangeSymbol" @change="onChangeSymbol"/>
    - Please use only Latin letters and numbers, e.g. “TOMO” + Please use only Latin letters and numbers, e.g. “VIC” --> @@ -214,8 +214,8 @@ new - TRC20 is the most standard token on TomoChain. - Transaction fees are paid through the native TOMO token. + TRC20 is the most standard token on Viction. + Transaction fees are paid through the native VIC token. @@ -246,7 +246,7 @@
    - ~{{ txFee }} TOMO + ~{{ txFee }} VIC
    Est. Issuance Fee - ~{{ issueFee }} TOMO + ~{{ issueFee }} VIC Code review @@ -201,7 +201,7 @@ export default { self.account = await self.getAccount() if (self.balance.isLessThan(self.issueFee)) { self.loading = false - self.$toasted.show('Not enough TOMO', { type: 'error' }) + self.$toasted.show('Not enough VIC', { type: 'error' }) } else { const compiledContract = this.TomoBridgeWrapToken diff --git a/app/components/applying/bridgeToken/CreateBridgeToken.vue b/app/components/applying/bridgeToken/CreateBridgeToken.vue index aa5ca44..b90dad8 100644 --- a/app/components/applying/bridgeToken/CreateBridgeToken.vue +++ b/app/components/applying/bridgeToken/CreateBridgeToken.vue @@ -2,7 +2,7 @@

    Wrap-ERC20 Token Issuance

    -

    Bring your ERC-20 token to TomoChain network.

    +

    Bring your ERC-20 token to Viction network.

    - TOMO + VIC
    Required field
    Minimum of depositing is 10 TOMO
    + class="text-danger pt-2">Minimum of depositing is 10 VIC
    Not enough TOMO
    + class="text-danger pt-2">Not enough VIC
    @@ -22,7 +22,7 @@ src="/app/assets/images/img_condition_1@3x.png"/>

    - The token issuer has to deposit a minimum amount of 10 TOMO to apply + The token issuer has to deposit a minimum amount of 10 VIC to apply to the TomoZ protocol. The deposit cannot be withdrawn.

    @@ -55,9 +55,9 @@ src="/app/assets/images/img_condition_4@3x.png"/>

    - Token transactions will not be processed if the TOMO deposit is not + Token transactions will not be processed if the VIC deposit is not enough for paying masternodes. In that case, any one can donate - TOMO to resume the token transaction processing. + VIC to resume the token transaction processing.

    diff --git a/app/components/applytomo/TomoZConfirm.vue b/app/components/applytomo/TomoZConfirm.vue index 41048e7..ff1deed 100644 --- a/app/components/applytomo/TomoZConfirm.vue +++ b/app/components/applytomo/TomoZConfirm.vue @@ -41,7 +41,7 @@ Deposit amount - {{ formatNumber(depositeFee) }} TOMO + {{ formatNumber(depositeFee) }} VIC
    diff --git a/app/components/applytomox/TomoXCondition.vue b/app/components/applytomox/TomoXCondition.vue index fee7530..0565751 100644 --- a/app/components/applytomox/TomoXCondition.vue +++ b/app/components/applytomox/TomoXCondition.vue @@ -14,7 +14,7 @@

    - Apply your tokens to TomoX(Fee: 1000 TOMO) + Apply your tokens to TomoX(Fee: 1000 VIC)

    diff --git a/app/components/applytomox/TomoXConfirm.vue b/app/components/applytomox/TomoXConfirm.vue index 5e17b4e..f612f10 100644 --- a/app/components/applytomox/TomoXConfirm.vue +++ b/app/components/applytomox/TomoXConfirm.vue @@ -13,12 +13,12 @@

    -

    Apply to TomoX protocol

    +

    Apply to VIC protocol

    Condition

    You need to pay - 1000 TOMO as TomoX protocol listing fee + 1000 VIC as TomoX protocol listing fee

    @@ -27,7 +27,7 @@ label-for="newFee"> TOMO + style="clear">VIC - Not enough TOMO + Not enough VIC
    Required field
    Deposit amount should be more than 0 TOMO
    + class="text-danger pt-2">Deposit amount should be more than 0 VIC
    diff --git a/app/components/deposit/DepositConfirm.vue b/app/components/deposit/DepositConfirm.vue index 7b0362d..a985e8c 100644 --- a/app/components/deposit/DepositConfirm.vue +++ b/app/components/deposit/DepositConfirm.vue @@ -32,7 +32,7 @@ Deposit amount - {{ formatNumber(depositFee) }} TOMO + {{ formatNumber(depositFee) }} VIC Transaction fee @@ -76,7 +76,7 @@

    Successful

    -

    You’ve just successfully deposited {{ depositFee }} TOMO

    +

    You’ve just successfully deposited {{ depositFee }} VIC

    Transaction hash:

    Deposit TRC-21 fee

    -

    Current {{ token.name }} fee fund: {{ currentPoolingFee }} TOMO

    +

    Current {{ token.name }} fee fund: {{ currentPoolingFee }} VIC

    - TOMO + VIC
    Required field
    Deposit amount should be more than 0 TOMO
    + class="text-danger pt-2">Deposit amount should be more than 0 VIC
    Not enough TOMO
    + class="text-danger pt-2">Not enough VIC
    Amount of donation - {{ formatNumber(donationAmount) }} TOMO + {{ formatNumber(donationAmount) }} VIC Transaction fee @@ -75,7 +75,7 @@

    Successful

    -

    You’ve succesfully donated {{ donationAmount }} TOMO

    +

    You’ve succesfully donated {{ donationAmount }} VIC

    Transaction hash: Token transactions will not be processed if the remaining deposit is not enough to pay transaction fees. In such a case, to resume the processing - of token transactions, any TOMO holder can deposit/donate TOMO to the TomoIssuer smart contract. + of token transactions, any VIC holder can deposit/donate VIC to the VicIssuer smart contract.

    - TRC-21 fee fund: {{ formatNumber(poolingFee) }} TOMO + TRC-21 fee fund: {{ formatNumber(poolingFee) }} VIC
    • Token not found
    Token has not been applied to TomoZ yet
    + class="text-danger pt-2">Token has not been applied to VIC yet
    - TOMO + VIC Required field
    Deposit amount should be more than 0 TOMO
    + class="text-danger pt-2">Deposit amount should be more than 0 VIC
    Not enough TOMO
    + class="text-danger pt-2">Not enough VIC
    Required field
    Deposit amount should be more than 0 TOMO
    + class="text-danger pt-2">Deposit amount should be more than 0 VIC
    - TomoIssuer + + VICIssuer - - - + + + + + + + + - + + + + +
    diff --git a/index.html b/index.html index f0d4ba3..138a05e 100644 --- a/index.html +++ b/index.html @@ -1,19 +1,29 @@ - - - - - TomoIssuer - - - - - - - - - + + + + + + VICIssuer + + + + + + + + + + + + + + + + + +
    From 00fba3f948f845eb0334438741099e0687c65432 Mon Sep 17 00:00:00 2001 From: Bob Jr Date: Thu, 16 Nov 2023 21:22:18 +0700 Subject: [PATCH 02/13] Update token api --- app/components/Token.vue | 17 ++++++++--------- config/default.json | 11 ++++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/components/Token.vue b/app/components/Token.vue index 5534d46..bfcbb3b 100644 --- a/app/components/Token.vue +++ b/app/components/Token.vue @@ -174,11 +174,11 @@
    -

    Total supply

    +

    Total Supply

    - {{ formatNumber(formatCapacity(token.totalSupplyNumber)) }} + {{ formatNumber(token.totalSupplyNumber) }}

    @@ -554,15 +554,14 @@ export default { methods: { async getTokenDetail () { const self = this - const { data } = await axios.get(`/api/account/${self.address}`) - const token = data.token - self.token = token || {} - self.token.contract = data.contract || null - self.tokenName = token.name - self.symbol = token.symbol + const { data } = await axios.get(`/api/token/${self.address}`) + self.token = data + self.token.contract = data.hash + self.tokenName = data.name + self.symbol = data.symbol self.contractCreation = data.contractCreation - self.$store.state.token = data.token + self.$store.state.token = self.token }, getTokenTransfer () { const self = this diff --git a/config/default.json b/config/default.json index d3a6c05..cf11d15 100644 --- a/config/default.json +++ b/config/default.json @@ -10,7 +10,7 @@ "https://swagger.tomochain.com", "http://api.etherscan.io" ], - "tomoscanUrl": "http://localhost:3003", + "tomoscanUrl": "https://tomoscan.io", "tomoscanAPI": "https://scan.tomochain.com", "tomowalletUrl": "https://wallet.testnet.tomochain.com", "tomorelayerAPI": "https://relayer.testnet.tomochain.com", @@ -24,13 +24,14 @@ }, "tomobridgeAPI": "", "bridgeAuthorityKey": "", + "coingeckoAPI": "https://api.coingecko.com/api/v3", "blockchain": { - "rpc": "https://testnet.tomochain.com", - "ws": "wss://testnet.tomochain.com/ws", - "networkId": 89, + "rpc": "https://rpc.tomochain.com", + "ws": "wss://ws.tomochain.com", + "networkId": 88, "gas": 2000000, "deployPrice": 10000000000000, - "issuerAddress": "", + "issuerAddress": "0x8c0faeb5C6bEd2129b8674F262Fd45c4e9468bee", "tomoXAddress": "", "bridgeTokenOwners": [], "multisignWallet": "", From 929060871be3093c8711312d386a77f197a32a5e Mon Sep 17 00:00:00 2001 From: toanpham96 Date: Fri, 17 Nov 2023 11:52:25 +0700 Subject: [PATCH 03/13] update --- app/App.vue | 6 +-- app/app.js | 22 ++++++----- app/assets/scss/elements/_fields.scss | 2 +- app/assets/scss/elements/_tables.scss | 4 +- app/assets/scss/settings/_colors.scss | 2 +- app/components/Login.vue | 53 ++++----------------------- app/components/Token.vue | 8 ++-- app/components/Welcome.vue | 2 +- app/components/accounts/ListToken.vue | 8 ++-- 9 files changed, 36 insertions(+), 71 deletions(-) diff --git a/app/App.vue b/app/App.vue index 2b8ea6e..382b8b1 100644 --- a/app/App.vue +++ b/app/App.vue @@ -61,13 +61,13 @@ - Donate TRC-21 fee + Donate transaction fee - Help - +     --> - - -
    -
    - - Unlock - -
    -
    -     - --> From 3a5b8dd20bbf8345a1becfff69b6150318417790 Mon Sep 17 00:00:00 2001 From: Bob Jr Date: Fri, 17 Nov 2023 14:58:16 +0700 Subject: [PATCH 11/13] TomoZ -> Apply to Viction Zero Gas Protocol --- app/components/Token.vue | 6 +++--- app/components/applying/CreateToken.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/Token.vue b/app/components/Token.vue index 33b12ad..72799e9 100644 --- a/app/components/Token.vue +++ b/app/components/Token.vue @@ -59,7 +59,7 @@ - Apply to TomoZ Protocol + Apply to Viction Zero Gas Protocol