Merge branch 'main' into 2298-bug-able-to-keep-pressing-send-and-send-more-and-more-while-processing

app/assets/sass/uswds/_uswds-theme-custom-styles.scss

@@ -1047,3 +1047,7 @@ nav.nav {
 .form-control-error {
   border: 4px solid #b10e1e
 }
+
+.usa-site-alert .usa-alert .usa-alert__body {
+  max-width: 75rem;
+}

app/main/views/index.py

@@ -258,11 +258,11 @@ def why_text_messaging():
     )
 
 
-@main.route("/join-notify")
+@main.route("/notify-service-ending")
-def join_notify():
+@user_is_logged_in
+def notify_service_ending():
     return render_template(
-        "views/join-notify.html",
+        "views/notify-service-ending.html",
-        navigation_links=about_notify_nav(),
     )
 
 

app/main/views/sub_navigation_dictionaries.py

@@ -56,10 +56,6 @@ def about_notify_nav():
                 },
             ],
         },
-        {
-            "name": "Join Notify",
-            "link": "main.join_notify",
-        },
         {
             "name": "Contact us",
             "link": "main.contact",

app/templates/base.html

@@ -29,6 +29,30 @@
 
     {% block header %}
       {% include 'components/usa_banner.html' %}
+      {% if current_user.is_authenticated or current_service or current_user.platform_admin %}
+      <section class="usa-site-alert usa-site-alert--emergency usa-site-alert--no-heading" aria-label="Site alert,,,,">
+        <div class="usa-alert">
+          <div class="usa-alert__body">
+            <p class="usa-alert__heading text-bold">Notify.gov Service Ending</p>
+            <p class="usa-alert__text">
+              GSA will no longer offer the Notify.gov service after June 8th, 2025. Visit
+              <a class="usa-link" href="/notify-service-ending">Notify.gov Service Ending</a> for more information.
+            </p>
+          </div>
+        </div>
+      </section>
+      {% else %}
+      <section class="usa-site-alert usa-site-alert--emergency usa-site-alert--no-heading" aria-label="Site alert,,,,">
+        <div class="usa-alert">
+          <div class="usa-alert__body">
+            <p class="usa-alert__heading text-bold">Notify.gov Service Ending</p>
+            <p class="usa-alert__text">
+              Notify.gov is no longer accepting new partners.
+            </p>
+          </div>
+        </div>
+      </section>
+      {% endif %}
       {% include 'components/header.html' %}
     {% endblock %}
 
@@ -94,10 +118,10 @@
     {% block footer %}
 
       {% if current_service and current_service.research_mode %}
-        {% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="usa-link">Technology Transformation Services</a><span id="research-mode" class="research-mode">research mode</span>' %}
+        {% set meta_suffix = 'Built by the <a href="https://tts.gsa.gov/" class="usa-link">Technology Transformation Services</a><span id="research-mode" class="research-mode">research mode</span>' %}
       {% else %}
         {% set commit_hash = ", Latest version: " + config['COMMIT_HASH'] %}
-        {% set long_link = '<a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="usa-link">Technology Transformation Services</a>' %}
+        {% set long_link = '<a href="https://tts.gsa.gov/" class="usa-link">Technology Transformation Services</a>' %}
         {% set meta_suffix = "Built by the " + long_link + commit_hash %}
       {% endif %}
 

app/templates/components/header.html

@@ -1,7 +1,6 @@
 {% set is_about_page = request.path.startswith('/about') %}
-{% set is_join_notify_page = request.path.startswith('/join-notify') %}
 {% set is_contact_page = request.path.startswith('/contact') %}
-{% set is_information_section = is_about_page or is_join_notify_page or is_contact_page %}
+{% set is_information_section = is_about_page or is_contact_page %}
 
 {% if current_user.is_authenticated %}
 {% set navigation = [
@@ -34,7 +33,6 @@
 {% else %}
 {% set navigation = [
   {"href": url_for('main.about_notify'), "text": "About Notify", "active": is_about_page},
-  {"href": url_for('main.join_notify'), "text": "Join Notify", "active": is_join_notify_page},
   {"href": url_for('main.contact'), "text": "Contact us", "active": is_contact_page}
 ] %}
 {% endif %}

app/templates/views/about/about.html

@@ -66,7 +66,6 @@
     </li>
     {% endfor %}
   </ul>
-  <p><a href="/join-notify">See if Notify is right for you</a></p>
   <p>Notify.gov is a product of the <a href="/studio">Public Benefits Studio</a>, a product accelerator inside
     the federal government. </p>
 </section>

app/templates/views/about/why-text-messaging.html

@@ -40,8 +40,7 @@
   </p>
   <p>
     Texting not only helps programs reach people using a nearly-universal communication method, it is a cost effective
-    way to do so. With Notify.gov <a href="/join-notify">you can get started for free</a>, allowing you to try out
+    way to do so.
-    texting to complement your existing communications and outreach strategies.
   </p>
   <h2 id="what-texting-is-best-for">What texting is best for</h2>
   <p>

app/templates/views/contact.html

@@ -7,19 +7,10 @@
 {% block content_column_content %}
 <section class="usa-prose">
   <h1>{{page_title}}</h1>
-  <p>Is your organization interested in using Notify.gov? Find more information at <a href="/join-notify">Join
+  <p>For any questions, contact us at <a href="mailto:tts-notify@gsa.gov"
-      Notify</a> or contact us at <a href="mailto:tts-notify@gsa.gov"
       aria-label="contact us at tts-notify@gsa.gov">tts-notify@gsa.gov</a>.</p>
-  <p>You can expect a response within one business day.</p>
+  <p>If you are a current Notify.gov partner and have technical issues or questions, we are available
-  <div class="usa-summary-box maxw-tablet __web-inspector-hide-shortcut__" role="region"
+    at <a href="mailto:notify-support@gsa.gov"
-    aria-label="For partnership inquiries">
+      aria-label="Email Notify for technical questions at notify-support@gsa.gov">notify-support@gsa.gov</a></p>
-    <div class="usa-summary-box__body">
-      <div class="usa-summary-box__text">
-        <p class="margin-0">If you are a current Notify.gov partner and have technical issues or questions, we are available at <a
-            href="mailto:notify-support@gsa.gov"
-            aria-label="Email Notify for technical questions at notify-support@gsa.gov">notify-support@gsa.gov</a></p>
-      </div>
-    </div>
-  </div>
 </section>
 {% endblock %}

app/templates/views/notify-service-ending.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% set page_title = "Notify.gov Service Ending" %}
+
+{% block per_page_title %}{{page_title}}{% endblock %}
+
+{% block content_column_content %}
+
+<section class="usa-prose">
+  <h1>{{page_title}}</h1>
+  <p>GSA will no longer offer the Notify.gov service after June 8th, 2025. Current partners will continue to have service access until it is fully suspended. After May 30, partners will no longer be able to send messages, and the full service will be suspended by June 8, 2025.
+  </p>
+  <h2>Notify.gov Status Announcement</h2>
+  <p class="text-italic">Notify.gov was in beta and will no longer be offered by GSA. Operations will be suspended on or before June 8. There is a chance that the service may need to stop sooner. GSA will keep partners informed to the extent possible.</p>
+
+  <p class="text-italic">All Notify.gov partners will be moved to trial mode no later than May 30, and will no longer be able to send messages. Partners will be able to access their templates and data through June 8.</p>
+
+  <p class="text-italic">We encourage government programs to explore ways to continue utilizing technology to meet people where they are. There are several commercial tools on the market that may work for Notify.gov use cases.</p>
+
+  <p class="text-italic">GSA is working to avoid potential disruptions to partners’ operations and ensure a smooth transition.</p>
+
+  <p class="text-italic">This decision is part of GSA’s renewed focus on its original mission: to be the backbone of the federal government’s administrative operations — streamlining processes, optimizing resources, and ensuring cost-effectiveness. GSA is driven to reducing federal spend, contributing to a more flexible and streamlined government, and delivering value for the American people.</p>
+
+  <p class="text-italic">We wish you all the best as you continue your work. </p>
+
+
+</section>
+{% endblock %}

app/templates/views/signedout.html

@@ -171,47 +171,29 @@ import usaButton %} {% block meta %}
   </section>
 
   <section
-    class="grid-container usa-section usa-section__home usa-prose grid-container padding-bottom-10"
+    class="grid-container usa-section usa-section__home usa-prose grid-container padding-bottom-10">
-  >
+    <div class="grid-row grid-gap-3">
-    <h2 class="font-heading-xl margin-top-0 margin-bottom-3">
+      <a
-      Who can use Notify.gov?
+        class="text-no-underline tablet:grid-col-4 mobile-lg:grid-col-12"
-    </h2>
+        href="mailto:tts-notify@gsa.gov"
-    <p class="usa-body">
+      >
-      All <span class="text-bold">federal</span> agencies and programs are
+        <div class="contact-us-card">
-      eligible to use Notify.gov.
+          <div class="grid-row flex-align-center grid-gap-2">
-    </p>
+            <div class="grid-col-auto">
-    <p class="usa-body">
+              <img
-      US
+                src="{{ asset_url('images/contact.svg') }}"
-      <span class="text-bold">state, local, territorial, or tribal</span>
+                alt=""
-      governments that administer or deliver federally-funded programs or
+                class="height-7 width-7"
-      services may qualify to use Notify.gov to communicate with applicants and
+              />
-      participants in these programs.
+            </div>
-    </p>
+            <div class="grid-col">
-    <div class="grid-container margin-top-4 padding-left-0 padding-right-0">
+              <p class="margin-0">
-      <div class="grid-row grid-gap-3">
+                <strong>Contact us</strong><br />
-        <a
+              </p>
-          class="text-no-underline tablet:grid-col-4 mobile-lg:grid-col-12"
-          href="mailto:tts-notify@gsa.gov"
-        >
-          <div class="contact-us-card">
-            <div class="grid-row flex-align-center grid-gap-2">
-              <div class="grid-col-auto">
-                <img
-                  src="{{ asset_url('images/contact.svg') }}"
-                  alt=""
-                  class="height-7 width-7"
-                />
-              </div>
-              <div class="grid-col">
-                <p class="margin-0">
-                  <strong>Contact us</strong><br />
-                  To learn more about becoming a partner!
-                </p>
-              </div>
             </div>
           </div>
-        </a>
+        </div>
-      </div>
+      </a>
     </div>
   </section>
 

tests/app/test_navigation.py

@@ -122,7 +122,6 @@ EXCLUDED_ENDPOINTS = tuple(
             "integration_testing",
             "invite_org_user",
             "invite_user",
-            "join_notify",
             "link_service_to_organization",
             "live_services",
             "live_services_csv",
@@ -134,6 +133,7 @@ EXCLUDED_ENDPOINTS = tuple(
             "multiple_languages",
             "new_password",
             "notifications_sent_by_service",
+            "notify_service_ending",
             "old_guest_list",
             "old_integration_testing",
             "old_service_dashboard",

tests/end_to_end/test_landing_and_sign_in_pages.py

@@ -40,7 +40,6 @@ def test_landing_page(end_to_end_context):
     content_headers = [
         "Government texting made easy",
         "Key features",
-        "Who can use Notify.gov",
     ]
 
     for content_header in content_headers:

urls.js

@@ -42,12 +42,8 @@ const sublinks = [
     path: '/about/security',
   },
   {
-    label: 'Join Notify',
+    label: 'Notify.gov Service Ending',
-    path: '/join-notify',
+    path: '/notify-service-ending',
-  },
-  {
-    label: 'Contact',
-    path: '/contact',
   },
 
   // Add more links here as needed