From be522dc92747b430be8ed3d6bed2fc943766b451 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Wed, 23 Jun 2021 16:55:11 +0300 Subject: [PATCH] Fix logo url redirection, set font-family defaults for chart.js --- CHANGELOG.md | 1 + .../js/lib/coin_balance_history_chart.js | 1 + .../assets/js/lib/history_chart.js | 6 ++-- apps/block_scout_web/assets/js/pages/chain.js | 2 +- .../assets/js/pages/stakes/utils.js | 1 + .../templates/chain/show.html.eex | 8 ++--- .../templates/layout/_footer.html.eex | 2 +- .../templates/layout/_topnav.html.eex | 2 +- apps/block_scout_web/priv/gettext/default.pot | 30 +++++++++---------- .../priv/gettext/en/LC_MESSAGES/default.po | 30 +++++++++---------- 10 files changed, 42 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41913a67a1..60ac0c7690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#4067](https://github.com/blockscout/blockscout/pull/4067) - Display LP tokens USD value and custom metadata in tokens dropdown at address page ### Fixes +- [#4310](https://github.com/blockscout/blockscout/pull/4310) - Fix logo URL redirection, set font-family defaults for chart.js - [#4308](https://github.com/blockscout/blockscout/pull/4308) - Fix internal server error on contract verification options page - [#4307](https://github.com/blockscout/blockscout/pull/4307) - Fix for composing IPFS URLs for NFTs images - [#4306](https://github.com/blockscout/blockscout/pull/4306) - Check token instance images MIME types diff --git a/apps/block_scout_web/assets/js/lib/coin_balance_history_chart.js b/apps/block_scout_web/assets/js/lib/coin_balance_history_chart.js index 2b60f1726a..6624486d09 100644 --- a/apps/block_scout_web/assets/js/lib/coin_balance_history_chart.js +++ b/apps/block_scout_web/assets/js/lib/coin_balance_history_chart.js @@ -3,6 +3,7 @@ import { Chart, Filler, LineController, LineElement, PointElement, LinearScale, import 'chartjs-adapter-moment' import humps from 'humps' +Chart.defaults.font.family = 'Nunito, "Helvetica Neue", Arial, sans-serif,"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"' Chart.register(Filler, LineController, LineElement, PointElement, LinearScale, TimeScale, Title, Tooltip) export function createCoinBalanceHistoryChart (el) { diff --git a/apps/block_scout_web/assets/js/lib/history_chart.js b/apps/block_scout_web/assets/js/lib/history_chart.js index 4ae2ed75ea..18a566ae90 100644 --- a/apps/block_scout_web/assets/js/lib/history_chart.js +++ b/apps/block_scout_web/assets/js/lib/history_chart.js @@ -7,6 +7,7 @@ import moment from 'moment' import { formatUsdValue } from '../lib/currency' import sassVariables from '../../css/app.scss' +Chart.defaults.font.family = 'Nunito, "Helvetica Neue", Arial, sans-serif,"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"' Chart.register(LineController, LineElement, PointElement, LinearScale, TimeScale, Title, Tooltip) const grid = { @@ -281,16 +282,15 @@ export function createMarketHistoryChart (el) { break } case 'transaction': { - const transactionHistory = JSON.parse(data.history_data) + const txsHistoryData = JSON.parse(data.history_data) $(el).show() - chart.updateTransactionHistory(transactionHistory) + chart.updateTransactionHistory(txsHistoryData) break } } }) .fail(() => { - $(el).hide() $chartError.show() }) }) diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js index 7a5e4dee79..d3efe36ada 100644 --- a/apps/block_scout_web/assets/js/pages/chain.js +++ b/apps/block_scout_web/assets/js/pages/chain.js @@ -172,7 +172,7 @@ const elements = { load () { chart = window.dashboardChart }, - render ($el, state, oldState) { + render (_$el, state, oldState) { if (!chart || (oldState.availableSupply === state.availableSupply && oldState.marketHistoryData === state.marketHistoryData) || !state.availableSupply) return chart.updateMarketHistory(state.availableSupply, state.marketHistoryData) diff --git a/apps/block_scout_web/assets/js/pages/stakes/utils.js b/apps/block_scout_web/assets/js/pages/stakes/utils.js index 084fd360cb..ef7c969197 100644 --- a/apps/block_scout_web/assets/js/pages/stakes/utils.js +++ b/apps/block_scout_web/assets/js/pages/stakes/utils.js @@ -2,6 +2,7 @@ import $ from 'jquery' import { ArcElement, Chart, DoughnutController } from 'chart.js' import { openErrorModal, openSuccessModal, openWarningModal } from '../../lib/modals' +Chart.defaults.font.family = 'Nunito, "Helvetica Neue", Arial, sans-serif,"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"' Chart.register(ArcElement, DoughnutController) export async function makeContractCall (call, store, gasLimit, callbackFunc) { diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex index 695f4ca386..2e1f2cc8a6 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex @@ -9,7 +9,6 @@ <%= gettext("There was a problem loading the chart.") %> + width="350" height="152"> + +
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex index e6ea5de0d9..983860c91f 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex @@ -4,7 +4,7 @@
<%= link to: webapp_url(@conn), class: "footer-brand" do %> - + <%= if logo_text() do %> <%= logo_text() %> <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index e18e58efb1..e9f2fd3f41 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -12,7 +12,7 @@
<%= link to: webapp_url(@conn), class: "navbar-brand", "data-test": "header_logo" do %> - + <%= if logo_text() do %> <%= logo_text() %> <% end %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 7a0c45561b..11e110469b 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -152,7 +152,7 @@ msgid "Anything not in this list is not supported. Click on the method to be tak msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:125 +#: lib/block_scout_web/templates/chain/show.html.eex:124 msgid "Average block time" msgstr "" @@ -237,7 +237,7 @@ msgid "BlockScout provides analytics data, API, and Smart Contract tools for the msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:180 +#: lib/block_scout_web/templates/chain/show.html.eex:178 #: lib/block_scout_web/templates/layout/_topnav.html.eex:36 #: lib/block_scout_web/templates/layout/_topnav.html.eex:40 msgid "Blocks" @@ -742,7 +742,7 @@ msgid "GraphQL" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:54 +#: lib/block_scout_web/templates/chain/show.html.eex:53 #: lib/block_scout_web/views/block_view.ex:20 #: lib/block_scout_web/views/wei_helpers.ex:77 msgid "Gwei" @@ -782,7 +782,7 @@ msgid "Success" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:94 +#: lib/block_scout_web/templates/chain/show.html.eex:93 #: lib/block_scout_web/templates/layout/app.html.eex:34 msgid "Tx/day" msgstr "" @@ -1042,7 +1042,7 @@ msgid "Mainnet" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:63 +#: lib/block_scout_web/templates/chain/show.html.eex:62 #: lib/block_scout_web/templates/layout/app.html.eex:31 #: lib/block_scout_web/views/address_view.ex:142 msgid "Market Cap" @@ -1075,7 +1075,7 @@ msgid "More internal transactions have come in" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:241 +#: lib/block_scout_web/templates/chain/show.html.eex:239 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:12 #: lib/block_scout_web/templates/transaction/index.html.eex:18 msgid "More transactions have come in" @@ -1180,7 +1180,7 @@ msgid "Potential matches from our contract method database:" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:43 +#: lib/block_scout_web/templates/chain/show.html.eex:42 #: lib/block_scout_web/templates/layout/app.html.eex:32 msgid "Price" msgstr "" @@ -1320,7 +1320,7 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:50 #: lib/block_scout_web/templates/address_validation/index.html.eex:24 #: lib/block_scout_web/templates/block_transaction/index.html.eex:23 -#: lib/block_scout_web/templates/chain/show.html.eex:184 +#: lib/block_scout_web/templates/chain/show.html.eex:182 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:21 #: lib/block_scout_web/templates/stakes/_table.html.eex:49 #: lib/block_scout_web/templates/tokens/holder/index.html.eex:22 @@ -1335,7 +1335,7 @@ msgid "Something went wrong, click to reload." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:247 +#: lib/block_scout_web/templates/chain/show.html.eex:245 msgid "Something went wrong, click to retry." msgstr "" @@ -1464,7 +1464,7 @@ msgid "Total Supply" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:155 +#: lib/block_scout_web/templates/chain/show.html.eex:154 msgid "Total blocks" msgstr "" @@ -1606,12 +1606,12 @@ msgid "Version" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:179 +#: lib/block_scout_web/templates/chain/show.html.eex:177 msgid "View All Blocks" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:237 +#: lib/block_scout_web/templates/chain/show.html.eex:235 msgid "View All Transactions" msgstr "" @@ -1653,7 +1653,7 @@ msgid "WEI" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:163 +#: lib/block_scout_web/templates/chain/show.html.eex:162 msgid "Wallet addresses" msgstr "" @@ -1792,7 +1792,7 @@ msgid "Module" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:134 +#: lib/block_scout_web/templates/chain/show.html.eex:133 msgid "Total transactions" msgstr "" @@ -1879,7 +1879,7 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:17 #: lib/block_scout_web/templates/block_transaction/index.html.eex:10 #: lib/block_scout_web/templates/block_transaction/index.html.eex:18 -#: lib/block_scout_web/templates/chain/show.html.eex:238 +#: lib/block_scout_web/templates/chain/show.html.eex:236 #: lib/block_scout_web/templates/layout/_topnav.html.eex:55 #: lib/block_scout_web/views/address_view.ex:345 msgid "Transactions" 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 7a0c45561b..11e110469b 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 @@ -152,7 +152,7 @@ msgid "Anything not in this list is not supported. Click on the method to be tak msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:125 +#: lib/block_scout_web/templates/chain/show.html.eex:124 msgid "Average block time" msgstr "" @@ -237,7 +237,7 @@ msgid "BlockScout provides analytics data, API, and Smart Contract tools for the msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:180 +#: lib/block_scout_web/templates/chain/show.html.eex:178 #: lib/block_scout_web/templates/layout/_topnav.html.eex:36 #: lib/block_scout_web/templates/layout/_topnav.html.eex:40 msgid "Blocks" @@ -742,7 +742,7 @@ msgid "GraphQL" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:54 +#: lib/block_scout_web/templates/chain/show.html.eex:53 #: lib/block_scout_web/views/block_view.ex:20 #: lib/block_scout_web/views/wei_helpers.ex:77 msgid "Gwei" @@ -782,7 +782,7 @@ msgid "Success" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:94 +#: lib/block_scout_web/templates/chain/show.html.eex:93 #: lib/block_scout_web/templates/layout/app.html.eex:34 msgid "Tx/day" msgstr "" @@ -1042,7 +1042,7 @@ msgid "Mainnet" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:63 +#: lib/block_scout_web/templates/chain/show.html.eex:62 #: lib/block_scout_web/templates/layout/app.html.eex:31 #: lib/block_scout_web/views/address_view.ex:142 msgid "Market Cap" @@ -1075,7 +1075,7 @@ msgid "More internal transactions have come in" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:241 +#: lib/block_scout_web/templates/chain/show.html.eex:239 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:12 #: lib/block_scout_web/templates/transaction/index.html.eex:18 msgid "More transactions have come in" @@ -1180,7 +1180,7 @@ msgid "Potential matches from our contract method database:" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:43 +#: lib/block_scout_web/templates/chain/show.html.eex:42 #: lib/block_scout_web/templates/layout/app.html.eex:32 msgid "Price" msgstr "" @@ -1320,7 +1320,7 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:50 #: lib/block_scout_web/templates/address_validation/index.html.eex:24 #: lib/block_scout_web/templates/block_transaction/index.html.eex:23 -#: lib/block_scout_web/templates/chain/show.html.eex:184 +#: lib/block_scout_web/templates/chain/show.html.eex:182 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:21 #: lib/block_scout_web/templates/stakes/_table.html.eex:49 #: lib/block_scout_web/templates/tokens/holder/index.html.eex:22 @@ -1335,7 +1335,7 @@ msgid "Something went wrong, click to reload." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:247 +#: lib/block_scout_web/templates/chain/show.html.eex:245 msgid "Something went wrong, click to retry." msgstr "" @@ -1464,7 +1464,7 @@ msgid "Total Supply" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:155 +#: lib/block_scout_web/templates/chain/show.html.eex:154 msgid "Total blocks" msgstr "" @@ -1606,12 +1606,12 @@ msgid "Version" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:179 +#: lib/block_scout_web/templates/chain/show.html.eex:177 msgid "View All Blocks" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:237 +#: lib/block_scout_web/templates/chain/show.html.eex:235 msgid "View All Transactions" msgstr "" @@ -1653,7 +1653,7 @@ msgid "WEI" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:163 +#: lib/block_scout_web/templates/chain/show.html.eex:162 msgid "Wallet addresses" msgstr "" @@ -1792,7 +1792,7 @@ msgid "Module" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/chain/show.html.eex:134 +#: lib/block_scout_web/templates/chain/show.html.eex:133 msgid "Total transactions" msgstr "" @@ -1879,7 +1879,7 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:17 #: lib/block_scout_web/templates/block_transaction/index.html.eex:10 #: lib/block_scout_web/templates/block_transaction/index.html.eex:18 -#: lib/block_scout_web/templates/chain/show.html.eex:238 +#: lib/block_scout_web/templates/chain/show.html.eex:236 #: lib/block_scout_web/templates/layout/_topnav.html.eex:55 #: lib/block_scout_web/views/address_view.ex:345 msgid "Transactions"