From f89e7dc2bea36d797def10ac9725f15ddde2e885 Mon Sep 17 00:00:00 2001 From: CM Date: Sun, 6 Nov 2022 18:50:48 +0000 Subject: [PATCH 1/6] Rebased PR #213 Add QR code support Add TOTP code support Improve menu UX Improve prompt UX with accordion components Fix wallet idle/timeout functionality --- .vscode/settings.json | 5 +- app/img/beetSmall.png | Bin 0 -> 19337 bytes package-lock.json | 182 +- package.json | 3 +- src/app.js | 10 +- src/background.js | 118 +- src/components/account-details.vue | 83 + src/components/account-select.vue | 85 + src/components/backup.vue | 63 + src/components/balances.vue | 12 +- src/components/blockchains/operations.vue | 141 ++ src/components/dapps.vue | 113 + src/components/dashboard.vue | 101 +- src/components/header-guest.vue | 2 +- src/components/header-small.vue | 18 +- src/components/lang-select.vue | 57 +- src/components/main-menu.vue | 111 + src/components/popups.vue | 130 +- src/components/popups/genericrequestpopup.vue | 3 + .../popups/identityrequestpopup.vue | 6 +- src/components/popups/linkrequestpopup.vue | 4 + src/components/popups/relinkrequestpopup.vue | 5 +- src/components/popups/signedmessagepopup.vue | 11 +- .../popups/transactionrequestpopup.vue | 8 +- .../popups/transferrequestpopup.vue | 5 +- src/components/qr.vue | 260 ++ src/components/qr/Drag.vue | 100 + src/components/qr/Scan.vue | 167 ++ src/components/qr/Upload.vue | 41 + src/components/totp.vue | 393 +++ src/lib/apiUtils.js | 38 +- src/lib/blockchains/BitShares.js | 2120 ++++++++++++++++- src/lib/blockchains/BlockchainAPI.js | 69 +- src/router/index.js | 30 +- src/store/modules/AccountStore.js | 14 +- src/store/modules/SettingsStore.js | 47 +- src/translations/common/de.json | 50 + src/translations/common/en.json | 50 + src/translations/operations/de.json | 317 ++- src/translations/operations/en.json | 316 ++- 40 files changed, 5011 insertions(+), 277 deletions(-) create mode 100644 app/img/beetSmall.png create mode 100644 src/components/account-details.vue create mode 100644 src/components/account-select.vue create mode 100644 src/components/backup.vue create mode 100644 src/components/blockchains/operations.vue create mode 100644 src/components/dapps.vue create mode 100644 src/components/main-menu.vue create mode 100644 src/components/qr.vue create mode 100644 src/components/qr/Drag.vue create mode 100644 src/components/qr/Scan.vue create mode 100644 src/components/qr/Upload.vue create mode 100644 src/components/totp.vue diff --git a/.vscode/settings.json b/.vscode/settings.json index 48699102..1c0074eb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,5 +8,8 @@ {"language": "vue", "autoFix": true} ], "eslint.provideLintTask": true, - "eslint.run": "onSave" + "eslint.run": "onSave", + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + } } \ No newline at end of file diff --git a/app/img/beetSmall.png b/app/img/beetSmall.png new file mode 100644 index 0000000000000000000000000000000000000000..55ea334a90e8df2845b73d74812afeac0a8bdb38 GIT binary patch literal 19337 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 10.4.0" + }, + "optionalDependencies": { + "@zxing/text-encoding": "~0.9.0" + } + }, + "node_modules/@zxing/text-encoding": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", + "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", + "optional": true + }, "node_modules/7zip-bin": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz", @@ -3814,6 +3835,15 @@ "vue": ">=3" } }, + "node_modules/barcode-detector": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/barcode-detector/-/barcode-detector-0.7.0.tgz", + "integrity": "sha512-SJh+LV6e+W5e6QJe70ralFfqcYwvaOUGWyr+GepuQ5swPH4jF2asyTxOIUZNSU9Z5isD3KWI5hlqQ+b/QaFFOg==", + "dependencies": { + "@zxing/library": "^0.18.4", + "jsqr": "^1.3.1" + } + }, "node_modules/base-x": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz", @@ -4432,6 +4462,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/callforth": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/callforth/-/callforth-0.4.0.tgz", + "integrity": "sha512-k3kD3OBPRvYs3Sb41Fn1T7l6vvSmTMPq1a0jxh8QKD+wb+17G8oOq48eBi0stn8ahpNVUJtPlrlYwbfv9Cfhpg==" + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -4772,6 +4807,16 @@ "node": ">= 0.6" } }, + "node_modules/core-js": { + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz", + "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-js-compat": { "version": "3.25.1", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.1.tgz", @@ -7808,6 +7853,11 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsqr": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz", + "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" + }, "node_modules/jssha": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jssha/-/jssha-3.2.0.tgz", @@ -8835,6 +8885,18 @@ "node": ">=8" } }, + "node_modules/qrcode-reader-vue3": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/qrcode-reader-vue3/-/qrcode-reader-vue3-3.1.2.tgz", + "integrity": "sha512-OqhJ4lkKHlyV42Fm5qptm7cdV3X2DRbtCgTNMjcFY7plkMNDqGo+bPxxlGkoPMCHowxXa1pPu9knWPfoqu5mUg==", + "dependencies": { + "barcode-detector": "^0.7", + "callforth": "^0.4", + "core-js": "^3", + "vue": "^3", + "webrtc-adapter": "^7" + } + }, "node_modules/query-string": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz", @@ -9269,6 +9331,18 @@ "node": ">=8.0" } }, + "node_modules/rtcpeerconnection-shim": { + "version": "1.2.15", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz", + "integrity": "sha512-C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw==", + "dependencies": { + "sdp": "^2.6.0" + }, + "engines": { + "node": ">=6.0.0", + "npm": ">=3.10.0" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -9405,6 +9479,11 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/sdp": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.12.0.tgz", + "integrity": "sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==" + }, "node_modules/secure-random": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/secure-random/-/secure-random-1.1.2.tgz", @@ -10118,6 +10197,14 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/ts-custom-error": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz", + "integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", @@ -10900,6 +10987,19 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/webrtc-adapter": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.7.1.tgz", + "integrity": "sha512-TbrbBmiQBL9n0/5bvDdORc6ZfRY/Z7JnEj+EYOD1ghseZdpJ+nF2yx14k3LgQKc7JZnG7HAcL+zHnY25So9d7A==", + "dependencies": { + "rtcpeerconnection-shim": "^1.2.15", + "sdp": "^2.12.0" + }, + "engines": { + "node": ">=6.0.0", + "npm": ">=3.10.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -13866,6 +13966,21 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "@zxing/library": { + "version": "0.18.6", + "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.18.6.tgz", + "integrity": "sha512-bulZ9JHoLFd9W36pi+7e7DnEYNJhljYjZ1UTsKPOoLMU3qtC+REHITeCRNx40zTRJZx18W5TBRXt5pq2Uopjsw==", + "requires": { + "@zxing/text-encoding": "~0.9.0", + "ts-custom-error": "^3.0.0" + } + }, + "@zxing/text-encoding": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz", + "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", + "optional": true + }, "7zip-bin": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz", @@ -14176,6 +14291,15 @@ "quill": "^1.3.7" } }, + "barcode-detector": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/barcode-detector/-/barcode-detector-0.7.0.tgz", + "integrity": "sha512-SJh+LV6e+W5e6QJe70ralFfqcYwvaOUGWyr+GepuQ5swPH4jF2asyTxOIUZNSU9Z5isD3KWI5hlqQ+b/QaFFOg==", + "requires": { + "@zxing/library": "^0.18.4", + "jsqr": "^1.3.1" + } + }, "base-x": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz", @@ -14636,6 +14760,11 @@ "get-intrinsic": "^1.0.2" } }, + "callforth": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/callforth/-/callforth-0.4.0.tgz", + "integrity": "sha512-k3kD3OBPRvYs3Sb41Fn1T7l6vvSmTMPq1a0jxh8QKD+wb+17G8oOq48eBi0stn8ahpNVUJtPlrlYwbfv9Cfhpg==" + }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -14896,6 +15025,11 @@ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" }, + "core-js": { + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz", + "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==" + }, "core-js-compat": { "version": "3.25.1", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.1.tgz", @@ -17163,6 +17297,11 @@ "graceful-fs": "^4.1.6" } }, + "jsqr": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz", + "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==" + }, "jssha": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jssha/-/jssha-3.2.0.tgz", @@ -17937,6 +18076,18 @@ "escape-goat": "^2.0.0" } }, + "qrcode-reader-vue3": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/qrcode-reader-vue3/-/qrcode-reader-vue3-3.1.2.tgz", + "integrity": "sha512-OqhJ4lkKHlyV42Fm5qptm7cdV3X2DRbtCgTNMjcFY7plkMNDqGo+bPxxlGkoPMCHowxXa1pPu9knWPfoqu5mUg==", + "requires": { + "barcode-detector": "^0.7", + "callforth": "^0.4", + "core-js": "^3", + "vue": "^3", + "webrtc-adapter": "^7" + } + }, "query-string": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz", @@ -18278,6 +18429,14 @@ "sprintf-js": "^1.1.2" } }, + "rtcpeerconnection-shim": { + "version": "1.2.15", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz", + "integrity": "sha512-C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw==", + "requires": { + "sdp": "^2.6.0" + } + }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -18345,6 +18504,11 @@ "ajv-keywords": "^3.5.2" } }, + "sdp": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.12.0.tgz", + "integrity": "sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==" + }, "secure-random": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/secure-random/-/secure-random-1.1.2.tgz", @@ -18869,6 +19033,11 @@ "utf8-byte-length": "^1.0.1" } }, + "ts-custom-error": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz", + "integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==" + }, "tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", @@ -19438,6 +19607,15 @@ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true }, + "webrtc-adapter": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.7.1.tgz", + "integrity": "sha512-TbrbBmiQBL9n0/5bvDdORc6ZfRY/Z7JnEj+EYOD1ghseZdpJ+nF2yx14k3LgQKc7JZnG7HAcL+zHnY25So9d7A==", + "requires": { + "rtcpeerconnection-shim": "^1.2.15", + "sdp": "^2.12.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 80f4c727..14bd1cc8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "beet", "productName": "Beet Blockchain Companion", - "version": "0.15.0-rc1", + "version": "0.16.0-rc1", "apiversion": 3, "description": "Beet is a stand-alone key-manager and signing app for blockchains like BitShares, Bitcoin and others.", "author": "clockworkgr ", @@ -63,6 +63,7 @@ "mitt": "^3.0.0", "otpauth": "^8.0.1", "query-string": "^7.1.1", + "qrcode-reader-vue3": "^3.1.2", "simple-websocket": "^9.1.0", "socket.io": "^4.5.1", "typeface-rajdhani": "1.1.13", diff --git a/src/app.js b/src/app.js index 968bf1aa..9e85088e 100644 --- a/src/app.js +++ b/src/app.js @@ -5,7 +5,6 @@ import mitt from 'mitt'; import BalmUI from 'balm-ui'; // Official Google Material Components import BalmUIPlus from 'balm-ui/dist/balm-ui-plus'; // BalmJS Team Material Components -import BalmUINext from 'balm-ui/dist/balm-ui-next'; import 'balm-ui-css'; import router from './router/index.js'; @@ -53,16 +52,11 @@ window.t = (key, params) => { app.use(VueRouter); app.use(BalmUI, { $theme: { - primary: '#C7088E' + primary: '#C7088E', + secondary: '#960069' } }); app.use(BalmUIPlus); -app.use(BalmUINext, { - // Optional. Overwrite `` props with default value. - UiNavigationBar: { - // some props - } -}); app.use(router); app.use(store); diff --git a/src/background.js b/src/background.js index 523b7822..52823eff 100644 --- a/src/background.js +++ b/src/background.js @@ -5,6 +5,9 @@ import path from "path"; import url from "url"; import fs from 'fs'; +import os from 'os'; +import { argv } from 'node:process'; +import queryString from "query-string"; // Special module holding environment variables which you declared // in config/env_xxx.json file. @@ -312,7 +315,7 @@ const createWindow = async () => { const NOTIFICATION_TITLE = 'Beet wallet notification'; const NOTIFICATION_BODY = arg == 'request' ? "Beet has received a new request." : arg; - if (process.platform === 'win32') + if (os.platform === 'win32') { app.setAppUserModelId(app.name); } @@ -334,7 +337,7 @@ const createWindow = async () => { seed = null; const emitter = mitt(); try { - emitter.emit('timeout', 'logout'); + mainWindow.webContents.send('timeout', 'logout'); } catch (error) { console.log(error); } @@ -460,26 +463,95 @@ const createWindow = async () => { app.disableHardwareAcceleration(); -// This method will be called when Electron has finished -// initialization and is ready to create browser windows. -// Some APIs can only be used after this event occurs. -app.on('ready', async () => { - createWindow(); -}); +let currentOS = os.platform(); +if (currentOS == 'win32') { + // windows specific steps + const gotTheLock = app.requestSingleInstanceLock() + + if (!gotTheLock) { + app.quit() + } else { + // Handle the protocol. In this case, we choose to show an Error Box. + app.on('second-instance', (event, args) => { + // Someone tried to run a second instance, we should focus our window. + if (mainWindow) { + if (mainWindow.isMinimized()) mainWindow.restore() + mainWindow.focus() + + if (process.platform == 'win32' && args.length > 2) { + let deeplinkingUrl = args[3].replace('beet://api/', ''); + + let qs; + try { + qs = queryString.parse(deeplinkingUrl); + } catch (error) { + console.log(error); + return; + } + + if (qs) { + mainWindow.webContents.send('deeplink', qs); + } + } -// Quit when all windows are closed. -app.on('window-all-closed', () => { - // On OS X it is common for applications and their menu bar - // to stay active until the user quits explicitly with Cmd + Q - if (process.platform !== 'darwin') { - app.quit(); - } -}); + } + }) + + let defaultPath; + try { + defaultPath = path.resolve(argv[1]); + } catch (error) { + console.log(error) + } + app.setAsDefaultProtocolClient('beet', process.execPath, [defaultPath]) + + app.whenReady().then(() => { + createWindow(); + }); + } +} else { + app.setAsDefaultProtocolClient('beet') + + // mac or linux + app.whenReady().then(() => { + createWindow() + }) + + // Handle the protocol. In this case, we choose to show an Error Box. + app.on('open-url', (event, url) => { + let deeplinkingUrl = url.replace('beet://api/', ''); + + let qs; + try { + qs = queryString.parse(deeplinkingUrl); + } catch (error) { + console.log(error); + return; + } + + if (qs) { + mainWindow.webContents.send('deeplink', qs); + } + }) + + // This method will be called when Electron has finished + // initialization and is ready to create browser windows. + // Some APIs can only be used after this event occurs. + // Quit when all windows are closed. + app.on('window-all-closed', () => { + // On OS X it is common for applications and their menu bar + // to stay active until the user quits explicitly with Cmd + Q + if (process.platform !== 'darwin') { + app.quit(); + } + }); + + app.on('activate', () => { + // On OS X it's common to re-create a window in the app when the + // dock icon is clicked and there are no other windows open. + if (mainWindow === null) { + createWindow(); + } + }); +} -app.on('activate', () => { - // On OS X it's common to re-create a window in the app when the - // dock icon is clicked and there are no other windows open. - if (mainWindow === null) { - createWindow(); - } -}); diff --git a/src/components/account-details.vue b/src/components/account-details.vue new file mode 100644 index 00000000..4b167e2d --- /dev/null +++ b/src/components/account-details.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/components/account-select.vue b/src/components/account-select.vue new file mode 100644 index 00000000..94f2f094 --- /dev/null +++ b/src/components/account-select.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/components/backup.vue b/src/components/backup.vue new file mode 100644 index 00000000..2a5396a7 --- /dev/null +++ b/src/components/backup.vue @@ -0,0 +1,63 @@ + + + diff --git a/src/components/balances.vue b/src/components/balances.vue index 65855205..51da3303 100644 --- a/src/components/balances.vue +++ b/src/components/balances.vue @@ -113,10 +113,12 @@ :data="tableData.data" :thead="tableData.thead" :tbody="tableData.tbody" - style="height: 180px; overflow-y: scroll;" + v-shadow="1" + style="height: 150px;" /> No balances in account @@ -124,17 +126,15 @@ -
- -
-
Connecting to blockchain
-
+ Couldn't to connect to blockchain diff --git a/src/components/blockchains/operations.vue b/src/components/blockchains/operations.vue new file mode 100644 index 00000000..fb90def7 --- /dev/null +++ b/src/components/blockchains/operations.vue @@ -0,0 +1,141 @@ + + + diff --git a/src/components/dapps.vue b/src/components/dapps.vue new file mode 100644 index 00000000..6bd1252f --- /dev/null +++ b/src/components/dapps.vue @@ -0,0 +1,113 @@ + + + diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue index 3e84a570..8d865e76 100644 --- a/src/components/dashboard.vue +++ b/src/components/dashboard.vue @@ -1,102 +1,29 @@ diff --git a/src/components/header-guest.vue b/src/components/header-guest.vue index efa38c94..693aa704 100644 --- a/src/components/header-guest.vue +++ b/src/components/header-guest.vue @@ -18,7 +18,7 @@ class="largeHeader" columns="12" > - + { logger.debug("Small Header mounted"); }); + + /* + + + + */