From b07059f06cbc857b458669d99ab42ce258e085f4 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 7 Aug 2025 05:24:45 -0400
Subject: [PATCH 1/4] Add snackbar component, notification toasts dont auto
 hide, add window.init.userVerified

---
 templates/base.html                     |  3 +++
 templates/components/notifications.html |  2 +-
 templates/components/snackbar.html      | 13 +++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 templates/components/snackbar.html

diff --git a/templates/base.html b/templates/base.html
index 6bcead5..c7ed0f1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,6 +24,7 @@
           'userId': {{ Session.id }},
           'userName': {{ User.name | tojson }},
           'userEmail': {{ User.email | tojson }},
+          'userVerified': {{ User.verified | tojson }},
           'teamId': {{ Team.id | tojson }},
           'teamName': {{ Team.name | tojson }},
           'start': {{ Configs.start | tojson }},
@@ -46,6 +47,8 @@
   {% endblock %}
 </main>
 
+{% include "components/snackbar.html" %}
+
 <footer class="footer">
   <div class="container text-center">
     <a href="https://ctfd.io" class="text-secondary">
diff --git a/templates/components/notifications.html b/templates/components/notifications.html
index 4d59f0b..3c66304 100644
--- a/templates/components/notifications.html
+++ b/templates/components/notifications.html
@@ -1,6 +1,6 @@
 <div x-data>
   <div class="position-fixed bottom-0 end-0 p-3" style="z-index: 11">
-    <div x-ref="toast" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true">
+    <div x-ref="toast" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true" data-bs-autohide="false">
       <div class="toast-header">
         <strong class="me-auto" x-text="$store.toast.title"></strong>
         <small>just now</small>
diff --git a/templates/components/snackbar.html b/templates/components/snackbar.html
new file mode 100644
index 0000000..b2d9d0a
--- /dev/null
+++ b/templates/components/snackbar.html
@@ -0,0 +1,13 @@
+<div 
+    x-data 
+    x-show="window.init.userId && !window.init.userVerified && localStorage.getItem('remind_email_verify') != window.init.userId" 
+    class="alert alert-info alert-dismissible col-md-4 col-10 position-fixed text-center m-0" 
+    style="bottom: 45px; left: 50%; transform: translateX(-50%); z-index: 1040; display: none;" 
+    role="alert"
+>
+  <small>
+    <strong>Email Unconfirmed</strong><br>
+    <span>To have the confirmation email resent please <a href="{{ url_for('auth.confirm') }}">click here</a>.</span>
+  </small>
+  <button type="button" class="btn-close" @click="localStorage.setItem('remind_email_verify', window.init.userId); $el.parentElement.style.display = 'none';" aria-label="Close"></button>
+</div>

From c08135132153757b3413e39bd848bab4d3537517 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 7 Aug 2025 05:53:55 -0400
Subject: [PATCH 2/4] Don't show email verification nudge if user is creaing
 their team

---
 templates/components/snackbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/components/snackbar.html b/templates/components/snackbar.html
index b2d9d0a..f81847f 100644
--- a/templates/components/snackbar.html
+++ b/templates/components/snackbar.html
@@ -1,6 +1,6 @@
 <div 
     x-data 
-    x-show="window.init.userId && !window.init.userVerified && localStorage.getItem('remind_email_verify') != window.init.userId" 
+    x-show="window.init.userId && !window.init.userVerified && localStorage.getItem('remind_email_verify') != window.init.userId && (!['/team', '/teams/join', '/teams/new'].includes(window.location.pathname) || window.init.teamId != null)"
     class="alert alert-info alert-dismissible col-md-4 col-10 position-fixed text-center m-0" 
     style="bottom: 45px; left: 50%; transform: translateX(-50%); z-index: 1040; display: none;" 
     role="alert"

From da3baa0234a0e5d244ba0546c0e931a90705106e Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 7 Aug 2025 14:46:10 -0400
Subject: [PATCH 3/4] Only show verification nudge if instance can send email

---
 templates/components/snackbar.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/components/snackbar.html b/templates/components/snackbar.html
