Skip to content

Commit

Permalink
Merge pull request #792 from BuildOnViction/new-ui
Browse files Browse the repository at this point in the history 
[new-ui] Update new theme
  • Loading branch information
@bobcoin98
bobcoin98 authored Nov 20, 2023
2 parents 7e7a080 + 96d4b94 commit 235512f
Show file tree
Hide file tree
Showing 38 changed files with 330 additions and 266 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ npm install
truffle deploy --reset --network tomo # only use this command if you want to connect to a private network
cp abis/*json build/contracts/
```
Note: before deploying to tomochain testnet, make sure you have TOMO in the wallet. If not, get free at [https://faucet.tomochain.com](https://faucet.testnet.tomochain.com)
Note: before deploying to tomochain testnet, make sure you have VIC in the wallet. If not, get free at [https://faucet.tomochain.com](https://faucet.testnet.tomochain.com)

## Enable https
``` npm run dev-https```
Expand Down
4 changes: 2 additions & 2 deletions apis/voters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ router.post('/generateQR', [

const candidateName = candidateInfo.name ? candidateInfo.name : 'Anonymous'

const message = voter + ' ' + action + ' ' + amount + ' TOMO for candidate ' + candidate + ' - ' + candidateName
const message = voter + ' ' + action + ' ' + amount + ' VIC for candidate ' + candidate + ' - ' + candidateName
const id = uuidv4()

const signData = {
Expand Down Expand Up @@ -274,7 +274,7 @@ router.post('/verifyTx', [
const convertedAmount = new BigNumber(amount)

if (convertedBalanc.isLessThan(convertedAmount)) {
throw Error('Not enough TOMO')
throw Error('Not enough VIC')
} else {
throw Error('Something went wrong')
}
Expand Down
44 changes: 20 additions & 24 deletions app/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<div class="page-layout">
<b-navbar
toggleable="lg"
type="dark"
variant="info">
>
<div class="container">
<b-navbar-brand to="/">
<img src="/app/assets/img/logo.svg" >
Expand All @@ -21,10 +20,7 @@
<auto-complete
v-model="search"
:items="items"/>
<b-button
variant="outline-success"
type="submit"
@click="searchCandidate">Search</b-button>

</b-nav-form>
</b-navbar-nav>
<b-navbar-nav class="ml-auto navbar-buttons">
Expand All @@ -38,7 +34,7 @@
id="btn-become-candidate"
to="/apply"
variant="primary">Become a candidate</b-button>
<b-dropdown
<!-- <b-dropdown
class="dd-setting ml-3"
right
offset="25"
Expand Down Expand Up @@ -158,7 +154,7 @@
'font-weight: bold;'"
class="notification__content">
<span class="notification_label withdraw">Withdraw</span>
{{ value.amount }} unvoted TOMO are ready to withdraw
{{ value.amount }} unvoted VIC are ready to withdraw
</span>
<div class="notification__time">TomoMaster -
{{ value.createdAt }}</div>
Expand Down Expand Up @@ -248,10 +244,10 @@
class="notification_bottom">
TomoMaster - {{ version }}
</b-dropdown-text>
</b-dropdown>
</b-dropdown> -->
<b-dropdown
v-if="isTomonet"
class="dd-setting ml-1"
class="dd-setting ml-3"
right
offset="25"
no-caret
Expand Down Expand Up @@ -289,7 +285,7 @@
<div class="row">
<div class="col-md-8">
<div class="tomo-footer__copyright">
TomoMaster &copy; {{ (new Date()).getFullYear() }} -
VicMater &copy; {{ (new Date()).getFullYear() }} -
<a
:href="`https://github.com/tomochain/tomomaster/releases/tag/v${version}`"
class="version-tag">
Expand All @@ -301,24 +297,24 @@
<a
:href="needHelpLink"
target="_blank">
<i class="tm-lifebuoy mr-1"/>Need help?</a>
Need help?</a>
</li>
<li class="list-inline-item">
<a
target="_blank"
href="https://docs.tomochain.com/legal/privacy">
<i class="tm-lock mr-1"/>Privacy Policy</a>
Privacy Policy</a>
</li>
<li class="list-inline-item">
<a
target="_blank"
href="https://docs.tomochain.com/legal/terms-of-use">
<i class="tm-profile mr-1"/>Terms of Use</a>
Terms of Use</a>
</li>
<li class="list-inline-item">
<a
target="_blank"
href="/api-docs"><i class="tm-checklist mr-1"/>API Documentation</a>
href="/api-docs">API Documentation</a>
</li>
</ul>
</div>
Expand All @@ -327,39 +323,39 @@
<ul class="list-inline">
<li class="list-inline-item">
<a
href="https://t.me/tomochain"
href="https://viction.link/telegram"
target="_blank">
<i class="tm-telegram" />
</a>
</li>
<li class="list-inline-item">
<!-- <li class="list-inline-item">
<a
href="https://www.facebook.com/tomochainofficial"
target="_blank">
<i class="tm-facebook" />
</a>
</li>
</li> -->
<li class="list-inline-item">
<a
href="https://twitter.com/TomoChainANN"
href="https://viction.link/twitter"
target="_blank">
<i class="tm-twitter" />
</a>
</li>
<li class="list-inline-item">
<a
href="https://github.com/tomochain/"
href="https://github.com/BuildOnViction"
target="_blank">
<i class="tm-github" />
</a>
</li>
<li class="list-inline-item">
<!-- <li class="list-inline-item">
<a
href="https://www.reddit.com/r/Tomochain/"
target="_blank">
<i class="tm-reddit" />
</a>
</li>
</li> -->
</ul>
</div>
</div>
Expand All @@ -378,9 +374,9 @@ import AutoComplete from './components/AutoComplete.vue'
export default {
name: 'App',
metaInfo: {
title: 'TomoChain Governance DApp | TomoMaster',
title: 'Viction Governance DApp | VicMaster',
meta: [
{ name: 'description', content: 'Tomomaster - Providing a professional UI which allows coin-holders to stake for masternodes, decentralized governance and explore masternode performance statistics' } // eslint-disable-line
{ name: 'description', content: 'VicMaster - Providing a professional UI which allows coin-holders to stake for masternodes, decentralized governance and explore masternode performance statistics' } // eslint-disable-line
]
},
components: {
Expand Down
2 changes: 1 addition & 1 deletion app/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Vue.use(Toasted, {
// set trezor's manifest
TrezorConnect.manifest({
email: '[email protected]',
appUrl: 'https://master.tomochain.com'
appUrl: 'https://vicmaster.xyz'
})

// stockInit(Highcharts)
Expand Down
Binary file added app/assets/img/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/img/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.
6 changes: 3 additions & 3 deletions app/assets/img/loading.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 235512f

Please sign in to comment.