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