From 0b8008aa93d05bc748b7d68cb475048729d9ee75 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Thu, 11 Jul 2024 12:38:56 +0200
Subject: [PATCH] Use message type as provided by kratos as bootstrap alert
class
---
backend/web/static/base.js | 14 ++++++--------
frontend/src/components/UserModal/UserModal.tsx | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/backend/web/static/base.js b/backend/web/static/base.js
index 4ed4ea06..1b9cf6bc 100644
--- a/backend/web/static/base.js
+++ b/backend/web/static/base.js
@@ -370,18 +370,16 @@ function render_messages(data) {
var html = "";
messages.forEach((message) => {
+ var type = message.type;
+ if (type == "error") {
+ type = "danger";
+ }
+ html += "<div class=\"alert alert-" + type + "\">";
html += message.text;
- html += "</br>";
+ html += "</div>";
});
$("#contentMessages").html(html);
- $("#contentMessages").addClass("alert");
- if (data.state == "success") {
- $("#contentMessages").addClass("alert-success");
- } else {
- $("#contentMessages").addClass("alert-warning");
- }
-
// Store we shown these messages
Cookies.set("last_flow_id_rendered_message", data.id);
diff --git a/frontend/src/components/UserModal/UserModal.tsx b/frontend/src/components/UserModal/UserModal.tsx
index 2d8b31ef..42d4ccc0 100644
--- a/frontend/src/components/UserModal/UserModal.tsx
+++ b/frontend/src/components/UserModal/UserModal.tsx
@@ -243,7 +243,7 @@ export const UserModal = ({ open, onClose, userId, setUserId, apps }: UserModalP
className="mb-4 sm:mb-0 inline-flex items-center px-4 py-2 text-sm
font-medium rounded-md text-primary-700 bg-primary-100 hover:bg-primary-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-700"
>
- Reset 2FA
+ Reset TOTP
<QrcodeIcon className="-mr-0.5 ml-2 h-4 w-4" aria-hidden="true" />
</button>
)
--
GitLab