Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install #1

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
53721ea
nav
devyin7 Feb 7, 2020
0ea173c
add footer and darapp
devyin7 Feb 8, 2020
6af166b
add valdiate store
devyin7 Feb 8, 2020
390fa16
add new UI create wallet and alert private key
devyin7 Feb 10, 2020
ff535d5
add create from private key form
devyin7 Feb 10, 2020
420bc76
add assets
devyin7 Feb 14, 2020
9b2b732
add mixin and store mosaics , namespace
devyin7 Feb 17, 2020
c808b2f
add wallet date
devyin7 Feb 18, 2020
0654976
add validate form
devyin7 Feb 19, 2020
2925cb8
add valdiate filter mosaic
devyin7 Feb 21, 2020
961b83f
new navbar - delete item
devyin7 Feb 21, 2020
f6c6fb9
nav new list item
devyin7 Feb 21, 2020
94a56ff
add valdiate dt
devyin7 Feb 26, 2020
eaf75fa
add config
devyin7 Mar 2, 2020
ec635e9
add stora db
devyin7 Mar 4, 2020
b7c98ba
add remove data
devyin7 Mar 4, 2020
0b45678
add new validate
devyin7 Mar 9, 2020
3a8529d
add loger
devyin7 Mar 9, 2020
8dfc11c
add store
devyin7 Mar 11, 2020
5f441b8
add filtel comp
devyin7 Mar 12, 2020
1d33c69
new filter type
devyin7 Mar 17, 2020
336db8e
add card new offer
devyin7 Mar 18, 2020
fcc05d4
add commit offer
devyin7 Mar 22, 2020
1359def
add newOffer
devyin7 Mar 27, 2020
cdd4bdd
add config db
devyin7 Mar 29, 2020
f63ce6a
add create table and bata base
devyin7 Mar 29, 2020
aac0648
add
devyin7 Apr 8, 2020
683f9ee
add
devyin7 Apr 8, 2020
8c9f0f5
dd use db
devyin7 Apr 8, 2020
f6e4620
buider
devyin7 Apr 9, 2020
27fb726
add filter
devyin7 Apr 13, 2020
243ab5d
add login
devyin7 Apr 14, 2020
d5ea6ca
add
devyin7 Apr 14, 2020
5c56701
add
devyin7 Apr 15, 2020
fce6c4e
add validate amount
devyin7 Apr 15, 2020
afc7da3
src/views/
devyin7 Apr 15, 2020
7420174
Data
Apr 15, 2020
281914a
Merge branch 'feature/refactoring-ui' of https://github.com/proximax-…
Apr 15, 2020
c241269
add all offers
devyin7 Apr 15, 2020
64d0326
GRaphics
Apr 15, 2020
ce1f90b
Merge branch 'feature/refactoring-ui' of https://github.com/proximax-…
Apr 15, 2020
7bd0fc7
Offers
Apr 15, 2020
0ec7768
Type search
Apr 15, 2020
42b49d0
add validate
devyin7 Apr 16, 2020
27b6b84
Type search
Apr 16, 2020
546da59
FIX BUGS
Apr 16, 2020
09c7490
add valdiate
devyin7 Apr 16, 2020
3d933a4
revolver conflict
devyin7 Apr 16, 2020
f596568
add
devyin7 Apr 16, 2020
3d77cad
add console
devyin7 Apr 16, 2020
f05e618
add validate new info wallet
devyin7 Apr 20, 2020
4e935a6
ade validatte
devyin7 Apr 21, 2020
63aa247
add UI remove offers
devyin7 Apr 21, 2020
4d74128
add
devyin7 Apr 22, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add new UI create wallet and alert private key
devyin7 committed Feb 10, 2020
commit 390fa16b32c7733ccd500a71c4b4bff9baf6d27b
41 changes: 41 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
"js-xpx-chain-library": "^0.3.0",
"tsjs-xpx-chain-sdk": "^0.7.0",
"vue": "^2.6.10",
"vue-clipboard2": "^0.3.1",
"vue-router": "^3.1.3",
"vuetify": "^2.1.0",
"vuex": "^3.1.2"
15 changes: 15 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -7,6 +7,21 @@
<v-overlay :value="overlay">
<v-progress-circular indeterminate size="64"></v-progress-circular>
</v-overlay>
<!-- Message -->
<v-snackbar
v-model="snackbar.snackbar"
:bottom="snackbar.y === 'bottom'"
:top="snackbar.y === 'top'"
:right="snackbar.x === 'right'"
:left="snackbar.x === 'left'"
:vertical="snackbar.mode === 'vertical'"
:color="snackbar.color"
:multi-line="snackbar.mode === 'multi-line'"
:timeout="snackbar.timeout"
>
{{ snackbar.text }}
<v-btn dark text @click="snackbar.snackbar = false">Close</v-btn>
</v-snackbar>
<menu-item></menu-item>
</v-app>
</template>
2 changes: 1 addition & 1 deletion src/components/core/View.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-content>
<v-content >
<v-fade-transition mode="out-in">
<router-view />
</v-fade-transition>
2 changes: 1 addition & 1 deletion src/components/shared/Buttons.vue
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
:disabled="item.disabled"
:key="key"
:color="item.color"
class="pl-8 pr-8 mt-2 mr-3 sky body-2 write--text"
class="pl-8 pr-8 mt-2 mr-3 body-2 white--text"
rounded
@click="triggerClick(item.action)"
>{{item.text}}</v-btn>
188 changes: 144 additions & 44 deletions src/components/wallet/WalletCreate.vue
Original file line number Diff line number Diff line change
@@ -1,62 +1,162 @@
<template>
<v-row justify="center" align="center">
<v-col cols="10" justify="center" align="center" class="pt-12">
<span class="leve--text font-italic font-weight-bold display-3">Sports</span>
<span class="primary--text font-italic font-weight-bold display-3">Bet</span>
</v-col>
<v-col cols="12" sm="8" md="6" lg="6">
<v-card elevation="10" class="pb-10">
<v-card-title class="title font-italic font-weight-medium primary--text">{{title}}</v-card-title>
<v-card-subtitle class="leve--text pa-0 pl-4">Has been created succesfully</v-card-subtitle>
<v-row>
<v-col cols="11" class="mx-auto pt-0">
<v-row>
<v-col cols="10" class="mx-auto">
<span class="body-1 leve--text">Adress:</span>
<br>
<span class="body-2 d-flex leve--text">{{address}}</span>
</v-col>
<!-- Icon -->
<v-col cols="2" class="text-right pt-7">
<v-btn text icon @click="doCopy('Address', address)">
<v-icon>mdi-content-copy</v-icon>
</v-btn>
</v-col>
</v-row>
<v-row>
<v-col cols="10" class="mx-auto">
<span class="body-1 leve--text">Private key:</span>
<br>
<span class="body-2 d-flex leve--text">{{privateKey}}</span>
</v-col>
<!-- Icon -->
<v-col cols="2" class="text-right pt-7">
<v-btn text icon @click="doCopy('Private key', privateKey)">
<v-icon>mdi-content-copy</v-icon>
</v-btn>
</v-col>
</v-row>
</v-col>
</v-row>
</v-card>
</v-col>
</v-row>
<v-container class="fill-height">
<v-row justify="center" align="center">
<v-col cols="8">
<v-card elevation="10" class="pb-10">
<v-card-title class="title font-italic font-weight-medium ">{{ title }} {{ walletName }}</v-card-title>
<v-card-subtitle class="pa-0 pl-4">Has been created succesfully</v-card-subtitle>
<v-row>
<v-col cols="11" class="mx-auto pt-0">
<v-row>
<!-- <v-col cols="12" class="mx-auto">
<span class="body-1">Name: {{ walletName }}</span>
</v-col> -->
</v-row>
<v-row>
<v-col cols="10" class="mx-auto">
<span class="body-1">Adress:</span>
<br />
<span class="body-2 d-flex">{{ address }}</span>
</v-col>
<!-- Icon -->
<v-col cols="2" class="text-right pt-7">
<v-btn text icon @click="doCopy('Address', address)">
<v-icon>mdi-content-copy</v-icon>
</v-btn>
</v-col>
</v-row>
<v-row justify="center">
<!-- Warning Message -->
<v-col cols="12">
<v-alert
outlined
type="warning"
prominent
class="text-center line-h-1-02em"
dense
>
<span class="gray-black--text caption">
Make sure you store your private key in a safe place.
<br />Access to your digital assets cannot be recovered without it.
</span>
</v-alert>
</v-col>
</v-row>
<v-row v-if="showPrivateKey">
<v-col cols="10" class="mx-auto">
<span class="body-1">Private key:</span>
<br />
<span class="body-2 d-flex break-word">{{ privateKey }}</span>
</v-col>
<!-- Icon -->
<v-col cols="2" class="text-right pt-7">
<v-btn text icon @click="doCopy('Private key', privateKey)">
<v-icon>mdi-content-copy</v-icon>
</v-btn>
</v-col>
</v-row>
</v-col>
</v-row>
<!-- Buttons -->
<custom-buttons @action="action" :arrayBtn="buttons"></custom-buttons>
</v-card>
</v-col>
</v-row>
</v-container>
</template>
<script>
import generalMixins from '../../mixins/general-mixin'
export default {
mixins: [generalMixins],
props: ['walletInfo'],
data: () => {
return {
address: '',
arrayBtn: {
showPvk: {
key: 'showPvk',
action: 'showPrivateKey',
disabled: false,
color: 'sky',
loading: false,
text: 'Show Private Key'
},
// savePaperWallet: {
// key: 'showPvk',
// action: 'savePaperWallet',
// disabled: false,
// color: 'primary',
// loading: false,
// text: 'Save Paper Wallet'
// },
continue: {
key: 'continue',
action: 'continue',
disabled: false,
color: 'sky',
loading: false,
text: 'Continue'
}
},
privateKey: '',
title: 'My account name,'
title: 'My account,',
walletName: '',
showPrivateKey: false
}
},
methods: {
action (action) {
switch (action) {
case 'showPrivateKey':
this.showPrivateKey = !this.showPrivateKey
break
// case 'savePaperWallet':
// const pdf = this.$pdfGenerator.walletCreatedCertified(
// this.base64QR,
// this.address,
// this.walletName
// )
// pdf.save(`${this.walletName}_paper_wallet`)
// break
case 'continue':
// if (this.infoOwnedSwap) {
// this.SET_SWAP_DATA(this.infoOwnedSwap)
// this.$router.push('/swap-account-nis1-found').catch(e => {})
// } else {
this.$router.push('/').catch(e => {})
// }
break
}
}
},
components: {
'custom-buttons': () => import('@/components/shared/Buttons')
},
computed: {
buttons () {
const arrayBtn = this.arrayBtn
arrayBtn['showPvk'].text = (this.showPrivateKey) ? 'Hide Private Key' : 'Show Private Key'
return arrayBtn
}
},
beforeMount () {
const walletInfo = this.walletInfo.data
this.address = walletInfo.accounts[0].address.pretty()
this.privateKey = this.walletInfo.pvk
console.log('walletInfo', walletInfo)
this.walletName = walletInfo.name
}
}
</script>
<style>
.break-word {
-ms-word-break: break-all;
word-break: break-all;

word-break: break-word;

-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}
</style>
3 changes: 2 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
@@ -8,9 +8,10 @@ import { GeneralService } from './services/general'
import { BlockchainProvider } from './services/blockchain-provider'
import { StorageService } from './services/storage'
import axios from 'axios'
import VueClipboard from 'vue-clipboard2'
Vue.config.productionTip = false
// Vue.use(axios)

Vue.use(VueClipboard)
// Define prototype
Vue.prototype.$generalService = new GeneralService()
Vue.prototype.$storage = new StorageService(localStorage)
23 changes: 20 additions & 3 deletions src/mixins/general-mixin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
export default {
methods: {
doCopy (itemName, text) {
this.$copyText(text).then(
e => {
this.$store.dispatch('showMSG', {
snackbar: true,
text: `${itemName} copied`,
color: 'success'
})
},
e => {
this.$store.dispatch('showMSG', {
snackbar: true,
text: `Can not copy`,
color: 'error'
})
}
)
},
getConfigForm () {
return {
amount: {
@@ -62,15 +80,15 @@ export default {
key: 'clear',
action: 'clear',
disabled: false,
color: 'leve',
color: 'sky',
loading: false,
text: 'Clear'
},
create: {
key: 'create',
action: 'create',
disabled: false,
color: 'primary',
color: 'sky',
loading: false,
text: 'Create'
}
@@ -88,6 +106,5 @@ export default {
}
]
}

}
}
Loading