shibao/cannery
shibao/cannery
1
2
Fork 1
Code Issues 16 Pull Requests Projects 1 Releases 36 Wiki Activity

show container name in ammo type listing

Browse Source
This commit is contained in:
shibao 2022-11-06 23:30:16 -05:00
parent dbc575d305
commit 2e0bb861f1
8 changed files with 72 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,8 +1,9 @@
# v0.5.5 # v0.5.5
- Update translations - Update translations
- Make ammo index page a bit more compact - Make ammo index page a bit more compact
- Add ammo count to ammo type index page - Make ammo catalog page include ammo count
- Make ammo type show page a bit more compact - Make ammo type show page a bit more compact
- Make ammo type show page include container names for each ammo
- Make container show page a bit more compact - Make container show page a bit more compact
- Forgot to add the logo as the favicon whoops - Forgot to add the logo as the favicon whoops

22
lib/cannery_web/components/ammo_group_card.ex
View File

@ -7,8 +7,13 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
alias Cannery.Repo alias Cannery.Repo
alias CanneryWeb.Endpoint alias CanneryWeb.Endpoint
def ammo_group_card(assigns) do def ammo_group_card(%{ammo_group: ammo_group} = assigns) do
assigns = assigns |> assign(:ammo_group, assigns.ammo_group |> Repo.preload(:ammo_type)) assigns =
%{show_container: show_container} = assigns |> assign_new(:show_container, fn -> false end)
preloads = if show_container, do: [:ammo_type, :container], else: [:ammo_type]
ammo_group = ammo_group |> Repo.preload(preloads)
assigns = assigns |> assign(:ammo_group, ammo_group)
~H""" ~H"""
<div <div
@ -17,7 +22,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
border border-gray-400 rounded-lg shadow-lg hover:shadow-md border border-gray-400 rounded-lg shadow-lg hover:shadow-md
transition-all duration-300 ease-in-out" transition-all duration-300 ease-in-out"
> >
<%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, @ammo_group), <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :show, @ammo_group),
class: "mb-2 link" do %> class: "mb-2 link" do %>
<h1 class="title text-xl title-primary-500"> <h1 class="title text-xl title-primary-500">
<%= @ammo_group.ammo_type.name %> <%= @ammo_group.ammo_type.name %>
@ -50,6 +55,17 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
) %> ) %>
</span> </span>
<% end %> <% end %>
<%= if @show_container and @ammo_group.container do %>
<span class="rounded-lg title text-lg">
<%= gettext("Container:") %>
<%= live_patch to: Routes.container_show_path(Endpoint, :show, @ammo_group.container),
class: "link" do %>
<%= @ammo_group.container.name %>
<% end %>
</span>
<% end %>
</div> </div>
<%= if assigns |> Map.has_key?(:inner_block) do %> <%= if assigns |> Map.has_key?(:inner_block) do %>

2
lib/cannery_web/live/ammo_type_live/show.html.heex
View File

@ -122,7 +122,7 @@
<% else %> <% else %>
<div class="flex flex-wrap justify-center items-center"> <div class="flex flex-wrap justify-center items-center">
<%= for ammo_group <- @ammo_groups do %> <%= for ammo_group <- @ammo_groups do %>
<.ammo_group_card ammo_group={ammo_group} /> <.ammo_group_card ammo_group={ammo_group} show_container={true} />
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

15
priv/gettext/de/LC_MESSAGES/default.po
View File

