From 77b7d34d50225ad68b47cd0565ec972e33decc3e Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 6 Aug 2019 19:53:43 +0300 Subject: [PATCH 1/6] Isolating staking dapp css, extracting of non-critical css --- apps/block_scout_web/assets/css/app.scss | 20 ++---- .../assets/css/components/_modal.scss | 6 -- .../css/components/_modal_variables.scss | 5 ++ .../assets/css/components/_stakes_table.scss | 2 + .../components/{ => stakes}/_copy_icon.scss | 0 .../{ => stakes}/_modal_become_candidate.scss | 0 .../_modal_bottom_disclaimer.scss | 0 .../components/{ => stakes}/_modal_stake.scss | 0 .../{ => stakes}/_modal_validator_info.scss | 0 .../{ => stakes}/_progress_from_to.scss | 0 .../css/components/{ => stakes}/_stakes.scss | 0 .../{ => stakes}/_stakes_btn_remove_pool.scss | 0 .../{ => stakes}/_stakes_empty_content.scss | 0 .../{ => stakes}/_stakes_progress.scss | 3 + .../assets/css/non-critical.scss | 13 ++++ apps/block_scout_web/assets/css/stakes.scss | 19 ++++++ .../block_scout_web/assets/js/non-critical.js | 63 +++++++++++++++++++ .../block_scout_web/assets/js/pages/stakes.js | 1 + apps/block_scout_web/assets/package.json | 4 +- apps/block_scout_web/assets/webpack.config.js | 10 ++- .../templates/layout/app.html.eex | 2 + 21 files changed, 121 insertions(+), 27 deletions(-) create mode 100644 apps/block_scout_web/assets/css/components/_modal_variables.scss rename apps/block_scout_web/assets/css/components/{ => stakes}/_copy_icon.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_modal_become_candidate.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_modal_bottom_disclaimer.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_modal_stake.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_modal_validator_info.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_progress_from_to.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_stakes.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_stakes_btn_remove_pool.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_stakes_empty_content.scss (100%) rename apps/block_scout_web/assets/css/components/{ => stakes}/_stakes_progress.scss (93%) create mode 100644 apps/block_scout_web/assets/css/non-critical.scss create mode 100644 apps/block_scout_web/assets/css/stakes.scss create mode 100644 apps/block_scout_web/assets/js/non-critical.js create mode 100644 apps/block_scout_web/assets/js/pages/stakes.js diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index e91df91740..4a914c6944 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/apps/block_scout_web/assets/css/app.scss @@ -24,7 +24,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "node_modules/bootstrap/scss/reboot"; @import "node_modules/bootstrap/scss/grid"; @import "node_modules/bootstrap/scss/code"; -@import "node_modules/bootstrap/scss/modal"; @import "node_modules/bootstrap/scss/close"; @import "node_modules/bootstrap/scss/buttons"; @import "node_modules/bootstrap/scss/forms"; @@ -50,7 +49,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "node_modules/bootstrap/scss/navbar"; @import "node_modules/bootstrap/scss/pagination"; @import "node_modules/bootstrap/scss/tables"; -@import "node_modules/bootstrap/scss/tooltip"; @import "node_modules/bootstrap/scss/transitions"; // Code highlight @@ -75,8 +73,10 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/filter"; @import "components/button"; @import "components/table"; -@import "components/qr-code"; @import "components/navbar"; + +@import "theme/dark-theme"; + @import "components/animations"; @import "components/card"; @import "components/tile"; @@ -93,26 +93,14 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/transaction-input"; @import "components/coin-balance-tile"; @import "components/highlight"; -@import "components/copy_icon"; @import "components/btn_full"; @import "components/btn_line"; -@import "components/stakes"; @import "components/check"; @import "components/stakes_table"; @import "components/i_tooltip"; @import "components/check_tooltip"; @import "components/tooltip"; -@import "components/progress_from_to"; -@import "components/stakes_empty_content"; -@import "components/stakes_btn_remove_pool"; -@import "components/modal"; -@import "components/modal_validator_info"; @import "components/form"; -@import "components/stakes_progress"; -@import "components/modal_status"; -@import "components/modal_bottom_disclaimer"; -@import "components/modal_become_candidate"; -@import "components/modal_stake"; @import "components/btn_copy"; @import "components/btn_qr"; @import "components/btn_address_card"; @@ -124,11 +112,11 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/errors"; @import "components/log-search"; @import "components/radio"; +@import "components/modal_variables"; @import "components/network-selector"; @import "components/new_smart_contract"; @import "components/radio_big"; @import "components/btn_no_border"; -@import "theme/dark-theme"; :export { dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color; diff --git a/apps/block_scout_web/assets/css/components/_modal.scss b/apps/block_scout_web/assets/css/components/_modal.scss index bc9e16c875..4e70be687c 100644 --- a/apps/block_scout_web/assets/css/components/_modal.scss +++ b/apps/block_scout_web/assets/css/components/_modal.scss @@ -1,9 +1,3 @@ -$modal-overlay-color: rgba($primary, 0.9) !default; -$modal-horizontal-padding: 30px !default; -$modal-vertical-padding: 25px !default; -$modal-border-radius: 10px !default; -$modal-gray-background: #f6f7f9 !default; - .modal-backdrop { background-color: $modal-overlay-color; diff --git a/apps/block_scout_web/assets/css/components/_modal_variables.scss b/apps/block_scout_web/assets/css/components/_modal_variables.scss new file mode 100644 index 0000000000..92e2a94a33 --- /dev/null +++ b/apps/block_scout_web/assets/css/components/_modal_variables.scss @@ -0,0 +1,5 @@ +$modal-overlay-color: rgba($primary, 0.9) !default; +$modal-horizontal-padding: 30px !default; +$modal-vertical-padding: 25px !default; +$modal-border-radius: 10px !default; +$modal-gray-background: #f6f7f9 !default; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_stakes_table.scss b/apps/block_scout_web/assets/css/components/_stakes_table.scss index 1831dc4d5b..46530836fb 100644 --- a/apps/block_scout_web/assets/css/components/_stakes_table.scss +++ b/apps/block_scout_web/assets/css/components/_stakes_table.scss @@ -1,5 +1,7 @@ $stakes-table-th-background: #f5f6fa !default; $stakes-table-cell-separation: 25px !default; +$stakes-banned-background: #fff3f7 !default; +$stakes-banned-color: #ff7986 !default; .stakes-table-container { max-width: 100%; diff --git a/apps/block_scout_web/assets/css/components/_copy_icon.scss b/apps/block_scout_web/assets/css/components/stakes/_copy_icon.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_copy_icon.scss rename to apps/block_scout_web/assets/css/components/stakes/_copy_icon.scss diff --git a/apps/block_scout_web/assets/css/components/_modal_become_candidate.scss b/apps/block_scout_web/assets/css/components/stakes/_modal_become_candidate.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_modal_become_candidate.scss rename to apps/block_scout_web/assets/css/components/stakes/_modal_become_candidate.scss diff --git a/apps/block_scout_web/assets/css/components/_modal_bottom_disclaimer.scss b/apps/block_scout_web/assets/css/components/stakes/_modal_bottom_disclaimer.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_modal_bottom_disclaimer.scss rename to apps/block_scout_web/assets/css/components/stakes/_modal_bottom_disclaimer.scss diff --git a/apps/block_scout_web/assets/css/components/_modal_stake.scss b/apps/block_scout_web/assets/css/components/stakes/_modal_stake.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_modal_stake.scss rename to apps/block_scout_web/assets/css/components/stakes/_modal_stake.scss diff --git a/apps/block_scout_web/assets/css/components/_modal_validator_info.scss b/apps/block_scout_web/assets/css/components/stakes/_modal_validator_info.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_modal_validator_info.scss rename to apps/block_scout_web/assets/css/components/stakes/_modal_validator_info.scss diff --git a/apps/block_scout_web/assets/css/components/_progress_from_to.scss b/apps/block_scout_web/assets/css/components/stakes/_progress_from_to.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_progress_from_to.scss rename to apps/block_scout_web/assets/css/components/stakes/_progress_from_to.scss diff --git a/apps/block_scout_web/assets/css/components/_stakes.scss b/apps/block_scout_web/assets/css/components/stakes/_stakes.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_stakes.scss rename to apps/block_scout_web/assets/css/components/stakes/_stakes.scss diff --git a/apps/block_scout_web/assets/css/components/_stakes_btn_remove_pool.scss b/apps/block_scout_web/assets/css/components/stakes/_stakes_btn_remove_pool.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_stakes_btn_remove_pool.scss rename to apps/block_scout_web/assets/css/components/stakes/_stakes_btn_remove_pool.scss diff --git a/apps/block_scout_web/assets/css/components/_stakes_empty_content.scss b/apps/block_scout_web/assets/css/components/stakes/_stakes_empty_content.scss similarity index 100% rename from apps/block_scout_web/assets/css/components/_stakes_empty_content.scss rename to apps/block_scout_web/assets/css/components/stakes/_stakes_empty_content.scss diff --git a/apps/block_scout_web/assets/css/components/_stakes_progress.scss b/apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss similarity index 93% rename from apps/block_scout_web/assets/css/components/_stakes_progress.scss rename to apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss index 4159099fcd..002860110c 100644 --- a/apps/block_scout_web/assets/css/components/_stakes_progress.scss +++ b/apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss @@ -1,3 +1,6 @@ +$modal-horizontal-padding: 30px !default; +$modal-vertical-padding: 25px !default; + .stakes-progress { .modal-stake-right & { border-left: 1px solid $base-border-color; diff --git a/apps/block_scout_web/assets/css/non-critical.scss b/apps/block_scout_web/assets/css/non-critical.scss new file mode 100644 index 0000000000..81d5bd2b09 --- /dev/null +++ b/apps/block_scout_web/assets/css/non-critical.scss @@ -0,0 +1,13 @@ +// Bootstrap Core CSS +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/mixins"; + +@import "theme/variables"; + +@import "node_modules/bootstrap/scss/modal"; +@import "node_modules/bootstrap/scss/tooltip"; + +@import "components/qr-code"; +@import "components/modal_variables"; +@import "components/modal"; +@import "components/modal_status"; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/stakes.scss b/apps/block_scout_web/assets/css/stakes.scss new file mode 100644 index 0000000000..81410e12f0 --- /dev/null +++ b/apps/block_scout_web/assets/css/stakes.scss @@ -0,0 +1,19 @@ +@import "./mixins"; + +// Bootstrap Core CSS +@import "node_modules/bootstrap/scss/functions"; +@import "node_modules/bootstrap/scss/mixins"; + +@import "theme/variables"; + +@import "components/stakes/copy_icon"; +@import "components/stakes/stakes"; +@import "components/stakes/progress_from_to"; +@import "components/stakes/stakes_empty_content"; +@import "components/stakes/stakes_btn_remove_pool"; +@import "components/stakes/stakes_progress"; +@import "components/modal_variables"; +@import "components/stakes/modal_stake"; +@import "components/stakes/modal_become_candidate"; +@import "components/stakes/modal_validator_info"; +@import "components/stakes/modal_bottom_disclaimer"; \ No newline at end of file diff --git a/apps/block_scout_web/assets/js/non-critical.js b/apps/block_scout_web/assets/js/non-critical.js new file mode 100644 index 0000000000..89059dd306 --- /dev/null +++ b/apps/block_scout_web/assets/js/non-critical.js @@ -0,0 +1,63 @@ +// We need to import the CSS so that webpack will load it. +// The ExtractTextPlugin is used to separate it out into +// its own CSS file. +import '../css/app.scss' + +// webpack automatically concatenates all files in your +// watched paths. Those paths can be configured as +// endpoints in "webpack.config.js". +// +// Import dependencies +// +import '@babel/polyfill' +import 'phoenix_html' +import 'bootstrap' + +// Import local files +// +// Local files can be imported directly using relative +// paths "./socket" or full ones "web/static/js/socket". + +import './locale' + +import './pages/address' +import './pages/address/coin_balances' +import './pages/address/transactions' +import './pages/address/logs' +import './pages/address/validations' +import './pages/address/internal_transactions' +import './pages/blocks' +import './pages/chain' +import './pages/pending_transactions' +import './pages/transaction' +import './pages/transactions' +import './pages/favorites' +import './pages/network-search' +import './pages/layout' +import './pages/verification_form' +import './pages/dark-mode-switcher' + +import './pages/admin/tasks.js' + +import './lib/clipboard_buttons' +import './lib/currency' +import './lib/from_now' +import './lib/indexing' +import './lib/loading_element' +import './lib/market_history_chart' +import './lib/pending_transactions_toggle' +import './lib/pretty_json' +import './lib/reload_button' +import './lib/smart_contract/read_only_functions' +import './lib/smart_contract/wei_ether_converter' +import './lib/stop_propagation' +import './lib/token_balance_dropdown' +import './lib/token_balance_dropdown_search' +import './lib/token_transfers_toggle' +import './lib/transaction_input_dropdown' +import './lib/async_listing_load' +import './lib/tooltip' +import './lib/modals' +import './lib/try_api' +import './lib/card_tabs' +import './lib/network_selector' diff --git a/apps/block_scout_web/assets/js/pages/stakes.js b/apps/block_scout_web/assets/js/pages/stakes.js new file mode 100644 index 0000000000..dd379d254f --- /dev/null +++ b/apps/block_scout_web/assets/js/pages/stakes.js @@ -0,0 +1 @@ +import '../../css/stakes.scss' diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json index 3ae8973cca..1e8bc813cb 100644 --- a/apps/block_scout_web/assets/package.json +++ b/apps/block_scout_web/assets/package.json @@ -20,12 +20,12 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.1.0-4", - "highlight.js": "^9.13.1", - "highlightjs-solidity": "^1.0.6", "bignumber.js": "^7.2.1", "bootstrap": "^4.1.3", "chart.js": "^2.7.2", "clipboard": "^2.0.1", + "highlight.js": "^9.13.1", + "highlightjs-solidity": "^1.0.6", "humps": "^2.0.1", "jquery": "^3.3.1", "lodash": "^4.17.11", diff --git a/apps/block_scout_web/assets/webpack.config.js b/apps/block_scout_web/assets/webpack.config.js index f1091dcffb..6a50bd5a06 100644 --- a/apps/block_scout_web/assets/webpack.config.js +++ b/apps/block_scout_web/assets/webpack.config.js @@ -29,9 +29,13 @@ function transpileViewScript(file) { const appJs = { - entry: './js/app.js', + entry: { + app: './js/app.js', + stakes: './js/pages/stakes.js', + 'non-critical': './css/non-critical.scss', + }, output: { - filename: 'app.js', + filename: '[name].js', path: path.resolve(__dirname, '../priv/static/js') }, optimization: { @@ -80,7 +84,7 @@ const appJs = }, plugins: [ new MiniCssExtractPlugin({ - filename: '../css/app.css' + filename: '../css/[name].css' }), new CopyWebpackPlugin([{ from: 'static/', to: '../' }]), new ContextReplacementPlugin(/moment[\/\\]locale$/, /en/) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex index c3b0fe2ff1..15b2167d43 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex @@ -5,6 +5,8 @@ "> + + "> "> From 83ee47fc85142bfb3e0f9753ce073d19d5254bfc Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 6 Aug 2019 21:28:13 +0300 Subject: [PATCH 2/6] Update variables --- apps/block_scout_web/assets/css/app.scss | 1 + apps/block_scout_web/assets/css/components/_stakes_table.scss | 2 -- apps/block_scout_web/assets/css/components/stakes/_stakes.scss | 2 -- .../assets/css/components/stakes/_stakes_progress.scss | 3 --- apps/block_scout_web/assets/css/stakes.scss | 3 ++- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index 4a914c6944..9c0f27e976 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/apps/block_scout_web/assets/css/app.scss @@ -96,6 +96,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/btn_full"; @import "components/btn_line"; @import "components/check"; +@import "components/stakes_variables"; @import "components/stakes_table"; @import "components/i_tooltip"; @import "components/check_tooltip"; diff --git a/apps/block_scout_web/assets/css/components/_stakes_table.scss b/apps/block_scout_web/assets/css/components/_stakes_table.scss index 46530836fb..1831dc4d5b 100644 --- a/apps/block_scout_web/assets/css/components/_stakes_table.scss +++ b/apps/block_scout_web/assets/css/components/_stakes_table.scss @@ -1,7 +1,5 @@ $stakes-table-th-background: #f5f6fa !default; $stakes-table-cell-separation: 25px !default; -$stakes-banned-background: #fff3f7 !default; -$stakes-banned-color: #ff7986 !default; .stakes-table-container { max-width: 100%; diff --git a/apps/block_scout_web/assets/css/components/stakes/_stakes.scss b/apps/block_scout_web/assets/css/components/stakes/_stakes.scss index 87271bc983..c6335ec066 100644 --- a/apps/block_scout_web/assets/css/components/stakes/_stakes.scss +++ b/apps/block_scout_web/assets/css/components/stakes/_stakes.scss @@ -1,8 +1,6 @@ $stakes-dashboard-copy-icon-color: $copy-icon-color !default; $stakes-address-color: $primary !default; $stakes-control-color: $primary !default; -$stakes-banned-color: #ff7986 !default; -$stakes-banned-background: #fff3f7 !default; $stakes-stats-item-color: #fff !default; $stakes-stats-item-border-color: #fff !default; diff --git a/apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss b/apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss index 002860110c..4159099fcd 100644 --- a/apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss +++ b/apps/block_scout_web/assets/css/components/stakes/_stakes_progress.scss @@ -1,6 +1,3 @@ -$modal-horizontal-padding: 30px !default; -$modal-vertical-padding: 25px !default; - .stakes-progress { .modal-stake-right & { border-left: 1px solid $base-border-color; diff --git a/apps/block_scout_web/assets/css/stakes.scss b/apps/block_scout_web/assets/css/stakes.scss index 81410e12f0..77ada07b46 100644 --- a/apps/block_scout_web/assets/css/stakes.scss +++ b/apps/block_scout_web/assets/css/stakes.scss @@ -6,13 +6,14 @@ @import "theme/variables"; +@import "components/stakes_variables"; @import "components/stakes/copy_icon"; @import "components/stakes/stakes"; @import "components/stakes/progress_from_to"; @import "components/stakes/stakes_empty_content"; @import "components/stakes/stakes_btn_remove_pool"; -@import "components/stakes/stakes_progress"; @import "components/modal_variables"; +@import "components/stakes/stakes_progress"; @import "components/stakes/modal_stake"; @import "components/stakes/modal_become_candidate"; @import "components/stakes/modal_validator_info"; From 023d9d13a437a57feafd476be33fd294cdd60b85 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 6 Aug 2019 21:32:42 +0300 Subject: [PATCH 3/6] stakes_variables.scss --- CHANGELOG.md | 1 + .../assets/css/components/_stakes_variables.scss | 2 ++ apps/block_scout_web/priv/gettext/default.pot | 16 ++++++++-------- .../priv/gettext/en/LC_MESSAGES/default.po | 16 ++++++++-------- 4 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 apps/block_scout_web/assets/css/components/_stakes_variables.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index 62d1cc05b7..619b9ff6f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth ### Fixes +- [#2514](https://github.com/poanetwork/blockscout/pull/2514) - Isolating of staking dapp css && extracting of non-critical css - [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance - [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout - [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes diff --git a/apps/block_scout_web/assets/css/components/_stakes_variables.scss b/apps/block_scout_web/assets/css/components/_stakes_variables.scss new file mode 100644 index 0000000000..4c23ea421b --- /dev/null +++ b/apps/block_scout_web/assets/css/components/_stakes_variables.scss @@ -0,0 +1,2 @@ +$stakes-banned-background: #fff3f7 !default; +$stakes-banned-color: #ff7986 !default; \ No newline at end of file diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 95bb1f079b..1ea7381c9a 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -62,7 +62,7 @@ msgid "(query)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:36 +#: lib/block_scout_web/templates/layout/app.html.eex:38 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate." msgstr "" @@ -157,7 +157,7 @@ msgid "Block Height: %{height}" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:51 +#: lib/block_scout_web/templates/layout/app.html.eex:53 msgid "Block Mined, awaiting import..." msgstr "" @@ -184,7 +184,7 @@ msgid "Blocks" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:50 +#: lib/block_scout_web/templates/layout/app.html.eex:52 msgid "Blocks Indexed" msgstr "" @@ -368,7 +368,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_balance_card.html.eex:15 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:21 -#: lib/block_scout_web/templates/layout/app.html.eex:56 +#: lib/block_scout_web/templates/layout/app.html.eex:58 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_tile.html.eex:30 #: lib/block_scout_web/templates/transaction/overview.html.eex:196 @@ -446,7 +446,7 @@ msgid "IN" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:52 +#: lib/block_scout_web/templates/layout/app.html.eex:54 msgid "Indexing Tokens" msgstr "" @@ -478,7 +478,7 @@ msgid "Inventory" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:53 +#: lib/block_scout_web/templates/layout/app.html.eex:55 msgid "Less than" msgstr "" @@ -499,7 +499,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:31 -#: lib/block_scout_web/templates/layout/app.html.eex:54 +#: lib/block_scout_web/templates/layout/app.html.eex:56 #: lib/block_scout_web/views/address_view.ex:121 #: lib/block_scout_web/views/address_view.ex:121 msgid "Market Cap" @@ -615,7 +615,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:24 -#: lib/block_scout_web/templates/layout/app.html.eex:55 +#: lib/block_scout_web/templates/layout/app.html.eex:57 msgid "Price" msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 6ecd22e7fa..21d90a2493 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -62,7 +62,7 @@ msgid "(query)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:36 +#: lib/block_scout_web/templates/layout/app.html.eex:38 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate." msgstr "" @@ -157,7 +157,7 @@ msgid "Block Height: %{height}" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:51 +#: lib/block_scout_web/templates/layout/app.html.eex:53 msgid "Block Mined, awaiting import..." msgstr "" @@ -184,7 +184,7 @@ msgid "Blocks" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:50 +#: lib/block_scout_web/templates/layout/app.html.eex:52 msgid "Blocks Indexed" msgstr "" @@ -368,7 +368,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_balance_card.html.eex:15 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:21 -#: lib/block_scout_web/templates/layout/app.html.eex:56 +#: lib/block_scout_web/templates/layout/app.html.eex:58 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_tile.html.eex:30 #: lib/block_scout_web/templates/transaction/overview.html.eex:196 @@ -446,7 +446,7 @@ msgid "IN" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:52 +#: lib/block_scout_web/templates/layout/app.html.eex:54 msgid "Indexing Tokens" msgstr "" @@ -478,7 +478,7 @@ msgid "Inventory" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:53 +#: lib/block_scout_web/templates/layout/app.html.eex:55 msgid "Less than" msgstr "" @@ -499,7 +499,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:31 -#: lib/block_scout_web/templates/layout/app.html.eex:54 +#: lib/block_scout_web/templates/layout/app.html.eex:56 #: lib/block_scout_web/views/address_view.ex:121 #: lib/block_scout_web/views/address_view.ex:121 msgid "Market Cap" @@ -615,7 +615,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:24 -#: lib/block_scout_web/templates/layout/app.html.eex:55 +#: lib/block_scout_web/templates/layout/app.html.eex:57 msgid "Price" msgstr "" From dc22eae54ab0385c6acd83a6493d6e5ea93369bc Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 9 Aug 2019 16:19:36 +0300 Subject: [PATCH 4/6] do not hide search input during logs search --- apps/block_scout_web/assets/js/pages/address/logs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/js/pages/address/logs.js b/apps/block_scout_web/assets/js/pages/address/logs.js index 5c9bed9da2..bf0c041b39 100644 --- a/apps/block_scout_web/assets/js/pages/address/logs.js +++ b/apps/block_scout_web/assets/js/pages/address/logs.js @@ -45,7 +45,7 @@ const elements = { }, '[data-search]': { render ($el, state) { - if (state.emptyResponse) { + if (state.emptyResponse && !state.isSearch) { return $el.hide() } From 2fe59f1d9f0025f2158840b0ae4b45c9e94311dd Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 9 Aug 2019 16:21:29 +0300 Subject: [PATCH 5/6] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e6d8e76d6..e7df8338ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method ### Fixes +- [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search - [#2528](https://github.com/poanetwork/blockscout/pull/2528) - fix coin history chart data - [#2520](https://github.com/poanetwork/blockscout/pull/2520) - Hide loading message when fetching is failed - [#2523](https://github.com/poanetwork/blockscout/pull/2523) - Avoid importing internal_transactions of pending transactions From f75fae141ae9f8c851bf07b1f62b5ed02e667f93 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 9 Aug 2019 23:06:19 +0300 Subject: [PATCH 6/6] Update app.scss replace `@import "components/alerts";` --- apps/block_scout_web/assets/css/app.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index 9c0f27e976..0e7d98f656 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/apps/block_scout_web/assets/css/app.scss @@ -74,6 +74,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/button"; @import "components/table"; @import "components/navbar"; +@import "components/alerts"; @import "theme/dark-theme"; @@ -108,7 +109,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "components/btn_dropdown_line"; @import "components/transaction"; @import "components/api"; -@import "components/alerts"; @import "components/verify_other_explorers"; @import "components/errors"; @import "components/log-search";