diff --git a/new-web/components/ExplorerLink.vue b/new-web/components/ExplorerLink.vue index f97c718..2d8badb 100644 --- a/new-web/components/ExplorerLink.vue +++ b/new-web/components/ExplorerLink.vue @@ -1,26 +1,22 @@ - +}; + \ No newline at end of file diff --git a/new-web/components/tables/Blocks.vue b/new-web/components/tables/Blocks.vue index 7e5887e..8c754fe 100644 --- a/new-web/components/tables/Blocks.vue +++ b/new-web/components/tables/Blocks.vue @@ -92,7 +92,7 @@ export default { align: 'start', value: 'height', }, - { text: this.$t('pages.blocks.blockHash'), value: 'hash' }, + { text: this.$t('pages.blocks.blockHash'), value: 'finder' }, { text: this.$t('pages.blocks.timeFound'), value: 'timestamp' }, { text: this.$t('pages.blocks.variance'), value: 'shares' }, { diff --git a/new-web/i18n/en.json b/new-web/i18n/en.json index 96f091b..7f42448 100644 --- a/new-web/i18n/en.json +++ b/new-web/i18n/en.json @@ -52,7 +52,7 @@ "blocksPerPage": "Blocks per page", "search": "Search by number or hash", "blockNumber": "Block Number", - "blockHash": "Block Hash", + "blockHash": "finder", "timeFound": "Time Found", "variance": "Variance", "reward": "Reward", diff --git a/new-web/nuxt.config.js b/new-web/nuxt.config.js index 64bc497..4736507 100644 --- a/new-web/nuxt.config.js +++ b/new-web/nuxt.config.js @@ -2,9 +2,6 @@ import config from './params/config.json' export default { - server: { - host: '192.168.8.169' // default: localhost sudo npm run dev - }, // Disable server-side rendering (https://go.nuxtjs.dev/ssr-mode) ssr: false, @@ -25,7 +22,7 @@ export default { //The dist folder is named dist by default but can be configured in your nuxt.config file. generate: { - dir: '/var/www/etc3pool' + dir: '/var/www/testpool' }, // Global CSS (https://go.nuxtjs.dev/config-css) diff --git a/new-web/package.json b/new-web/package.json index 63f79ef..41c706f 100644 --- a/new-web/package.json +++ b/new-web/package.json @@ -28,6 +28,7 @@ "@nuxtjs/eslint-module": "^3.0.2", "@nuxtjs/vuetify": "^1.12.1", "@vue/test-utils": "^1.2.0", + "apexcharts": "^3.41.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", "babel-jest": "^26.5.0", @@ -38,6 +39,7 @@ "husky": "^6.0.0", "jest": "^26.5.0", "prettier": "^2.4.1", + "vue-apexcharts": "^1.6.2", "vue-jest": "^3.0.4" } } diff --git a/new-web/pages/blocks.vue b/new-web/pages/blocks.vue index 0c68c78..5bb4b6f 100644 --- a/new-web/pages/blocks.vue +++ b/new-web/pages/blocks.vue @@ -1,31 +1,23 @@ -> diff --git a/new-web/pages/index.vue b/new-web/pages/index.vue index c335db6..25ffdfa 100644 --- a/new-web/pages/index.vue +++ b/new-web/pages/index.vue @@ -15,12 +15,8 @@ - {{ - config.title - }} - {{ - config.description - }} + {{ config.title }} + {{ config.description }} @@ -49,12 +45,8 @@ - {{ - config.network.title - }} - {{ - config.network.algo - }} + {{ config.network.title }} + {{ config.network.algo }} @@ -68,12 +60,6 @@ }}
  • {{ $tc('pages.home.mode', 0, { mode: config.mode }) }}
  • -
  • - {{ $t('pages.home.poweredBy') }} - open-etc-pool-friends. -
  • {{ $t('pages.home.protocols') }}
  • @@ -103,25 +89,37 @@ :items-per-page="-1" :no-data-text="$t('pages.home.noMiners')" > -