Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Embedding makerdojo (#750)" #966

Merged
merged 4 commits into from
Sep 28, 2023
Merged

Revert "Embedding makerdojo (#750)" #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d5703a
Revert "Embedding makerdojo (#750)"
arthurgousset Sep 26, 2023
8f26c6b
mix gettext
shazarre Sep 27, 2023
301aecf
restore stats css and csp header changes
shazarre Sep 27, 2023
0a14aa8
Merge branch 'master' into 0xarthurxyz/remove-makerdojo
arthurgousset Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions apps/block_scout_web/lib/block_scout_web/controllers/makerdojo_controller.ex
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/block_scout_web/lib/block_scout_web/csp_header.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ defmodule BlockScoutWeb.CSPHeader do
img-src 'self' * data: https://*.google-analytics.com https://*.googletagmanager.com;\
media-src 'self' * data:;\
font-src 'self' 'unsafe-inline' 'unsafe-eval' https://fonts.gstatic.com data:;\
frame-src 'self' 'unsafe-inline' 'unsafe-eval' https://www.google.com https://datastudio.google.com/ https://lookerstudio.google.com/ https://makerdojo.io/;\
frame-src 'self' 'unsafe-inline' 'unsafe-eval' https://www.google.com https://datastudio.google.com/ https://lookerstudio.google.com/;\
"
})
end
Expand Down
20 changes: 4 additions & 16 deletions apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,26 +94,14 @@
</li>
<% end %>
<%= if stats_enabled do %>
<li class="nav-item dropdown">
<a href="#" role="button" id="navbarStatsDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<li class="nav-item">
<a class="nav-link topnav-nav-link" href="/stats" id="navbarBlocksDropdown" role="button" data-toggle="tooltip" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_stats_icon.html" %>
</span>
<%= gettext("Stats") %>
<%= gettext("Stats") %>
</a>
<div class="dropdown-menu" aria-labeledby="navbarTransactionsDropdown">
<%= link(
gettext("cLabs"),
class: "dropdown-item #{tab_status("stats", @conn.request_path)}",
to: stats_path(@conn, :index)
) %>
<%= link(
gettext("MakerDojo"),
class: "dropdown-item #{tab_status("makerdojo", @conn.request_path)}",
to: makerdojo_path(@conn, :index)
) %>
</div>
</li>
</li>
<% end %>
<%= if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter)[:reading_enabled] || Application.get_env(:block_scout_web, :api_url) do %>
<li class="nav-item dropdown">
Expand Down
44 changes: 0 additions & 44 deletions apps/block_scout_web/lib/block_scout_web/templates/makerdojo/index.html.eex
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions apps/block_scout_web/lib/block_scout_web/views/makerdojo_view.ex
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apps/block_scout_web/lib/block_scout_web/web_router.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,6 @@ defmodule BlockScoutWeb.WebRouter do

get("/stats", StatsController, :index)

get("/makerdojo", MakerdojoController, :index)

get("/visualize/sol2uml", VisualizeSol2umlController, :index)

get("/*path", PageNotFoundController, :index)
Expand Down
55 changes: 15 additions & 40 deletions apps/block_scout_web/priv/gettext/default.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ msgstr ""
msgid "API keys"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:124
#: lib/block_scout_web/templates/layout/_topnav.html.eex:112
#, elixir-autogen, elixir-format
msgid "APIs"
msgstr ""
Expand Down Expand Up @@ -1201,7 +1201,7 @@ msgstr ""
msgid "Error: Could not determine contract creator."
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:138
#: lib/block_scout_web/templates/layout/_topnav.html.eex:126
#, elixir-autogen, elixir-format
msgid "Eth RPC"
msgstr ""
Expand Down Expand Up @@ -1365,7 +1365,7 @@ msgstr ""
msgid "Go to"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:128
#: lib/block_scout_web/templates/layout/_topnav.html.eex:116
#, elixir-autogen, elixir-format
msgid "GraphQL"
msgstr ""
Expand Down Expand Up @@ -2030,7 +2030,7 @@ msgstr ""
msgid "Query"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:133
#: lib/block_scout_web/templates/layout/_topnav.html.eex:121
#, elixir-autogen, elixir-format
msgid "RPC"
msgstr ""
Expand Down Expand Up @@ -3381,11 +3381,6 @@ msgstr ""
msgid "Amount of locked CELO that has been activated to vote for validator(s)"
msgstr ""

#: lib/block_scout_web/templates/makerdojo/index.html.eex:13
#, elixir-autogen, elixir-format
msgid "Attestations"
msgstr ""

