End to end woes continue.

Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>

.ds.baseline

@@ -161,7 +161,7 @@
         "filename": "app/config.py",
         "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
         "is_verified": false,
-        "line_number": 123,
+        "line_number": 120,
         "is_secret": false
       }
     ],
@@ -555,7 +555,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 201,
+        "line_number": 199,
         "is_secret": false
       },
       {
@@ -563,7 +563,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
         "is_verified": false,
-        "line_number": 274,
+        "line_number": 272,
         "is_secret": false
       }
     ],
@@ -684,5 +684,5 @@
       }
     ]
   },
-  "generated_at": "2024-11-21T23:08:45Z"
+  "generated_at": "2025-01-16T16:38:48Z"
 }

.github/actions/setup-project/action.yml

@@ -15,7 +15,7 @@ runs:
         python-version: "3.12.3"
     - name: Install poetry
       shell: bash
-      run: pip install poetry
+      run: pip install poetry==1.8.5
     - name: Install application dependencies
       shell: bash
       run: make bootstrap

.github/pull_request_template.md

@@ -20,3 +20,8 @@ Please enter a detailed description here.
 * Consideration 1
 * Consideration 2
 * Consideration ...
+
+## A11y Checks (if applicable)
+
+* Conduct automated tests through [AxeDevTools](https://www.deque.com/axe/devtools/) and [WAVE](https://wave.webaim.org/)
+* Review the [Manual Checklist](https://docs.google.com/document/d/192bBXStebdXWtYhZQ73qaWMJhGcuSB1W6c9YBXhWZvc/edit?usp=sharing)

Makefile

@@ -15,7 +15,6 @@ NVMSH := $(shell [ -f "$(HOME)/.nvm/nvm.sh" ] && echo "$(HOME)/.nvm/nvm.sh" || e
 
 .PHONY: bootstrap
 bootstrap: generate-version-file ## Set up everything to run the app
-	poetry self update
 	poetry self add poetry-dotenv-plugin
 	poetry lock --no-update
 	poetry install --sync --no-root

app/__init__.py

@@ -168,20 +168,12 @@ def _csp(config):
 
 
 def create_app(application):
-    application.config["FEATURE_BEST_PRACTICES_ENABLED"] = (
-        os.getenv("FEATURE_BEST_PRACTICES_ENABLED", "false").lower() == "true"
-    )
-
     @application.context_processor
     def inject_feature_flags():
-        feature_best_practices_enabled = application.config.get(
-            "FEATURE_BEST_PRACTICES_ENABLED", False
-        )
         feature_about_page_enabled = application.config.get(
             "FEATURE_ABOUT_PAGE_ENABLED", False
         )
         return dict(
-            FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled,
             FEATURE_ABOUT_PAGE_ENABLED=feature_about_page_enabled,
         )
 

app/assets/javascripts/sidenav.js

@@ -0,0 +1,57 @@
+document.addEventListener('DOMContentLoaded', () => {
+    const sidenavItems = document.querySelectorAll('.usa-sidenav__item > .parent-link');
+    let lastPath = window.location.pathname;
+    let debounceTimeout = null;
+
+    sidenavItems.forEach((link) => {
+      const parentItem = link.parentElement;
+      const sublist = parentItem.querySelector('.usa-sidenav__sublist');
+      const targetHref = link.getAttribute('href');
+
+      // initialize the menu to open the correct submenu based on the current route
+      if (window.location.pathname.startsWith(targetHref)) {
+        parentItem.classList.add('open');
+        link.setAttribute('aria-expanded', 'true');
+      }
+
+      link.addEventListener('click', (event) => {
+        const currentPath = window.location.pathname;
+
+        // prevent default behavior only if navigating to the same route
+        if (currentPath === targetHref) {
+          event.preventDefault();
+          return;
+        }
+
+        if (sublist && !parentItem.classList.contains('open')) {
+          // debounce the menu update to avoid flickering
+          clearTimeout(debounceTimeout);
+          debounceTimeout = setTimeout(() => {
+            parentItem.classList.add('open');
+            link.setAttribute('aria-expanded', 'true');
+          }, 50);
+        }
+      });
+    });
+
+    // handle browser back/forward navigation
+    window.addEventListener('popstate', () => {
+      const currentPath = window.location.pathname;
+
+      // sync menu state
+      sidenavItems.forEach((link) => {
+        const parentItem = link.parentElement;
+        const targetHref = link.getAttribute('href');
+
+        if (currentPath.startsWith(targetHref)) {
+          parentItem.classList.add('open');
+          link.setAttribute('aria-expanded', 'true');
+        } else {
+          parentItem.classList.remove('open');
+          link.setAttribute('aria-expanded', 'false');
+        }
+      });
+
+      lastPath = currentPath;
+    });
+  });

app/assets/sass/uswds/_legacy-styles.scss

@@ -8,7 +8,7 @@
   width: 100%;
   max-width: 464px;
   box-sizing: border-box;
-  padding: units(1);
+  padding: units(2);
   background: color('gray-cool-10');
   border: 1px solid color('gray-cool-10');
   border-radius: 5px;

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

@@ -198,8 +198,8 @@ td.table-empty-message {
     word-wrap: break-word;
   }
 
-  border: 1px solid color('gray-cool-10');
-  padding: units(2);
+  // border: 1px solid color('gray-cool-10');
+  // padding: units(2);
 
   .tick-cross-list-permissions {
     margin: units(1) 0;
@@ -852,21 +852,36 @@ $do-dont-top-bar-width: 1;
   }
 }
 
-.linked-content:hover {
-  cursor: pointer;
-  transform: scale(1.05);
-  transition: transform 0.3s ease, background-color 0.3s ease;
-}
+.linked-card a {
+  text-decoration: none;
+  .usa-card__header, .usa-card__media {
+    @include at-media('tablet') {
+      padding-top: units(1);
+    }
+  }
+  &:visited {
+    color: color('ink');
+  }
+  &:focus .usa-card__container {
+    outline: units(2px) solid color('blue-40v');
+    outline-offset: 0.3rem;
+  }
+  &:hover .usa-card__container, &:focus .usa-card__container {
+    border-color: color('blue-60v');
+    background: color('blue-60v');
+    p, h3 {
+      color: white;
+    }
+    svg {
+      filter: brightness(0) invert(1);
+    }
+  }
 
-li.linked-card:hover > div:first-child:hover {
-  border-color: #005ea2;
-}
+  &.linked-content:hover, &.linked-content:focus {
+    cursor: pointer;
+    transition: transform 0.3s ease, background-color 0.3s ease;
+  }
 
-li.linked-card:hover h4,
-li.linked-card:hover p,
-li.linked-card:hover svg,
-.best-practices_card_img:hover {
-  color: #005ea2;
 }
 
 .best-practices_card_img {
@@ -876,10 +891,6 @@ li.linked-card:hover svg,
   margin: 0 auto;
 }
 
-.best-practices_link {
-  text-decoration: none;
-}
-
 .usa-link--downloadable {
   position: relative;
 }
@@ -914,17 +925,25 @@ li.linked-card:hover svg,
   mask-size: 1.75ex 1.75ex;
 }
 
+nav.nav {
+  position: sticky;
+  top: units(3);
+}
+
 .usa-sidenav__sublist {
   display: none;
 }
 
-.usa-sidenav__item:hover .usa-sidenav__sublist,
-.usa-sidenav__item:focus-within .usa-sidenav__sublist {
+.usa-sidenav__item.open .usa-sidenav__sublist {
   display: block;
 }
 
-.usa-sidenav__item a {
-  display: block;
+.usa-sidenav__sublist .bold {
+  font-weight: bold;
+}
+
+.usa-sidenav__sublist li[role="menuitem"] {
+  border-top: 1px solid #dfe1e2;
 }
 
 .icon-list {
@@ -957,6 +976,9 @@ li.linked-card:hover svg,
   .usa-card__container {
     align-items: center;
     text-align: center;
+    border-radius: 4px;
+    overflow: hidden;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
     img {
       margin: units(4) auto 0;
       width: units(15);
@@ -965,9 +987,17 @@ li.linked-card:hover svg,
     .usa-card__body {
       margin-bottom: units(2);
     }
+    .blue-bar {
+      background-color: #005eb8;
+      height: 1.3em;
+      width: 100%;
+      margin: 0;
+      border-radius: 0;
+    }
   }
 }
 
+
 .contact-us-card {
   border: 2px solid color("ink");
   padding: units(2);

app/config.py

@@ -87,9 +87,6 @@ class Config(object):
             "tts-benefits-studio@gsa.gov",
         ],
     }
-    FEATURE_BEST_PRACTICES_ENABLED = (
-        getenv("FEATURE_BEST_PRACTICES_ENABLED", "false") == "true"
-    )
 
     FEATURE_ABOUT_PAGE_ENABLED = getenv("FEATURE_ABOUT_PAGE_ENABLED", "false") == "true"
 
@@ -186,6 +183,16 @@ class E2ETest(Staging):
         "notify-admin-logo-upload-bucket-staging"
     )
 
+    API_HOST_NAME = "http://localhost:6011"  # nosec B105 - only used in development
+    # credential overrides
+    DANGEROUS_SALT = "development-notify-salt"
+    SECRET_KEY = "dev-notify-secret-key"  # nosec B105 - only used in development
+    # ADMIN_CLIENT_USER_NAME is called ADMIN_CLIENT_ID in api repo, they should match
+    ADMIN_CLIENT_USER_NAME = "notify-admin"
+    ADMIN_CLIENT_SECRET = (
+        "dev-notify-secret-key"  # nosec B105 - only used in development
+    )
+
 
 class Demo(Staging):
     HEADER_COLOUR = "#6F72AF"  # $mauve

app/main/validators.py

@@ -41,14 +41,8 @@ class ValidGovEmail:
         if field.data == "":
             return
 
-        from flask import url_for
+        message = "Enter a public sector email address."
 
-        message = """
-            Enter a public sector email address or
-            <a class="usa-link" href="{}">find out who can use Notify</a>
-        """.format(
-            url_for("main.features")
-        )
         if not is_gov_user(field.data.lower()):
             raise ValidationError(message)
 

app/main/views/index.py

@@ -15,8 +15,6 @@ from app.main import main
 from app.main.views.pricing import CURRENT_SMS_RATE
 from app.main.views.sub_navigation_dictionaries import (
     about_notify_nav,
-    best_practices_nav,
-    features_nav,
     using_notify_nav,
 )
 from app.utils.user import user_is_logged_in
@@ -25,11 +23,6 @@ from app.utils.user import user_is_logged_in
 # Hook to check for feature flags
 @main.before_request
 def check_feature_flags():
-    if request.path.startswith("/guides") and not current_app.config.get(
-        "FEATURE_BEST_PRACTICES_ENABLED", False
-    ):
-        abort(404)
-
     if request.path.startswith("/about") and not current_app.config.get(
         "FEATURE_ABOUT_PAGE_ENABLED", False
     ):
@@ -39,11 +32,7 @@ def check_feature_flags():
 @main.route("/test/feature-flags")
 def test_feature_flags():
     return jsonify(
-        {
-            "FEATURE_BEST_PRACTICES_ENABLED": current_app.config[
-                "FEATURE_BEST_PRACTICES_ENABLED"
-            ]
-        }
+        {"FEATURE_ABOUT_PAGE_ENABLED": current_app.config["FEATURE_ABOUT_PAGE_ENABLED"]}
     )
 
 
@@ -111,44 +100,6 @@ def callbacks():
     return redirect(url_for("main.documentation"), 301)
 
 
-# --- Features page set --- #
-
-
-@main.route("/features")
-@user_is_logged_in
-def features():
-    return render_template("views/features.html", navigation_links=features_nav())
-
-
-@main.route("/features/roadmap", endpoint="roadmap")
-@user_is_logged_in
-def roadmap():
-    return render_template("views/roadmap.html", navigation_links=features_nav())
-
-
-@main.route("/features/sms")
-@user_is_logged_in
-def features_sms():
-    return render_template(
-        "views/features/text-messages.html", navigation_links=features_nav()
-    )
-
-
-@main.route("/features/security", endpoint="security")
-@user_is_logged_in
-def security():
-    return render_template("views/security.html", navigation_links=features_nav())
-
-
-@main.route("/features/using_notify")
-@user_is_logged_in
-def using_notify():
-    return (
-        render_template("views/using-notify.html", navigation_links=features_nav()),
-        410,
-    )
-
-
 @main.route("/using-notify/delivery-status")
 @user_is_logged_in
 def message_status():
@@ -203,78 +154,75 @@ def trial_mode_new():
     )
 
 
-@main.route("/guides/best-practices")
+@main.route("/using-notify/best-practices")
 @user_is_logged_in
 def best_practices():
     return render_template(
         "views/guides/best-practices.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/clear-goals")
+@main.route("/using-notify/best-practices/clear-goals")
 @user_is_logged_in
 def clear_goals():
     return render_template(
         "views/guides/clear-goals.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/rules-and-regulations")
+@main.route("/using-notify/best-practices/rules-and-regulations")
 @user_is_logged_in
 def rules_and_regulations():
     return render_template(
         "views/guides/rules-and-regulations.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/establish-trust")
+@main.route("/using-notify/best-practices/establish-trust")
 @user_is_logged_in
 def establish_trust():
     return render_template(
         "views/guides/establish-trust.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/write-for-action")
+@main.route("/using-notify/best-practices/write-for-action")
 @user_is_logged_in
 def write_for_action():
     return render_template(
         "views/guides/write-for-action.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/multiple-languages")
+@main.route("/using-notify/best-practices/multiple-languages")
 @user_is_logged_in
 def multiple_languages():
     return render_template(
         "views/guides/multiple-languages.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/benchmark-performance")
+@main.route("/using-notify/best-practices/benchmark-performance")
 @user_is_logged_in
 def benchmark_performance():
     return render_template(
         "views/guides/benchmark-performance.html",
-        navigation_links=best_practices_nav(),
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/guides/using-notify/guidance")
+@main.route("/using-notify/guidance")
 @user_is_logged_in
 def guidance_index():
     return render_template(
         "views/guidance/index.html",
         navigation_links=using_notify_nav(),
-        feature_best_practices_enabled=current_app.config[
-            "FEATURE_BEST_PRACTICES_ENABLED"
-        ],
     )
 
 
@@ -282,6 +230,7 @@ def guidance_index():
 def contact():
     return render_template(
         "views/contact.html",
+        navigation_links=about_notify_nav(),
     )
 
 
@@ -313,6 +262,7 @@ def why_text_messaging():
 def join_notify():
     return render_template(
         "views/join-notify.html",
+        navigation_links=about_notify_nav(),
     )
 
 
@@ -343,17 +293,29 @@ def send_files_by_email():
     )
 
 
+@main.route("/studio")
+def studio():
+    return render_template(
+        "views/studio.html",
+    )
+
+
+@main.route("/acceptable-use-policy")
+def acceptable_use_policy():
+    return render_template(
+        "views/acceptable-use-policy.html",
+    )
+
+
 # --- Redirects --- #
 
 
-@main.route("/roadmap", endpoint="old_roadmap")
 @main.route("/information-security", endpoint="information_security")
 @main.route("/using_notify", endpoint="old_using_notify")
 @main.route("/information-risk-management", endpoint="information_risk_management")
 @main.route("/integration_testing", endpoint="old_integration_testing")
 def old_page_redirects():
     redirects = {
-        "main.old_roadmap": "main.roadmap",
         "main.information_security": "main.using_notify",
         "main.old_using_notify": "main.using_notify",
         "main.information_risk_management": "main.security",

app/main/views/send.py

@@ -483,7 +483,7 @@ def send_one_off_step(service_id, template_id, step_index):
         link_to_upload=(
             request.endpoint == "main.send_one_off_step" and step_index == 0
         ),
-        errors=form.errors if form.errors else None
+        errors=form.errors if form.errors else None,
     )
 
 

app/main/views/sub_navigation_dictionaries.py

@@ -1,89 +1,45 @@
-from flask import current_app
-
-
-def features_nav():
-    return [
-        {
-            "name": "Features",
-            "link": "main.features",
-            "sub_navigation_items": [
-                # {
-                #     "name": "Text messages",
-                #     "link": "main.features_sms",
-                # },
-            ],
-        },
-        {
-            "name": "Roadmap",
-            "link": "main.roadmap",
-        },
-        {
-            "name": "Security",
-            "link": "main.security",
-        },
-    ]
-
-
 def using_notify_nav():
     nav_items = [
         {"name": "Get started", "link": "main.get_started"},
-        {"name": "Guides", "link": "main.best_practices"},
+        {
+            "name": "Best Practices",
+            "link": "main.best_practices",
+            "sub_navigation_items": [
+                {
+                    "name": "Clear goals",
+                    "link": "main.clear_goals",
+                },
+                {
+                    "name": "Rules and regulations",
+                    "link": "main.rules_and_regulations",
+                },
+                {
+                    "name": "Establish trust",
+                    "link": "main.establish_trust",
+                },
+                {
+                    "name": "Write for action",
+                    "link": "main.write_for_action",
+                },
+                {
+                    "name": "Multiple languages",
+                    "link": "main.multiple_languages",
+                },
+                {
+                    "name": "Benchmark performance",
+                    "link": "main.benchmark_performance",
+                },
+            ],
+        },
         {"name": "Trial mode", "link": "main.trial_mode_new"},
         {"name": "Tracking usage", "link": "main.pricing"},
         {"name": "Delivery Status", "link": "main.message_status"},
         {"name": "Guidance", "link": "main.guidance_index"},
     ]
-    if not current_app.config.get("FEATURE_BEST_PRACTICES_ENABLED"):
-        nav_items = [
-            item for item in nav_items if item["link"] != "main.best_practices"
-        ]
 
     return nav_items
 
 
-def best_practices_nav():
-    return [
-        {
-            "name": "Best Practices",
-            "link": "main.best_practices",
-        },
-        {
-            "name": "Clear goals",
-            "link": "main.clear_goals",
-        },
-        {
-            "name": "Rules and regulations",
-            "link": "main.rules_and_regulations",
-        },
-        {
-            "name": "Establish trust",
-            "link": "main.establish_trust",
-            "sub_navigation_items": [
-                {
-                    "name": "Get the word out",
-                    "link": "main.establish_trust#get-the-word-out",
-                },
-                {
-                    "name": "As people receive texts",
-                    "link": "main.establish_trust#as-people-receive-texts",
-                },
-            ],
-        },
-        {
-            "name": "Write for action",
-            "link": "main.write_for_action",
-        },
-        {
-            "name": "Multiple languages",
-            "link": "main.multiple_languages",
-        },
-        {
-            "name": "Benchmark performance",
-            "link": "main.benchmark_performance",
-        },
-    ]
-
-
 def about_notify_nav():
     return [
         {
@@ -93,20 +49,6 @@ def about_notify_nav():
                 {
                     "name": "Why text messaging",
                     "link": "main.why_text_messaging",
-                    "sub_sub_navigation_items": [
-                        {
-                            "name": "Reach people using a common method",
-                            "link": "main.why_text_messaging#reach-people-using-a-common-method",
-                        },
-                        {
-                            "name": "Improve customer experience",
-                            "link": "main.why_text_messaging#improve-customer-experience",
-                        },
-                        {
-                            "name": "What texting is best for",
-                            "link": "main.why_text_messaging#what-texting-is-best-for",
-                        },
-                    ],
                 },
                 {
                     "name": "Security",
@@ -115,7 +57,11 @@ def about_notify_nav():
             ],
         },
         {
-            "name": "Contact",
+            "name": "Join Notify",
+            "link": "main.join_notify",
+        },
+        {
+            "name": "Contact us",
             "link": "main.contact",
         },
     ]

app/navigation.py

@@ -40,12 +40,6 @@ class HeaderNavigation(Navigation):
         "support": {
             "support",
         },
-        "features": {
-            "features",
-            "features_sms",
-            "roadmap",
-            "security",
-        },
         "best_practices": {
             "best_practices",
             "clear_goals",
@@ -57,7 +51,6 @@ class HeaderNavigation(Navigation):
         },
         "using_notify": {
             "get_started",
-            "using_notify",
             "pricing",
             "trial_mode_new",
             "message_status",

app/notify_client/__init__.py

@@ -85,8 +85,9 @@ class NotifyAdminAPIClient(BaseAPIClient):
             abort(403)
 
     def post(self, *args, **kwargs):
-        self.check_inactive_service()
-        self.check_inactive_user(args)
+        if os.getenv('NOTIFY_ENVIRONMENT') != "e2etest":
+            self.check_inactive_service()
+            self.check_inactive_user(args)
         return super().post(*args, **kwargs)
 
     def put(self, *args, **kwargs):

app/notify_client/billing_api_client.py

@@ -1,3 +1,6 @@
+import json
+
+from app.extensions import redis_client
 from app.notify_client import NotifyAdminAPIClient
 
 
@@ -15,10 +18,19 @@ class BillingAPIClient(NotifyAdminAPIClient):
         )
 
     def get_free_sms_fragment_limit_for_year(self, service_id, year=None):
+        frag_limit = redis_client.get(f"free-sms-fragment-limit-{service_id}-{year}")
+        if frag_limit is not None:
+            return json.loads(frag_limit.decode("utf-8"))
         result = self.get(
             "/service/{0}/billing/free-sms-fragment-limit".format(service_id),
             params=dict(financial_year_start=year),
         )
+
+        redis_client.set(
+            f"free-sms-fragment-limit-{service_id}-{year}",
+            json.dumps(result["free_sms_fragment_limit"]),
+            ex=30,
+        )
         return result["free_sms_fragment_limit"]
 
     def create_or_update_free_sms_fragment_limit(

app/notify_client/service_api_client.py

@@ -1,3 +1,4 @@
+import json
 from datetime import datetime, timezone
 
 from app.extensions import redis_client
@@ -517,7 +518,18 @@ class ServiceAPIClient(NotifyAdminAPIClient):
         return int(count)
 
     def get_global_notification_count(self, service_id):
-        return self.get("/service/{}/notification-count".format(service_id))
+        notification_count = redis_client.get(f"notification-count-{service_id}")
+        if notification_count is not None:
+            return json.loads(notification_count.decode("utf-8"))
+
+        notification_count = self.get(
+            "/service/{}/notification-count".format(service_id)
+        )
+        redis_client.set(
+            f"notification-count-{service_id}", json.dumps(notification_count), ex=30
+        )
+
+        return notification_count
 
     def get_service_invite_data(self, redis_key):
         """

app/templates/base.html

@@ -56,28 +56,19 @@
                         {% for item in navigation_links %}
                           <li class="usa-sidenav__item">
                             <a href="{{ url_for(item.link) }}"
-                              class="parent-link {% if item['link'] == request.endpoint %} usa-current {% endif %}"
-                              aria-haspopup="true" aria-expanded="false">
+                               class="parent-link {% if request.endpoint.startswith(item['link']) or item.sub_navigation_items | selectattr('link', 'equalto', request.endpoint) | list | length > 0 %} usa-current {% endif %}"
+                               aria-haspopup="true"
+                               aria-expanded="{{ 'true' if request.endpoint.startswith(item['link']) else 'false' }}">
                               {{ item.name }}
                             </a>
                             {% if item.sub_navigation_items %}
                               <ul class="usa-sidenav__sublist" role="menu">
                                 {% for sub_item in item.sub_navigation_items %}
                                   <li role="menuitem">
-                                    <a href="{{ url_for(sub_item.link.split('#')[0]) }}#{{ sub_item.link.split('#')[1] }}">
+                                    <a href="{{ url_for(sub_item.link.split('#')[0]) }}#{{ sub_item.link.split('#')[1] }}"
+                                       class="{% if request.endpoint == sub_item['link'] %}usa-current bold{% endif %}">
                                       {{ sub_item.name }}
                                     </a>
-                                    {% if sub_item.sub_sub_navigation_items %}
-                                      <ul class="usa-sidenav__sublist usa-sidenav__sub-sublist" role="menu">
-                                        {% for sub_sub_item in sub_item.sub_sub_navigation_items %}
-                                          <li role="menuitem">
-                                            <a href="{{ url_for(sub_sub_item.link.split('#')[0]) }}#{{ sub_sub_item.link.split('#')[1] }}">
-                                              {{ sub_sub_item.name }}
-                                            </a>
-                                          </li>
-                                        {% endfor %}
-                                      </ul>
-                                    {% endif %}
                                   </li>
                                 {% endfor %}
                               </ul>
@@ -85,6 +76,8 @@
                           </li>
                         {% endfor %}
                       </ul>
+
+
                     </nav>
                   </div>
                   <div class="tablet:grid-col-10 tablet:padding-left-4 usa-prose site-prose">

app/templates/components/footer.html

@@ -32,6 +32,9 @@
           <li class="usa-identifier__required-links-item">
             <a href="https://www.gsa.gov/about-us" class="usa-identifier__required-link">About GSA</a>
           </li>
+          <li class="usa-identifier__required-links-item">
+            <a href="/studio" class="usa-identifier__required-link">About the Public Benefits Studio</a>
+          </li>
           <li class="usa-identifier__required-links-item">
             <a href="https://www.gsa.gov/website-information/accessibility-aids"
               class="usa-identifier__required-link">Accessibility support</a>
@@ -51,6 +54,9 @@
             <a href="https://www.gsa.gov/reference/reports/budget-performance"
               class="usa-identifier__required-link">Performance reports</a>
           </li>
+          <li class="usa-identifier__required-links-item">
+            <a href="/acceptable-use-policy" class="usa-identifier__required-link">Acceptable use policy</a>
+          </li>
           <li class="usa-identifier__required-links-item">
             <a href="https://www.gsa.gov/website-information/website-policies"
               class="usa-identifier__required-link">Privacy policy</a>
@@ -58,16 +64,20 @@
         </ul>
       </div>
     </nav>
-    <section class="usa-identifier__section usa-identifier__section--usagov"
+    <section class="usa-identifier__section"
       aria-label="Github Repos">
       <div class="usa-identifier__container">
         <div class="usa-identifier__required-links-item">
           Find us on Github:
         </div>
-        <ul>
-          <li><a href="https://github.com/gsa/notifications-admin" class="usa-identifier__required-link">Notify.gov Admin repo</a></li>
-        <li><a href="https://github.com/gsa/notifications-api" class="usa-identifier__required-link">Notify.gov API repo</a></li>
-      </ul>
+        <ul class="usa-identifier__required-links-list">
+          <li class="usa-identifier__required-links-item">
+            <a href="https://github.com/gsa/notifications-admin" class="usa-identifier__required-link">Notify.gov Admin repo</a>
+          </li>
+          <li class="usa-identifier__required-links-item">
+            <a href="https://github.com/gsa/notifications-api" class="usa-identifier__required-link">Notify.gov API repo</a>
+          </li>
+        </ul>
 
       </div>
     </section>

app/templates/components/guides/cards.html

@@ -1,18 +1,17 @@
-<ul class="usa-card-group">
+<ul class="usa-card-group grid-row flex-row">
   {% for item in card_contents %}
-  <li class="usa-card grid-col tablet:grid-col-4 {% if item.link %}linked-card linked-content{% endif %}">
+  <li class="usa-card grid-col mobile-lg:grid-col-12 tablet:grid-col-6 desktop:grid-col-4 {% if item.link %}linked-card linked-content{% endif %}">
+    {% if item.link %}
+    <a href="{{ item.link }}">
+    {% endif %}
     <div class="usa-card__container">
       {% if item.card_heading %}
       <div class="usa-card__header">
-        {% if item.link %}
-        <a href="{{ item.link }}">
-          {% endif %}
           <h3
             class="usa-card__heading {% if text_align != 'left' or text_align is not defined %}text-center{% else %}text-left{% endif %} {% if item.link %}linked-card{% endif %}">
             {{ item.card_heading }}
           </h3>
           {% if item.link %}
-        </a>
         {% endif %}
       </div>
       {% endif %}
@@ -37,6 +36,9 @@
       </div>
       {% endif %}
     </div>
+    {% if item.link %}
+    </a>
+    {% endif %}
   </li>
   {% endfor %}
 </ul>

app/templates/components/header.html

@@ -1,49 +1,54 @@
+{% 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 %}
+
 {% if current_user.is_authenticated %}
 {% set navigation = [
-{"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active":
-header_navigation.is_selected('accounts-or-dashboard')},
-{"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')}
-] %}
-
-{% if FEATURE_BEST_PRACTICES_ENABLED %}
-{% set navigation = navigation + [{"href": url_for('main.best_practices'), "text": "Guides", "active":
-header_navigation.is_selected('best_practices')}] %}
-{% endif %}
-
-{% set navigation = navigation + [
-{"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
-{"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
+  {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": request.path.startswith('/accounts')},
+  {"href": url_for('main.get_started'), "text": "Using Notify", "active": request.path.startswith('/using-notify')},
+  {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
 ] %}
 
 {% if current_user.platform_admin %}
-{% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin",
-"active": header_navigation.is_selected('platform-admin')}] %}
+{% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin')}] %}
 {% else %}
-{% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active":
-header_navigation.is_selected('user-profile')}] %}
+{% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile')}] %}
 {% endif %}
 
 {% if current_service %}
 {% if current_user.has_permissions('manage_service') %}
 {% set secondaryNavigation = [
-{"href": url_for('main.service_settings', service_id=current_service.id), "text": "Settings", "active":
-secondary_navigation.is_selected('settings')},
-{"href": url_for('main.sign_out'), "text": "Sign out"}
+  {"href": url_for('main.service_settings', service_id=current_service.id), "text": "Settings", "active": secondary_navigation.is_selected('settings')},
+  {"href": url_for('main.sign_out'), "text": "Sign out"}
 ] %}
 {% else %}
 {% set secondaryNavigation = [
-{"href": url_for('main.sign_out'), "text": "Sign out"}
+  {"href": url_for('main.sign_out'), "text": "Sign out"}
 ] %}
 {% endif %}
 {% else %}
 {% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %}
 {% endif %}
+
+{% 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 %}
 
+
+
+
+
+
+
 <header class="usa-header usa-header--extended">
   <div class="usa-nav-container">
     <div class="usa-navbar">
-      <div class="display-flex flex-align-center flex-justify">
+      <div class="display-flex flex-align-center flex-justify width-full">
         <div class="usa-logo display-flex flex-align-center flex-justify" id="-logo">
           <div class="logo-img display-flex">
             <a href="/">
@@ -56,7 +61,7 @@ secondary_navigation.is_selected('settings')},
           <button type="button" class="usa-menu-btn">Menu</button>
           {% endif %}
         </div>
-        {% if not current_user.is_authenticated and FEATURE_ABOUT_PAGE_ENABLED and request.path == '/about'%}
+        {% if not current_user.is_authenticated and is_information_section%}
         <div class="usa-nav__login">
           <a class="usa-button usa-button login-button login-button--primary margin-right-2"
             href="{{ initial_signin_url }}">Sign

app/templates/views/about/about.html

@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% set page_title = "About Notify" %}
-
 {% block per_page_title %}
 {{page_title}}
 {% endblock %}
@@ -27,7 +26,7 @@
   {% set product_highlights = [
   {
   "svg_src": "#send",
-  "card_heading": "Send customized one-way customized messages",
+  "card_heading": "Send customized one-way messages",
   "p_text": "Upload a file with recipient phone numbers and Notify.gov sends customized messages",
   },
   {
@@ -68,7 +67,7 @@
     {% 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="#">Public Benefits Studio</a>, a product accelerator inside
+  <p>Notify.gov is a product of the <a href="/studio">Public Benefits Studio</a>, a product accelerator inside
     the federal government. </p>
 </section>
 {% endblock %}

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

@@ -40,7 +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="#">you can get started for free</a>, allowing you to try out
+    way to do so. With Notify.gov <a href="/join-notify">you can get started for free</a>, allowing you to try out
     texting to complement your existing communications and outreach strategies.
   </p>
   <h2 id="what-texting-is-best-for">What texting is best for</h2>
@@ -51,35 +51,37 @@
   {
   "image_src": asset_url('images/calendar.svg'),
   "card_heading": "Reminders",
-  "p_text": "In a text bubble // Your Quality Control food phone interview is on ((date)) at ((time)). Failure to
+  "p_text": "Your Quality Control food phone interview is on ((date)) at ((time)). Failure to
   attend may lead to closure of your benefits. Call 1-800-222-3333 with questions.",
   "alt_text": "reminder text example"
   },
   {
   "image_src": asset_url('images/alert.svg'),
   "card_heading": "Alerts to take action",
-  "p_text": "In a text bubble // Your household's Medicaid coverage is expiring. To keep getting Medicaid, you must
+  "p_text": "Your household's Medicaid coverage is expiring. To keep getting Medicaid, you must
   complete your renewal by ((date)). You can renew online at dhs.state.gov…",
   "alt_text": "alerts text example"
   },
   {
   "image_src": asset_url('images/alarm.svg'),
   "card_heading": "Important status updates",
-  "p_text": "In a text bubble // Your passport has been issued at the Los Angeles Passport Agency. Please come to the
+  "p_text": "Your passport has been issued at the Los Angeles Passport Agency. Please come to the
   desk between 1:30pm and 2:30pm today to pick up your passport…",
   "alt_text": "status update text example"
   },
   ] %}
   {% for item in card_contents %}
-  <div class="radius-lg border-2px maxw-tablet">
-    <div class="grid-row grid-gap-4 padding-4 padding-y-3 flex-align-center">
-      <div class="grid-col flex-3">
-        <p><b>{{item.card_heading}}</b></p>
-        <p>{{item.p_text}}</p>
+  <div class="grid-container-tablet padding-3 radius-lg border-2px margin-left-0 ">
+    <h3 class="usa-card__heading padding-y-2">{{item.card_heading}}</h3>
+    <div class="grid-row grid-gap-3 flex-align-center">
+      <div class="grid-col-auto ">
+        <p class="sms-message-wrapper">{{item.p_text}}</p>
+      </div>
+      <div class="grid-col-fill">
+        {% if item.image_src %}
+        <img src="{{ item.image_src }}" alt="{{ item.alt_text }}" class="height-15" />
+        {% endif %}
       </div>
-      {% if item.image_src %}
-      <img src="{{item.image_src}}" alt="{{ item.alt_text }}" class="height-15" />
-      {% endif %}
     </div>
   </div>
   {% endfor %}

app/templates/views/acceptable-use-policy.html

@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+
+{% set page_title = "Acceptable Use Policy" %}
+
+{% block per_page_title %}{{page_title}}{% endblock %}
+
+{% block content_column_content %}
+
+<section class="usa-prose">
+  <h1>{{page_title}}</h1>
+  <p>Use of the application indicates agreement with this acceptable use policy.</p>
+  <p>Acceptable uses of Notify.gov for this trial period include:</p>
+  <ul>
+    <li>Configuring test services and sending test SMS messages to learn and demonstrate how Notify.gov works.</li>
+    <li>Reviewing data provided by Notify.gov and configuring available settings.</li>
+  </ul>
+  <p>
+    In order to help us keep Notify.gov secure, we require that you use your account appropriately. When you use Notify.gov, you agree that you’ll respect these rules of behavior:
+  </p>
+  <ul>
+    <li>Conduct only authorized business on the system.</li>
+    <li>Maintain the confidentiality of your authentication credentials; a Notify.gov operator should never ask you to reveal them. We recommend using a password manager and strong credentials.</li>
+    <li>Log out when you no longer need session access. Never leave your computer unattended while logged into Notify.gov.</li>
+    <li>Report all security incidents or suspected incidents (such as improper or suspicious acts) related to Notify.gov systems and networks to Notify.gov support.</li>
+    <li>Safeguard system resources against waste, loss, abuse, unauthorized use or disclosure, and misappropriation.</li>
+    <li>Don’t process U.S. classified national security information on the system.</li>
+    <li>Don’t browse, search or reveal information hosted by Notify.gov except as required to perform your legitimate tasks or assigned duties.</li>
+    <li>Don’t retrieve information, or in any other way disclose information, for someone who does not have authority to access that information.</li>
+    <li>Don’t intentionally use a client that makes use of obsolete or insecure encryption algorithms.</li>
+    <li>Don’t configure your browser to ignore security warnings which may involve your connection with Notify.gov; report warnings that you can’t explain to Notify.gov support.</li>
+    <li>If you believe you’ve been granted more access than necessary to perform your legitimate tasks or assigned duties, immediately notify Notify.gov support.</li>
+    <li>Don’t share your account with another person or create anonymous or group accounts. Your account is just for you.</li>
+  </ul>
+  <p>Access to systems and networks owned by Notify.gov is governed by, and subject to, all federal laws, including, but not limited to, the Privacy Act, 5 U.S.C. 552a, if the applicable Notify.gov system maintains individual Privacy Act information. Access to Notify.gov systems constitutes consent to the retrieval and disclosure of the information within the scope of your authorized access, subject to the Privacy Act, and applicable state and federal laws.</p>
+  <p>Please contact Notify.gov support if you have questions about these rules or don’t understand them.</p>
+</section>
+
+{% endblock %}

app/templates/views/contact.html

@@ -15,7 +15,7 @@
     aria-label="For partnership inquiries">
     <div class="usa-summary-box__body">
       <div class="usa-summary-box__text">
-        <p>If you are a current Notify.gov partner and have technical issues or questions, we are available at <a
+        <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>

app/templates/views/features.html

@@ -11,10 +11,8 @@
 
 <h1 class="font-body-2xl">Features</h1>
 <p class="usa-body">If you work for the government, you can use Notify.gov to keep your users updated.</p>
-<p class="usa-body">Notify makes it easy to create, customize, and send <a class="usa-link" href="{{ url_for('main.features_sms') }}">text messages</a>.</p>
-<!-- <ul class="list list-bullet">
-  <li><a class="usa-link" href="{{ url_for('main.features_sms') }}">text messages</a></li>
-</ul> -->
+<p class="usa-body">Notify makes it easy to create, customize, and send text messages</a>.</p>
+
 <p class="usa-body">You do not need any technical knowledge to use Notify.</p>
 {% if not current_user.is_authenticated %}
   <p class="usa-body"><a class="usa-link" href="{{ url_for('main.register') }}">Create an account</a> for free and try it yourself.</p>

app/templates/views/guidance/index.html

@@ -8,245 +8,103 @@
 {% endblock %}
 
 {% block content_column_content %}
+<h1 class="font-body-2xl margin-bottom-3">Guidance</h1>
 
-  <h1 class="font-body-2xl margin-bottom-3">Guidance</h1>
+<p>Notify allows you to easily create templates for messages for your recipients. You can customize messages to encourage
+your recipient to manage their benefits and increase follow-through.</p>
+<p>Below we explain how to:</p>
 
-  <p>Notify allows you easily to create templates for messages for your recipients. You can customize messages to encourage
-  your recipient to manage their benefits and increase follow through.</p>
-  <p>Below we explain how to:</p>
+<ul class="list list-bullet">
+  <li><a class="usa-link" href="#personalize-content">Personalize your content</a></li>
+  <li><a class="usa-link" href="#conditional-content">Add conditional content</a></li>
+</ul>
 
-  <ul class="list list-bullet">
-    {% if not feature_best_practices_enabled %}
-    <li><a class="usa-link" href="#format-content">Format your content</a></li>
-    <li><a class="usa-link" href="#add-links">Add links</a></li>
-    {% endif %}
-    <li><a class="usa-link" href="#personalize-content">Personalize your content</a></li>
-    <li><a class="usa-link" href="#conditional-content">Add conditional content</a></li>
-    <li><a class="usa-link" href="#indentify-program">Identify your program</a></li>
-    <li><a class="usa-link" href="#prepare-data">Prepare your data</a></li>
-    {% if not feature_best_practices_enabled %}
-    <li><a class="usa-link" href="#prevent-fraud">Prevent fraud</a></li>
-    {% endif%}
-  </ul>
-
-  {# Format content #}
-  <h2 class="padding-top-1" id="format-content">Format your content</h2>
-  {% if not feature_best_practices_enabled %}
-  <p>Effective texts will help your message recipients take the steps needed to secure and keep the benefits and services
-  they depend on. To craft an effective text:</p>
-
-  <ul class="list list-bullet">
-    <li>Choose your messages thoughtfully. Text messages are best to remind/nudge someone to take a specific action or
-    communicate information at a particular time rather than pushing out broad or overly general information.</li>
-    <li>Clearly state the issue and expected response. Tell your recipient what you expect from them.</li>
-    <li>Say only one important thing per message.</li>
-    <li>Frame the message to encourage action and explain the consequences of not completing the desired action.</li>
-  </ul>
-  {% endif %}
-  <h3>To create and format your message</h3>
-  <ol class="list">
-    <li>All messages start from a template</li>
-    <li>Click "<a href={{ url_for('.choose_template', service_id=current_service.id) }}>Send Messages</a>". You'll see existing templates.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
-  </ol>
-
-  {% if not feature_best_practices_enabled %}
-  {# Add links #}
-  <h2 class="padding-top-1" id="add-links">Add links</h2>
-  <p>When composing a text message, links to websites or online applications can help your recipient respond quickly.</p>
-
-  <ul class="list list-bullet">
-    <li>Write URLs in full and Notify will convert them into links for you. Note that you cannot hyperlink text in Notify
-    messages.</li>
-    <li>For link click tracking, you can consider adding campaign parameters to URLs.</li>
-    <li>All links should point to a government domain.</li>
-    <li>Link directly to where your recipient needs to take action, not to more information.</li>
-  </ul>
-
-  <h3>About link-shortening services</h3>
-  <p>We do not recommend using a third-party link-shortening service because:</p>
-  <ul class="list list-bullet">
-    <li>Your recipient cannot see where the link will take them, which could make them suspect the link is spam/scam.</li>
-    <li>Your link might stop working if there’s a service outage.</li>
-    <li>You can no longer control where the redirect goes.</li>
-  </ul>
-  {% endif %}
-
-  {# Personalize content #}
-  <h2 class="padding-top-1" id="personalize-content">Personalize your content</h2>
-  <p>Personalizing your content can increase response rates and help the recipient know the text is legitimate.</p>
-  <ul class="list list-bullet">
-    <li>Including a person's first name increases response rates.</li>
-    <li>Specific details such as time and location of an appointment or where suspected fraud use occurred encourages action.</li>
-  </ul>
-
-  <h3>To personalize your content</h3>
-  <ol class="list">
-    <li>Add a placeholder to your content by placing two brackets around the personalized elements.</li>
-    <li>You can manually enter the personalized content or you can upload a spreadsheet with the details and let Notify do the
-    work for you. See <a href="#prepare-data">data preparation</a>.</li>
-  </ol>
-
-  <h4>Example</h4>
-  <p>To personalize with the recipient's first name and include a reference number:</p>
-  <p class="padding-2 bg-base-lightest">State WIC: Hello ((first name)), your reference is ((ref number)). Please provide this number when you call 555-123-1234 to make an appointment.</p>
-
-  <p>Note that variations in the length of personalized content can impact the length of specific messages, and may affect
-  the number of parts used.</p>
-
-  {# Add conditional content #}
-  <h2 class="padding-top-1" id="conditional-content">Add conditional content</h2>
-  <p>Conditional (or optional) content appears only when a recipient meets certain criteria. This feature allows you to make
-  all or part of the message contingent upon specific criteria associated with the recipient.</p>
-
-  <h3>To add conditional content</h3>
-  <ol class="list">
-    <li>Use two brackets and ?? to define the conditional content.</li>
-    <li>You can manually enter the conditional content or you can upload a spreadsheet with the personal details and let Notify
-    do the work for you. See <a href="#prepare-data">data preparation</a>.</li>
-  </ol>
-
-  <h4>Examples</h4>
-  <ol class="list">
-    <li>If you only want to show something to people who are under 18:
-      </br>
-      <p class="padding-2 bg-base-lightest">State SNAP: Renewal applications are due by March 15. ((under18??Please get your application signed by a parent or
-      guardian.))</p>
-    </li>
-    <li>
-      If you want to make people who are homebound aware of the option of virtual visits (but not other message recipients):
-      </br>
-      <p class="padding-2 bg-base-lightest">State Medicaid: Please call 555-123-1234 to schedule an appointment. ((homebound??Virtual visits are available.))</p>
-    </li>
-    <li>
-      If you want to send a messages in different languages to different recipients:
-      </br>
-      <p class="padding-2 bg-base-lightest">((English??We’ve identified unauthorized use on your EBT account. Call the phone number on the back of your card to
-      cancel or go to your local CSO for immediate replacement.))((Spanish??Hemos identificado un uso no autorizado en su
-      cuenta EBT. Llame al número de teléfono que aparece en el reverso de su tarjeta para cancelarla o diríjase a su CSO
-      local para que se la sustituyan inmediatamente.))</p>
-    </li>
-  </ol>
+{# Format content #}
+<h2 class="padding-top-1" id="format-content">Format your content</h2>
 
 
-  {# Identify your program #}
-  <h2 class="padding-top-1" id="indentify-program">Identify your program</h2>
-  <p>You can help your recipients identify your texts as legitimate by customizing your messages to clearly state who they
-  are from. Consider using the program or benefit name that is most familiar to your recipients.</p>
+<h3>To create and format your message</h3>
+<ol class="list">
+  <li>All messages start from a template</li>
+  <li>Click "<a href={{ url_for('.choose_template', service_id=current_service.id) }}>Send Messages</a>". You'll see existing templates.</li>
+  <li>Add a new template or choose an existing template and select Edit.</li>
+</ol>
 
-  <h3>To customize your program name</h3>
-  <p>To change the text message sender from the default service name:</p>
-  <ol class="list">
-    <li>Go to the <a href="{{ url_for('main.service_settings', service_id=current_service.id) }}">Settings page</a></li>
-    <li>Select “Start text messages with service name.”</li>
-    <li>Change the service name to a familiar program or benefit.</li>
-  </ol>
+{# Add links #}
+<p>When composing a text message, links to websites or online applications can help your recipient respond quickly.</p>
 
-  {# Prepare your data #}
-  <h2 class="padding-top-1" id="prepare-data">Prepare your data</h2>
-  <p>The easiest and most efficient way to personalize your content is by uploading a spreadsheet. Notify can accommodate
-  many file formats and structures.</p>
+<ul class="list list-bullet">
+  <li>Write URLs in full and Notify will convert them into links for you. Note that you cannot hyperlink text in Notify
+  messages.</li>
+  <li>For link click tracking, you can consider adding campaign parameters to URLs.</li>
+  <li>All links should point to a government domain.</li>
+  <li>Link directly to where your recipient needs to take action, not to more information.</li>
+</ul>
 
-  <h3>File format</h3>
-  <p>Notify can accept files in the following formats: CSV, TSV, ODS, and Microsoft Excel.</p>
+<h3>About link-shortening services</h3>
+<p>We do not recommend using a third-party link-shortening service because:</p>
+<ul class="list list-bullet">
+  <li>Your recipient cannot see where the link will take them, which could make them suspect the link is spam/scam.</li>
+  <li>Your link might stop working if there’s a service outage.</li>
+  <li>You can no longer control where the redirect goes.</li>
+</ul>
 
-  <h3>File structure</h3>
-  <ul class="list">
-    <li>The phone number must be in the first column (Column A) and must be labeled <strong>Phone number</strong>.</li>
-    <li>Each column must have a unique name.</li>
-    <li>If you are using Excel, you must either disable the”auto-date/time format” for time and date columns or convert the file
-    to a CSV prior to loading. (If you do not, Excel will display date/time data in a confusing format.)</li>
-  </ul>
+{# Personalize content #}
+<h2 class="padding-top-1" id="personalize-content">Personalize your content</h2>
+<p>Personalizing your content can increase response rates and help the recipient know the text is legitimate.</p>
+<ul class="list list-bullet">
+  <li>Including a person's first name increases response rates.</li>
+  <li>Specific details such as time and location of an appointment or where suspected fraud use occurred encourages action.</li>
+</ul>
 
-  <h3>Formatting personalized content</h3>
-  <p>If you are sending a message with personalized content, such as the first name of the recipient or the appointment time
-  and location, the names of the column headings have to match the indicator included in the message template.</p>
-  <p>For example, if the personalized content is the first name of the recipient, and we are using the spreadsheet below, the
-  indicator in the message needs to be ((First name)), not ((firstname)) or ((name)).</p>
+<h3>To personalize your content</h3>
+<ol class="list">
+  <li>Add a placeholder to your content by placing two brackets around the personalized elements.</li>
+  <li>You can manually enter the personalized content or you can upload a spreadsheet with the details and let Notify do the
+  work for you. See <a href="#prepare-data">data preparation</a>.</li>
+</ol>
 
-  <h3>Formatting conditional content</h3>
-  <p>If you are sending messages with conditional content, such as content based on the recipient’s preferred language or
-  location, the flag to receive the content needs to be captured in its own column with a Yes or No (Y/N) flag.</p>
+<h4>Example</h4>
+<p>To personalize with the recipient's first name and include a reference number:</p>
+<p class="padding-2 bg-base-lightest">State WIC: Hello ((first name)), your reference is ((ref number)). Please provide this number when you call 555-123-1234 to make an appointment.</p>
 
-  <h3>Example</h3>
-  <div class="table-overflow-x-auto">
-    <table class="usa-table">
-      <caption class="usa-sr-only">
-        Example
-      </caption>
-      <thead>
-        <tr>
-          <th scope="col">Phone number</th>
-          <th scope="col">First name</th>
-          <th scope="col">Last name</th>
-          <th scope="col">Spanish</th>
-          <th scope="col">English</th>
-          <th scope="col">Date</th>
-          <th scope="col">Time</th>
-          <th scope="col">Location</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>123-456-7890</td>
-          <td>Lulu</td>
-          <td>Praether</td>
-          <td>N</td>
-          <td>Y</td>
-          <td>November 2, 2023</td>
-          <td>3:25</td>
-          <td>123 Ford Rd.</td>
-        </tr>
-        <tr>
-          <td>234-567-8901</td>
-          <td>Sela</td>
-          <td>Appel</td>
-          <td>Y</td>
-          <td>N</td>
-          <td>November 2, 2023</td>
-          <td>4:00</td>
-          <td>123 Ford Rd.</td>
-        </tr>
-        <tr>
-          <td>123-456-7890</td>
-          <td>Dexter</td>
-          <td>Moseley</td>
-          <td>N</td>
-          <td>Y</td>
-          <td>November 2, 2023</td>
-          <td>2:00</td>
-          <td>123 Ford Rd.</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
+<p>Note that variations in the length of personalized content can impact the length of specific messages, and may affect
+the number of parts used.</p>
 
-  {% if not feature_best_practices_enabled %}
-  {# Preventing fraud #}
-  <h2 class="padding-top-1" id="prevent-fraud">Preventing fraud</h2>
-  <p>Texting fraud is ever prevalent and while we can’t eliminate the risk, we can reduce the chances that recipients will
-  fall victim to fraud.</p>
-  <ol class="list">
-    <li>Never send unnecessary or protected private information.</li>
-    <li>Remind your recipients that text messaging is not a secure means of communication and they should not send you private
-    information via text.</li>
-    <li>Only include links to websites and online applications that are secure.</li>
-    <li>Send an introductory text letting recipients know you will be texting them and to save the number in their phone.</li>
-    <li>Include an auto-response with the name of your organization and a contact phone number.</li>
-  </ol>
+{# Add conditional content #}
+<h2 class="padding-top-1" id="conditional-content">Add conditional content</h2>
+<p>Conditional (or optional) content appears only when a recipient meets certain criteria. This feature allows you to make
+all or part of the message contingent upon specific criteria associated with the recipient.</p>
+
+<h3>To add conditional content</h3>
+<ol class="list">
+  <li>Use two brackets and ?? to define the conditional content.</li>
+  <li>You can manually enter the conditional content or you can upload a spreadsheet with the personal details and let Notify
+  do the work for you. See <a href="#prepare-data">data preparation</a>.</li>
+</ol>
+
+<h4>Examples</h4>
+<ol class="list">
+  <li>If you only want to show something to people who are under 18:
+    </br>
+    <p class="padding-2 bg-base-lightest">State SNAP: Renewal applications are due by March 15. ((under18??Please get your application signed by a parent or
+    guardian.))</p>
+  </li>
+  <li>
+    If you want to make people who are homebound aware of the option of virtual visits (but not other message recipients):
+    </br>
+    <p class="padding-2 bg-base-lightest">State Medicaid: Please call 555-123-1234 to schedule an appointment. ((homebound??Virtual visits are available.))</p>
+  </li>
+  <li>
+    If you want to send a messages in different languages to different recipients:
+    </br>
+    <p class="padding-2 bg-base-lightest">((English??We’ve identified unauthorized use on your EBT account. Call the phone number on the back of your card to
+    cancel or go to your local CSO for immediate replacement.))((Spanish??Hemos identificado un uso no autorizado en su
+    cuenta EBT. Llame al número de teléfono que aparece en el reverso de su tarjeta para cancelarla o diríjase a su CSO
+    local para que se la sustituyan inmediatamente.))</p>
+  </li>
+</ol>
+
+...
 
-  <h3>Examples</h3>
-  <ol class="list">
-    <li>Introductory text:
-      </br>
-      <p class="padding-2 bg-base-lightest">State Transit Dept: We're piloting a new way to get important reminders to our staff. Save this number to your phone,
-      you'll receive updates from us here.</p>
-    </li>
-    <li>Auto-response text:
-      </br>
-      <p class="padding-2 bg-base-lightest">State Agency: This number is unmonitored. To contact us, call us at 555-123-1234. We will never ask for personal details
-      in a text. If you have questions about how to protect your privacy, see statename.gov/privacy.</p>
-    </li>
-  </ol>
-  {% endif %}
 {% endblock %}

app/templates/views/guides/benchmark-performance.html

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Guides", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}
 
 <section class="usa-prose">
   <h1>{{page_title}}</h1>
@@ -27,58 +27,46 @@
     quantity of messages delivered, how people engage with messages, and how they take action.
   </p>
 
-  <h3 class="padding-left-5">Message delivery</h3>
-  <p class="font-body-lg text-light padding-left-5">Benchmark: <span class="text-bold">80%</span> of texts are
+  <h3>Message delivery</h3>
+  <p class="text-light">Benchmark: <span class="text-bold">80%</span> of texts are
     successfully delivered
   </p>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>
-          You may discover that some numbers are temporarily or permanently unavailable due to service being
-          discontinued,
-          numbers changing, or being a landline.
-        </p>
-      </li>
-    </ul>
-  </div>
+  <ul>
+    <li>
+      <p>
+        You may discover that some numbers are temporarily or permanently unavailable due to service being
+        discontinued,
+        numbers changing, or being a landline.
+      </p>
+    </li>
+  </ul>
 
+  <h3>Engagement</h3>
+  <p class="text-light">Benchmark: Engagement rates with texts ranged from <span
+      class="text-bold">17%</span>
+    to <span class="text-bold">26%</span></p>
+  <ul>
+    <li>
+      <p>
+        The highest rate of engagement with a text comes within hours of sending. Engagement rates include any kind
+        of
+        action taken due to a text, including replying “STOP” to prevent future texts.
+      </p>
+    </li>
+  </ul>
 
-  <h3 class="padding-left-5">Engagement</h3>
-  <div class="measure-4 padding-left-5">
-    <p class="font-body-lg text-light">Benchmark: Engagement rates with texts ranged from <span
-        class="text-bold">17%</span>
-      to <span class="text-bold">26%</span></p>
-  </div>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>
-          The highest rate of engagement with a text comes within hours of sending. Engagement rates include any kind
-          of
-          action taken due to a text, including replying “STOP” to prevent future texts.
-        </p>
-      </li>
-    </ul>
-  </div>
-
-  <h3 class="padding-left-5">Appointment requests</h3>
-  <div class="measure-4 padding-left-5">
-    <p class="font-body-lg text-light">Benchmark: Requesting appointments after receiving texts ranged
+  <h3>Appointment requests</h3>
+    <p class="text-light">Benchmark: Requesting appointments after receiving texts ranged
       from <span class="text-bold">4%</span> to <span class="text-bold">9%</span></p>
-  </div>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>
-          Requesting appointments is a specific type of engagement. Provide a phone number or link to an online
-          appointment
-          request form.
-        </p>
-      </li>
-    </ul>
-  </div>
-
+  <ul>
+    <li>
+      <p>
+        Requesting appointments is a specific type of engagement. Provide a phone number or link to an online
+        appointment
+        request form.
+      </p>
+    </li>
+  </ul>
   <p>
     The <a class="use-link usa-link--external" href="https://codeforamerica.org/resources/texting-playbook/"
       target="_blank">Code for America’s Texting
@@ -86,63 +74,42 @@
     reported specific learnings around appointment reminders, completing
     document submission, and maintenance reminders.
   </p>
-  <h3 class="padding-left-5">Appointment reminders</h3>
-  <div class="measure-4 padding-left-5">
-    <p class="font-body-lg text-light">Benchmark: Clients were <span class="text-bold">79%</span> more
-      likely
-      to keep
-      their appointment after receiving a text reminder.</p>
-  </div>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>You will likely see more completed appointments.</p>
-      </li>
-    </ul>
-  </div>
+  <h3>Appointment reminders</h3>
+  <p class="text-light">Benchmark: Clients were <span class="text-bold">79%</span> more
+    likely to keep their appointment after receiving a text reminder.</p>
+  <ul>
+    <li>
+      <p>You will likely see more completed appointments.</p>
+    </li>
+  </ul>
+  <p class="text-light">Benchmark: Clients were <span class="text-bold">55%</span> more
+    likely to complete an interview after receiving an interview reminder</p>
+  <ul>
+    <li>
+      <p>You will likely see more completed interviews.</p>
+    </li>
+  </ul>
 
-  <div class="measure-4 padding-left-5">
-    <p class="font-body-lg text-light">Benchmark: Clients were <span class="text-bold">55%</span> more
-      likely
-      to complete
-      an interview after receiving an interview reminder</p>
-  </div>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>You will likely see more completed interviews.</p>
-      </li>
-    </ul>
-  </div>
-
-  <h3 class="padding-left-5">Document submission</h3>
-  <div class="measure-4 padding-left-5">
-    <p class="font-body-lg text-light">
+  <h3>Document submission</h3>
+    <p class="text-light">
       Benchmark: Clients were <span class="text-bold">6%</span> more likely to complete document submission after
       receiving a customized list of required documents via text
     </p>
-  </div>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>To encourage response, provide a custom list of the needed documents and information about how to submit
-          them.
-        </p>
-      </li>
-    </ul>
-  </div>
+  <ul>
+    <li>
+      <p>To encourage response, provide a custom list of the needed documents and information about how to submit
+        them.
+      </p>
+    </li>
+  </ul>
 
-  <h3 class="padding-left-5">Reminders</h3>
-  <div class="measure-4 padding-left-5">
-    <p class="font-body-lg text-light">Benchmark: Text reminders improved case maintenance rates by <span
-        class="text-bold">21%</span></p>
-  </div>
-  <div class="padding-left-2 measure-4">
-    <ul>
-      <li>
-        <p>You may see less turnover in your case rates.</p>
-      </li>
-    </ul>
-  </div>
+  <h3 class="font-body-xl">Reminders</h3>
+  <p class="text-light">Benchmark: Text reminders improved case maintenance rates by <span
+      class="text-bold">21%</span></p>
+  <ul>
+    <li>
+      <p>You may see less turnover in your case rates.</p>
+    </li>
+  </ul>
 </section>
 {% endblock %}

app/templates/views/guides/best-practices.html

@@ -15,7 +15,7 @@
   </p>
 
   <p>This set of best practices will help you get an effective texting initiative up and running.</p>
-  <h2 class="padding-bottom-2">
+  <h2 class="padding-bottom-4">
     Key elements of a texting campaign
   </h2>
 
@@ -24,37 +24,37 @@
   "svg_src": "goal",
   "card_heading": "Establish clear goals",
   "p_text": "Start with a singular purpose. Make explicit what you want to achieve.",
-  "link": "/guides/clear-goals"
+  "link": "/using-notify/best-practices/clear-goals"
   },
   {
   "svg_src": "compliant",
   "card_heading": "Follow rules & regulations",
   "p_text": "Understand what is required when texting the public.",
-  "link": "/guides/rules-and-regulations"
+  "link": "/using-notify/best-practices/rules-and-regulations"
   },
   {
   "svg_src": "trust",
   "card_heading": "Establish trust",
   "p_text": "Help your audience anticipate and welcome your texts.",
-  "link": "/guides/establish-trust"
+  "link": "/using-notify/best-practices/establish-trust"
   },
   {
   "svg_src": "runner",
   "card_heading": "Write texts that provoke action",
   "p_text": "Help your audience know what to do with the information you send.",
-  "link": "/guides/write-for-action"
+  "link": "/using-notify/best-practices/write-for-action"
   },
   {
   "svg_src": "language",
   "card_heading": "Send texts in multiple languages",
   "p_text": "What to know as you plan translated texts.",
-  "link": "/guides/multiple-languages"
+  "link": "/using-notify/best-practices/multiple-languages"
   },
   {
   "svg_src": "chart",
   "card_heading": "Measure performance with benchmarking",
   "p_text": "Learn how effective your texting program can be.",
-  "link": "/guides/benchmark-performance"
+  "link": "/using-notify/best-practices/benchmark-performance"
   }
   ] %}
 

app/templates/views/guides/clear-goals.html

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Guides", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}
 
 <section class="usa-prose">
   <h1>{{page_title}}</h1>
@@ -162,7 +162,7 @@
   </div>
   <p>
     Review your drafted hypothesis with your team to make sure everyone is aligned on your desired goals. A clear and
-    concise hypothesis can help you decide how to <a href="../guides/write-for-action">write text message
+    concise hypothesis can help you decide how to <a href="../best-practices/write-for-action">write text message
       content
       that provokes action</a>.
   </p>

app/templates/views/guides/establish-trust.html

@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Guides", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}
 
 <section class="usa-prose">
   <h1>{{page_title}}</h1>

app/templates/views/guides/multiple-languages.html

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Guides", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}
 
 <section class="usa-prose">
   <h1>{{page_title}}</h1>

app/templates/views/guides/rules-and-regulations.html

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Guides", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}
 
 <section class="usa-prose">
   <h1>{{page_title}}</h1>
@@ -22,7 +22,7 @@
     If you do need expressed consent, consider including a pre-checked plain language opt-in (i.e. “It’s OK to text
     me.”) on
     digital forms. Be sure to ask for an up-to-date phone number and include a question about the recipient’s preferred
-    language for text messages if you expect to <a href="../guides/multiple-languages">translate your text
+    language for text messages if you expect to <a href="../best-practices/multiple-languages">translate your text
       messages</a> in
     languages other than English.
   </p>
@@ -81,7 +81,7 @@
   <h3>Opting out</h3>
   <p>
     There is no policy requirement for senders to communicate opt-out options, but <a
-      href="../guides/establish-trust#as-people-receive-texts"> including instructions in introductory and/or
+      href="../best-practices/establish-trust#as-people-receive-texts"> including instructions in introductory and/or
       auto-response texts </a> on how to opt out and opt back in are effective ways to establish trust with your
     audience.
   </p>

app/templates/views/guides/write-for-action.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Guides", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}
 
 <section class="usa-prose">
   <h1>{{page_title}}</h1>

app/templates/views/join-notify.html

@@ -34,7 +34,7 @@
   {% set product_highlights = [
   {
   "svg_src": "#chat",
-  "card_heading": "Up to 250,000 messages to use over your first year*",
+  "card_heading": "Up to 100,000 messages to use over your first year*",
   },
   {
   "svg_src": "#phone",
@@ -72,14 +72,14 @@
     aria-labelledby="summary-box-how-to-get-started">
     <div class="usa-summary-box__body">
       <div class="usa-summary-box__text">
-        <p>Interested in trying Notify.gov before signing an agreement? We can provide qualifying partners with access
+        <p class="margin-0">Interested in trying Notify.gov before signing an agreement? We can provide qualifying partners with access
           to Trial Mode to review Notify.gov features before deciding. In Trial Mode, you can test sending messages,
           explore the personalization and customization features, and review sample delivery reports.</p>
       </div>
     </div>
   </div>
 
-  <h4>Tell us about your program</h4>
+  <h3 class="font-body-md">Tell us about your program</h3>
   <p class="padding-bottom-3">
     Let’s determine if Notify.gov is a good fit for your organization. To <b>get started</b>, we’ll ask you for
     information such as:
@@ -126,14 +126,14 @@
   {
   "heading": "What if I need more than 250,000 messages?",
   "p_text": "Plans that include additional messages for a fee will be available soon. We want to design these plans
-  based on our partners’ needs, so please <a href='mailto:tts-notify@gsa.gov'>contact us</a> if you hope to be able to
+  based on our partners’ needs, so please <a class='use-link usa-link--external' href='mailto:tts-notify@gsa.gov'>contact us</a> if you hope to be able to
   send more messages. We’d like to talk with you.",
   "position": "b-a1"
   },
   {
   "heading": "What phone numbers can my agency send to?",
   "p_text": "Right now, Notify.gov supports sending messages to North American numbers (+1). If you’d like to send to
-  international numbers, we want to <u>hear from you</u>.",
+  international numbers, we want to <a href='/contact'>hear from you</a>.",
   "position": "b-a2",
   },
   {
@@ -146,7 +146,7 @@
   {
   "heading": "Can we use API integrations with Notify?",
   "p_text": "While public API integrations are not yet available, we are working on enabling these. If you're looking
-  for this feature <a href='/about/contact'>we want to hear from you</a>.",
+  for this feature <a href='/contact'>we want to hear from you</a>.",
   "position": "b-a4",
   },
   {
@@ -164,7 +164,7 @@
   {
   "heading": "My OGC is asking about consent, where can I get more information for them?",
   "p_text": "Text message notifications are governed by the Telephone Consumer Protection Act. Different levels of
-  government have different consent requirements. Download and share our <a
+  government have different consent requirements. Download and share our <a class='use-link usa-link--external'
     href='https://github.com/GSA/notifications-admin/files/15100120/TCPA.Overview_Notify.gov.pdf'>overview of the
     TCPA</a> with your legal counsel as
   a starting point.",

app/templates/views/message-status.html

@@ -77,7 +77,7 @@
   <p>Sometimes Notify receives more detailed information from the carriers on the status of messages, and these can be found
   in the downloadable reports. Not all carriers provide the same level of detail regarding delivery and some delivery
   statutes have a slight variation in word choice. Notify includes this information in the reports to provide you as much
-  detail as possible. Remember, for <a class="usa-link" href="/features/security">security</a> purposes, detailed information is only available for seven days after a
+  detail as possible. Remember, for security purposes, detailed information is only available for seven days after a
   message has been sent.</p>
 
   <h2 class="heading-medium">Opting out</h2>

app/templates/views/roadmap.html

@@ -1,87 +0,0 @@
-{% extends "base.html" %}
-{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
-{% from "components/content-metadata.html" import content_metadata %}
-
-{% block per_page_title %}
-  Roadmap
-{% endblock %}
-
-{% block content_column_content %}
-
-  <h1 class="font-body-2xl margin-bottom-3">Roadmap</h1>
-
-  <!-- {{ content_metadata(
-    data={
-      "Last updated": "1 November 2022",
-      "Next review due on": "15 December 2022"
-    }
-  ) }} -->
-
-
-  <p>The Notify roadmap shows what we’re working on and what we're planning to do next.</p>
-  <p>This roadmap is only a guide. It does not cover everything we do, and some things may change.</p>
-  <p>You can <a class="usa-link" href="{{url_for('.support')}}">contact us</a> if you have any questions about the roadmap or suggestions for new features.</p>
-
-  <h2 id="things-we-are-working-on">What we’re working on</h2>
-
-  <h3 id="now">Now</h3>
-
-  <p>We are investigating the Notify concept, building on the notifications tool pioneered by the UK.</p>
-  <p>To do this, we are convening a pilot with a small set of partners.</p>
-  <p>Goals during this stage:</p>
-
-  <ul class="list list-bullet">
-    <li>Achieve compliance to begin piloting, such as ATO and privacy standards.
-      <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-        <use xlink:href="/assets/img/sprite.svg#check"></use>
-      </svg>
-    </li>
-    <li>Demonstrate that a government-run notifications tool provides a unique value.</li>
-    <li>Gather data from the pilot to improve the product.</li>
-  </ul>
-
-  <p>Features prioritized during this stage:</p>
-
-  <ul class="list list-bullet">
-    <li>Bulk, individually customizable one-way SMS sending via web UI</li>
-    <li>Organization permissions settings for various team members to edit/send</li>
-    <li>Reusable message templates</li>
-    <li>Seven-day records deletion</li>
-    <li>Message send/failure analytics</li>
-  </ul>
-
-  <h3 id="next">Next</h3>
-
-  <p>If the pilot is successful, we hope to recruit additional partners to improve outcomes for low-income individuals and families.</p>
-
-  <p>Goals during this stage:</p>
-
-  <ul class="list list-bullet">
-    <li>Complement Notify with practical guidance and support services.</li>
-    <li>Iterate on existing features and implement new features based on what we've learned so far.</li>
-    <li>Hone our measurement approaches to better quantify impact.</li>
-  </ul>
-
-  <p>Features prioritized during this stage:</p>
-
-  <ul class="list">
-    <li>SMS sending via API integration</li>
-    <li>Self-service account creation</li>
-    <li>Application status page</li>
-    <li>Improved scheduled send option</li>
-  </ul>
-
-  <h3 id="later">Later</h3>
-
-  <p>In the future, we may decide to expand beyond SMS, or to offer the service government-wide.</p>
-
-  <p>Features to be considered during this stage:</p>
-
-  <ul class="list">
-
-    <li>Two-way messaging</li>
-    <li>Multilingual interface and content library options</li>
-    <li>Recurring scheduled send (such as “Send each Monday for 3 weeks”)</li>
-  </ul>
-
-{% endblock %}

app/templates/views/signedout.html

@@ -6,6 +6,7 @@ import usaButton %} {% block meta %}
 />
 {% endblock %} {% block pageTitle %} Notify.gov {% endblock %} {% block main %}
 {% block beforeContent %}{% endblock %}
+
 <main id="main-content" role="main">
   {% block content %}
   <section class="usa-section--dark usa-hero" aria-label="Introduction">
@@ -57,13 +58,19 @@ import usaButton %} {% block meta %}
     </p>
   </section>
 
-  <section class="grid-container usa-section usa-section__home usa-prose padding-bottom-1">
+  <section
+    class="grid-container usa-section usa-section__home usa-prose padding-bottom-1"
+  >
     <h2 class="font-sans-xl margin-top-0">Key features</h2>
     <div class="home-cards margin-top-5">
       <ul class="usa-card-group display-flex margin-bottom-4">
         <li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
           <div class="usa-card__container">
-            <img src="{{ asset_url('images/internet.svg') }}" alt="Globe on top of a web browser" />
+            <div class="blue-bar"></div>
+            <img
+              src="{{ asset_url('images/internet.svg') }}"
+              alt="Globe on top of a web browser"
+            />
             <div class="usa-card__header">
               <h3 class="font-heading-md">Web-based</h3>
             </div>
@@ -74,7 +81,11 @@ import usaButton %} {% block meta %}
         </li>
         <li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
           <div class="usa-card__container">
-            <img src="{{ asset_url('images/fast.svg') }}" alt="Stopwatch with a notification speech bubble with a star inside" />
+            <div class="blue-bar"></div>
+            <img
+              src="{{ asset_url('images/fast.svg') }}"
+              alt="Stopwatch with a notification speech bubble with a star inside"
+            />
             <div class="usa-card__header">
               <h3 class="font-heading-md">Fast and easy</h3>
             </div>
@@ -85,7 +96,11 @@ import usaButton %} {% block meta %}
         </li>
         <li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
           <div class="usa-card__container">
-            <img src="{{ asset_url('images/status.svg') }}" alt="3 status messages, 2 successes and one failure" />
+            <div class="blue-bar"></div>
+            <img
+              src="{{ asset_url('images/status.svg') }}"
+              alt="3 status messages, 2 successes and one failure"
+            />
             <div class="usa-card__header">
               <h3 class="font-heading-md">Track message delivery</h3>
             </div>
@@ -98,12 +113,15 @@ import usaButton %} {% block meta %}
       <ul class="usa-card-group">
         <li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
           <div class="usa-card__container">
+            <div class="blue-bar"></div>
             <img
               src="{{ asset_url('images/translation.svg') }}"
               alt="Speech bubbles with the letter A and the Chinese character for language"
             />
             <div class="usa-card__header">
-              <h3 class="font-heading-md">Send in recipients' preferred language</h3>
+              <h3 class="font-heading-md">
+                Send in recipients' preferred language
+              </h3>
             </div>
             <div class="usa-card__body">
               <p>Notify.gov has support for more than 30 character sets</p>
@@ -112,28 +130,38 @@ import usaButton %} {% block meta %}
         </li>
         <li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
           <div class="usa-card__container">
-            <img src="{{ asset_url('images/security.svg') }}" alt="Lock with code icon inside on top of a web browser" />
+            <div class="blue-bar"></div>
+            <img
+              src="{{ asset_url('images/security.svg') }}"
+              alt="Lock with code icon inside on top of a web browser"
+            />
             <div class="usa-card__header">
               <h3 class="font-heading-md">Security and privacy</h3>
             </div>
             <div class="usa-card__body">
               <p>
-                Limited data retention, encryption, and multi-factor authentication
-                protect user data and manage risk
+                Limited data retention, encryption, and multi-factor
+                authentication protect user data and manage risk with <br><a href="/about/security">our security efforts</a>
               </p>
             </div>
           </div>
         </li>
         <li class="usa-card tablet:grid-col-4 mobile-lg:grid-col-12">
           <div class="usa-card__container">
-            <img src="{{ asset_url('images/send.svg') }}" alt="Paper airplane and a notification icon with the number 1 inside" />
+            <div class="blue-bar"></div>
+            <img
+              src="{{ asset_url('images/send.svg') }}"
+              alt="Paper airplane and a notification icon with the number 1 inside"
+            />
             <div class="usa-card__header">
-              <h3 class="font-heading-md">Send bulk, customized, one-way messages</h3>
+              <h3 class="font-heading-md">
+                Send bulk, customized, one-way messages
+              </h3>
             </div>
             <div class="usa-card__body">
               <p>
-                Send hundreds or thousands of individually customized messages with
-                just a few clicks
+                Send hundreds or thousands of individually customized messages
+                with just a few clicks
               </p>
             </div>
           </div>
@@ -142,7 +170,9 @@ import usaButton %} {% block meta %}
     </div>
   </section>
 
-  <section class="grid-container usa-section usa-section__home usa-prose grid-container padding-bottom-10">
+  <section
+    class="grid-container usa-section usa-section__home usa-prose grid-container padding-bottom-10"
+  >
     <h2 class="font-heading-xl margin-top-0 margin-bottom-3">
       Who can use Notify.gov?
     </h2>
@@ -159,7 +189,10 @@ import usaButton %} {% block meta %}
     </p>
     <div class="grid-container margin-top-4 padding-left-0 padding-right-0">
       <div class="grid-row grid-gap-3">
-        <a class="text-no-underline tablet:grid-col-4 mobile-lg:grid-col-12" href="mailto:tts-notify@gsa.gov">
+        <a
+          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">

app/templates/views/studio.html

@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+
+{% set page_title = "About the Public Benefits Studio" %}
+
+{% block per_page_title %}{{page_title}}{% endblock %}
+
+{% block content_column_content %}
+
+<section class="usa-prose">
+  <h1>{{page_title}}</h1>
+  <p>The Benefits Studio is a product accelerator inside the federal government.
+    We collaborate with benefits programs and the people they serve to build and
+    scale shared tools that reduce burden within the social safety net.
+  </p>
+  <p>
+    As a part of GSA’s <a href="https://tts.gsa.gov/">Technology Transformation Services (TTS)</a>, the Studio is uniquely
+    positioned to work between and across agencies and programs, to make it easier and
+    cheaper for programs with the same challenges to use the same tools.
+  </p>
+  <p>
+    We focus on benefits programs first, because we believe solving problems for people
+    who face the highest challenges when interacting with the government will result in
+    solutions that serve everyone else well, too.
+  </p>
+  <p class="margin-bottom-4">
+    <strong>The Studio’s first product offering is <a href="/">Notify.gov</a></strong>, a text message service that helps government agencies at all levels more effectively communicate with the people they serve.
+  </p>
+  <p class="font-body-lg">We’re currently exploring two new product spaces:</p>
+  <ul>
+    <li><strong>Better Document Submission:</strong> How might we enable simple digital submission and document processing for benefits agencies?</li>
+    <li><strong>Automated Enrollment Checks:</strong> How might we improve how enrollment information is shared across benefit programs, especially where enrollment in one program provides partial or full eligibility for another program?</li>
+  </ul>
+  <p class="margin-bottom-4">If you’re interested in providing feedback on where we should go next, reach us at <a href="mailto:public-benefits-studio@gsa.gov">public-benefits-studio@gsa.gov.</a></p>
+  <p class="font-body-lg">Read more about the Studio:</p>
+  <ul>
+    <li><a href="https://digital.gov/2023/02/07/collaborate-with-the-tts-public-benefits-studio/">Collaborate with the Public Benefits Studio</a> — Digital.gov, Feb 2023</li>
+    <li><a href="https://federalnewsnetwork.com/it-modernization/2023/10/gsa-considers-text-messages-as-new-frontier-for-better-customer-experience/">GSA considers text messages as new frontier for better customer experience</a> — Federal News Network, Oct 2023</li>
+    <li><a href="https://www.gsa.gov/blog/2024/03/18/notifygov-is-helping-government-meet-families-where-they-are">Notify.gov is helping government meet families where they are</a> — GSA.gov blog, Mar 2024</li>
+  </ul>
+</section>
+
+{% endblock %}

app/templates/views/using-notify.html

@@ -21,7 +21,6 @@
     <ul class="list list-bullet">
       <li><a class="usa-link" href="{{ url_for('main.trial_mode_new') }}">trial mode</a></li>
       <li><a class="usa-link" href="{{ url_for('main.message_status') }}">message status types</a></li>
-      <li><a class="usa-link" href="{{ url_for('main.features_sms') }}">text message replies</a></li>
     </ul>
 
   </div>

deploy-config/demo.yml

@@ -7,4 +7,3 @@ cloud_dot_gov_route: notify-demo.app.cloud.gov
 redis_enabled: 1
 nr_agent_id: '1134302465'
 nr_app_id: '1083160688'
-FEATURE_BEST_PRACTICES_ENABLED: true

deploy-config/production.yml

@@ -7,4 +7,3 @@ cloud_dot_gov_route: notify.app.cloud.gov
 redis_enabled: 1
 nr_agent_id: '1050708682'
 nr_app_id: '1050708682'
-FEATURE_BEST_PRACTICES_ENABLED: false

deploy-config/sandbox.yml

@@ -12,4 +12,3 @@ SECRET_KEY: sandbox-notify-secret-key
 nr_agent_id: ''
 nr_app_id: ''
 NR_BROWSER_KEY: ''
-FEATURE_BEST_PRACTICES_ENABLED: true

deploy-config/staging.yml

@@ -7,4 +7,3 @@ cloud_dot_gov_route: notify-staging.app.cloud.gov
 redis_enabled: 1
 nr_agent_id: '1134291385'
 nr_app_id: '1031640326'
-FEATURE_BEST_PRACTICES_ENABLED: false

gulpfile.js

@@ -81,6 +81,8 @@ const javascripts = () => {
     paths.src + 'javascripts/main.js',
     paths.src + 'javascripts/totalMessagesChart.js',
     paths.src + 'javascripts/activityChart.js',
+    paths.src + 'javascripts/sidenav.js',
+
   ])
     .pipe(plugins.prettyerror())
     .pipe(

manifest.yml

@@ -62,4 +62,3 @@ applications:
       LOGIN_DOT_GOV_CERTS_URL: ((LOGIN_DOT_GOV_CERTS_URL))
 
       # feature flagging
-      FEATURE_BEST_PRACTICES_ENABLED: ((FEATURE_BEST_PRACTICES_ENABLED))

package.json

@@ -28,7 +28,7 @@
     "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/stream": "^3.0.1",
-    "@uswds/uswds": "^3.10.0",
+    "@uswds/uswds": "^3.11.0",
     "cbor-js": "0.1.0",
     "d3": "^7.9.0",
     "govuk_frontend_toolkit": "^9.0.1",
@@ -40,7 +40,7 @@
     "playwright": "^1.49.1",
     "python": "^0.0.4",
     "query-command-supported": "1.0.0",
-    "sass-embedded": "^1.83.0",
+    "sass-embedded": "^1.83.4",
     "textarea-caret": "3.1.0",
     "timeago": "1.6.7",
     "vinyl-buffer": "^1.0.1",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
-    "@uswds/compile": "^1.2.0",
+    "@uswds/compile": "^1.2.1",
     "backstopjs": "^6.3.25",
     "better-npm-audit": "^3.11.0",
     "gulp": "^5.0.0",
@@ -66,7 +66,7 @@
     "jest-environment-jsdom": "^29.2.2",
     "jshint": "2.13.6",
     "jshint-stylish": "2.2.1",
-    "rollup": "^4.28.1",
+    "rollup": "^4.31.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0"
   }

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand.
 
 [[package]]
 name = "ago"
@@ -1226,13 +1226,13 @@ files = [
 
 [[package]]
 name = "jinja2"
-version = "3.1.4"
+version = "3.1.5"
 description = "A very fast and expressive template engine."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"},
-    {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"},
+    {file = "jinja2-3.1.5-py3-none-any.whl", hash = "sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb"},
+    {file = "jinja2-3.1.5.tar.gz", hash = "sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb"},
 ]
 
 [package.dependencies]
@@ -1936,13 +1936,13 @@ files = [
 
 [[package]]
 name = "phonenumbers"
-version = "8.13.48"
+version = "8.13.52"
 description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
 optional = false
 python-versions = "*"
 files = [
-    {file = "phonenumbers-8.13.48-py2.py3-none-any.whl", hash = "sha256:5c51939acefa390eb74119750afb10a85d3c628dc83fd62c52d6f532fcf5d205"},
-    {file = "phonenumbers-8.13.48.tar.gz", hash = "sha256:62d8df9b0f3c3c41571c6b396f044ddd999d61631534001b8be7fdf7ba1b18f3"},
+    {file = "phonenumbers-8.13.52-py2.py3-none-any.whl", hash = "sha256:e803210038ece9d208b129e3023dc20e656a820d6bf6f1cb0471d4164f54bada"},
+    {file = "phonenumbers-8.13.52.tar.gz", hash = "sha256:fdc371ea6a4da052beb1225de63963d5a2fddbbff2bb53e3a957f360e0185f80"},
 ]
 
 [[package]]
@@ -3134,4 +3134,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12.2"
-content-hash = "870238eefd4342c30a6843c595dde7180180904ad12f6682586916a52ee0a332"
+content-hash = "3035525f7fc44291ea02b011d9fa6c0e84501d567417144e4d8fd6beebb11928"

pyproject.toml

@@ -21,7 +21,7 @@ flask-wtf = "^1.2"
 gunicorn = {version = "==22.0.0", extras = ["eventlet"]}
 humanize = "~=4.10"
 itsdangerous = "~=2.2"
-jinja2 = "~=3.1"
+jinja2 = "^3.1.5"
 newrelic = "*"
 notifications-python-client = "==10.0.0"
 pyexcel = "==0.7.0"
@@ -50,7 +50,7 @@ jmespath = "^1.0.1"
 mistune = "0.8.4"
 numpy = "^1.26.4"
 ordered-set = "^4.1.0"
-phonenumbers = "^8.13.43"
+phonenumbers = "^8.13.52"
 pycparser = "^2.22"
 python-json-logger = "^2.0.7"
 redis = "^5.0.8"

tests/app/main/views/test_index.py

@@ -2,7 +2,7 @@ from functools import partial
 
 import pytest
 from bs4 import BeautifulSoup
-from flask import current_app, url_for
+from flask import url_for
 from freezegun import freeze_time
 
 from tests.conftest import SERVICE_ONE_ID, normalize_spaces
@@ -83,8 +83,6 @@ def test_hiding_pages_from_search_engines(
     [
         "privacy",
         "pricing",
-        "roadmap",
-        "features",
         "documentation",
         "best_practices",
         "clear_goals",
@@ -93,9 +91,7 @@ def test_hiding_pages_from_search_engines(
         "write_for_action",
         "multiple_languages",
         "benchmark_performance",
-        "security",
         "message_status",
-        "features_sms",
         "how_to_pay",
         "get_started",
         "guidance_index",
@@ -108,54 +104,31 @@ def test_hiding_pages_from_search_engines(
 def test_static_pages(client_request, mock_get_organization_by_domain, view, mocker):
     mocker.patch("app.notify_client.user_api_client.UserApiClient.deactivate_user")
 
-    # Function to check if a view is feature-flagged and should return 404 when disabled
-    def is_feature_flagged(view):
-        feature_flagged_views = [
-            "best_practices",
-            "clear_goals",
-            "rules_and_regulations",
-            "establish_trust",
-            "write_for_action",
-            "multiple_languages",
-            "benchmark_performance",
-            "guidance_index",
-        ]
-        return (
-            not current_app.config["FEATURE_BEST_PRACTICES_ENABLED"]
-            and view in feature_flagged_views
-        )
-
     request = partial(client_request.get, "main.{}".format(view))
 
-    # If the guidance feature is disabled, expect a 404 for feature-flagged views
-    if is_feature_flagged(view):
-        page = request(_expected_status=404)
-    else:
-        # Check the page loads when user is signed in
-        page = request()
-        assert page.select_one("meta[name=description]")
+    # Assert the page loads successfully
+    page = request(_expected_status=200)
+    assert page.select_one("meta[name=description]")
 
-        # Check it still works when they don’t have a recent service
-        with client_request.session_transaction() as session:
-            session["service_id"] = None
-        request()
+    # Check the behavior when no recent service is set
+    with client_request.session_transaction() as session:
+        session["service_id"] = None
+    request()
 
-        # Check it redirects to the login screen when they sign out
-        client_request.logout()
-        with client_request.session_transaction() as session:
-            session["service_id"] = None
-            session["user_id"] = None
-        request(
-            _expected_status=302,
-            _expected_redirect="/sign-in?next={}".format(
-                url_for("main.{}".format(view))
-            ),
-        )
+    # Check redirection to login screen when signed out
+    client_request.logout()
+    with client_request.session_transaction() as session:
+        session["service_id"] = None
+        session["user_id"] = None
+    request(
+        _expected_status=302,
+        _expected_redirect="/sign-in?next={}".format(url_for("main.{}".format(view))),
+    )
 
 
 def test_guidance_pages_link_to_service_pages_when_signed_in(client_request, mocker):
-
     mocker.patch("app.notify_client.user_api_client.UserApiClient.deactivate_user")
+
     request = partial(client_request.get, "main.edit_and_format_messages")
     selector = ".list-number li a"
 
@@ -177,18 +150,13 @@ def test_guidance_pages_link_to_service_pages_when_signed_in(client_request, moc
     with client_request.session_transaction() as session:
         session["service_id"] = None
         session["user_id"] = None
-    page = request(_expected_status=302)
-    assert not page.select_one(selector)
+    request(_expected_status=302)
 
 
 @pytest.mark.parametrize(
     ("view", "expected_view"),
     [
-        ("information_risk_management", "security"),
         ("old_integration_testing", "integration_testing"),
-        ("old_roadmap", "roadmap"),
-        ("information_security", "using_notify"),
-        ("old_using_notify", "using_notify"),
         ("delivery_and_failure", "message_status"),
         ("callbacks", "documentation"),
     ],
@@ -206,10 +174,6 @@ def test_old_static_pages_redirect(client_request, view, expected_view, mocker):
     )
 
 
-def test_old_using_notify_page(client_request):
-    client_request.get("main.using_notify", _expected_status=410)
-
-
 def test_css_is_served_from_correct_path(client_request):
     page = client_request.get("main.documentation")  # easy static page
 

tests/app/main/views/test_register.py

@@ -144,11 +144,9 @@ def test_should_return_200_when_email_is_not_gov_uk(
         _expected_status=200,
     )
 
-    assert (
-        "Enter a public sector email address or find out who can use Notify"
-        in normalize_spaces(page.select_one(".usa-error-message").text)
+    assert "Enter a public sector email address." in normalize_spaces(
+        page.select_one(".usa-error-message").text
     )
-    assert page.select_one(".usa-error-message a")["href"] == url_for("main.features")
 
 
 @pytest.mark.parametrize(

tests/app/main/views/test_user_profile.py

@@ -84,7 +84,7 @@ def test_should_redirect_after_email_change(
     [
         (
             "me@example.com",
-            "Enter a public sector email address or find out who can use Notify",
+            "Enter a public sector email address.",
         ),
         (
             "not_valid",

tests/app/notify_client/test_billing_client.py

@@ -10,7 +10,15 @@ def test_get_free_sms_fragment_limit_for_year_correct_endpoint(mocker, api_user_
     expected_url = "/service/{}/billing/free-sms-fragment-limit".format(service_id)
     client = BillingAPIClient()
 
-    mock_get = mocker.patch("app.notify_client.billing_api_client.BillingAPIClient.get")
+    mock_get = mocker.patch(
+        "app.notify_client.billing_api_client.BillingAPIClient.get",
+        return_value={"free_sms_fragment_limit": 0},
+    )
+    mocker.patch(
+        "app.notify_client.billing_api_client.redis_client.get", return_value=None
+    )
+
+    mocker.patch("app.notify_client.billing_api_client.redis_client.set")
 
     client.get_free_sms_fragment_limit_for_year(service_id, year=1999)
     mock_get.assert_called_once_with(
@@ -28,6 +36,11 @@ def test_post_free_sms_fragment_limit_for_current_year_endpoint(
     )
     client = BillingAPIClient()
 
+    mocker.patch(
+        "app.notify_client.billing_api_client.redis_client.get", return_value=None
+    )
+
+    mocker.patch("app.notify_client.billing_api_client.redis_client.set")
     client.create_or_update_free_sms_fragment_limit(
         service_id=service_id, free_sms_fragment_limit=1111
     )

tests/app/test_navigation.py

@@ -19,6 +19,7 @@ EXCLUDED_ENDPOINTS = tuple(
         {
             "about_notify",
             "about_security",
+            "acceptable_use_policy",
             "accept_invite",
             "accept_org_invite",
             "accessibility_statement",
@@ -94,8 +95,6 @@ EXCLUDED_ENDPOINTS = tuple(
             "email_not_received",
             "error",
             "establish_trust",
-            "features",
-            "features_sms",
             "find_services_by_name",
             "find_users_by_email",
             "forgot_password",
@@ -140,7 +139,6 @@ EXCLUDED_ENDPOINTS = tuple(
             "notifications_sent_by_service",
             "old_guest_list",
             "old_integration_testing",
-            "old_roadmap",
             "old_service_dashboard",
             "old_using_notify",
             "organization_billing",
@@ -169,9 +167,7 @@ EXCLUDED_ENDPOINTS = tuple(
             "resume_service",
             "revalidate_email_sent",
             "revoke_api_key",
-            "roadmap",
             "rules_and_regulations",
-            "security",
             "security_policy",
             "send_files_by_email",
             "send_files_by_email_contact_details",
@@ -217,6 +213,7 @@ EXCLUDED_ENDPOINTS = tuple(
             "sign_in",
             "sign_out",
             "start_job",
+            "studio",
             "support",
             "suspend_service",
             "template_history",
@@ -246,7 +243,6 @@ EXCLUDED_ENDPOINTS = tuple(
             "user_profile_name",
             "user_profile_password",
             "user_profile_preferred_timezone",
-            "using_notify",
             "verify",
             "verify_email",
             "view_job",

tests/end_to_end/conftest.py

@@ -1,11 +1,53 @@
+import datetime
 import os
+from contextlib import contextmanager
+from unittest.mock import patch
 
 import pytest
 from axe_core_python.sync_playwright import Axe
+from flask import Flask, current_app, url_for
+from flask import session as flask_session
+from flask_login import login_user
+from flask.testing import FlaskClient
+
+from app import create_app
+from app.models.service import Service
+from app.models.user import User
+from app.notify_client.service_api_client import service_api_client
+from app.notify_client.user_api_client import user_api_client
+from notifications_python_client.errors import HTTPError
+from .. import TestClient
+
 
 E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
 
 
+class TestClient(FlaskClient):
+    def login(self, user, mocker=None, service=None):
+        # Skipping authentication here and just log them in
+        model_user = User(user)
+        with self.session_transaction() as session:
+            session["current_session_id"] = model_user.current_session_id
+            session["user_id"] = model_user.id
+        if mocker:
+            mocker.patch("app.user_api_client.get_user", return_value=user)
+        if mocker and service:
+            with self.session_transaction() as session:
+                session["service_id"] = service["id"]
+            mocker.patch(
+                "app.service_api_client.get_service", return_value={"data": service}
+            )
+
+        with patch("app.events_api_client.create_event"):
+            login_user(model_user, force=True)  # forces the user to be logged in.
+        with self.session_transaction() as test_session:
+            for key, value in flask_session.items():
+                test_session[key] = value
+
+    def logout(self, user):
+        self.get(url_for("main.sign_out"))
+
+
 @pytest.fixture
 def end_to_end_context(browser):
     context = browser.new_context()
@@ -36,3 +78,107 @@ def check_axe_report(page):
             "minor",
             "moderate",
         ], f"Accessibility violation: {violation}"
+
+
+@pytest.fixture
+def notify_admin_e2e():
+    os.environ["NOTIFY_ENVIRONMENT"] = "e2etest"
+
+    application = Flask("app")
+    create_app(application)
+
+    application.test_client_class = TestClient
+
+    with application.app_context():
+        yield application
+
+
+@pytest.fixture
+def default_user(notify_admin_e2e):
+    user_data = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
+    return user_data
+
+
+@pytest.fixture
+def client(notify_admin_e2e, default_user):
+    """
+    Do not use this fixture directly – use `client_request` instead
+    """
+    with notify_admin_e2e.test_request_context(), notify_admin_e2e.test_client() as client:
+        client.allow_subdomain_redirects = True
+        try:
+            client.login(default_user)
+            yield client
+        finally:
+            client.logout(default_user)
+
+
+# Need e2e service defined here?
+@pytest.fixture()
+def default_service(browser, client, default_user):
+    current_date_time = datetime.datetime.now()
+    now = current_date_time.strftime("%m/%d/%Y %H:%M:%S")
+    browser_type = browser.browser_type.name
+    service_name = f"E2E Federal Test Service {now} - {browser_type}"
+
+    service_id = service_api_client.create_service(
+        service_name=service_name,
+        organization_type="federal",
+        message_limit=current_app.config["DEFAULT_SERVICE_LIMIT"],
+        restricted=True,
+        user_id=default_user["id"],
+        email_from=default_user["email_address"],
+    )
+
+    print("*" * 80)
+    print(service_id)
+
+    service_data = service_api_client.get_service(service_id)
+
+    service = Service(service_data)
+
+    from pprint import pprint
+    pprint(dir(service))
+
+    try:
+        yield service
+    finally:
+        service_api_client.archive_service(service.id, None)
+
+
+@contextmanager
+def _set_up_user(
+    default_service,
+    name,
+    email_addr,
+    phone,
+    password,
+    auth_type,
+    permissions,
+    folder_permissions,
+):
+    user = user_api_client.get_user_by_email_or_none(email_addr)
+    if user is None:
+        user = user_api_client.register_user(
+            name, email_addr, phone, password, auth_type
+        )
+    user_api_client.add_user_to_service(
+        default_service.id, user.id, permissions, folder_permissions
+    )
+    user_api_client.activate_user(user.id)
+    yield user
+    user_api_client.deactivate_user(user.id)
+    service_api_client.remove_user_from_service(user.id, default_service.id)
+
+
+@pytest.fixture
+def admin_user(default_service):
+    with _set_up_user(
+        default_service,
+        "E2E Admin Test",
+        "admin@nowhere.huh",
+        "1234567890",
+        "password",
+        "sms",
+    ) as user:
+        yield user

tests/end_to_end/test_best_practices_content_pages.py

@@ -1,72 +0,0 @@
-import os
-import re
-
-from playwright.sync_api import expect
-
-from tests.end_to_end.conftest import check_axe_report
-
-E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
-
-
-def test_best_practices_side_menu(authenticated_page):
-    page = authenticated_page
-
-    page.goto(f"{E2E_TEST_URI}")
-
-    page.wait_for_load_state("domcontentloaded")
-    check_axe_report(page)
-
-    response = page.request.get(f"{E2E_TEST_URI}/test/feature-flags")
-    feature_flags = response.json()
-    feature_best_practices_enabled = feature_flags.get("FEATURE_BEST_PRACTICES_ENABLED")
-
-    if feature_best_practices_enabled:
-        page.get_by_role("link", name="Best Practices").click()
-        expect(page).to_have_title(re.compile("Best Practice"))
-
-        page.get_by_role("link", name="Clear goals", exact=True).click()
-        expect(page).to_have_title(re.compile("Establish clear goals"))
-
-        page.get_by_role("link", name="Rules and regulations").click()
-        expect(page).to_have_title(re.compile("Rules and regulations"))
-
-        page.get_by_role("link", name="Establish trust").click()
-        expect(page).to_have_title(re.compile("Establish trust"))
-
-        page.get_by_role("link", name="Write for action").click()
-        expect(page).to_have_title(re.compile("Write texts that provoke"))
-
-        page.get_by_role("link", name="Multiple languages").click()
-        expect(page).to_have_title(re.compile("Text in multiple languages"))
-
-        page.get_by_role("link", name="Benchmark performance").click()
-        expect(page).to_have_title(re.compile("Measuring performance with"))
-
-        parent_link = page.get_by_role("link", name="Establish trust")
-        parent_link.hover()
-
-        submenu_item = page.get_by_role("link", name=re.compile("Get the word out"))
-        submenu_item.click()
-
-        expect(page).to_have_url(re.compile(r"#get-the-word-out"))
-
-        anchor_target = page.locator("#get-the-word-out")
-        expect(anchor_target).to_be_visible()
-        anchor_target.click()
-
-
-def test_breadcrumbs_best_practices(authenticated_page):
-    page = authenticated_page
-
-    page.goto(f"{E2E_TEST_URI}")
-
-    page.wait_for_load_state("domcontentloaded")
-    check_axe_report(page)
-
-    response = page.request.get(f"{E2E_TEST_URI}/test/feature-flags")
-    feature_flags = response.json()
-    feature_best_practices_enabled = feature_flags.get("FEATURE_BEST_PRACTICES_ENABLED")
-
-    if feature_best_practices_enabled:
-        page.get_by_role("link", name="Clear goals", exact=True).click()
-        page.locator("ol").get_by_role("link", name="Best Practices").click()

tests/end_to_end/test_campaign_manager_story.py

@@ -0,0 +1,247 @@
+import datetime
+import os
+import re
+import uuid
+
+from playwright.sync_api import expect
+
+from tests.conftest import create_user
+from tests.end_to_end.conftest import check_axe_report
+
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+
+
+def create_new_template(page):
+
+    current_service_link = page.get_by_text("Current service")
+    expect(current_service_link).to_be_visible()
+    current_service_link.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    send_messages_button = page.get_by_role("link", name="Send messages")
+    expect(send_messages_button).to_be_visible()
+    send_messages_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    create_template_button = page.get_by_role("button", name="New template")
+    expect(create_template_button).to_be_visible()
+    create_template_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    start_with_a_blank_template_radio = page.get_by_text("Start with a blank template")
+    expect(start_with_a_blank_template_radio).to_be_visible()
+    start_with_a_blank_template_radio.click()
+
+    continue_button = page.get_by_role("button", name="Continue")
+
+    # continue_button = page.get_by_text("Continue")
+    expect(continue_button).to_be_visible()
+    continue_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    template_name_input = page.get_by_text("Template name")
+    expect(template_name_input).to_be_visible()
+    template_name = str(uuid.uuid4())
+    template_name_input.fill(template_name)
+    message_input = page.get_by_role("textbox", name="Message")
+    expect(message_input).to_be_visible()
+    message = "Test message for e2e test"
+    message_input.fill(message)
+
+    save_button = page.get_by_text("Save")
+    expect(save_button).to_be_visible()
+    save_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    assert template_name in page.content()
+    assert message in page.content()
+
+
+def update_template(page):
+    # Check update template button is visible
+    update_template_button = page.get_by_text("Edit this template")
+    expect(update_template_button).to_be_visible()
+    update_template_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    assert "Edit text message template" in page.content()
+
+    # Update template name and message
+    template_name_input = page.get_by_text("Template name")
+    expect(template_name_input).to_be_visible()
+    template_name = str(uuid.uuid4())
+    template_name_input.fill(template_name)
+    message_input = page.get_by_role("textbox", name="Message")
+    expect(message_input).to_be_visible()
+    message = "Test message is updated for e2e test"
+    message_input.fill(message)
+
+    # Save new template info
+    save_button = page.get_by_text("Save")
+    expect(save_button).to_be_visible()
+    save_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    # Check new template name, message and last edited text are on page.
+    assert template_name in page.content()
+    assert message in page.content()
+    # assert "Last edited just now" in page.content()
+
+
+def delete_template(page):
+    # Check delete template link is visible
+    delete_template_link = page.get_by_text("Delete this template")
+    expect(delete_template_link).to_be_visible()
+    delete_template_link.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    # Check confirmation text is visible
+    assert "Are you sure you want to delete" in page.content()
+
+    # Check that the delete button is visible
+    delete_button = page.get_by_text("Yes, delete")
+    expect(delete_button).to_be_visible()
+    delete_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    assert "Select or create a template" in page.content()
+
+
+def test_campaign_manager_core_user_story(default_service, end_to_end_context):
+    create_user()
+    page = end_to_end_context.new_page()
+    # page.goto(f"{E2E_TEST_URI}/sign-in")
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    current_date_time = datetime.datetime.now()
+    # new_service_name = "E2E Federal Test Service {now} - {browser_type}".format(
+    #    now=current_date_time.strftime("%m/%d/%Y %H:%M:%S"),
+    #    browser_type=page.context.browser.browser_type.name,
+    # )
+    # page.goto(f"{E2E_TEST_URI}/accounts")
+
+    # Check to make sure that we've arrived at the next page.
+    # page.wait_for_load_state("domcontentloaded")
+    # check_axe_report(page)
+
+    # Check to make sure that we've arrived at the next page.
+    # Check the page title exists and matches what we expect.
+    # expect(page).to_have_title(re.compile("Choose service"))
+
+    # Check for the sign in heading.
+    # sign_in_heading = page.get_by_role("heading", name="Choose service")
+    # expect(sign_in_heading).to_be_visible()
+
+    # Retrieve some prominent elements on the page for testing.
+    # add_service_button = page.get_by_role(
+    #     "button", name=re.compile("Add a new service")
+    # )
+
+    # expect(add_service_button).to_be_visible()
+
+    # existing_service_link = page.get_by_role("link", name=new_service_name)
+
+    # Check to see if the service was already created - if so, we should fail.
+    # TODO:  Figure out how to make this truly isolated, and/or work in a
+    #        delete service workflow.
+    # expect(existing_service_link).to_have_count(0)
+
+    # Click on add a new service.
+    a  # dd_service_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    # page.wait_for_load_state("domcontentloaded")
+    # check_axe_report(page)
+
+    # Check for the sign in heading.
+    # about_heading = page.get_by_role("heading", name="About your service")
+    # expect(about_heading).to_be_visible()
+
+    # Retrieve some prominent elements on the page for testing.
+    # service_name_input = page.locator('xpath=//input[@name="name"]')
+    # add_service_button = page.get_by_role("button", name=re.compile("Add service"))
+
+    # expect(service_name_input).to_be_visible()
+    # expect(add_service_button).to_be_visible()
+
+    # Fill in the form.
+    # service_name_input.fill(new_service_name)
+
+    # Click on add service.
+    # add_service_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    # page.wait_for_load_state("domcontentloaded")
+    # check_axe_report(page)
+
+    # TODO this fails on staging due to duplicate results on 'get_by_text'
+    # Check for the service name title and heading.
+    # service_heading = page.get_by_text(new_service_name, exact=True)
+    # expect(service_heading).to_be_visible()
+
+    print("*" * 80)
+    print(default_service.name)
+    print("*" * 80)
+
+    expect(page).to_have_title(re.compile(default_service.name))
+
+    create_new_template(page)
+
+    update_template(page)
+
+    delete_template(page)
+
+    _teardown(page)
+
+
+def _teardown(page):
+    page.click("text='Settings'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    page.click("text='Delete this service'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    page.click("text='Yes, delete'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    # Check to make sure that we've arrived at the next page.
+    # Check the page title exists and matches what we expect.
+    expect(page).to_have_title(re.compile("Choose service"))

urls.js

@@ -8,30 +8,48 @@ const sublinks = [
   { label: 'Trial Mode', path: '/using-notify/trial-mode' },
   { label: 'Pricing', path: '/using-notify/pricing' },
   { label: 'Delivery Status', path: '/using-notify/delivery-status' },
-  { label: 'Guidance', path: '/guides/using-notify/guidance' },
-  { label: 'Features', path: '/features' },
-  { label: 'Roadmap', path: '/features/roadmap' },
-  { label: 'Security', path: '/features/security' },
+  { label: 'Guidance', path: '/using-notify/guidance' },
   { label: 'Support', path: '/support' },
-  { label: 'Best Practices', path: '/guides/best-practices' },
-  { label: 'Clear Goals', path: '/guides/clear-goals' },
+  { label: 'Best Practices', path: '/using-notify/best-practices' },
+  { label: 'Clear Goals', path: '/using-notify/best-practices/clear-goals' },
   {
     label: 'Rules And Regulations',
-    path: '/guides/rules-and-regulations',
+    path: '/using-notify/best-practices//rules-and-regulations',
   },
-  { label: 'Establish Trust', path: '/guides/establish-trust' },
+  { label: 'Establish Trust', path: '/using-notify/best-practices//establish-trust' },
   {
     label: 'Write For Action',
-    path: '/guides/write-for-action',
+    path: '/using-notify/best-practices//write-for-action',
   },
   {
     label: 'Multiple Languages',
-    path: '/guides/multiple-languages',
+    path: '/using-notify/best-practices//multiple-languages',
   },
   {
     label: 'Benchmark Performance',
-    path: '/guides/benchmark-performance',
+    path: '/using-notify/best-practices//benchmark-performance',
   },
+  {
+    label: 'About',
+    path: '/about',
+  },
+  {
+    label: 'Why Text Messaging',
+    path: '/about/why-text-messaging',
+  },
+  {
+    label: 'Security',
+    path: '/about/security',
+  },
+  {
+    label: 'Join Notify',
+    path: '/join-notify',
+  },
+  {
+    label: 'Contact',
+    path: '/contact',
+  },
+
   // Add more links here as needed
 ];