From 3dd6430105fc35dda9935d1b6ba154c6c2e86bc7 Mon Sep 17 00:00:00 2001 From: shibao Date: Wed, 9 Nov 2022 23:47:11 -0500 Subject: [PATCH] fix patch links to working properly --- lib/cannery_web/components/ammo_group_card.ex | 4 ++-- .../components/move_ammo_group_component.ex | 2 +- lib/cannery_web/components/topbar.ex | 22 +++++++++---------- lib/cannery_web/live/ammo_group_live/index.ex | 6 ++--- .../live/ammo_group_live/index.html.heex | 4 ++-- .../live/ammo_group_live/show.html.heex | 2 +- lib/cannery_web/live/ammo_type_live/index.ex | 4 ++-- lib/cannery_web/live/range_live/index.ex | 5 ++++- .../live/range_live/index.html.heex | 4 ++-- priv/gettext/de/LC_MESSAGES/prompts.po | 2 +- priv/gettext/en/LC_MESSAGES/prompts.po | 2 +- priv/gettext/es/LC_MESSAGES/prompts.po | 2 +- priv/gettext/fr/LC_MESSAGES/prompts.po | 2 +- priv/gettext/ga/LC_MESSAGES/prompts.po | 2 +- priv/gettext/prompts.pot | 2 +- 15 files changed, 34 insertions(+), 31 deletions(-) diff --git a/lib/cannery_web/components/ammo_group_card.ex b/lib/cannery_web/components/ammo_group_card.ex index 0f5bec89..e3141269 100644 --- a/lib/cannery_web/components/ammo_group_card.ex +++ b/lib/cannery_web/components/ammo_group_card.ex @@ -26,7 +26,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do border border-gray-400 rounded-lg shadow-lg hover:shadow-md transition-all duration-300 ease-in-out" > - <.link patch={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="mb-2 link"> + <.link navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="mb-2 link">

<%= @ammo_group.ammo_type.name %>

