Skip to content

Commit

Permalink
Merge pull request #313 from BuildOnViction/update-new-feature
Browse files Browse the repository at this point in the history 
VicIssuer redesign
  • Loading branch information
@bobcoin98
bobcoin98 committed Nov 20, 2023
2 parents 18273cd + 43cc0bd commit db8e177
Show file tree
Hide file tree
Showing 42 changed files with 322 additions and 330 deletions.
34 changes: 17 additions & 17 deletions app/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
toggleable="lg"
type="light"
class="tomo-header"
variant="white">
>
<section class="container container-tomochain">
<b-navbar-brand to="/">
<b-img
src="../app/assets/images/logo-tomoissuer.svg"
alt="logo tomoissuer"/>
alt="logo vicissuer"/>
</b-navbar-brand>
<!-- button menu SP -->
<b-navbar-toggle
Expand Down Expand Up @@ -45,7 +45,7 @@
<b-dropdown-text
class="flex_box">
<span>Balance:</span>
<strong>{{ balance }} TOMO</strong>
<strong>{{ balance }} VIC</strong>
</b-dropdown-text>
<b-dropdown-divider />
<b-dropdown-item
Expand All @@ -61,13 +61,13 @@
<b-dropdown-divider />
<b-dropdown-item
to="/donateTxFee">
Donate TRC-21 fee
Donate transaction fee
</b-dropdown-item>
<b-dropdown-item
<!-- <b-dropdown-item
href="/help"
target="_blank">
Help
</b-dropdown-item>
</b-dropdown-item> -->
<b-dropdown-item
v-if="!mobileCheck"
class="sign_out"
Expand All @@ -90,9 +90,9 @@
<div class="row">
<div class="col-md-7 col-lg-8">
<div class="tomo-copyright">
TomoIssuer &copy; {{ (new Date()).getFullYear() }} -
VICIssuer &copy; {{ (new Date()).getFullYear() }} -
<a
:href="`https://github.com/tomochain/tomoissuer/releases/tag/v${version}`"
:href="`https://github.com/buildOnViction/tomoissuer/releases/tag/v${version}`"
target="_blank"
class="version-tag">
v{{ version }}</a>
Expand Down Expand Up @@ -125,24 +125,24 @@
<div class="col-md-5 col-lg-4">
<div class="tomo-social">
<ul>
<li><a
<!-- <li><a
href="https://www.facebook.com/tomochainofficial"
target="_blank"><i class="tm-icon-facebook"/></a></li>
target="_blank"><i class="tm-icon-facebook"/></a></li> -->
<li><a
href="https://twitter.com/TomoChainANN"
href="https://viction.link/twitter"
target="_blank"><i class="tm-icon-twiter"/></a></li>
<li><a
href="https://t.me/tomochain"
href="https://viction.link/telegram"
target="_blank"><i class="tm-icon-telegram"/></a></li>
<li><a
href="https://github.com/tomochain/"
href="https://github.com/BuildOnViction"
target="_blank"><i class="tm-icon-github"/></a></li>
<li><a
<!-- <li><a
href="https://www.linkedin.com/company/tomochain"
target="_blank"><i class="tm-icon-linkedin"/></a></li>
<li><a
target="_blank"><i class="tm-icon-linkedin"/></a></li> -->
<!-- <li><a
href="https://www.reddit.com/r/Tomochain/"
target="_blank"><i class="tm-icon-reddit"/></a></li>
target="_blank"><i class="tm-icon-reddit"/></a></li> -->
</ul>
</div>
</div>
Expand Down
30 changes: 16 additions & 14 deletions app/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Vue.prototype.getAccount = async function () {
const provider = Vue.prototype.NetworkProvider || ''
const wjs = Vue.prototype.web3
let account
console.log('provider', provider)
switch (provider) {
case 'metamask':
// Request account access if needed - for metamask
Expand Down Expand Up @@ -300,23 +301,24 @@ Vue.prototype.detectNetwork = async function (provider) {
if (!wjs) {
switch (provider) {
case 'tomowallet':
case 'pantograph':
case 'metamask':
if (window.ethereum) {
// var p = window.web3.currentProvider
var p = window.ethereum
wjs = new Web3(p)
}
break
case 'pantograph':
if (window.tomoWeb3) {
if (window.tomoWeb3.currentProvider) {
let pp = window.tomoWeb3.currentProvider
wjs = new Web3(pp)
} else {
wjs = window.tomoWeb3
}
}
break
// case 'pantograph':
// if (window.tomoWeb3) {
// if (window.tomoWeb3.currentProvider) {
// let pp = window.tomoWeb3.currentProvider
// wjs = new Web3(pp)
// } else {
// wjs = window.tomoWeb3
// }
// }
// break
case 'trezor':
case 'ledger':
if (provider === 'ledger') {
Expand Down Expand Up @@ -492,14 +494,14 @@ Vue.prototype.serializeQuery = function (params, prefix) {
Vue.prototype.formatCapacity = function (value) {
// Nine Zeroes for Billions
return Math.abs(Number(value)) >= 1.0e+9
? Math.abs(Number(value)) / 1.0e+9 + 'B'
? (Math.abs(Number(value)) / 1.0e+9).toFixed(2) + 'B'
// Six Zeroes for Millions
: Math.abs(Number(value)) >= 1.0e+6
? Math.abs(Number(value)) / 1.0e+6 + 'M'
? (Math.abs(Number(value)) / 1.0e+6).toFixed(2) + 'M'
// Three Zeroes for Thousands
: Math.abs(Number(value)) >= 1.0e+3
? Math.abs(Number(value)) / 1.0e+3 + 'K'
: Math.abs(Number(value))
? (Math.abs(Number(value)) / 1.0e+3).toFixed(2) + 'K'
: (Math.abs(Number(value))).toFixed(2)
}

/**
Expand Down
Binary file added app/assets/images/favicon-dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/favicon-dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 13 additions & 40 deletions app/assets/images/logo-tomoissuer.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit db8e177

Please sign in to comment.