From 3880f7a60e7f1c09491447c47e9e5d86f6ce0e82 Mon Sep 17 00:00:00 2001 From: Vitalii Shpital <46756926+VitaliiShpital@users.noreply.github.com> Date: Fri, 25 Oct 2019 12:53:35 +0300 Subject: [PATCH] web/storagenode: vue-svg-loader implemented (#3347) --- web/storagenode/package-lock.json | 19 +++++++++ web/storagenode/package.json | 1 + .../src/app/components/BandwidthChart.vue | 1 + .../src/app/components/BarInfo.vue | 1 + .../src/app/components/ChecksArea.vue | 12 +++--- .../src/app/components/DiskSpaceChart.vue | 1 + .../src/app/components/PayoutArea.vue | 16 +++++--- .../src/app/components/SNOContentFilling.vue | 18 +++++--- .../src/app/components/SNOContentTitle.vue | 41 +++++++++++-------- .../src/app/components/SNOFooter.vue | 21 +++++++--- .../src/app/components/SNOHeader.vue | 22 ++++++---- .../src/app/components/SatelliteSelection.vue | 10 +++-- .../components/SatelliteSelectionDropdown.vue | 18 +++++--- web/storagenode/src/app/components/VChart.vue | 1 + web/storagenode/src/app/types/svg.d.ts | 7 ++++ .../src/app/views/DashboardArea.vue | 1 + web/storagenode/static/images/checksInfo.svg | 5 +++ web/storagenode/static/images/disqualify.svg | 3 ++ .../static/images/dropdownArrow.svg | 3 ++ .../static/images/largeDisqualify.svg | 3 ++ web/storagenode/static/images/offline.svg | 4 ++ web/storagenode/static/images/online.svg | 4 ++ web/storagenode/static/images/refresh.svg | 4 ++ web/storagenode/static/images/storjIcon.svg | 3 ++ web/storagenode/static/images/version.svg | 4 ++ web/storagenode/static/images/wallet.svg | 4 ++ web/storagenode/tsconfig.json | 3 +- web/storagenode/tslint.json | 8 +++- web/storagenode/vue.config.js | 8 ++++ 29 files changed, 190 insertions(+), 56 deletions(-) create mode 100644 web/storagenode/src/app/types/svg.d.ts create mode 100644 web/storagenode/static/images/checksInfo.svg create mode 100644 web/storagenode/static/images/disqualify.svg create mode 100644 web/storagenode/static/images/dropdownArrow.svg create mode 100644 web/storagenode/static/images/largeDisqualify.svg create mode 100644 web/storagenode/static/images/offline.svg create mode 100644 web/storagenode/static/images/online.svg create mode 100644 web/storagenode/static/images/refresh.svg create mode 100644 web/storagenode/static/images/storjIcon.svg create mode 100644 web/storagenode/static/images/version.svg create mode 100644 web/storagenode/static/images/wallet.svg diff --git a/web/storagenode/package-lock.json b/web/storagenode/package-lock.json index 755b17257..2dc725cd9 100644 --- a/web/storagenode/package-lock.json +++ b/web/storagenode/package-lock.json @@ -13129,6 +13129,15 @@ "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", "dev": true }, + "svg-to-vue": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/svg-to-vue/-/svg-to-vue-0.4.0.tgz", + "integrity": "sha512-g/ZHtEFf4QDsDtTk9tuYX/MJ2HESTUBMTkuLoffQGQ3xMtlmD9Ec4YyTgmMkP1P8QJtWWu2FiGdOnlKaXc/X/Q==", + "dev": true, + "requires": { + "svgo": "^1.1.1" + } + }, "svgo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz", @@ -14200,6 +14209,16 @@ "loader-utils": "^1.0.2" } }, + "vue-svg-loader": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/vue-svg-loader/-/vue-svg-loader-0.12.0.tgz", + "integrity": "sha512-pg8H6iKCj+DAC7FZuxdfGJMHiFpJPv/YyoN1M7Iqlf+Hu4eU6Q/W/sEFx978syQA+aOx0NXrp+uQUAajqQvXbQ==", + "dev": true, + "requires": { + "loader-utils": "^1.2.3", + "svg-to-vue": "^0.4.0" + } + }, "vue-template-compiler": { "version": "2.6.10", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz", diff --git a/web/storagenode/package.json b/web/storagenode/package.json index b8d7e6f69..e4e6c1779 100644 --- a/web/storagenode/package.json +++ b/web/storagenode/package.json @@ -32,6 +32,7 @@ "tslint-consistent-codestyle": "1.15.1", "tslint-loader": "3.5.4", "typescript": "3.5.3", + "vue-svg-loader": "0.12.0", "vue-template-compiler": "2.6.10", "vue-tslint": "0.3.2", "vue-tslint-loader": "3.5.6", diff --git a/web/storagenode/src/app/components/BandwidthChart.vue b/web/storagenode/src/app/components/BandwidthChart.vue index 85df93ee1..c77368d09 100644 --- a/web/storagenode/src/app/components/BandwidthChart.vue +++ b/web/storagenode/src/app/components/BandwidthChart.vue @@ -18,6 +18,7 @@ import { Component, Vue } from 'vue-property-decorator'; import VChart from '@/app/components/VChart.vue'; + import { ChartData } from '@/app/types/chartData'; import { ChartUtils } from '@/app/utils/chart'; import { formatBytes } from '@/app/utils/converter'; diff --git a/web/storagenode/src/app/components/BarInfo.vue b/web/storagenode/src/app/components/BarInfo.vue index 9e40743ed..79e2c5e8f 100644 --- a/web/storagenode/src/app/components/BarInfo.vue +++ b/web/storagenode/src/app/components/BarInfo.vue @@ -22,6 +22,7 @@ import { Component, Prop, Vue } from 'vue-property-decorator'; import VBar from '@/app/components/VBar.vue'; import VInfo from '@/app/components/VInfo.vue'; + import { formatBytes } from '@/app/utils/converter'; @Component ({ diff --git a/web/storagenode/src/app/components/ChecksArea.vue b/web/storagenode/src/app/components/ChecksArea.vue index 1cab508aa..19e12e545 100644 --- a/web/storagenode/src/app/components/ChecksArea.vue +++ b/web/storagenode/src/app/components/ChecksArea.vue @@ -11,11 +11,10 @@ is-custom-position="true" >
{{label}}
{{walletAddress}}
@@ -20,7 +20,13 @@ @@ -35,6 +42,10 @@ export default class SNOFooter extends Vue {} justify-content: space-between; align-items: center; + &__icon { + min-width: 125px; + } + &__community-link, &__support-link { font-size: 14px; diff --git a/web/storagenode/src/app/components/SNOHeader.vue b/web/storagenode/src/app/components/SNOHeader.vue index 4ec457bde..eab75d6f1 100644 --- a/web/storagenode/src/app/components/SNOHeader.vue +++ b/web/storagenode/src/app/components/SNOHeader.vue @@ -5,14 +5,12 @@