Merge branch 'main' of https://github.com/GSA/notifications-admin into 2227-acceptable-use-policy

.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

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/main/views/index.py

@@ -282,6 +282,8 @@ def guidance_index():
 def contact():
     return render_template(
         "views/contact.html",
+        navigation_links=about_notify_nav(),
+
     )
 
 
@@ -313,6 +315,8 @@ def why_text_messaging():
 def join_notify():
     return render_template(
         "views/join-notify.html",
+        navigation_links=about_notify_nav(),
+
     )
 
 

app/main/views/sub_navigation_dictionaries.py

@@ -119,7 +119,7 @@ def about_notify_nav():
             "link": "main.join_notify",
         },
         {
-            "name": "Contact",
+            "name": "Contact us",
             "link": "main.contact",
         },
     ]

app/templates/components/header.html

@@ -41,7 +41,7 @@
 {% set navigation = navigation + [
   {"href": url_for('main.about_notify'), "text": "About Notify", "active": request.path == '/about'},
   {"href": url_for('main.join_notify'), "text": "Join Notify", "active": request.path == '/join-notify'},
-  {"href": url_for('main.contact'), "text": "Contact", "active": request.path == '/contact'}
+  {"href": url_for('main.contact'), "text": "Contact us", "active": request.path == '/contact'}
 ] %}
 {% endif %}
 {% endif %}

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>

app/templates/views/join-notify.html

@@ -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/signedout.html

@@ -141,7 +141,7 @@ import usaButton %} {% block meta %}
             <div class="usa-card__body">
               <p>
                 Limited data retention, encryption, and multi-factor
-                authentication protect user data and manage risk
+                authentication protect user data and manage risk with <br><a href="/about/security">our security efforts</a>
               </p>
             </div>
           </div>