#: lib/block_scout_web/templates/page_not_found/index.html.eex:9
#: lib/block_scout_web/templates/transaction/not_found.html.eex:30
#, elixir-autogen, elixir-format
Expand Down Expand Up @@ -3443,7 +3438,7 @@ msgstr ""
msgid "Community Fund"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:172
#: lib/block_scout_web/templates/layout/_topnav.html.eex:160
#, elixir-autogen, elixir-format
msgid "Connect"
msgstr ""
Expand Down Expand Up @@ -3521,12 +3516,12 @@ msgstr ""
msgid "Fees sent to Community Fund"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:213
#: lib/block_scout_web/templates/layout/_topnav.html.eex:201
#, elixir-autogen, elixir-format
msgid "Finance Tools"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:221
#: lib/block_scout_web/templates/layout/_topnav.html.eex:209
#, elixir-autogen, elixir-format
msgid "Gas Tracker"
msgstr ""
Expand Down Expand Up @@ -3561,12 +3556,12 @@ msgstr ""
msgid "It could still be in the TX Pool of a different node, waiting to be broadcasted."
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:178
#: lib/block_scout_web/templates/layout/_topnav.html.eex:166
#, elixir-autogen, elixir-format
msgid "Learn"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:186
#: lib/block_scout_web/templates/layout/_topnav.html.eex:174
#, elixir-autogen, elixir-format
msgid "Learn, Borrow, Earn"
msgstr ""
Expand All @@ -3581,11 +3576,6 @@ msgstr ""
msgid "Locked CELO Balance"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:111
#, elixir-autogen, elixir-format
msgid "MakerDojo"
msgstr ""

#: lib/block_scout_web/templates/stats/index.html.eex:22
#, elixir-autogen, elixir-format
msgid "Mento"
Expand All @@ -3596,12 +3586,7 @@ msgstr ""
msgid "Mento Reserve"
msgstr ""

#: lib/block_scout_web/templates/makerdojo/index.html.eex:23
#, elixir-autogen, elixir-format
msgid "Moola"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:151
#: lib/block_scout_web/templates/layout/_topnav.html.eex:139
#, elixir-autogen, elixir-format
msgid "More"
msgstr ""
Expand All @@ -3611,7 +3596,7 @@ msgstr ""
msgid "More epoch transactions have come in"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:193
#: lib/block_scout_web/templates/layout/_topnav.html.eex:181
#, elixir-autogen, elixir-format
msgid "NFT"
msgstr ""
Expand Down Expand Up @@ -3651,7 +3636,7 @@ msgstr ""
msgid "Reserve bolster"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:205
#: lib/block_scout_web/templates/layout/_topnav.html.eex:193
#, elixir-autogen, elixir-format
msgid "Resources"
msgstr ""
Expand Down Expand Up @@ -3696,7 +3681,7 @@ msgstr ""
msgid "Source code matches deployed contracts except the metadata hash"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:199
#: lib/block_scout_web/templates/layout/_topnav.html.eex:187
#, elixir-autogen, elixir-format
msgid "Spend"
msgstr ""
Expand All @@ -3706,7 +3691,7 @@ msgstr ""
msgid "Stats"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:157
#: lib/block_scout_web/templates/layout/_topnav.html.eex:145
#, elixir-autogen, elixir-format
msgid "Swap"
msgstr ""
Expand Down Expand Up @@ -3772,11 +3757,6 @@ msgstr ""
msgid "Total amount of epoch rewards this address has received, all time."
msgstr ""

#: lib/block_scout_web/templates/makerdojo/index.html.eex:18
#, elixir-autogen, elixir-format
msgid "Uniswap"
msgstr ""

#: lib/block_scout_web/templates/block/_tile.html.eex:50
#: lib/block_scout_web/templates/block/overview.html.eex:153
#: lib/block_scout_web/templates/chain/_block.html.eex:16
Expand Down Expand Up @@ -3876,16 +3856,11 @@ msgstr ""
msgid "Voting rewards accumulated over time."
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:164
#: lib/block_scout_web/templates/layout/_topnav.html.eex:152
#, elixir-autogen, elixir-format
msgid "Wallet"
msgstr ""

#: lib/block_scout_web/templates/layout/_topnav.html.eex:106
#, elixir-autogen, elixir-format
msgid "cLabs"
msgstr ""

#: lib/block_scout_web/templates/address/overview.html.eex:250
#, elixir-autogen, elixir-format
msgid "cUSD"
Expand Down
Loading
Loading