From 8890c7891333ae55dee558e175a5199404cf06fb Mon Sep 17 00:00:00 2001 From: Claudio Ortolina Date: Mon, 12 May 2025 17:13:04 +0100 Subject: [PATCH] Consolidate Fluxon button usage via CoreComponents --- .../components/barcode_scanner_component.ex | 4 ++-- .../components/core_components.ex | 1 + .../components/form_component.ex | 8 ++------ .../components/release_component.ex | 17 ++++++----------- .../live/collection_live/index.html.heex | 16 ++++++++-------- 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/lib/music_library_web/components/barcode_scanner_component.ex b/lib/music_library_web/components/barcode_scanner_component.ex index 4ac58b32..77339682 100644 --- a/lib/music_library_web/components/barcode_scanner_component.ex +++ b/lib/music_library_web/components/barcode_scanner_component.ex @@ -48,14 +48,14 @@ defmodule MusicLibraryWeb.BarcodeScannerComponent do
- {gettext("Add releases")} - +
""" diff --git a/lib/music_library_web/components/core_components.ex b/lib/music_library_web/components/core_components.ex index c3dfc85c..4bc88b1d 100644 --- a/lib/music_library_web/components/core_components.ex +++ b/lib/music_library_web/components/core_components.ex @@ -19,6 +19,7 @@ defmodule MusicLibraryWeb.CoreComponents do alias Phoenix.LiveView.JS use Gettext, backend: MusicLibraryWeb.Gettext + defdelegate button(assigns), to: Fluxon.Components.Button defdelegate date_time_picker(assigns), to: Fluxon.Components.DatePicker defdelegate input(assigns), to: Fluxon.Components.Input defdelegate loading(assigns), to: Fluxon.Components.Loading diff --git a/lib/music_library_web/components/form_component.ex b/lib/music_library_web/components/form_component.ex index 25ba6437..a00231fb 100644 --- a/lib/music_library_web/components/form_component.ex +++ b/lib/music_library_web/components/form_component.ex @@ -114,13 +114,9 @@ defmodule MusicLibraryWeb.FormComponent do <:actions>
- + <.button variant="solid" class="w-full md:w-auto" phx-disable-with={gettext("Saving...")}> {gettext("Save")} - +
diff --git a/lib/music_library_web/components/release_component.ex b/lib/music_library_web/components/release_component.ex index 6c8dbd25..b8d2ba1a 100644 --- a/lib/music_library_web/components/release_component.ex +++ b/lib/music_library_web/components/release_component.ex @@ -37,7 +37,7 @@ defmodule MusicLibraryWeb.ReleaseComponent do <.sheet :if={@record.selected_release_id} id={@sheet_id} placement="right">

{gettext("Tracks")}

- {gettext("Scrobble release")} - - + + <.button :if={!@can_scrobble?} as="link" size="sm" href={LastFm.auth_url()}> {gettext("Connect your Last.fm account")} - +
@@ -81,7 +76,7 @@ defmodule MusicLibraryWeb.ReleaseComponent do

{medium_title(medium)}

- {gettext("Scrobble disc")} - +