@@ -71,7 +71,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do <%= gettext("Container:") %> <.link - patch={Routes.container_show_path(Endpoint, :show, @ammo_group.container)} + navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container)} class="link" > <%= @ammo_group.container.name %> diff --git a/lib/cannery_web/components/move_ammo_group_component.ex b/lib/cannery_web/components/move_ammo_group_component.ex index c2856e65..258af093 100644 --- a/lib/cannery_web/components/move_ammo_group_component.ex +++ b/lib/cannery_web/components/move_ammo_group_component.ex @@ -86,7 +86,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do <%= display_emoji("😔") %> - <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary"> + <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary"> <%= dgettext("actions", "Add another container!") %> <% else %> diff --git a/lib/cannery_web/components/topbar.ex b/lib/cannery_web/components/topbar.ex index 2116bf07..573446fb 100644 --- a/lib/cannery_web/components/topbar.ex +++ b/lib/cannery_web/components/topbar.ex @@ -17,7 +17,7 @@ defmodule CanneryWeb.Components.Topbar do
<.link - patch={Routes.live_path(Endpoint, HomeLive)} + navigate={Routes.live_path(Endpoint, HomeLive)} class="inline mx-2 my-1 leading-5 text-xl text-white" >
  • <.link - patch={Routes.tag_index_path(Endpoint, :index)} + navigate={Routes.tag_index_path(Endpoint, :index)} class="text-primary-600 text-white hover:underline" > <%= gettext("Tags") %> @@ -51,7 +51,7 @@ defmodule CanneryWeb.Components.Topbar do
  • <.link - patch={Routes.container_index_path(Endpoint, :index)} + navigate={Routes.container_index_path(Endpoint, :index)} class="text-primary-600 text-white hover:underline" > <%= gettext("Containers") %> @@ -59,7 +59,7 @@ defmodule CanneryWeb.Components.Topbar do
  • <.link - patch={Routes.ammo_type_index_path(Endpoint, :index)} + navigate={Routes.ammo_type_index_path(Endpoint, :index)} class="text-primary-600 text-white hover:underline" > <%= gettext("Catalog") %> @@ -67,7 +67,7 @@ defmodule CanneryWeb.Components.Topbar do
  • <.link - patch={Routes.ammo_group_index_path(Endpoint, :index)} + navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="text-primary-600 text-white hover:underline" > <%= gettext("Ammo") %> @@ -75,7 +75,7 @@ defmodule CanneryWeb.Components.Topbar do
  • <.link - patch={Routes.range_index_path(Endpoint, :index)} + navigate={Routes.range_index_path(Endpoint, :index)} class="text-primary-600 text-white hover:underline" > <%= gettext("Range") %> @@ -84,7 +84,7 @@ defmodule CanneryWeb.Components.Topbar do <%= if @current_user.role == :admin do %>
  • <.link - patch={Routes.invite_index_path(Endpoint, :index)} + navigate={Routes.invite_index_path(Endpoint, :index)} class="text-primary-600 text-white hover:underline" > <%= gettext("Invites") %> @@ -93,7 +93,7 @@ defmodule CanneryWeb.Components.Topbar do <% end %>
  • <.link - patch={Routes.user_settings_path(Endpoint, :edit)} + navigate={Routes.user_settings_path(Endpoint, :edit)} class="text-primary-600 text-white hover:underline truncate" > <%= @current_user.email %> @@ -111,7 +111,7 @@ defmodule CanneryWeb.Components.Topbar do <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
  • <.link - patch={Routes.live_dashboard_path(Endpoint, :home)} + navigate={Routes.live_dashboard_path(Endpoint, :home)} class="text-primary-600 text-white hover:underline" > @@ -122,7 +122,7 @@ defmodule CanneryWeb.Components.Topbar do <%= if Accounts.allow_registration?() do %>
  • <.link - patch={Routes.user_registration_path(Endpoint, :new)} + navigate={Routes.user_registration_path(Endpoint, :new)} class="text-primary-600 text-white hover:underline truncate" > <%= dgettext("actions", "Register") %> @@ -131,7 +131,7 @@ defmodule CanneryWeb.Components.Topbar do <% end %>
  • <.link - patch={Routes.user_session_path(Endpoint, :new)} + navigate={Routes.user_session_path(Endpoint, :new)} class="text-primary-600 text-white hover:underline truncate" > <%= dgettext("actions", "Log in") %> diff --git a/lib/cannery_web/live/ammo_group_live/index.ex b/lib/cannery_web/live/ammo_group_live/index.ex index da453e88..b6f13da8 100644 --- a/lib/cannery_web/live/ammo_group_live/index.ex +++ b/lib/cannery_web/live/ammo_group_live/index.ex @@ -133,7 +133,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do {ammo_type.name, ~H""" - <.link patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="link"> + <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="link"> <%= @ammo_type.name %> """} @@ -202,7 +202,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do ~H"""
    <.link - patch={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} + navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="text-primary-600 link" data-qa={"view-#{@ammo_group.id}"} > @@ -240,7 +240,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do ~H"""
    <.link - patch={Routes.container_show_path(Endpoint, :show, @ammo_group.container)} + navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container)} class="mx-2 my-1 link" > <%= @ammo_group.container.name %> diff --git a/lib/cannery_web/live/ammo_group_live/index.html.heex b/lib/cannery_web/live/ammo_group_live/index.html.heex index d8f05b80..8743c39c 100644 --- a/lib/cannery_web/live/ammo_group_live/index.html.heex +++ b/lib/cannery_web/live/ammo_group_live/index.html.heex @@ -17,7 +17,7 @@ <%= dgettext("prompts", "You'll need to") %> - <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary"> + <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary"> <%= dgettext("actions", "add a container first") %>
    @@ -27,7 +27,7 @@ <%= dgettext("prompts", "You'll need to") %> - <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary"> + <.link navigate={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary"> <%= dgettext("actions", "add an ammo type first") %>
    diff --git a/lib/cannery_web/live/ammo_group_live/show.html.heex b/lib/cannery_web/live/ammo_group_live/show.html.heex index ca3e156b..7250d510 100644 --- a/lib/cannery_web/live/ammo_group_live/show.html.heex +++ b/lib/cannery_web/live/ammo_group_live/show.html.heex @@ -53,7 +53,7 @@
    <.link - patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)} + navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)} class="mx-4 my-2 btn btn-primary" data-qa="details" > diff --git a/lib/cannery_web/live/ammo_type_live/index.ex b/lib/cannery_web/live/ammo_type_live/index.ex index 7f3678c8..74ea76fe 100644 --- a/lib/cannery_web/live/ammo_type_live/index.ex +++ b/lib/cannery_web/live/ammo_type_live/index.ex @@ -124,7 +124,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do ~H""" <.link - patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} + navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="link" data-qa={"view-name-#{@ammo_type.id}"} > @@ -139,7 +139,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do ~H"""
    <.link - patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} + navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="text-primary-600 link" data-qa={"view-#{@ammo_type.id}"} > diff --git a/lib/cannery_web/live/range_live/index.ex b/lib/cannery_web/live/range_live/index.ex index 29c049cd..d876edae 100644 --- a/lib/cannery_web/live/range_live/index.ex +++ b/lib/cannery_web/live/range_live/index.ex @@ -154,7 +154,10 @@ defmodule CanneryWeb.RangeLive.Index do :name -> {shot_group.ammo_group.ammo_type.name, ~H""" - <.link patch={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)} class="link"> + <.link + navigate={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)} + class="link" + > <%= @shot_group.ammo_group.ammo_type.name %> """} diff --git a/lib/cannery_web/live/range_live/index.html.heex b/lib/cannery_web/live/range_live/index.html.heex index 390a3708..b593f020 100644 --- a/lib/cannery_web/live/range_live/index.html.heex +++ b/lib/cannery_web/live/range_live/index.html.heex @@ -9,11 +9,11 @@ <%= display_emoji("😔") %> - <.link patch={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary"> + <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary"> <%= dgettext("actions", "Why not get some ready to shoot?") %> <% else %> - <.link patch={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary"> + <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary"> <%= dgettext("actions", "Stage ammo") %> diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index 6737f51b..ef4feab9 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -213,7 +213,7 @@ msgid "Are you sure you want to unstage this ammo?" msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?" #: lib/cannery_web/live/ammo_group_live/show.ex:132 -#: lib/cannery_web/live/range_live/index.ex:181 +#: lib/cannery_web/live/range_live/index.ex:184 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this shot record?" msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index d4db1d15..d7f6bd72 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -193,7 +193,7 @@ msgid "Are you sure you want to unstage this ammo?" msgstr "" #: lib/cannery_web/live/ammo_group_live/show.ex:132 -#: lib/cannery_web/live/range_live/index.ex:181 +#: lib/cannery_web/live/range_live/index.ex:184 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this shot record?" msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/prompts.po b/priv/gettext/es/LC_MESSAGES/prompts.po index 134ed15d..455cb62e 100644 --- a/priv/gettext/es/LC_MESSAGES/prompts.po +++ b/priv/gettext/es/LC_MESSAGES/prompts.po @@ -212,7 +212,7 @@ msgid "Are you sure you want to unstage this ammo?" msgstr "Está seguro que desea desmontar esta munición?" #: lib/cannery_web/live/ammo_group_live/show.ex:132 -#: lib/cannery_web/live/range_live/index.ex:181 +#: lib/cannery_web/live/range_live/index.ex:184 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this shot record?" msgstr "" diff --git a/priv/gettext/fr/LC_MESSAGES/prompts.po b/priv/gettext/fr/LC_MESSAGES/prompts.po index b8bd2105..0f01ffe7 100644 --- a/priv/gettext/fr/LC_MESSAGES/prompts.po +++ b/priv/gettext/fr/LC_MESSAGES/prompts.po @@ -214,7 +214,7 @@ msgid "Are you sure you want to unstage this ammo?" msgstr "Êtes-vous certain·e de vouloir désélectionner cette munition ?" #: lib/cannery_web/live/ammo_group_live/show.ex:132 -#: lib/cannery_web/live/range_live/index.ex:181 +#: lib/cannery_web/live/range_live/index.ex:184 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this shot record?" msgstr "Êtes-vous certain·e de vouloir supprimer cet enregistrement de tir ?" diff --git a/priv/gettext/ga/LC_MESSAGES/prompts.po b/priv/gettext/ga/LC_MESSAGES/prompts.po index a375d409..757d84c3 100644 --- a/priv/gettext/ga/LC_MESSAGES/prompts.po +++ b/priv/gettext/ga/LC_MESSAGES/prompts.po @@ -203,7 +203,7 @@ msgid "Are you sure you want to unstage this ammo?" msgstr "" #: lib/cannery_web/live/ammo_group_live/show.ex:132 -#: lib/cannery_web/live/range_live/index.ex:181 +#: lib/cannery_web/live/range_live/index.ex:184 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this shot record?" msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index 575917a8..616a32ee 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -192,7 +192,7 @@ msgid "Are you sure you want to unstage this ammo?" msgstr "" #: lib/cannery_web/live/ammo_group_live/show.ex:132 -#: lib/cannery_web/live/range_live/index.ex:181 +#: lib/cannery_web/live/range_live/index.ex:184 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this shot record?" msgstr ""