Create One Login bridging page #968

jack-coggin · 2023-11-16T11:27:19Z

ER-875

Create new bridging page for Gov One Login
Update homepage to remove legacy login links and add link to bridging page
Update navigation links for gov one auth

…es to account page

viezly · 2023-11-16T11:27:45Z

Changes preview:

Legend:

👀 Review pull request on Viezly

github-actions · 2023-11-16T11:34:26Z

https://eyrecovery-review-pr-968.azurewebsites.net

peterdavidhamilton · 2023-11-16T12:11:34Z

app/helpers/application_helper.rb

-        header.with_action_link(text: 'Sign in', href: new_user_session_path, options: { inverse: true })
-        header.with_navigation_item(text: 'Sign in', href: new_user_session_path, classes: %w[dfe-header__navigation-item dfe-header-f-mob])
+        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])


Is there not a path helper?

Like this? 7b776be

peterdavidhamilton · 2023-11-16T12:13:15Z

app/views/home/index.html.slim

+  .govuk-button-group
+    = govuk_button_link_to 'gov-one/info', 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'


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.

peterdavidhamilton · 2023-11-16T15:29:28Z

config/routes.rb

@@ -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


Out of curiosity what name was it given before?

Good point! Not necessary

q

peterdavidhamilton · 2023-11-16T16:24:34Z

app/views/home/_cta.html.slim

+  .govuk-button-group
+    = 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'


Sorry just meant the SVG, see the module overview

instantrick · 2023-11-20T10:18:47Z

app/views/gov_one/info.html.slim

Change the containing class to three-quarters

peterdavidhamilton · 2023-11-29T11:08:22Z

config/locales/en.yml

@@ -575,9 +578,12 @@ en:
  # /gov-one/info
  gov_one_info:
    title: Gov One Info
-    body: This is some information about Gov One Login.
+    hero_header: How to access this training course


Because I18n has :scope I like to nest keys where possible. Here that would create 2 keys under gov_one_info.hero

peterdavidhamilton · 2023-11-29T11:10:23Z

app/controllers/gov_one_controller.rb

-  def info; end
+  layout 'hero'
+
+  def info


Do you think it is possible to stick to RESTful CRUD actions in this controller at this point in time?

peterdavidhamilton · 2023-11-29T11:12:52Z

config/locales/en.yml

@@ -508,6 +508,8 @@ en:
  home:
    title: Home page
    hero: |
+      # %{service_name}


Haven't checked but I think this needs to be removed.

peterdavidhamilton · 2023-11-29T11:15:41Z

spec/system/gov_one_info_spec.rb

+    end
+
+    it 'has the correct login link' do
+      link = find_link('Continue to GOV.UK One Login')


If this complex link is asserted elsewhere I'd favour a simpler, more readable, spec.

peterdavidhamilton · 2023-11-29T11:17:43Z

app/helpers/gov_one_helper.rb

@@ -31,11 +31,6 @@ def login_button
    govuk_button_link_to t('gov_one_info.sign_in_button'), login_uri.to_s
  end

-  # @return [String]
-  def logout_button
-    govuk_button_link_to t('gov_one_info.sign_out_button'), logout_uri.to_s


Are we also removing the locale/resource? Again, if there are multiple button keys, we can nest them (flips how you read it).

peterdavidhamilton · 2023-12-01T08:48:36Z

app/views/home/index.html.slim

@@ -11,20 +11,17 @@
  .govuk-grid-column-one-half
    = m('home.about', headings_start_with: 'xl')

-  - unless current_user
-    .govuk-grid-column-one-half
-      .light-grey-box.enrol-box


Are .enrol-box and .white-space-pre-wrap being used elsewhere or can they also be deleted?

No, deleted now

peterdavidhamilton · 2023-12-01T08:49:38Z

spec/system/whats_new_page_spec.rb

@@ -20,18 +20,20 @@
    end

    describe 'with subsequent logins' do
-      before do
-        click_on 'sign-out-desktop'
+      skip 'wip' do


Why is skipping necessary?

Removed 948fa98

jack-coggin added 8 commits November 14, 2023 11:12

update account page for one login

5af4ec3

Merge branch 'main' into one-login-bridging-page

0c96676

create gov one bridging page

adaa702

wip

226345e

update bridging page

8410f8f

update homepage

b7a8ff5

Merge branch 'one-login' into one-login-bridging-page

385e30a

update application_helper links, gov_one_helper spec and revert chang…

2cf7064

…es to account page

jack-coggin had a problem deploying to test November 16, 2023 11:27 — with GitHub Actions Failure

jack-coggin changed the base branch from main to one-login November 16, 2023 11:28

jack-coggin added the review Review app deployed to Azure label Nov 16, 2023

jack-coggin temporarily deployed to development November 16, 2023 11:29 — with GitHub Actions Inactive

skip whats_new_page_spec and update locales

784f116

