merge main

app/main/views/index.py

@@ -292,7 +292,6 @@ def benchmark_performance():
     )
 
 
-@main.route("/using-notify/guidance")
 @main.route("/guides/using-notify/guidance")
 @user_is_logged_in
 def guidance_index():

app/main/views/sub_navigation_dictionaries.py

@@ -1,3 +1,6 @@
+from flask import current_app
+
+
 def features_nav():
     return [
         {
@@ -22,46 +25,20 @@ def features_nav():
 
 
 def using_notify_nav():
-    return [
+    nav_items = [
-        {
+        {"name": "Get started", "link": "main.get_started"},
-            "name": "Get started",
+        {"name": "Guides", "link": "main.best_practices"},
-            "link": "main.get_started",
+        {"name": "Trial mode", "link": "main.trial_mode_new"},
-        },
+        {"name": "Tracking usage", "link": "main.pricing"},
-        {
+        {"name": "Delivery Status", "link": "main.message_status"},
-            "name": "Guides",
+        {"name": "Guidance", "link": "main.guidance_index"},
-            "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",
-            # "sub_navigation_items": [
-            #     {
-            #         "name": "Formatting",
-            #         "link": "main.edit_and_format_messages",
-            #     },
-            #     {
-            #        "name": "Send files by email",
-            #        "link": "main.send_files_by_email",
-            #     },
-            # ]
-            # {
-            #   "name": "API documentation",
-            #   "link": "main.documentation",
-            # },
-        },
     ]
+    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():

deploy-config/production.yml

@@ -1,6 +1,6 @@
 env: production
 instances: 2
-memory: 1.5G
+memory: 2G
 command: newrelic-admin run-program gunicorn -c /home/vcap/app/gunicorn_config.py application
 public_admin_route: beta.notify.gov
 cloud_dot_gov_route: notify.app.cloud.gov

urls.js

@@ -8,7 +8,7 @@ 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: '/using-notify/guidance' },
+  { label: 'Guidance', path: '/guides/using-notify/guidance' },
   { label: 'Features', path: '/features' },
   { label: 'Roadmap', path: '/features/roadmap' },
   { label: 'Security', path: '/features/security' },