index f81847f..68418ff 100644
--- a/templates/components/snackbar.html
+++ b/templates/components/snackbar.html
@@ -1,3 +1,4 @@
+{% if can_send_mail() %}
 <div 
     x-data 
     x-show="window.init.userId && !window.init.userVerified && localStorage.getItem('remind_email_verify') != window.init.userId && (!['/team', '/teams/join', '/teams/new'].includes(window.location.pathname) || window.init.teamId != null)"
@@ -11,3 +12,4 @@
   </small>
   <button type="button" class="btn-close" @click="localStorage.setItem('remind_email_verify', window.init.userId); $el.parentElement.style.display = 'none';" aria-label="Close"></button>
 </div>
+{% endif %}

From 66cc4ed45dde158af9512b745822f27e2a46d66d Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 7 Aug 2025 15:13:17 -0400
Subject: [PATCH 4/4] Adjust confirmation language

---
 templates/components/snackbar.html |  2 +-
 templates/confirm.html             | 42 ++++++++++++++++++------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/templates/components/snackbar.html b/templates/components/snackbar.html
index 68418ff..ea187d0 100644
--- a/templates/components/snackbar.html
+++ b/templates/components/snackbar.html
@@ -8,7 +8,7 @@
 >
   <small>
     <strong>Email Unconfirmed</strong><br>
-    <span>To have the confirmation email resent please <a href="{{ url_for('auth.confirm') }}">click here</a>.</span>
+    <span>To confirm your email address please <a href="{{ url_for('auth.confirm', flow='init') }}">click here</a>.</span>
   </small>
   <button type="button" class="btn-close" @click="localStorage.setItem('remind_email_verify', window.init.userId); $el.parentElement.style.display = 'none';" aria-label="Close"></button>
 </div>
diff --git a/templates/confirm.html b/templates/confirm.html
index 6257894..b98e5ee 100644
--- a/templates/confirm.html
+++ b/templates/confirm.html
@@ -14,21 +14,29 @@ <h1>
       <div class="col-md-10 col-lg-8 col-xl-6 offset-md-1 offset-lg-2 offset-xl-3">
         {% include "components/errors.html" %}
 
-        <h5 class="text-center">
-          {% trans %}We've sent a confirmation email to your email address.{% endtrans %}
-        </h5>
-
-        <br>
-
-        <h5 class="text-center">
-          {% trans %}Please click the link in that email to confirm your account.{% endtrans %}
-        </h5>
-
-        <br>
-
-        <h5 class="text-center">
-          {% trans %}If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account.{% endtrans %}
-        </h5>
+        {% if request.args.get('flow') == "init" %}
+          <h5 class="text-center">
+            {% trans %}To send a confirmation email to your email address, please click the button below.{% endtrans %}
+          </h5>
+          <br>
+          <h5 class="text-center">
+            {% trans %}Please click the link in that email to confirm your account.{% endtrans %}
+          </h5>
+          <h5 class="text-center">
+            {% trans %}If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account.{% endtrans %}
+          </h5>
+        {% else%}
+          <h5 class="text-center">
+            {% trans %}We've sent a confirmation email to your email address.{% endtrans %}
+          </h5>
+          <br>
+          <h5 class="text-center">
+            {% trans %}Please click the link in that email to confirm your account.{% endtrans %}
+          </h5>
+          <h5 class="text-center">
+            {% trans %}If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account.{% endtrans %}
+          </h5>
+        {% endif %}
 
         <hr>
 
@@ -36,10 +44,10 @@ <h5 class="text-center">
           <form method="POST" action="{{ url_for('auth.confirm') }}">
             <div class="row">
               <div class="mb-3 col-md-6">
-                {{ form.submit(class="btn btn-primary w-100") }}
+                {{ form.submit(class="btn btn-primary w-100 p-2") }}
               </div>
               <div class="mb-3 col-md-6">
-                <a href="{{ url_for('views.settings') }}" class="btn btn-secondary w-100">
+                <a href="{{ url_for('views.settings') }}" class="btn btn-secondary w-100 p-2">
                   {% trans %}Change Email Address{% endtrans %}
                 </a>
               </div>