jack-coggin had a problem deploying to test November 16, 2023 11:58 — with GitHub Actions Failure

jack-coggin temporarily deployed to development November 16, 2023 11:58 — with GitHub Actions Inactive

peterdavidhamilton reviewed Nov 16, 2023

View reviewed changes

jack-coggin added 2 commits November 16, 2023 15:22

add route alias for bridging page

7b776be

extract homepage cta to partial

9765caf

peterdavidhamilton reviewed Nov 16, 2023

View reviewed changes

remove unnecessary route alias

6d74e30

peterdavidhamilton added this to the rc0.13.0 milestone Nov 16, 2023

resolve merge conflicts:

65a4a22

q

jack-coggin had a problem deploying to test November 16, 2023 16:15 — with GitHub Actions Failure

jack-coggin temporarily deployed to development November 16, 2023 16:15 — with GitHub Actions Inactive

peterdavidhamilton reviewed Nov 16, 2023

View reviewed changes

fix merge conflicts and update locales

f262a40

jack-coggin had a problem deploying to test November 17, 2023 11:16 — with GitHub Actions Failure

jack-coggin temporarily deployed to test November 20, 2023 10:07 — with GitHub Actions Inactive

jack-coggin requested a review from instantrick November 20, 2023 10:09

instantrick reviewed Nov 20, 2023

View reviewed changes

change div width

b556ac3

jack-coggin temporarily deployed to test November 20, 2023 10:40 — with GitHub Actions Inactive

jack-coggin temporarily deployed to development November 20, 2023 10:40 — with GitHub Actions Inactive

jack-coggin requested a review from instantrick November 20, 2023 10:40

instantrick approved these changes Nov 20, 2023

View reviewed changes

jack-coggin requested a review from ebrett November 22, 2023 13:18

peterdavidhamilton reviewed Nov 29, 2023

View reviewed changes

peterdavidhamilton reviewed Dec 1, 2023

View reviewed changes

jack-coggin added 3 commits December 4, 2023 11:22

update locales, rename controller method

0c6fa46

Merge branch 'one-login' into one-login-bridging-page

93923c3

use feature flag in application_helper links

948fa98

jack-coggin temporarily deployed to test December 4, 2023 11:57 — with GitHub Actions Inactive

jack-coggin temporarily deployed to development December 4, 2023 11:57 — with GitHub Actions Inactive

github-actions bot added the frontend Changes to assets detected label Dec 4, 2023

nest gov one info locales

932ba80

jack-coggin temporarily deployed to development December 4, 2023 13:16 — with GitHub Actions Inactive

jack-coggin temporarily deployed to test December 4, 2023 13:16 — with GitHub Actions Inactive

jack-coggin added 2 commits December 4, 2023 13:27

simplify gov_one_info spec

9c8bdda

remove link assertion from gov_one_info spec

a21cd78

jack-coggin temporarily deployed to development December 4, 2023 13:34 — with GitHub Actions Inactive

jack-coggin temporarily deployed to test December 4, 2023 13:34 — with GitHub Actions Inactive

jack-coggin requested a review from peterdavidhamilton December 4, 2023 13:39

jack-coggin merged commit 879fbed into one-login Dec 5, 2023
4 checks passed

jack-coggin temporarily deployed to development December 5, 2023 10:49 — with GitHub Actions Inactive

jack-coggin had a problem deploying to production December 5, 2023 10:49 — with GitHub Actions Failure

peterdavidhamilton deleted the one-login-bridging-page branch January 8, 2024 14:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create One Login bridging page #968

Create One Login bridging page #968

jack-coggin commented Nov 16, 2023 •

edited by jira bot

Loading

viezly bot commented Nov 16, 2023 •

edited

Loading

github-actions bot commented Nov 16, 2023

peterdavidhamilton Nov 16, 2023

jack-coggin Nov 16, 2023

peterdavidhamilton Nov 16, 2023

jack-coggin Nov 16, 2023

peterdavidhamilton Nov 16, 2023

jack-coggin Nov 17, 2023

peterdavidhamilton Nov 16, 2023

instantrick Nov 20, 2023

jack-coggin Nov 20, 2023

peterdavidhamilton Nov 29, 2023

peterdavidhamilton Nov 29, 2023

peterdavidhamilton Nov 29, 2023

peterdavidhamilton Nov 29, 2023

peterdavidhamilton Nov 29, 2023

peterdavidhamilton Dec 1, 2023

jack-coggin Dec 4, 2023

peterdavidhamilton Dec 1, 2023

jack-coggin Dec 4, 2023

Create One Login bridging page #968

Create One Login bridging page #968

Conversation

jack-coggin commented Nov 16, 2023 • edited by jira bot Loading

viezly bot commented Nov 16, 2023 • edited Loading

github-actions bot commented Nov 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jack-coggin commented Nov 16, 2023 •

edited by jira bot

Loading

viezly bot commented Nov 16, 2023 •

edited

Loading