diff --git a/assets/js/app.js b/assets/js/app.js index 0ed82f4..76ebb4b 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -32,5 +32,6 @@ let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute(" let liveSocket = new LiveSocket("/live", Socket, { hooks: Hooks, params: { _csrf_token: csrfToken } }) liveSocket.connect() window.liveSocket = liveSocket +liveSocket.enableDebug() diff --git a/lib/zcash_explorer_web.ex b/lib/zcash_explorer_web.ex index 80d4588..066ea22 100644 --- a/lib/zcash_explorer_web.ex +++ b/lib/zcash_explorer_web.ex @@ -29,8 +29,7 @@ defmodule ZcashExplorerWeb do def view do quote do - import Phoenix.LiveView.Helpers - + use Phoenix.View, root: "lib/zcash_explorer_web/templates", namespace: ZcashExplorerWeb @@ -39,6 +38,8 @@ defmodule ZcashExplorerWeb do import Phoenix.Controller, only: [get_flash: 1, get_flash: 2, view_module: 1, view_template: 1] + import Phoenix.LiveView.Helpers + # Include shared imports and aliases for views unquote(view_helpers()) end @@ -61,6 +62,23 @@ defmodule ZcashExplorerWeb do end end + def live_view do + quote do + use Phoenix.LiveView, + layout: {ZcashExplorerWeb.LayoutView, "live.html"} + + unquote(view_helpers()) + end + end + + def live_component do + quote do + use Phoenix.LiveComponent + + unquote(view_helpers()) + end + end + defp view_helpers do quote do # Use all HTML functionality (forms, tags, etc) diff --git a/lib/zcash_explorer_web/live/block_count_live.ex b/lib/zcash_explorer_web/live/block_count_live.ex index 4034c64..fcd4373 100644 --- a/lib/zcash_explorer_web/live/block_count_live.ex +++ b/lib/zcash_explorer_web/live/block_count_live.ex @@ -1,6 +1,7 @@ defmodule ZcashExplorerWeb.BlockCountLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers + @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/blockchain_info_live.ex b/lib/zcash_explorer_web/live/blockchain_info_live.ex index 7396831..2674dc6 100644 --- a/lib/zcash_explorer_web/live/blockchain_info_live.ex +++ b/lib/zcash_explorer_web/live/blockchain_info_live.ex @@ -1,6 +1,7 @@ defmodule ZcashExplorerWeb.BlockChainInfoLive do - use Phoenix.LiveView - + + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/blockchain_size_live.ex b/lib/zcash_explorer_web/live/blockchain_size_live.ex index 0c16666..fca23d4 100644 --- a/lib/zcash_explorer_web/live/blockchain_size_live.ex +++ b/lib/zcash_explorer_web/live/blockchain_size_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.BlockChainSizeLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/difficulty_live.ex b/lib/zcash_explorer_web/live/difficulty_live.ex index efbad46..ec00727 100644 --- a/lib/zcash_explorer_web/live/difficulty_live.ex +++ b/lib/zcash_explorer_web/live/difficulty_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.DifficultyLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/mempool_info_live.ex b/lib/zcash_explorer_web/live/mempool_info_live.ex index 0977783..cdce88e 100644 --- a/lib/zcash_explorer_web/live/mempool_info_live.ex +++ b/lib/zcash_explorer_web/live/mempool_info_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.MempoolInfoLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/networksolps_live.ex b/lib/zcash_explorer_web/live/networksolps_live.ex index be78158..5801efe 100644 --- a/lib/zcash_explorer_web/live/networksolps_live.ex +++ b/lib/zcash_explorer_web/live/networksolps_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.NetworkSolpsLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/nodes_live.ex b/lib/zcash_explorer_web/live/nodes_live.ex index e3eeb28..0678f55 100644 --- a/lib/zcash_explorer_web/live/nodes_live.ex +++ b/lib/zcash_explorer_web/live/nodes_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.NodesLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/price_live.ex b/lib/zcash_explorer_web/live/price_live.ex index 144f6c9..cb7e745 100644 --- a/lib/zcash_explorer_web/live/price_live.ex +++ b/lib/zcash_explorer_web/live/price_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.PriceLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/raw_mempool_live.ex b/lib/zcash_explorer_web/live/raw_mempool_live.ex index 87d1fa8..538df51 100644 --- a/lib/zcash_explorer_web/live/raw_mempool_live.ex +++ b/lib/zcash_explorer_web/live/raw_mempool_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.RawMempoolLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/recent_blocks_live.ex b/lib/zcash_explorer_web/live/recent_blocks_live.ex index 9f2f22e..932f56c 100644 --- a/lib/zcash_explorer_web/live/recent_blocks_live.ex +++ b/lib/zcash_explorer_web/live/recent_blocks_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.RecentBlocksLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/recent_transactions_live.ex b/lib/zcash_explorer_web/live/recent_transactions_live.ex index 0e5a990..c9b51b7 100644 --- a/lib/zcash_explorer_web/live/recent_transactions_live.ex +++ b/lib/zcash_explorer_web/live/recent_transactions_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.RecentTransactionsLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(assigns) do ~L""" diff --git a/lib/zcash_explorer_web/live/vk_live.ex b/lib/zcash_explorer_web/live/vk_live.ex index 32cadc1..5729cc3 100644 --- a/lib/zcash_explorer_web/live/vk_live.ex +++ b/lib/zcash_explorer_web/live/vk_live.ex @@ -1,6 +1,6 @@ defmodule ZcashExplorerWeb.VkLive do - use Phoenix.LiveView - + use ZcashExplorerWeb, :live_view + import Phoenix.LiveView.Helpers @impl true def render(%{message: %{"txs" => []}} = assigns) do ~L""" diff --git a/lib/zcash_explorer_web/templates/layout/app.html.eex b/lib/zcash_explorer_web/templates/layout/app.html.heex similarity index 100% rename from lib/zcash_explorer_web/templates/layout/app.html.eex rename to lib/zcash_explorer_web/templates/layout/app.html.heex diff --git a/lib/zcash_explorer_web/templates/layout/footer.html.eex b/lib/zcash_explorer_web/templates/layout/footer.html.heex similarity index 100% rename from lib/zcash_explorer_web/templates/layout/footer.html.eex rename to lib/zcash_explorer_web/templates/layout/footer.html.heex diff --git a/lib/zcash_explorer_web/templates/layout/header.html.eex b/lib/zcash_explorer_web/templates/layout/header.html.heex similarity index 98% rename from lib/zcash_explorer_web/templates/layout/header.html.eex rename to lib/zcash_explorer_web/templates/layout/header.html.heex index 6b29f59..26062cf 100644 --- a/lib/zcash_explorer_web/templates/layout/header.html.eex +++ b/lib/zcash_explorer_web/templates/layout/header.html.heex @@ -6,7 +6,7 @@
- " alt="Block Explorer"> + Block Explorer
@@ -78,8 +78,6 @@ Heroicon name: outline/x" x-state:on="Menu open" x-state:off="Menu closed" class
- -
diff --git a/lib/zcash_explorer_web/templates/layout/live.html.heex b/lib/zcash_explorer_web/templates/layout/live.html.heex new file mode 100644 index 0000000..f3985a1 --- /dev/null +++ b/lib/zcash_explorer_web/templates/layout/live.html.heex @@ -0,0 +1 @@ +<%= @inner_content %> \ No newline at end of file diff --git a/lib/zcash_explorer_web/templates/layout/root.html.eex b/lib/zcash_explorer_web/templates/layout/root.html.heex similarity index 64% rename from lib/zcash_explorer_web/templates/layout/root.html.eex rename to lib/zcash_explorer_web/templates/layout/root.html.heex index 1062eb3..2ac6da8 100644 --- a/lib/zcash_explorer_web/templates/layout/root.html.eex +++ b/lib/zcash_explorer_web/templates/layout/root.html.heex @@ -5,9 +5,9 @@ <%= live_title_tag assigns[:page_title] || " " %> - "/> + <%= csrf_meta_tag() %> - + <%= @inner_content %>