@ -144,7 +144,7 @@ msgid "Count"
msgstr "Anzahl" msgstr "Anzahl"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:29 #: lib/cannery_web/components/ammo_group_card.ex:34
#: lib/cannery_web/live/ammo_group_live/show.html.heex:8 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
msgid "Count:" msgid "Count:"
msgstr "Anzahl:" msgstr "Anzahl:"
@ -352,7 +352,7 @@ msgid "Notes"
msgstr "Bemerkungen" msgstr "Bemerkungen"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:35 #: lib/cannery_web/components/ammo_group_card.ex:40
#: lib/cannery_web/live/ammo_group_live/show.html.heex:24 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
msgid "Notes:" msgid "Notes:"
msgstr "Bemerkungen:" msgstr "Bemerkungen:"
@ -376,7 +376,7 @@ msgid "Price paid"
msgstr "Kaufpreis" msgstr "Kaufpreis"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:47 #: lib/cannery_web/components/ammo_group_card.ex:52
msgid "Price paid:" msgid "Price paid:"
msgstr "Kaufpreis:" msgstr "Kaufpreis:"
@ -616,7 +616,7 @@ msgid "Shot log"
msgstr "Schießkladde" msgstr "Schießkladde"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:48 #: lib/cannery_web/components/ammo_group_card.ex:53
#: lib/cannery_web/live/ammo_group_live/index.ex:125 #: lib/cannery_web/live/ammo_group_live/index.ex:125
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
@ -829,7 +829,7 @@ msgid "Added on"
msgstr "Hinzugefügt am" msgstr "Hinzugefügt am"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:41 #: lib/cannery_web/components/ammo_group_card.ex:46
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:90 #: lib/cannery_web/live/ammo_type_live/show.html.heex:90
msgid "Added on:" msgid "Added on:"
@ -940,3 +940,8 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:87 #: lib/cannery_web/live/ammo_type_live/index.ex:87
msgid "Total # of ammo" msgid "Total # of ammo"
msgstr "Summe aller Patronen" msgstr "Summe aller Patronen"
#, elixir-autogen, elixir-format, fuzzy
#: lib/cannery_web/components/ammo_group_card.ex:61
msgid "Container:"
msgstr "Behälter"

15
priv/gettext/default.pot
View File

@ -129,7 +129,7 @@ msgid "Count"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:29 #: lib/cannery_web/components/ammo_group_card.ex:34
#: lib/cannery_web/live/ammo_group_live/show.html.heex:8 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
msgid "Count:" msgid "Count:"
msgstr "" msgstr ""
@ -337,7 +337,7 @@ msgid "Notes"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:35 #: lib/cannery_web/components/ammo_group_card.ex:40
#: lib/cannery_web/live/ammo_group_live/show.html.heex:24 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
msgid "Notes:" msgid "Notes:"
msgstr "" msgstr ""
@ -361,7 +361,7 @@ msgid "Price paid"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:47 #: lib/cannery_web/components/ammo_group_card.ex:52
msgid "Price paid:" msgid "Price paid:"
msgstr "" msgstr ""
@ -599,7 +599,7 @@ msgid "Shot log"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:48 #: lib/cannery_web/components/ammo_group_card.ex:53
#: lib/cannery_web/live/ammo_group_live/index.ex:125 #: lib/cannery_web/live/ammo_group_live/index.ex:125
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
@ -812,7 +812,7 @@ msgid "Added on"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:41 #: lib/cannery_web/components/ammo_group_card.ex:46
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:90 #: lib/cannery_web/live/ammo_type_live/show.html.heex:90
msgid "Added on:" msgid "Added on:"
@ -923,3 +923,8 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:87 #: lib/cannery_web/live/ammo_type_live/index.ex:87
msgid "Total # of ammo" msgid "Total # of ammo"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:61
msgid "Container:"
msgstr ""

15
priv/gettext/en/LC_MESSAGES/default.po
View File

@ -130,7 +130,7 @@ msgid "Count"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:29 #: lib/cannery_web/components/ammo_group_card.ex:34
#: lib/cannery_web/live/ammo_group_live/show.html.heex:8 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
msgid "Count:" msgid "Count:"
msgstr "" msgstr ""
@ -338,7 +338,7 @@ msgid "Notes"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:35 #: lib/cannery_web/components/ammo_group_card.ex:40
#: lib/cannery_web/live/ammo_group_live/show.html.heex:24 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
msgid "Notes:" msgid "Notes:"
msgstr "" msgstr ""
@ -362,7 +362,7 @@ msgid "Price paid"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:47 #: lib/cannery_web/components/ammo_group_card.ex:52
msgid "Price paid:" msgid "Price paid:"
msgstr "" msgstr ""
@ -600,7 +600,7 @@ msgid "Shot log"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:48 #: lib/cannery_web/components/ammo_group_card.ex:53
#: lib/cannery_web/live/ammo_group_live/index.ex:125 #: lib/cannery_web/live/ammo_group_live/index.ex:125
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
@ -813,7 +813,7 @@ msgid "Added on"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:41 #: lib/cannery_web/components/ammo_group_card.ex:46
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:90 #: lib/cannery_web/live/ammo_type_live/show.html.heex:90
msgid "Added on:" msgid "Added on:"
@ -924,3 +924,8 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:87 #: lib/cannery_web/live/ammo_type_live/index.ex:87
msgid "Total # of ammo" msgid "Total # of ammo"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format, fuzzy
#: lib/cannery_web/components/ammo_group_card.ex:61
msgid "Container:"
msgstr ""

