Skip to content
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

Create One Login bridging page #968

Merged
merged 26 commits into from
Dec 5, 2023
Merged

Create One Login bridging page #968

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5af4ec3
update account page for one login
jack-coggin Nov 14, 2023
0c96676
Merge branch 'main' into one-login-bridging-page
jack-coggin Nov 14, 2023
adaa702
create gov one bridging page
jack-coggin Nov 14, 2023
226345e
wip
jack-coggin Nov 15, 2023
8410f8f
update bridging page
jack-coggin Nov 15, 2023
b7a8ff5
update homepage
jack-coggin Nov 16, 2023
385e30a
Merge branch 'one-login' into one-login-bridging-page
jack-coggin Nov 16, 2023
2cf7064
update application_helper links, gov_one_helper spec and revert chang…
jack-coggin Nov 16, 2023
784f116
skip whats_new_page_spec and update locales
jack-coggin Nov 16, 2023
7b776be
add route alias for bridging page
jack-coggin Nov 16, 2023
9765caf
extract homepage cta to partial
jack-coggin Nov 16, 2023
6d74e30
remove unnecessary route alias
jack-coggin Nov 16, 2023
65a4a22
resolve merge conflicts:
jack-coggin Nov 16, 2023
f262a40
fix merge conflicts and update locales
jack-coggin Nov 17, 2023
e17b30e
update locales
jack-coggin Nov 17, 2023
391c35b
convert sso auth uri to string in navbar
jack-coggin Nov 17, 2023
2b4f1a5
update system spec
jack-coggin Nov 17, 2023
208c212
update gov one info system spec
jack-coggin Nov 17, 2023
3b7ba6a
styling tweaks
jack-coggin Nov 20, 2023
b556ac3
change div width
jack-coggin Nov 20, 2023
0c6fa46
update locales, rename controller method
jack-coggin Dec 4, 2023
93923c3
Merge branch 'one-login' into one-login-bridging-page
jack-coggin Dec 4, 2023
948fa98
use feature flag in application_helper links
jack-coggin Dec 4, 2023
932ba80
nest gov one info locales
jack-coggin Dec 4, 2023
9c8bdda
simplify gov_one_info spec
jack-coggin Dec 4, 2023
a21cd78
remove link assertion from gov_one_info spec
jack-coggin Dec 4, 2023
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
4 changes: 2 additions & 2 deletions app/helpers/application_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def navigation
header.with_navigation_item(text: 'My account', href: user_path, classes: %w[dfe-header__navigation-item dfe-header-f-mob])
header.with_navigation_item(text: 'Sign out', href: logout_uri, options: { data: { turbo_method: :get } }, classes: %w[dfe-header__navigation-item dfe-header-f-mob], html_attributes: { id: 'sign-out-f-mob' })
else
header.with_action_link(text: 'Sign in', href: 'gov-one/info', options: { inverse: true })
header.with_navigation_item(text: 'Sign in', href: 'gov-one/info', classes: %w[dfe-header__navigation-item dfe-header-f-mob])
header.with_action_link(text: 'Sign in', href: gov_one_info_path, options: { inverse: true })
header.with_navigation_item(text: 'Sign in', href: gov_one_info_path, classes: %w[dfe-header__navigation-item dfe-header-f-mob])
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/views/home/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Copy link

Choose a reason for hiding this comment

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

I am not sure of the syntax here but your HTML contains an empty div that is adding spacing. For cleanliness it needs removing -
image

The button at the bottom should be in the grid as follows:
<div class="govuk-!-margin-top-9 govuk-grid-row"><div class="govuk-grid-column-full"><a data-module="govuk-button" draggable="false" role="button" class="govuk-button govuk-button--start" href="/gov-one/info">Start your training now<svg aria-hidden="true" class="govuk-button__start-icon" focusable="false" height="19" viewBox="0 0 33 40" width="17.5" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h13l20 20-20 20H0l20-20z" fill="currentColor"></path></svg></a></div></div>

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, thanks there was a div left over from the old design that I hadn't deleted

- unless current_user
.govuk-button-group
= govuk_button_link_to 'gov-one/info', class: "govuk-button--start" do
= govuk_button_link_to gov_one_info_path, class: "govuk-button--start" do
| #{t('home.gov-one-button')}
svg.govuk-button__start-icon xmlns='http://www.w3.org/2000/svg' width='17.5' height='19' viewBox='0 0 33 40' aria-hidden='true' focusable='false'
Copy link
Contributor

Choose a reason for hiding this comment

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

Think I'd left a comment in the code about moving this CTA button into a partial. If you can manage it as part of this please do.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

9765caf

path fill='currentColor' d='M0 0h13l20 20-20 20H0l20-20z'
2 changes: 1 addition & 1 deletion config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

get 'my-modules', to: 'learning#show' # @see User#course
get 'about-training', to: 'training/modules#index', as: :course_overview
get 'gov-one/info', to: 'gov_one#info'
get 'gov-one/info', to: 'gov_one#info', as: :gov_one_info
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of curiosity what name was it given before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point! Not necessary


get '/404', to: 'errors#not_found', via: :all
get '/422', to: 'errors#unprocessable_entity', via: :all
Expand Down