Skip to content

Commit

Permalink
Merge pull request #192 from MickWang/master
Browse files Browse the repository at this point in the history 
update dapps module
  • Loading branch information
@MickWang
MickWang authored Aug 21, 2019
2 parents 752a340 + f5a2128 commit d4c617d
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 32 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "owallet",
"productName": "OWallet",
"homepage": "http://ont.io",
"version": "v0.9.13",
"version": "v0.9.14",
"author": "Ontology Foundation Ltd. <[email protected]>",
"description": "OWallet is a comprehensive Ontology desktop wallet",
"license": "Apache-2.0",
Expand Down
1 change: 1 addition & 0 deletions src/renderer/assets/apps.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.
Binary file modified src/renderer/assets/dapps-hover.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.
Binary file modified src/renderer/assets/dapps.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: 2 additions & 2 deletions src/renderer/components/Identitys.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<div class="div-create-wallet" :class="[viewBtn?'div-create-wallet-bg-color':'']"
v-on:mouseenter="viewAllBtn(true)" v-on:mouseleave="viewAllBtn(false)">
<div class="div-create" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="CreateIdentity">{{$t('identitys.createIdentity')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'CreateIdentity'}">{{$t('identitys.createIdentity')}}</router-link>
</div>
<div class="div-join" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="ImportIdentity">{{$t('identitys.importIdentity')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'ImportIdentity'}">{{$t('identitys.importIdentity')}}</router-link>
</div>
<img class="img-wallet-create" v-show="!viewBtn" src="./../assets/create-wallet.png" alt="">
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/JsonWallet/View/Details.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<div>
<a-input type="password" class="input change-password"
v-validate="{required: true , min:6, is:newPassword}" :data-vv-as="$t('newPasswordConfirmation')" name="reNewPassword"
v-validate="{required: true , min:6, is:newPassword}" :data-vv-as="$t('FormField.newPasswordConfirmation')" name="reNewPassword"
v-model="reNewPassword" :placeholder="$t('wallets.reNewPassword')"></a-input>
<span class="v-validate-span-errors" v-show="errors.has('reNewPassword')">{{ errors.first('reNewPassword') }}</span>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/renderer/components/Wallets.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
<div class="div-create-wallet" :class="[viewBtn?'div-create-wallet-bg-color':'']"
v-on:mouseenter="viewAllBtn(true)" v-on:mouseleave="viewAllBtn(false)">
<div class="div-create" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="CreateJsonWallet">{{$t('wallets.createCommonWallet')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'CreateJsonWallet'}">{{$t('wallets.createCommonWallet')}}</router-link>
</div>
<div class="div-join" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="ImportJsonWallet">{{$t('wallets.importCommonWallet')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'ImportJsonWallet'}">{{$t('wallets.importCommonWallet')}}</router-link>
</div>
<img class="img-wallet-create" v-show="!viewBtn" src="./../assets/create-wallet.png" alt="">
</div>
Expand All @@ -63,10 +63,10 @@
<div class="div-create-wallet" :class="[viewBtn?'div-create-wallet-bg-color':'']"
v-on:mouseenter="viewAllBtn(true)" v-on:mouseleave="viewAllBtn(false)">
<div class="div-create" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="CreateSharedWallet">{{$t('wallets.createSharedWallet')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'CreateSharedWallet'}">{{$t('wallets.createSharedWallet')}}</router-link>
</div>
<div class="div-join" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="ImportSharedWallet">{{$t('wallets.joinSharedWallet')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'ImportSharedWallet'}">{{$t('wallets.joinSharedWallet')}}</router-link>
</div>
<img class="img-wallet-create" v-show="!viewBtn" src="./../assets/create-wallet.png" alt="">
</div>
Expand All @@ -85,7 +85,7 @@
<div class="div-create-wallet" :class="[viewBtn?'div-create-wallet-bg-color':'']"
v-on:mouseenter="viewAllBtn(true)" v-on:mouseleave="viewAllBtn(false)">
<div class="div-join div-ledger-join" v-show="viewBtn">
<router-link class="btn btn-default btn-create" to="ImportLedgerWallet">{{$t('wallets.importLedgerWallet')}}</router-link>
<router-link class="btn btn-default btn-create" :to="{name: 'ImportLedgerWallet'}">{{$t('wallets.importLedgerWallet')}}</router-link>
</div>
<img class="img-wallet-create" v-show="!viewBtn" src="./../assets/create-wallet.png" alt="">
</div>
Expand Down
44 changes: 21 additions & 23 deletions src/renderer/router/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import Router from 'vue-router'
Vue.use(Router)

export default new Router({
routes: [
{
routes: [{
path: '/Dashboard',
name: 'Dashboard',
component: require('@/components/Dashboard').default
Expand Down Expand Up @@ -36,55 +35,45 @@ export default new Router({
component: require('@/components/Dapps').default
},
{
path: '*',
redirect: '/'
},
{
path: '/',
name: 'Home',
component: require('@/components/Home').default
},
{
path: '/createIdentity',
path: '/identitys/createIdentity',
name: 'CreateIdentity',
component: require('@/components/Identitys/CreateIdentity').default
},
{
path: '/importIdentity',
path: '/identitys/importIdentity',
name: 'ImportIdentity',
component: require('@/components/Identitys/ImportIdentity').default
},
{
path: '/createJsonWallet',
path: '/Wallets/createJsonWallet',
name: 'CreateJsonWallet',
component: require('@/components/JsonWallet/CreateJsonWallet').default
},
{
path: '/importJsonWallet',
path: '/Wallets/importJsonWallet',
name: 'ImportJsonWallet',
component: require('@/components/JsonWallet/ImportJsonWallet').default
},
{
path: '/importLedgerWallet',
path: '/Wallets/importLedgerWallet',
name: 'ImportLedgerWallet',
component: require('@/components/LedgerWallet/ImportLedgerWallet').default
},
{
path: '/createSharedWallet',
path: '/Wallets/createSharedWallet',
name: 'CreateSharedWallet',
component: require('@/components/SharedWallet/CreateSharedWallet').default
},
{
path: '/importSharedWallet',
path: '/Wallets/importSharedWallet',
name: 'ImportSharedWallet',
component: require('@/components/SharedWallet/ImportSharedWallet').default
},
{
path: '/sharedWallet',
name: 'SharedWalletDetail',
component: require('@/components/SharedWallet/SharedWalletDetail').default,
children: [
{
children: [{
path: 'home',
name: 'SHaredWalletHome',
component: require('@/components/SharedWallet/SharedWalletHome').default,
Expand Down Expand Up @@ -191,7 +180,7 @@ export default new Router({
component: require('@/components/Node/NodeAuthorize/AuthorizeLogin').default
},
{
path: '/node/authorizeLoginSesameseed',
path: '/dapps/authorizeLoginSesameseed',
name: 'AuthorizeLoginSesameseed',
component: require('@/components/Node/NodeAuthorize/Sesameseed/AuthorizeLoginSesameseed').default
},
Expand All @@ -201,7 +190,7 @@ export default new Router({
component: require('@/components/Node/NodeAuthorize/AuthorizationMgmt').default
},
{
path: '/node/authorizationMgmtSesameseed',
path: '/dapps/authorizationMgmtSesameseed',
name: 'AuthorizationMgmtSesameseed',
component: require('@/components/Node/NodeAuthorize/Sesameseed/AuthorizationMgmtSesameseed').default
},
Expand All @@ -211,7 +200,7 @@ export default new Router({
component: require('@/components/Node/NodeAuthorize/NewAuthorization').default
},
{
path: '/node/newAuthorizationSesameseed',
path: '/dapps/newAuthorizationSesameseed',
name: 'NewAuthorizationSesameseed',
component: require('@/components/Node/NodeAuthorize/Sesameseed/NewAuthorizationSesameseed').default
},
Expand All @@ -220,5 +209,14 @@ export default new Router({
name: 'Oep4Home',
component: require('@/components/Common/Oep4Home').default
},
{
path: '*',
redirect: '/'
},
{
path: '/',
name: 'Home',
component: require('@/components/Home').default
},
]
})

0 comments on commit d4c617d

Please sign in to comment.