From 058d8cc6c94a00524abeae3855f432e86ae3dd57 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 8 Nov 2023 11:40:07 +0200 Subject: [PATCH] Extract button component (#3474) * Add button component * Use new button in settings screen * Use button component in registration screens * Use new button component for Billing.upgrade_link * Separate .button and .button_link * Add attr definiton for disabled * Fix funnels test --- lib/plausible_web/components/billing.ex | 17 +++---- lib/plausible_web/components/generic.ex | 44 +++++++++++++++++++ lib/plausible_web/components/site/feature.ex | 4 +- .../live/funnel_settings/form.ex | 36 +++++---------- .../live/funnel_settings/list.ex | 4 +- lib/plausible_web/live/goal_settings/form.ex | 4 +- lib/plausible_web/live/goal_settings/list.ex | 4 +- .../live/plugins/api/settings.ex | 4 +- .../live/plugins/api/token_form.ex | 4 +- lib/plausible_web/live/props_settings/form.ex | 4 +- lib/plausible_web/live/props_settings/list.ex | 8 +--- lib/plausible_web/live/register_form.ex | 5 +-- lib/plausible_web/live/reset_password_form.ex | 4 +- .../templates/auth/user_settings.html.heex | 15 ++++--- .../templates/site/change_domain.html.heex | 4 +- .../templates/site/settings_general.html.heex | 19 ++++---- .../templates/site/settings_people.html.heex | 17 +++---- .../site/settings_visibility.html.heex | 14 +++--- .../live/funnel_settings_test.exs | 10 ++--- 19 files changed, 121 insertions(+), 100 deletions(-) diff --git a/lib/plausible_web/components/billing.ex b/lib/plausible_web/components/billing.ex index af6acc022..a2a9f85eb 100644 --- a/lib/plausible_web/components/billing.ex +++ b/lib/plausible_web/components/billing.ex @@ -322,24 +322,19 @@ defmodule PlausibleWeb.Components.Billing do def upgrade_link(%{business_tier: true} = assigns) do ~H""" - <.link - id="upgrade-link-2" - href={upgrade_link_href(@user)} - class="inline-block px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-500 focus:outline-none focus:border-indigo-700 focus:ring active:bg-indigo-700 transition ease-in-out duration-150" - > + Upgrade - + """ end def upgrade_link(assigns) do ~H""" - <.link - href={Routes.billing_path(PlausibleWeb.Endpoint, :upgrade)} - class="inline-block px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-500 focus:outline-none focus:border-indigo-700 focus:ring active:bg-indigo-700 transition ease-in-out duration-150" - > + Upgrade - + """ end diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex index cf2036823..7c72e0d22 100644 --- a/lib/plausible_web/components/generic.ex +++ b/lib/plausible_web/components/generic.ex @@ -4,6 +4,50 @@ defmodule PlausibleWeb.Components.Generic do """ use Phoenix.Component + attr(:type, :string, default: "button") + attr(:class, :string, default: "") + attr(:disabled, :boolean, default: false) + attr(:rest, :global) + + slot(:inner_block) + + def button(assigns) do + ~H""" + + """ + end + + attr(:href, :string, required: true) + attr(:class, :string, default: "") + attr(:rest, :global) + + slot(:inner_block) + + def button_link(assigns) do + ~H""" + <.link + href={@href} + class={[ + "inline-flex items-center justify-center gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400", + @class + ]} + {@rest} + > + <%= render_slot(@inner_block) %> + + """ + end + attr(:slug, :string, required: true) def docs_info(assigns) do diff --git a/lib/plausible_web/components/site/feature.ex b/lib/plausible_web/components/site/feature.ex index 07239108a..c751f02bb 100644 --- a/lib/plausible_web/components/site/feature.ex +++ b/lib/plausible_web/components/site/feature.ex @@ -19,7 +19,7 @@ defmodule PlausibleWeb.Components.Site.Feature do ~H"""
- <.button + <.feature_button set_to={!@current_setting} disabled?={@disabled?} conn={@conn} @@ -49,7 +49,7 @@ defmodule PlausibleWeb.Components.Site.Feature do Routes.site_path(conn, :update_feature_visibility, site.domain, setting, r: r, set: set_to) end - defp button(assigns) do + defp feature_button(assigns) do ~H""" <.form action={target(@site, @feature_mod.toggle_field(), @conn, @set_to)} method="put" for={nil}>
@@ -173,26 +179,6 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do """ end - def submit_button(assigns) do - ~H""" - - """ - end - - def submit_button_inactive(assigns) do - ~H""" - - """ - end - attr(:at, :integer, required: true) attr(:result, :map, required: true) diff --git a/lib/plausible_web/live/funnel_settings/list.ex b/lib/plausible_web/live/funnel_settings/list.ex index 98cb60e1c..a1fcc2aec 100644 --- a/lib/plausible_web/live/funnel_settings/list.ex +++ b/lib/plausible_web/live/funnel_settings/list.ex @@ -39,9 +39,9 @@ defmodule PlausibleWeb.Live.FunnelSettings.List do
- +
<%= if Enum.count(@funnels) > 0 do %> diff --git a/lib/plausible_web/live/goal_settings/form.ex b/lib/plausible_web/live/goal_settings/form.ex index 9b42d77cc..4229505c5 100644 --- a/lib/plausible_web/live/goal_settings/form.ex +++ b/lib/plausible_web/live/goal_settings/form.ex @@ -74,9 +74,9 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do <.pageview_fields :if={@tabs.pageviews} f={f} site={@site} />
- +
diff --git a/lib/plausible_web/live/goal_settings/list.ex b/lib/plausible_web/live/goal_settings/list.ex index 1dbdfb719..efb947dba 100644 --- a/lib/plausible_web/live/goal_settings/list.ex +++ b/lib/plausible_web/live/goal_settings/list.ex @@ -40,9 +40,9 @@ defmodule PlausibleWeb.Live.GoalSettings.List do
- +
<%= if Enum.count(@goals) > 0 do %> diff --git a/lib/plausible_web/live/plugins/api/settings.ex b/lib/plausible_web/live/plugins/api/settings.ex index 4fa466b3e..7f48382db 100644 --- a/lib/plausible_web/live/plugins/api/settings.ex +++ b/lib/plausible_web/live/plugins/api/settings.ex @@ -52,9 +52,9 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do
- +
diff --git a/lib/plausible_web/live/plugins/api/token_form.ex b/lib/plausible_web/live/plugins/api/token_form.ex index 0fd31815d..5180b177b 100644 --- a/lib/plausible_web/live/plugins/api/token_form.ex +++ b/lib/plausible_web/live/plugins/api/token_form.ex @@ -86,9 +86,9 @@ defmodule PlausibleWeb.Live.Plugins.API.TokenForm do

- +
diff --git a/lib/plausible_web/live/props_settings/form.ex b/lib/plausible_web/live/props_settings/form.ex index f38cae2ab..8e715a1b7 100644 --- a/lib/plausible_web/live/props_settings/form.ex +++ b/lib/plausible_web/live/props_settings/form.ex @@ -90,9 +90,9 @@ defmodule PlausibleWeb.Live.PropsSettings.Form do
- +
+ <%= if is_list(@props) && length(@props) > 0 do %> diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.ex index c368368b5..b6fdaa372 100644 --- a/lib/plausible_web/live/register_form.ex +++ b/lib/plausible_web/live/register_form.ex @@ -167,10 +167,9 @@ defmodule PlausibleWeb.Live.RegisterForm do else "Start my free trial →" end %> - - +

Already have an account? <%= link("Log in", diff --git a/lib/plausible_web/live/reset_password_form.ex b/lib/plausible_web/live/reset_password_form.ex index 50794a58d..5ffd6b7ef 100644 --- a/lib/plausible_web/live/reset_password_form.ex +++ b/lib/plausible_web/live/reset_password_form.ex @@ -57,9 +57,9 @@ defmodule PlausibleWeb.Live.ResetPasswordForm do class="transition bg-gray-100 dark:bg-gray-900 outline-none appearance-none border border-transparent rounded w-full p-2 text-gray-700 dark:text-gray-300 leading-normal appearance-none focus:outline-none focus:bg-white dark:focus:bg-gray-800 focus:border-gray-300 dark:focus:border-gray-500" /> - +

Don't have an account? <%= link("Register", to: "/register", diff --git a/lib/plausible_web/templates/auth/user_settings.html.heex b/lib/plausible_web/templates/auth/user_settings.html.heex index 915b4234c..b7281c75e 100644 --- a/lib/plausible_web/templates/auth/user_settings.html.heex +++ b/lib/plausible_web/templates/auth/user_settings.html.heex @@ -232,7 +232,10 @@ "dark:bg-gray-900 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:text-gray-100 cursor-pointer" ) %> - <%= submit("Save", class: "button mt-4") %> + + + Save + <% end %> @@ -254,7 +257,9 @@ <%= error_tag(f, :name) %> - <%= submit("Save", class: "button mt-4") %> + + Save + <% end %> @@ -375,13 +380,13 @@ <% end %> - <.link + + New API Key - + diff --git a/lib/plausible_web/templates/site/change_domain.html.heex b/lib/plausible_web/templates/site/change_domain.html.heex index 8ea758763..5e42e10ed 100644 --- a/lib/plausible_web/templates/site/change_domain.html.heex +++ b/lib/plausible_web/templates/site/change_domain.html.heex @@ -31,7 +31,9 @@ for details.

- <%= submit("Change Domain and add new Snippet →", class: "button mt-4 w-full") %> + + Change Domain and add new Snippet → +
<.styled_link diff --git a/lib/plausible_web/templates/site/settings_general.html.heex b/lib/plausible_web/templates/site/settings_general.html.heex index 1ef45e133..c918df149 100644 --- a/lib/plausible_web/templates/site/settings_general.html.heex +++ b/lib/plausible_web/templates/site/settings_general.html.heex @@ -21,12 +21,13 @@ ) %>
- - <%= link("Change Domain", - to: Routes.site_path(@conn, :change_domain, @site.domain), - class: "button" - ) %> - +
+ + Change Domain + +
@@ -54,9 +55,9 @@ ) %> - - <%= submit("Save", class: "button") %> - + + Save + <% end %> diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heex index 5d57dd6ba..8569f7783 100644 --- a/lib/plausible_web/templates/site/settings_people.html.heex +++ b/lib/plausible_web/templates/site/settings_people.html.heex @@ -226,17 +226,10 @@
- <%= link(to: Routes.membership_path(@conn, :invite_member_form, @site.domain), class: "button") do %> - - - - - Invite - <% end %> + + Invite +
diff --git a/lib/plausible_web/templates/site/settings_visibility.html.heex b/lib/plausible_web/templates/site/settings_visibility.html.heex index ea73d95f7..2ae8796e6 100644 --- a/lib/plausible_web/templates/site/settings_visibility.html.heex +++ b/lib/plausible_web/templates/site/settings_visibility.html.heex @@ -147,10 +147,12 @@ <% end %> - <%= link("+ New Link", - to: Routes.site_path(@conn, :new_shared_link, @site.domain), - class: "button mt-4" - ) %> + + + New Link + @@ -220,7 +222,9 @@ - + + Generate Embed Code 👇 +
diff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exs index 9b00cc084..a1b73901f 100644 --- a/test/plausible_web/live/funnel_settings_test.exs +++ b/test/plausible_web/live/funnel_settings_test.exs @@ -232,11 +232,7 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest do |> element("li#dropdown-step-2-option-1 a") |> render_click() - save_inactive = ~s/form button#save.cursor-not-allowed/ - save_active = ~s/form button#save[type="submit"]/ - - refute element_exists?(doc, save_active) - assert element_exists?(doc, save_inactive) + assert element_exists?(doc, ~s/form button#save:disabled/) doc = lv @@ -251,8 +247,8 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest do } }) - assert element_exists?(doc, save_active) - refute element_exists?(doc, save_inactive) + assert element_exists?(doc, ~s/form button#save/) + refute element_exists?(doc, ~s/form button#save:disabled/) end @tag :slow