diff --git a/package.json b/package.json index 0bbb92a..83750c5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "owallet", "productName": "OWallet", "homepage": "http://ont.io", - "version": "v0.9.13", + "version": "v0.9.14", "author": "Ontology Foundation Ltd. ", "description": "OWallet is a comprehensive Ontology desktop wallet", "license": "Apache-2.0", diff --git a/src/renderer/assets/apps.svg b/src/renderer/assets/apps.svg new file mode 100644 index 0000000..c210e93 --- /dev/null +++ b/src/renderer/assets/apps.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/dapps-hover.png b/src/renderer/assets/dapps-hover.png index 44e9455..1810d4d 100644 Binary files a/src/renderer/assets/dapps-hover.png and b/src/renderer/assets/dapps-hover.png differ diff --git a/src/renderer/assets/dapps.png b/src/renderer/assets/dapps.png index d5917fe..3afc9bd 100644 Binary files a/src/renderer/assets/dapps.png and b/src/renderer/assets/dapps.png differ diff --git a/src/renderer/components/Identitys.vue b/src/renderer/components/Identitys.vue index 38941f3..f8bc42b 100644 --- a/src/renderer/components/Identitys.vue +++ b/src/renderer/components/Identitys.vue @@ -18,10 +18,10 @@
- {{$t('identitys.createIdentity')}} + {{$t('identitys.createIdentity')}}
- {{$t('identitys.importIdentity')}} + {{$t('identitys.importIdentity')}}
diff --git a/src/renderer/components/JsonWallet/View/Details.vue b/src/renderer/components/JsonWallet/View/Details.vue index 4863e19..2af9472 100644 --- a/src/renderer/components/JsonWallet/View/Details.vue +++ b/src/renderer/components/JsonWallet/View/Details.vue @@ -77,7 +77,7 @@
{{ errors.first('reNewPassword') }}
diff --git a/src/renderer/components/Wallets.vue b/src/renderer/components/Wallets.vue index 6874f82..5eced57 100644 --- a/src/renderer/components/Wallets.vue +++ b/src/renderer/components/Wallets.vue @@ -44,10 +44,10 @@
- {{$t('wallets.createCommonWallet')}} + {{$t('wallets.createCommonWallet')}}
- {{$t('wallets.importCommonWallet')}} + {{$t('wallets.importCommonWallet')}}
@@ -63,10 +63,10 @@
- {{$t('wallets.createSharedWallet')}} + {{$t('wallets.createSharedWallet')}}
- {{$t('wallets.joinSharedWallet')}} + {{$t('wallets.joinSharedWallet')}}
@@ -85,7 +85,7 @@
- {{$t('wallets.importLedgerWallet')}} + {{$t('wallets.importLedgerWallet')}}
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js index e3b0405..70fbf51 100644 --- a/src/renderer/router/index.js +++ b/src/renderer/router/index.js @@ -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 @@ -36,46 +35,37 @@ 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 }, @@ -83,8 +73,7 @@ export default new Router({ path: '/sharedWallet', name: 'SharedWalletDetail', component: require('@/components/SharedWallet/SharedWalletDetail').default, - children: [ - { + children: [{ path: 'home', name: 'SHaredWalletHome', component: require('@/components/SharedWallet/SharedWalletHome').default, @@ -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 }, @@ -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 }, @@ -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 }, @@ -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 + }, ] })