Skip to content

Commit

Permalink
Merge pull request #36 from Volentix/development
Browse files Browse the repository at this point in the history
Bring master up-to-date when ready
gluneau authored Sep 5, 2019
2 parents 037fcfb + 6b64478 commit 028bd44
Showing 345 changed files with 879 additions and 1,389 deletions.
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -159,13 +159,13 @@ node_modules

.quasar
.thumbs.db
/dist
/build
app/dist
app/build
.nuxt.
/src-cordova/node_modules
/src-cordova/platforms
/src-cordova/plugins
/src-cordova/www
app/src-cordova/node_modules
app/src-cordova/platforms
app/src-cordova/plugins
app/src-cordova/www
npm-debug.log*
yarn-debug.log*
yarn-error.log*
@@ -181,7 +181,7 @@ test
.env

# binaries
src/renderer/resources/*
app/src/renderer/resources/*

#Config for releases
electron-builder.yml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ quasar dev -m ios

## Maintainers

[@rhys@volentixlabs.com](https://github.com/[email protected])
[[email protected]](https://github.com/[email protected])

## Contribute

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions .quasar.env.json → app/.quasar.env.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"ENV_DEV": "Development",
"mainnet": {
"CHAIN_ID": "aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906",
"EOS_HISTORYAPI": "https://history.cryptolions.io,http://eos.eoscafeblock.com,http://api.eosbean.com,https://api-eos.blckchnd.com,https://eos.greymass.com:443",
"EOS_HISTORYAPI": "https://public.eosinfra.io,https://public.eosinfra.io,https://public.eosinfra.io,https://eos.eoscafeblock.com,https://eos.greymass.com:443",
"DEMUX_API": "https://demux.vlabs.ninja:4000",
"LEDGER_ACCOUNT_NAME": "volentixfrst",
"CROWDFUND_URL": "https://volentix-cf.tekstackapps.com/",
@@ -34,7 +34,7 @@
"ENV_PROD": "Production",
"mainnet": {
"CHAIN_ID": "aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906",
"EOS_HISTORYAPI": "https://history.cryptolions.io,http://eos.eoscafeblock.com,http://api.eosbean.com,https://api-eos.blckchnd.com,https://eos.greymass.com:443",
"EOS_HISTORYAPI": "https://public.eosinfra.io,https://public.eosinfra.io,https://public.eosinfra.io,https://eos.eoscafeblock.com,https://eos.greymass.com:443",
"DEMUX_API": "https://demux.vlabs.ninja:4000",
"LEDGER_ACCOUNT_NAME": "volentixfrst",
"CROWDFUND_URL": "https://volentix-cf.tekstackapps.com/",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json → app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "verto",
"version": "0.8.11",
"version": "0.9.0",
"description": "A multi-currency crypto wallet with initial support for EOS & VTX",
"productName": "Verto",
"cordovaId": "org.cordova.verto",
1 change: 1 addition & 0 deletions quasar.conf.js → app/quasar.conf.js
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ module.exports = function (ctx) {
'QBtn',
'QCard',
'QCardSection',
'QCardActions',
'QCircularProgress',
'QChip',
'QDialog',
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src-cordova/config.xml → app/src-cordova/config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="org.cordova.verto" version="0.8.10" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="org.cordova.verto" version="0.8.11" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Verto</name>
<description>A multi-currency crypto wallet with initial support for EOS &amp; VTX</description>
<author email="[email protected]" href="https://volentix.io">Volentix Labs, Inc.</author>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/boot/clipboard.js → app/src/boot/clipboard.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import * as clipboard from 'clipboard-polyfill'
export default ({ Vue }) => {
Vue.prototype.$clipboardWrite = (str) => {
clipboard.writeText(str)
if (cordova && !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform)) {
if (typeof cordova !== 'undefined') {
cordova.plugins.clipboard.copy(str)
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -9,14 +9,22 @@
<q-step default :name="1" :done="step > 1" title="Verto Password" class=" bg-black workflow-step">
<q-card-section class="text-center text-white" >
<q-input
type="password"
dark
v-model="password"
@input="checkPassword"
@keyup.enter="submit"
color="green"
v-bind:label="$t('ChangeVertoPassword.current')"
/>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
<div v-show="badPassword" class="text-h6 text-uppercase text-red q-pa-md">
{{ $t('SaveToFile.password_incorrect') }}
</div>
@@ -43,6 +51,7 @@ export default {
data () {
return {
password: '',
isPwd: true,
submitBtn: false,
passHasError: false,
modal: false,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions src/i18n/en.json → app/src/i18n/en.json
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@
"cancel": "Cancel",
"ok": "Ok",
"delete": "Delete",
"upgrade": "Upgrade",
"keyhere": "Wallet Public Key Here",
"header": "Wallet Manager",
"wallets": "Wallets",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@
</q-step>
<q-step
:name="3"
title="Select Quatity"
title="Select Quantity"
class="bg-black workflow-step"
:done="step > 3"
:header-nav="step > 3"
@@ -192,7 +192,7 @@
dark
v-model="depositQuantity"
color="green"
@input="quatityFromDeposit()"
@input="quantityFromDeposit()"
:disabled="!rateData"
:loading="!rateData"
:label="depositQuantityLabel"
@@ -206,7 +206,7 @@
dark
v-model="destinationQuantity"
color="green"
@input="quatityFromDestination()"
@input="quantityFromDestination()"
:disabled="!rateData"
:loading="!rateData"
:label="destinationQuantityLabel"
@@ -559,12 +559,12 @@ export default {
verifyAddress () {
// check validity of all keys
},
quatityFromDeposit () {
quantityFromDeposit () {
// deal with precision
this.destinationQuantity = (+this.depositQuantity * +this.rateData.rate) - +this.rateData.minerFee
this.lastChangedValue = 'deposit'
},
quatityFromDestination () {
quantityFromDestination () {
// deal with precision
this.depositQuantity = (+this.destinationQuantity + +this.rateData.minerFee) / +this.rateData.rate
this.lastChangedValue = 'destination'
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -57,13 +57,21 @@
<q-card-section class="text-white text-center">
<q-input
v-model="wallet.vertoPassword"
type="password"
dark
color="green"
@input="checkVertoPassword"
@keyup.enter="submit"
:label="$t('CreateVertoPassword.vertopassword')"
/>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
<div v-show="errors.nameUsed" class="text-h6 text-uppercase text-red q-pa-md">
{{ $t('DisplayKey.name_is_used') }}
</div>
@@ -91,6 +99,7 @@ export default {
data () {
return {
step: 1,
isPwd: true,
contractable: true,
wallet: {
name: '',
Original file line number Diff line number Diff line change
@@ -134,14 +134,21 @@
> -->
<q-input
dark
type="password"
@keyup.enter="addAssociation"
v-model="vertopassword"
color="green"
:error="vertoPasswordEmpty"
bottom-slots
v-bind:label="$t('CreateVertoPassword.vertopassword')"
>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
<template v-slot:error>
{{$t('Welcome.incorrect')}}
</template>
@@ -164,6 +171,7 @@ export default {
// name: 'PageName',
data () {
return {
isPwd: true,
blocktopusStatus: {},
venueStatus: {},
zixipayStatus: {},
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 16 additions & 1 deletion src/pages/Intro/Login.vue → app/src/pages/Intro/Login.vue
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<div class="">
<div class="">
<q-input
type="password"
:type="isPwd ? 'password' : 'text'"
dark
v-model="password"
color="green"
@@ -26,6 +26,13 @@
<template v-slot:error>
{{$t('Welcome.incorrect')}}
</template>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
</div>
<div v-show="showSubmit" @click="login">
@@ -55,6 +62,7 @@ export default {
hasConfig: false,
passHasError: false,
password: '',
isPwd: true,
deleteConfigFail: false,
deleteConfig: false,
version: {},
@@ -77,6 +85,12 @@ export default {
this.showSubmit = false
}
},
async startRestoreConfig () {
this.$router.push({
name: 'restore-wallet',
params: { returnto: 'settings' }
})
},
async login () {
this.passHasError = false
if (!this.password) {
@@ -90,6 +104,7 @@ export default {
if (results.message === 'no_default_key') {
this.$router.push({ path: 'vertomanager' })
} else {
// this.startRestoreConfig()
this.passHasError = true
}
}
Original file line number Diff line number Diff line change
@@ -61,25 +61,41 @@
</div>
<div class="text-left">
<div class="q-py-xs">
<q-input
<q-input
v-model="password"
type="password"
dark
color="green"
label="Choose Private Key Passwords"
@input="checkPassword"
/>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
</div>
<div class="q-py-xs">
<q-input
v-model="confirmPassword"
type="password"
dark
color="green"
label="Confirm Private Key Password"
@input="checkPassword"
@keyup.enter="showTheVertoPasswordScreen"
/>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
</div>
<div
v-show="showNextButtonToVertoPassword"
@@ -103,13 +119,21 @@
<div class="">
<q-input
v-model="vertoPassword"
type="password"
dark
color="green"
label="Verto Password"
@input="checkVertoPassword"
@keyup.enter="submit"
/>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
</div>
<div v-show="nameAlreadyUsed" class="text-h6 text-uppercase text-red q-pa-md">
{{ $t('DisplayKey.name_is_used') }}
@@ -149,6 +173,7 @@ export default {
password: '',
confirmPassword: '',
vertoPassword: '',
isPwd: true,
showNextButtonToVertoPassword: false,
showNextButtonToPassword: false,
showSubmitButton: false,
Original file line number Diff line number Diff line change
@@ -69,13 +69,21 @@
<span class="q-pa-sm">
<q-input
v-model="vertoPassword"
type="password"
dark
color="green"
@input="checkPassword"
@keyup.enter="submit"
:label="$t('DisplayKey.verto_password')"
/>
:type="isPwd ? 'password' : 'text'"
>
<template v-slot:append>
<q-icon
:name="isPwd ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="isPwd = !isPwd"
/>
</template>
</q-input>
</span>
<div v-show="nameAlreadyUsed" class="text-h6 text-uppercase text-red">
{{ $t('DisplayKey.name_is_used') }}
@@ -117,6 +125,7 @@ export default {
showPasswordSubmit: false,
nameAlreadyUsed: false,
passwordInvalid: false,
isPwd: true,
step: 1
}
},
File renamed without changes.
Loading

0 comments on commit 028bd44

Please sign in to comment.