Skip to content

Fix mobile nav rendering #4209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mitchellhenke merged 5 commits into from
Sep 17, 2020
Merged

Fix mobile nav rendering #4209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60801f9
make sure nav is rendered in a valid place
Sep 16, 2020
c82e3b3
render mobile nav as child of body
Sep 16, 2020
398e2ac
Update app/views/layouts/base.html.erb
Sep 17, 2020
f361f98
add usa-overlay div
Sep 17, 2020
5006dce
add title to new account pages
Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/views/accounts/connected_accounts/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<% title t('account.navigation.connected_accounts') %>

<h1 class="mt0">
<%= t('headings.account.connected_accounts') %>
Comment on lines +1 to 4
Copy link
Contributor

@aduth aduth Sep 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking out loud a bit: It's sensible that the page's title and the page's h1 are the same, which raises a question whether it's worth having duplicate strings for these. And if we do have duplicate strings (one for the navigation and one for the page title), whether the value we use in title should be the same as the page's h1, or the same as what's shown in the navigation.

Copy link
Contributor Author

@mitchellhenke mitchellhenke Sep 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, 100% agree

</h1>
Expand Down
2 changes: 2 additions & 0 deletions app/views/accounts/history/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<% title t('account.navigation.history') %>

<h1 class="mt0">
<%= t('account.navigation.history') %>
</h1>
Expand Down
2 changes: 2 additions & 0 deletions app/views/accounts/two_factor_authentication/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<% title t('account.navigation.two_factor_authentication') %>

<h1 class="mt0">
<%= t('headings.account.two_factor') %>
</h1>
Expand Down
5 changes: 4 additions & 1 deletion app/views/layouts/account_side_nav.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<%= render 'accounts/nav_auth', enable_mobile_nav: true, greeting: @view_model.header_personalization %>
<% end %>

<% content_for(:mobile_nav) do %>
<%= render 'accounts/mobile_nav' %>
<% end %>

<% content_for :content do %>
<div class="top-banner grid-row grid-gap mb3">
<div class="grid-offset-3 grid-col-3">
Expand Down Expand Up @@ -29,5 +33,4 @@
</div>
<% end %>

<%= render 'accounts/mobile_nav' %>
<%= render template: 'layouts/base', locals: { disable_card: true } %>
2 changes: 2 additions & 0 deletions app/views/layouts/base.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
</head>

<body class="<%= Rails.env %>-env site <%= yield(:background_cls) %>">
<div class="usa-overlay"></div>
<%= yield(:mobile_nav) if content_for?(:mobile_nav) %>
<div class="site-wrap bg-light-blue">
<%= render 'shared/banner' %>
<div aria-label="main-navigation" role="navigation">
Expand Down
5 changes: 4 additions & 1 deletion spec/views/accounts/_nav_auth.html.erb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
require 'rails_helper'

describe 'accounts/_nav_auth.html.erb' do
include Devise::Test::ControllerHelpers

before do
@user = build_stubbed(:user, :signed_up)
@user = build_stubbed(:user, :with_backup_code)
allow(view).to receive(:greeting).and_return(@user.email)
allow(view).to receive(:current_user).and_return(@user)
end

context 'user is signed in' do
Expand Down