Updated navigation links and backstopjs

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
@@ -106,44 +104,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():
@@ -198,70 +158,70 @@ 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(

app/main/views/sub_navigation_dictionaries.py

@@ -1,46 +1,11 @@
-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": "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"},
-    ]
-
-    return nav_items
-
-
-def best_practices_nav():
-    return [
         {
             "name": "Best Practices",
             "link": "main.best_practices",
-        },
-        {
+            "sub_navigation_items": [
+                {
             "name": "Clear goals",
             "link": "main.clear_goals",
         },
@@ -51,16 +16,6 @@ def best_practices_nav():
         {
             "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",
@@ -73,9 +28,17 @@ def best_practices_nav():
         {
             "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"},
     ]
 
+    return nav_items
+
 
 def about_notify_nav():
     return [

app/templates/components/header.html

@@ -6,9 +6,7 @@
 {% 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')},
-  {"href": url_for('main.best_practices'), "text": "Guides", "active": header_navigation.is_selected('best_practices')},
-  {"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
+  {"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')}
 ] %}
 

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

@@ -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"
   }
   ] %}
 

urls.js

@@ -8,29 +8,26 @@ 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',