diff --git a/lib/music_library_web.ex b/lib/music_library_web.ex index a51427f2..b475c88d 100644 --- a/lib/music_library_web.ex +++ b/lib/music_library_web.ex @@ -62,8 +62,7 @@ defmodule MusicLibraryWeb do def live_view do quote do - use Phoenix.LiveView, - layout: {MusicLibraryWeb.Layouts, :app} + use Phoenix.LiveView unquote(html_helpers()) end @@ -102,6 +101,7 @@ defmodule MusicLibraryWeb do # HTML escaping functionality import Phoenix.HTML + alias MusicLibraryWeb.Layouts # Shortcut for generating JS commands alias Phoenix.LiveView.JS diff --git a/lib/music_library_web/components/layouts/app.html.heex b/lib/music_library_web/components/layouts/app.html.heex index b0c62bdc..3f3242b7 100644 --- a/lib/music_library_web/components/layouts/app.html.heex +++ b/lib/music_library_web/components/layouts/app.html.heex @@ -126,7 +126,7 @@ toasts_sync={assigns[:toasts_sync]} toast_class_fn={&toast_class_fn/1} /> - {@inner_content} + {render_slot(@inner_block)} diff --git a/lib/music_library_web/live/artist_live/show.html.heex b/lib/music_library_web/live/artist_live/show.html.heex index 967884a2..b492bff3 100644 --- a/lib/music_library_web/live/artist_live/show.html.heex +++ b/lib/music_library_web/live/artist_live/show.html.heex @@ -1,270 +1,272 @@ -
- {@artist.musicbrainz_id}
-
-
-
-
+ {@artist.musicbrainz_id}
+
+
+
+ - <.record_colors record={@record} /> - - {Records.Record.format_release_date(@record.release_date)} · {format_label( - @record.format - )} · {type_label(@record.type)} - -
-+ <.record_colors record={@record} /> + + {Records.Record.format_release_date(@record.release_date)} · {format_label( + @record.format + )} · {type_label(@record.type)} + +
+{@record.id}
+
+ {@record.musicbrainz_id}
+
+
+ {@record.id}
-
- {@record.musicbrainz_id}
-
-
- - {template.name} +
+ {template.name} +
+ <.badge :if={template.enabled} color="success"> + {gettext("Enabled")} + + <.badge :if={!template.enabled} color="warning"> + {gettext("Disabled")} + +{template.url_template}
++ {template.description}
- <.badge :if={template.enabled} color="success"> - {gettext("Enabled")} - - <.badge :if={!template.enabled} color="warning"> - {gettext("Disabled")} -{template.url_template}
+- {template.description} -
-+ {scrobble_rule.match_value} +
++ {scrobble_rule.target_musicbrainz_id} +
++ {scrobble_rule.description} +
+- {scrobble_rule.match_value} -
-- {scrobble_rule.target_musicbrainz_id} -
-- {scrobble_rule.description} -
-- {gettext("No scrobbled tracks found")} -
-+ {gettext("No scrobbled tracks found")} +
++ {track.title} +
++ {track.artist.name} +
++ {track.album.title} +
++ {track.scrobbled_at_label} +
- {track.title} -
-- {track.artist.name} -
-- {track.album.title} -
-- {track.scrobbled_at_label} -
++ {album.artist.name} +
+ <.link + :if={album.artist.musicbrainz_id in @artist_ids} + class="font-semibold text-sm block text-zinc-700 hover:text-zinc-500 dark:text-zinc-400 dark:hover:text-zinc-300" + navigate={~p"/artists/#{album.artist.musicbrainz_id}"} + > + {album.artist.name} + ++ {album.metadata.title} +
+ +- {album.artist.name} -
+- {album.metadata.title} -
-+ {track.artist.name} +
+ <.link + :if={track.artist.musicbrainz_id in @artist_ids} + class="font-semibold text-sm block text-zinc-700 hover:text-zinc-500 dark:text-zinc-400 dark:hover:text-zinc-300" + navigate={~p"/artists/#{track.artist.musicbrainz_id}"} + > + {track.artist.name} + ++ {track.title} +
++ {track.album.title} +
+ <.tooltip> <.icon name="hero-information-circle" @@ -130,16 +316,43 @@ <:content>
- {album.metadata.musicbrainz_id || gettext("Unknown")}
+
+ {track.musicbrainz_id || gettext("Unknown")}
+
+ {track.album.musicbrainz_id || gettext("Unknown")}
+
+ - {track.artist.name} -
<.link - :if={track.artist.musicbrainz_id in @artist_ids} - class="font-semibold text-sm block text-zinc-700 hover:text-zinc-500 dark:text-zinc-400 dark:hover:text-zinc-300" - navigate={~p"/artists/#{track.artist.musicbrainz_id}"} + :if={ + record_id = tracked_record?(@collected_releases, track.album.musicbrainz_id) + } + navigate={~p"/collection/#{record_id}"} > - {track.artist.name} + <.badge color="success">{gettext("Collected")} -- {track.title} -
-- {track.album.title} -
- - <.tooltip> + <.badge color="warning">{gettext("Wishlisted")} + +
- {track.musicbrainz_id || gettext("Unknown")}
-
-
- {track.album.musicbrainz_id || gettext("Unknown")}
-
-
- {track.artist.musicbrainz_id || gettext("Unknown")}
-
- - <.record_colors record={@record} /> - {Records.Record.format_release_date(@record.release_date)} - - ({gettext("Unreleased")}) - - · {format_label(@record.format)} · {type_label(@record.type)} -
-{@record.id}
- {@record.musicbrainz_id}
-
- + <.record_colors record={@record} /> + {Records.Record.format_release_date(@record.release_date)} + + ({gettext("Unreleased")}) - - <.release_summary - :if={@record.selected_release_id} - release={Records.Record.selected_release(@record)} + · {format_label(@record.format)} · {type_label(@record.type)} +
+{@record.id}
+ {@record.musicbrainz_id}
+
+