diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex index 382a7c22b..289c0cb17 100644 --- a/lib/plausible_web/components/generic.ex +++ b/lib/plausible_web/components/generic.ex @@ -22,7 +22,6 @@ defmodule PlausibleWeb.Components.Generic do attr(:type, :string, default: "button") attr(:class, :string, default: "") attr(:disabled, :boolean, default: false) - attr(:onclick, :string, default: "") attr(:rest, :global) slot(:inner_block) @@ -32,9 +31,8 @@ defmodule PlausibleWeb.Components.Generic do +
@@ -475,7 +472,6 @@ state_param="regenerate2FAOpen" form_data={@conn.params} form_target={Routes.auth_path(@conn, :generate_2fa_recovery_codes)} - onsubmit="var group = document.querySelector('#regenerate-2fa-modal-buttons'); group.classList.add('submitting');" title="Generate New Recovery Codes?" > <:icon> @@ -483,25 +479,20 @@ <:buttons> -
- <.button - type="submit" - onclick="submitted = true" - class="w-full sm:w-52 group-[.submitting]:bg-gray-400 dark:group-[.submitting]:bg-gray-800" - > - - Generate New Codes - - - - -
+ <.button + type="submit" + onclick="event.target.disabled = true" + class="w-full sm:w-auto [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block" + > + + Generate New Codes + + + + <.spinner class="inline-block h-5 w-5 mr-2 text-white dark:text-gray-600" /> + Generating Codes + +
diff --git a/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex b/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex index 026342f18..cc696d78a 100644 --- a/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex +++ b/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex @@ -2,8 +2,7 @@ <%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_recovery_code), [ - class: "w-full max-w-lg mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8", - onsubmit: "var button = document.getElementById('submit'); button.disabled = true; button.classList.add('animate-pulse')" + class: "w-full max-w-lg mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8" ], fn f -> %>

Enter Recovery Code @@ -19,11 +18,26 @@ class: "font-medium shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full px-2 border-gray-300 dark:border-gray-500 dark:text-gray-200 dark:bg-gray-900 rounded-md", maxlength: "10", + oninvalid: "document.getElementById('use-code-button').disabled = false", placeholder: "Enter recovery code", required: "required" ) %>

- + <.button + id="use-code-button" + type="submit" + onclick="event.target.disabled = true" + class="w-full mt-2 [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block" + > + + Use Code + + + + + Verifying... + +
diff --git a/lib/plausible_web/templates/auth/verify_2fa_setup.html.heex b/lib/plausible_web/templates/auth/verify_2fa_setup.html.heex index 793157537..244ede92c 100644 --- a/lib/plausible_web/templates/auth/verify_2fa_setup.html.heex +++ b/lib/plausible_web/templates/auth/verify_2fa_setup.html.heex @@ -5,9 +5,7 @@
- <%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_setup), [ - onsubmit: "var button = document.getElementById('verify'); button.disabled = true; button.classList.add('animate-pulse')", - ], fn f -> %> + <%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_setup), [], fn f -> %> Enter the code from your authenticator application before it expires or wait for a new one. <% end %>