darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added link to new guidance page that enables navigating

Browse Source
This commit is contained in:
alexjanousekGSA
2024-11-04 11:44:45 -05:00
parent 60e9ac18f5
commit 12c28682df
6 changed files with 99 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/__init__.py
View File

@@ -162,6 +162,13 @@ def _csp(config):
def create_app(application): def create_app(application):
@application.context_processor
def inject_feature_flags():
feature_best_practices_enabled = os.getenv("FEATURE_BEST_PRACTICES_ENABLED", "false").lower() == "true"
return dict(FEATURE_BEST_PRACTICES_ENABLED=feature_best_practices_enabled)
notify_environment = os.environ["NOTIFY_ENVIRONMENT"] notify_environment = os.environ["NOTIFY_ENVIRONMENT"]
application.config.from_object(configs[notify_environment]) application.config.from_object(configs[notify_environment])

20
app/main/views/index.py
View File

@@ -21,10 +21,8 @@ from notifications_utils.url_safe_token import generate_token
# Hook to check for guidance routes # Hook to check for guidance routes
@main.before_request @main.before_request
def check_guidance_feature(): def check_guidance_feature():
current_app.logger.warning("best practices 1234")
current_app.logger.warning(current_app.config["FEATURE_BEST_PRACTICES_ENABLED"])
if ( if (
request.path.startswith("/best-practices") request.path.startswith("/guides/best-practices")
and not current_app.config["FEATURE_BEST_PRACTICES_ENABLED"] and not current_app.config["FEATURE_BEST_PRACTICES_ENABLED"]
): ):
abort(404) abort(404)
@@ -205,7 +203,7 @@ def trial_mode_new():
) )
@main.route("/best-practices") @main.route("/guides/best-practices")
@user_is_logged_in @user_is_logged_in
def best_practices(): def best_practices():
return render_template( return render_template(
@@ -214,7 +212,7 @@ def best_practices():
) )
@main.route("/best-practices/clear-goals") @main.route("/guides/best-practices/clear-goals")
@user_is_logged_in @user_is_logged_in
def clear_goals(): def clear_goals():
return render_template( return render_template(
@@ -223,7 +221,7 @@ def clear_goals():
) )
@main.route("/best-practices/rules-and-regulations") @main.route("/guides/best-practices/rules-and-regulations")
@user_is_logged_in @user_is_logged_in
def rules_and_regulations(): def rules_and_regulations():
return render_template( return render_template(
@@ -232,7 +230,7 @@ def rules_and_regulations():
) )
@main.route("/best-practices/establish-trust") @main.route("/guides/best-practices/establish-trust")
@user_is_logged_in @user_is_logged_in
def establish_trust(): def establish_trust():
return render_template( return render_template(
@@ -241,7 +239,7 @@ def establish_trust():
) )
@main.route("/best-practices/write-for-action") @main.route("/guides/best-practices/write-for-action")
@user_is_logged_in @user_is_logged_in
def write_for_action(): def write_for_action():
return render_template( return render_template(
@@ -250,7 +248,7 @@ def write_for_action():
) )
@main.route("/best-practices/multiple-languages") @main.route("/guides/best-practices/multiple-languages")
@user_is_logged_in @user_is_logged_in
def multiple_languages(): def multiple_languages():
return render_template( return render_template(
@@ -259,7 +257,7 @@ def multiple_languages():
) )
@main.route("/best-practices/benchmark-performance") @main.route("/guides/best-practices/benchmark-performance")
@user_is_logged_in @user_is_logged_in
def benchmark_performance(): def benchmark_performance():
return render_template( return render_template(
@@ -268,7 +266,7 @@ def benchmark_performance():
) )
@main.route("/using-notify/guidance") @main.route("/guides/using-notify/guidance")
@user_is_logged_in @user_is_logged_in
def guidance_index(): def guidance_index():
return render_template( return render_template(

4
app/main/views/sub_navigation_dictionaries.py
View File

@@ -26,6 +26,10 @@ def using_notify_nav():
{ {
"name": "Get started", "name": "Get started",
"link": "main.get_started", "link": "main.get_started",
},
{
"name": "Best Practices",
"link": "main.best_practices",
}, },
{ {
"name": "Trial mode", "name": "Trial mode",

3
app/navigation.py
View File

@@ -46,6 +46,9 @@ class HeaderNavigation(Navigation):
"roadmap", "roadmap",
"security", "security",
}, },
"best_practices": {
"best_practices",
},
"using_notify": { "using_notify": {
"get_started", "get_started",
"using_notify", "using_notify",

103
app/templates/components/header.html
View File

@@ -1,32 +1,43 @@
{% if current_user.is_authenticated %} {% if current_user.is_authenticated %}
{% set navigation = [ {% 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.show_accounts_or_dashboard"), "text": "Current service", "active":
{"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')}, header_navigation.is_selected('accounts-or-dashboard')},
{"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')}, {"href": url_for('main.get_started'), "text": "Using Notify", "active": header_navigation.is_selected('using_notify')}
{"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')} ] %}
] %}
{% if current_user.platform_admin %} {% if FEATURE_BEST_PRACTICES_ENABLED %}
{% 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.best_practices'), "text": "Best Practices", "active":
{% else %} header_navigation.is_selected('best_practices')}] %}
{% set navigation = navigation + [{"href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile')}] %} {% endif %}
{% endif %}
{% if current_service %} {% set navigation = navigation + [
{% if current_user.has_permissions('manage_service') %} {"href": url_for('main.features'), "text": "Features", "active": header_navigation.is_selected('features')},
{% set secondaryNavigation = [ {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
{"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"}
] %}
{% endif %} {% if current_user.platform_admin %}
{% else %} {% set navigation = navigation + [{"href": url_for('main.platform_admin_splash_page'), "text": "Platform admin",
{% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %} "active": header_navigation.is_selected('platform-admin')}] %}
{% endif %} {% else %}
{% 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"}
] %}
{% else %}
{% set secondaryNavigation = [
{"href": url_for('main.sign_out'), "text": "Sign out"}
] %}
{% endif %}
{% else %}
{% set secondaryNavigation = [{"href": url_for('main.sign_out'), "text": "Sign out"}] %}
{% endif %}
{% endif %} {% endif %}
<header class="usa-header usa-header--extended"> <header class="usa-header usa-header--extended">
@@ -36,12 +47,12 @@
<div class="logo-img display-flex"> <div class="logo-img display-flex">
<a href="/"> <a href="/">
<span class="usa-sr-only">Notify.gov logo</span> <span class="usa-sr-only">Notify.gov logo</span>
<img src="{{ (asset_path | default('/static')) + 'images/notify-logo.svg' }}" alt="Notify.gov logo" class="usa-flag-logo margin-right-1"> <img src="{{ (asset_path | default('/static')) + 'images/notify-logo.svg' }}" alt="Notify.gov logo"
class="usa-flag-logo margin-right-1">
</a> </a>
</div> </div>
{% if navigation %} {% if navigation %}
<button type="button" class="usa-menu-btn">Menu</button> <button type="button" class="usa-menu-btn">Menu</button>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -52,29 +63,29 @@
</button> </button>
<ul class="usa-nav__primary usa-accordion margin-right-1"> <ul class="usa-nav__primary usa-accordion margin-right-1">
{% for item in navigation %} {% for item in navigation %}
{% if item.href and item.text %} {% if item.href and item.text %}
<li class="usa-nav__primary-item{{ ' is-current' if item.active }}"> <li class="usa-nav__primary-item{{ ' is-current' if item.active }}">
<a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value in <a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value
item.attributes %} {{attribute}}="{{value}}" {% endfor %}> in item.attributes %} {{attribute}}="{{value}}" {% endfor %}>
<span>{{ item.text }}</span> <span>{{ item.text }}</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
<div class="usa-nav__secondary margin-bottom-6"> <div class="usa-nav__secondary margin-bottom-6">
<ul class="usa-nav__secondary-links"> <ul class="usa-nav__secondary-links">
{% if secondaryNavigation %} {% if secondaryNavigation %}
{% for item in secondaryNavigation %} {% for item in secondaryNavigation %}
{% if item.href and item.text %} {% if item.href and item.text %}
<li class="usa-nav__secondary-item{{ ' is-current' if item.active }}"> <li class="usa-nav__secondary-item{{ ' is-current' if item.active }}">
<a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute, value in <a class="usa-nav__link {{ ' usa-current' if item.active }}" href="{{ item.href }}" {% for attribute,
item.attributes %} {{attribute}}="{{value}}" {% endfor %}> value in item.attributes %} {{attribute}}="{{value}}" {% endfor %}>
<span>{{ item.text }}</span> <span>{{ item.text }}</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

26
urls.js
View File

@@ -13,13 +13,25 @@ const sublinks = [
{ label: 'Roadmap', path: '/features/roadmap' }, { label: 'Roadmap', path: '/features/roadmap' },
{ label: 'Security', path: '/features/security' }, { label: 'Security', path: '/features/security' },
{ label: 'Support', path: '/support' }, { label: 'Support', path: '/support' },
{ label: 'Best Practices', path: '/best-practices' }, { label: 'Best Practices', path: '/guides/best-practices' },
{ label: 'Clear Goals', path: '/best-practices/clear-goals' }, { label: 'Clear Goals', path: '/guides/best-practices/clear-goals' },
{ label: 'Rules And Regulations', path: '/best-practices/rules-and-regulations' }, {
{ label: 'Establish Trust', path: '/best-practices/establish-trust' }, label: 'Rules And Regulations',
{ label: 'Write For Action', path: '/best-practices/write-for-action' }, path: '/guides/best-practices/rules-and-regulations',
{ label: 'Multiple Languages', path: '/best-practices/multiple-languages' }, },
{ label: 'Benchmark Performance', path: '/best-practices/benchmark-performance' }, { label: 'Establish Trust', path: '/guides/best-practices/establish-trust' },
{
label: 'Write For Action',
path: '/guides/best-practices/write-for-action',
},
{
label: 'Multiple Languages',
path: '/guides/best-practices/multiple-languages',
},
{
label: 'Benchmark Performance',
path: '/guides/best-practices/benchmark-performance',
},
// Add more links here as needed // Add more links here as needed
]; ];