Fix waiting state under Chrome and Safari

feat/2fa-final-bigger-refactor
Adrian Gruntkowski 3 years ago
parent be6813467c
commit 8d5b421e7d

@ -4,6 +4,7 @@ defmodule PlausibleWeb.Components.TwoFactor do
"""
use Phoenix.Component
attr :id, :string, default: "verify-button"
attr :form, :any, required: true
attr :field, :any, required: true
attr :class, :string, default: ""
@ -26,8 +27,7 @@ defmodule PlausibleWeb.Components.TwoFactor do
) %>
<PlausibleWeb.Components.Generic.button
type="submit"
id="verify-button"
onclick="event.target.disabled = true"
id={@id}
class="rounded-l-none [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"
>
<span class="label-enabled pointer-events-none">
@ -47,7 +47,7 @@ defmodule PlausibleWeb.Components.TwoFactor do
attr :state_param, :string, required: true
attr :form_data, :any, required: true
attr :form_target, :string, required: true
attr :onsubmit, :string, default: ""
attr :onsubmit, :string, default: nil
attr :title, :string, required: true
slot :icon, required: true

@ -458,6 +458,7 @@
<div class="mt-3">
<%= password_input(f, :password,
id: "disable_2fa_password",
placeholder: "Enter password",
"x-ref": "disable2FAPassword",
class:
@ -472,6 +473,7 @@
state_param="regenerate2FAOpen"
form_data={@conn.params}
form_target={Routes.auth_path(@conn, :generate_2fa_recovery_codes)}
onsubmit="document.getElementById('generate-2fa-recovery-button').disabled = true"
title="Generate New Recovery Codes?"
>
<:icon>
@ -480,8 +482,8 @@
<:buttons>
<.button
id="generate-2fa-recovery-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"
>
<span class="label-enabled pointer-events-none">
@ -505,6 +507,7 @@
<div class="mt-3 w-full">
<%= password_input(f, :password,
id: "regenerate_2fa_password",
placeholder: "Enter password",
"x-ref": "regenerate2FAPassword",
class:

@ -1,5 +1,8 @@
<div class="w-full max-w-3xl mt-4 mx-auto flex">
<%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa), [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 -> %>
<%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa), [
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: "document.getElementById('verify-button').disabled = true"
], fn f -> %>
<h2 class="text-xl font-black dark:text-gray-100">
Enter Your 2FA Code
</h2>

@ -2,7 +2,8 @@
<%= 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"
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: "document.getElementById('use-code-button').disabled = true"
], fn f -> %>
<h2 class="text-xl font-black dark:text-gray-100">
Enter Recovery Code
@ -26,7 +27,6 @@
<.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"
>
<span class="label-enabled pointer-events-none">

@ -5,7 +5,9 @@
</h2>
<div class="text-sm mt-2 text-gray-500 dark:text-gray-200 leading-tight">
<%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_setup), [], fn f -> %>
<%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_setup), [
onsubmit: "document.getElementById('verify-button').disabled = true"
], fn f -> %>
Enter the code from your authenticator application before it expires or wait for a new one.
<PlausibleWeb.Components.TwoFactor.verify_2fa_input form={f} field={:code} class="mt-6" />
<% end %>

Loading…
Cancel
Save