From 142900c759a1acd84c37e79d5f479ed4a13f85ca Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Sat, 5 Jul 2025 13:33:30 -0500 Subject: [PATCH] liveview links --- lib/aprsme_web/components/core_components.ex | 16 +- lib/aprsme_web/components/layouts.ex | 10 +- .../components/layouts/app.html.heex | 171 ++++++++++++++++++ lib/aprsme_web/live/map_live/callsign_view.ex | 13 +- lib/aprsme_web/live/map_live/index.ex | 31 +--- lib/aprsme_web/live/map_live/packet_utils.ex | 6 +- .../user_confirmation_instructions_live.ex | 4 +- lib/aprsme_web/live/user_confirmation_live.ex | 4 +- .../live/user_forgot_password_live.ex | 4 +- lib/aprsme_web/live/user_login_live.ex | 2 +- .../live/user_reset_password_live.ex | 4 +- lib/aprsme_web/router.ex | 3 - 12 files changed, 214 insertions(+), 54 deletions(-) diff --git a/lib/aprsme_web/components/core_components.ex b/lib/aprsme_web/components/core_components.ex index fa93051..d2e080d 100644 --- a/lib/aprsme_web/components/core_components.ex +++ b/lib/aprsme_web/components/core_components.ex @@ -446,9 +446,9 @@ defmodule AprsmeWeb.CoreComponents do ~H""" diff --git a/lib/aprsme_web/live/map_live/packet_utils.ex b/lib/aprsme_web/live/map_live/packet_utils.ex index b118c86..ce5aaf2 100644 --- a/lib/aprsme_web/live/map_live/packet_utils.ex +++ b/lib/aprsme_web/live/map_live/packet_utils.ex @@ -199,14 +199,14 @@ defmodule AprsmeWeb.MapLive.PacketUtils do weather_link_html = if has_weather_packets?(packet_info.callsign) do - ~s( weather charts) + ~s( <.link navigate="/weather/#{packet_info.callsign}" class="aprs-info-link">weather charts) else "" end """
-
#{packet_info.callsign} info#{weather_link_html}
+
<.link navigate="/#{packet_info.callsign}">#{packet_info.callsign} <.link navigate="/info/#{packet_info.callsign}" class="aprs-info-link">info#{weather_link_html}
#{comment_html} #{timestamp_html}
@@ -234,7 +234,7 @@ defmodule AprsmeWeb.MapLive.PacketUtils do """
- +
<.link navigate="/#{sender}">#{sender} <.link navigate="/info/#{sender}" class="aprs-info-link">info <.link navigate="/weather/#{sender}" class="aprs-info-link">weather charts
Weather Report
#{timestamp_html}
diff --git a/lib/aprsme_web/live/user_confirmation_instructions_live.ex b/lib/aprsme_web/live/user_confirmation_instructions_live.ex index 7311c55..6cc0917 100644 --- a/lib/aprsme_web/live/user_confirmation_instructions_live.ex +++ b/lib/aprsme_web/live/user_confirmation_instructions_live.ex @@ -22,8 +22,8 @@ defmodule AprsmeWeb.UserConfirmationInstructionsLive do

- <.link href={~p"/users/register"}>Register - | <.link href={~p"/users/log_in"}>Log in + <.link navigate={~p"/users/register"}>Register + | <.link navigate={~p"/users/log_in"}>Log in

""" end diff --git a/lib/aprsme_web/live/user_confirmation_live.ex b/lib/aprsme_web/live/user_confirmation_live.ex index 7727fb3..6d70e08 100644 --- a/lib/aprsme_web/live/user_confirmation_live.ex +++ b/lib/aprsme_web/live/user_confirmation_live.ex @@ -17,8 +17,8 @@ defmodule AprsmeWeb.UserConfirmationLive do

- <.link href={~p"/users/register"}>Register - | <.link href={~p"/users/log_in"}>Log in + <.link navigate={~p"/users/register"}>Register + | <.link navigate={~p"/users/log_in"}>Log in

""" diff --git a/lib/aprsme_web/live/user_forgot_password_live.ex b/lib/aprsme_web/live/user_forgot_password_live.ex index 5831e35..1bb8b05 100644 --- a/lib/aprsme_web/live/user_forgot_password_live.ex +++ b/lib/aprsme_web/live/user_forgot_password_live.ex @@ -21,8 +21,8 @@ defmodule AprsmeWeb.UserForgotPasswordLive do

- <.link href={~p"/users/register"}>Register - | <.link href={~p"/users/log_in"}>Log in + <.link navigate={~p"/users/register"}>Register + | <.link navigate={~p"/users/log_in"}>Log in

""" diff --git a/lib/aprsme_web/live/user_login_live.ex b/lib/aprsme_web/live/user_login_live.ex index b7f2d31..1c1a5e2 100644 --- a/lib/aprsme_web/live/user_login_live.ex +++ b/lib/aprsme_web/live/user_login_live.ex @@ -32,7 +32,7 @@ defmodule AprsmeWeb.UserLoginLive do <:actions :let={f}> <.input field={{f, :remember_me}} type="checkbox" label="Keep me logged in" /> - <.link href={~p"/users/reset_password"} class="text-sm font-semibold"> + <.link navigate={~p"/users/reset_password"} class="text-sm font-semibold"> Forgot your password? diff --git a/lib/aprsme_web/live/user_reset_password_live.ex b/lib/aprsme_web/live/user_reset_password_live.ex index 10dbb20..2d17479 100644 --- a/lib/aprsme_web/live/user_reset_password_live.ex +++ b/lib/aprsme_web/live/user_reset_password_live.ex @@ -33,8 +33,8 @@ defmodule AprsmeWeb.UserResetPasswordLive do

- <.link href={~p"/users/register"}>Register - | <.link href={~p"/users/log_in"}>Log in + <.link navigate={~p"/users/register"}>Register + | <.link navigate={~p"/users/log_in"}>Log in

""" diff --git a/lib/aprsme_web/router.ex b/lib/aprsme_web/router.ex index 6fabf49..e7884e5 100644 --- a/lib/aprsme_web/router.ex +++ b/lib/aprsme_web/router.ex @@ -39,9 +39,6 @@ defmodule AprsmeWeb.Router do live "/about", AboutLive, :index live "/api", ApiDocsLive, :index live "/info/:callsign", InfoLive.Show, :show - end - - live_session :map_pages, layout: {AprsmeWeb.Layouts, :map} do live "/", MapLive.Index, :index live "/:callsign", MapLive.CallsignView, :index end