15
priv/gettext/es/LC_MESSAGES/default.po
View File

@ -144,7 +144,7 @@ msgid "Count"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:29 #: lib/cannery_web/components/ammo_group_card.ex:34
#: lib/cannery_web/live/ammo_group_live/show.html.heex:8 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
msgid "Count:" msgid "Count:"
msgstr "" msgstr ""
@ -352,7 +352,7 @@ msgid "Notes"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:35 #: lib/cannery_web/components/ammo_group_card.ex:40
#: lib/cannery_web/live/ammo_group_live/show.html.heex:24 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
msgid "Notes:" msgid "Notes:"
msgstr "" msgstr ""
@ -376,7 +376,7 @@ msgid "Price paid"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:47 #: lib/cannery_web/components/ammo_group_card.ex:52
msgid "Price paid:" msgid "Price paid:"
msgstr "" msgstr ""
@ -614,7 +614,7 @@ msgid "Shot log"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:48 #: lib/cannery_web/components/ammo_group_card.ex:53
#: lib/cannery_web/live/ammo_group_live/index.ex:125 #: lib/cannery_web/live/ammo_group_live/index.ex:125
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
@ -827,7 +827,7 @@ msgid "Added on"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:41 #: lib/cannery_web/components/ammo_group_card.ex:46
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:90 #: lib/cannery_web/live/ammo_type_live/show.html.heex:90
msgid "Added on:" msgid "Added on:"
@ -938,3 +938,8 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:87 #: lib/cannery_web/live/ammo_type_live/index.ex:87
msgid "Total # of ammo" msgid "Total # of ammo"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format, fuzzy
#: lib/cannery_web/components/ammo_group_card.ex:61
msgid "Container:"
msgstr ""

15
priv/gettext/fr/LC_MESSAGES/default.po
View File

@ -144,7 +144,7 @@ msgid "Count"
msgstr "Quantité" msgstr "Quantité"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:29 #: lib/cannery_web/components/ammo_group_card.ex:34
#: lib/cannery_web/live/ammo_group_live/show.html.heex:8 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
msgid "Count:" msgid "Count:"
msgstr "Quantité :" msgstr "Quantité :"
@ -352,7 +352,7 @@ msgid "Notes"
msgstr "Notes" msgstr "Notes"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:35 #: lib/cannery_web/components/ammo_group_card.ex:40
#: lib/cannery_web/live/ammo_group_live/show.html.heex:24 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
msgid "Notes:" msgid "Notes:"
msgstr "Notes :" msgstr "Notes :"
@ -376,7 +376,7 @@ msgid "Price paid"
msgstr "Prix payé" msgstr "Prix payé"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:47 #: lib/cannery_web/components/ammo_group_card.ex:52
msgid "Price paid:" msgid "Price paid:"
msgstr "Prix payé :" msgstr "Prix payé :"
@ -618,7 +618,7 @@ msgid "Shot log"
msgstr "Évènements de tir" msgstr "Évènements de tir"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:48 #: lib/cannery_web/components/ammo_group_card.ex:53
#: lib/cannery_web/live/ammo_group_live/index.ex:125 #: lib/cannery_web/live/ammo_group_live/index.ex:125
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
@ -831,7 +831,7 @@ msgid "Added on"
msgstr "Ajouté le" msgstr "Ajouté le"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/cannery_web/components/ammo_group_card.ex:41 #: lib/cannery_web/components/ammo_group_card.ex:46
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:90 #: lib/cannery_web/live/ammo_type_live/show.html.heex:90
msgid "Added on:" msgid "Added on:"
@ -942,3 +942,8 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:87 #: lib/cannery_web/live/ammo_type_live/index.ex:87
msgid "Total # of ammo" msgid "Total # of ammo"
msgstr "Quantité de cartouches" msgstr "Quantité de cartouches"
#, elixir-autogen, elixir-format, fuzzy
#: lib/cannery_web/components/ammo_group_card.ex:61
msgid "Container:"
msgstr "Conteneur"