From c55ccc37af800266f0f712a6cd4fdeef58c2f119 Mon Sep 17 00:00:00 2001 From: jrbarnes9 Date: Mon, 1 Jun 2020 09:05:54 +0100 Subject: [PATCH] fixed routing issues in RH ce fulfillment flows --- _css/base/_sprite.scss | 10 ++++----- .../end-to-end/confirm-rh-address-ce.html | 21 +++++++------------ .../end-to-end/uac-request-enter-name.html | 3 ++- css/fixed.css | 2 +- css/main.css | 4 ++-- css/responsive.css | 2 +- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/_css/base/_sprite.scss b/_css/base/_sprite.scss index c0ce373284..d985190f14 100644 --- a/_css/base/_sprite.scss +++ b/_css/base/_sprite.scss @@ -114,7 +114,7 @@ .svg-icons--chevron-down { @extend %svg-common; - background-position: 98.93992932862191% 43.2%; + background-position: 98.93992932862191% 42.93448275862069%; } .svg-icons--chevron-down-dims { @@ -294,7 +294,7 @@ .svg-icons--lock { @extend %svg-common; - background-position: 96.07796040215489% 57.342756183745585%; + background-position: 96.07796040215489% 57.07067137809187%; } .svg-icons--lock-dims { @@ -334,7 +334,7 @@ .svg-icons--right-arrow { @extend %svg-common; - background-position: 95.69050955196336% 26.64727272727273%; + background-position: 95.69050955196336% 26.367272727272724%; } .svg-icons--right-arrow-dims { @@ -344,7 +344,7 @@ .svg-logo { @extend %svg-common; - background-position: 100% 15.609512722434726%; + background-position: 100% 15.353400964576752%; } .svg-logo-dims { @@ -359,7 +359,7 @@ .svg-logo-crest-dims { width: 52px; - height: 46.93px; + height: 46.16px; } .svg-logo-cy { diff --git a/_prototypes/end-to-end/confirm-rh-address-ce.html b/_prototypes/end-to-end/confirm-rh-address-ce.html index b4461f55bb..ac8e855623 100644 --- a/_prototypes/end-to-end/confirm-rh-address-ce.html +++ b/_prototypes/end-to-end/confirm-rh-address-ce.html @@ -94,24 +94,19 @@

* Routing */ if (residentBox.checked) { - if (currentJourney = 'new-hh-paper') { - var currentJourney = 'new-ce-resident-paper'; - var url = '../uac-request-enter-name'; - } else { - var currentJourney = 'new-ce-resident-uac'; - var url = '../uac-request-method'; + if (currentJourney === 'new-hh-paper' || currentJourney === 'new-ce-resident-paper' || currentJourney === 'new-ce-manager-paper') { + window.location.href = '../uac-request-enter-name' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-resident-paper'; + } else if (currentJourney === 'new-hh-uac'|| currentJourney === 'new-ce-resident-uac' || currentJourney === 'new-ce-manager-uac') { + window.location.href = '../uac-request-method' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-resident-uac'; } } else { - if (currentJourney = 'new-hh-paper') { - var currentJourney = 'new-ce-manager-paper'; - var url = '../ce-manager-paper'; - } else { - var currentJourney = 'new-ce-manager-uac'; - var url = '../uac-request-method'; + if (currentJourney === 'new-hh-paper' || currentJourney === 'new-ce-manager-paper' || currentJourney === 'new-ce-resident-paper') { + window.location.href = '../ce-manager-paper' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-manager-paper'; + } else if (currentJourney === 'new-hh-uac' || currentJourney === 'new-ce-manager-uac' || currentJourney === 'new-ce-resident-uac') { + window.location.href = '../uac-request-method' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-manager-uac'; } } - window.location.href = url + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + currentJourney; }); if (addressParam) { diff --git a/_prototypes/end-to-end/uac-request-enter-name.html b/_prototypes/end-to-end/uac-request-enter-name.html index fde94d6adf..6245c8741a 100644 --- a/_prototypes/end-to-end/uac-request-enter-name.html +++ b/_prototypes/end-to-end/uac-request-enter-name.html @@ -115,6 +115,7 @@ hasErrors = false; var urlParams = new URLSearchParams(window.location.search); var previousPage = urlParams.get('previous'); + var currentPage = 'uac-request-enter-name'; var currentJourney = urlParams.get('current-journey'); var householdNumber = urlParams.get('hh-members'); @@ -220,7 +221,7 @@ $(updateQuestion); function updateAllLinks() { - $('.js-previous-link').attr('href', '../' + previousPage); + $('.js-previous-link').attr('href', '../' + previousPage + '?previous=' + currentPage + '¤t-journey=' + currentJourney); } $(updateAllLinks); diff --git a/css/fixed.css b/css/fixed.css index d968c7f15e..0628498970 100644 --- a/css/fixed.css +++ b/css/fixed.css @@ -3,4 +3,4 @@ margin-bottom: 2rem; } -/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9iamVjdHMvX2dyb3VwLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSxvQkFBb0I7RUFBcEIsb0JBQW9CO0NBQ3JCIiwiZmlsZSI6ImZpeGVkLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIi5ncm91cCB7XG4gIG1hcmdpbi1ib3R0b206IDJyZW07XG59XG4iXX0= */ +/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9iamVjdHMvX2dyb3VwLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSxvQkFBbUI7RUFBbkIsb0JBQW1CO0NBQ3BCIiwiZmlsZSI6ImZpeGVkLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIi5ncm91cCB7XG4gIG1hcmdpbi1ib3R0b206IDJyZW07XG59XG4iXX0= */ diff --git a/css/main.css b/css/main.css index cd945bbe8f..b2949ce79f 100644 --- a/css/main.css +++ b/css/main.css @@ -52,7 +52,7 @@ html.prototypes-home h1 { left: 0; width: 25px; height: 25px; - background: transparent; + background: rgba(0, 0, 0, 0); cursor: pointer; } @@ -96,4 +96,4 @@ html.prototypes-home h1 { border-bottom: 1px solid rgba(239, 239, 239, 0.1); } -/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uc2NzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFLGdCQUFnQjtDQVFqQjs7QUFURDtFQUdJLGtCQUFrQjtDQUNuQjs7QUFKSDtFQU9JLGtCQUFrQjtFQUFsQixrQkFBa0I7Q0FDbkI7O0FBR0g7RUFDRSxpQkFBaUI7RUFDakIsYUFBYTtFQUNiLGlCQUFrQjtFQUFsQixrQkFBa0I7RUFDbEIsb0JBQW9CO0VBQXBCLG9CQUFvQjtDQVFyQjs7QUFaRDtFQU1JLGFBQWE7RUFDYixzQkFBc0I7RUFDdEIsa0JBQWtCO0VBQWxCLGtCQUFrQjtFQUNsQiwwQkFBMEI7RUFDMUIsc0JBQXVCO0VBQXZCLHVCQUF1QjtDQUN4Qjs7QUFHSDtFQUVJLFVBQVU7RUFDVixXQUFXO0VBQ1gsaUJBQWlCO0NBQ2xCOztBQUxIO0VBUUksZ0JBQWdCO0VBQWhCLGdCQUFnQjtFQUNoQixpQ0FBaUM7Q0FDbEM7O0FBVkg7RUFhSSxzQkFBc0I7Q0FDdkI7O0FBR0g7RUFDRSxnQkFBZ0I7RUFDaEIsVUFBVTtFQUNWLFFBQVE7RUFDUixZQUFZO0VBQ1osYUFBYTtFQUNiLHdCQUFnQjtFQUNoQixnQkFBZ0I7Q0FJakI7O0FBWEQ7RUFTSSwrQkFBZ0I7Q0FDakI7O0FBR0g7RUFFRSxnQkFBZ0I7RUFDaEIsY0FBYztFQUFkLGNBQWM7RUFDZCxPQUFPO0VBQ1AsU0FBUztFQUNULGFBTGE7RUFLYixhQUxhO0VBTWIsYUFBYTtFQUNiLGtDQUFxQjtFQUNyQixhQUFhO0VBQ2IsWUFBWTtFQUNaLHFDQUFxQjtNQUFyQixpQ0FBcUI7VUFBckIsNkJBQXFCO0VBQ3JCLHVDQUErQjtFQUEvQiwrQkFBK0I7RUFDL0IsaUJBQWlCO0NBV2xCOztBQXhCRDtFQWVJLGlDQUFxQjtNQUFyQiw2QkFBcUI7VUFBckIseUJBQXFCO0NBQ3RCOztBQWhCSDtFQWtCSSxhQUFhO0NBQ2Q7O0FBbkJIO0VBcUJJLGVBQWtCO0VBQWxCLGtCQUFrQjtFQUNsQixrREFBcUM7Q0FDdEMiLCJmaWxlIjoibWFpbi5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyJodG1sLnByb3RvdHlwZXMtaG9tZSB7XG4gIGZvbnQtc2l6ZTogMThweDtcbiAgYm9keSB7XG4gICAgYmFja2dyb3VuZDogd2hpdGU7XG4gIH1cblxuICBoMSB7XG4gICAgZm9udC1zaXplOiAxLjJyZW07XG4gIH1cbn1cblxuLnNpdGUtaGVhZGVyIHtcbiAgYmFja2dyb3VuZDogIzIyMjtcbiAgY29sb3I6IHdoaXRlO1xuICBwYWRkaW5nOiAwLjNyZW0gMDtcbiAgbWFyZ2luLWJvdHRvbTogM3JlbTtcbiAgYSB7IFxuICAgIGNvbG9yOiB3aGl0ZTtcbiAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7XG4gICAgZm9udC1zaXplOiAwLjhyZW07XG4gICAgdGV4dC10cmFuc2Zvcm06IHVwcGVyY2FzZTtcbiAgICBsZXR0ZXItc3BhY2luZzogMC4ycmVtO1xuICB9XG59XG5cbi5wcm90b3R5cGUtbGlzdCB7XG4gIHVsIHtcbiAgICBtYXJnaW46IDA7XG4gICAgcGFkZGluZzogMDtcbiAgICBsaXN0LXN0eWxlOiBub25lO1xuICB9XG5cbiAgbGkge1xuICAgIHBhZGRpbmc6IDFyZW0gMDtcbiAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2VmZWZlZjtcbiAgfVxuXG4gIGEge1xuICAgIHRleHQtZGVjb3JhdGlvbjogbm9uZTtcbiAgfVxufVxuXG4uaGlkZGVuLW5hdi1idG4ge1xuICBwb3NpdGlvbjogZml4ZWQ7XG4gIGJvdHRvbTogMDtcbiAgbGVmdDogMDtcbiAgd2lkdGg6IDI1cHg7XG4gIGhlaWdodDogMjVweDtcbiAgYmFja2dyb3VuZDogcmdiYSgwLDAsMCwwKTtcbiAgY3Vyc29yOiBwb2ludGVyO1xuICAmOmhvdmVyIHtcbiAgICBiYWNrZ3JvdW5kOiByZ2JhKDAsMCwwLCAwLjIpO1xuICB9XG59XG5cbi5oaWRkZW4tbmF2IHtcbiAgJHdpZHRoOiAyMHJlbTtcbiAgcG9zaXRpb246IGZpeGVkO1xuICBwYWRkaW5nOiAxcmVtO1xuICB0b3A6IDA7XG4gIHJpZ2h0OiAwO1xuICB3aWR0aDogJHdpZHRoO1xuICBoZWlnaHQ6IDEwMCU7XG4gIGJhY2tncm91bmQ6IHJnYmEoIzIyMiwgMC45KTtcbiAgY29sb3I6IHdoaXRlO1xuICB6LWluZGV4OiAxMDtcbiAgdHJhbnNmb3JtOiB0cmFuc2xhdGVYKCR3aWR0aCk7XG4gIHRyYW5zaXRpb246IGFsbCAxMDBtcyBlYXNlLW91dDtcbiAgb3ZlcmZsb3c6IHNjcm9sbDtcbiAgJi5pcy1vcGVuIHtcbiAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVgoMCk7XG4gIH1cbiAgYSB7XG4gICAgY29sb3I6IHdoaXRlO1xuICB9XG4gIGxpIHtcbiAgICBwYWRkaW5nOiAwLjVyZW0gMDtcbiAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiYSgjZWZlZmVmLCAwLjEpO1xuICB9XG59XG4iXX0= */ +/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uc2NzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFLGdCQUFlO0NBUWhCOztBQVREO0VBR0ksa0JBQWlCO0NBQ2xCOztBQUpIO0VBT0ksa0JBQWlCO0VBQWpCLGtCQUFpQjtDQUNsQjs7QUFHSDtFQUNFLGlCQUFnQjtFQUNoQixhQUFZO0VBQ1osaUJBQWlCO0VBQWpCLGtCQUFpQjtFQUNqQixvQkFBbUI7RUFBbkIsb0JBQW1CO0NBUXBCOztBQVpEO0VBTUksYUFBWTtFQUNaLHNCQUFxQjtFQUNyQixrQkFBaUI7RUFBakIsa0JBQWlCO0VBQ2pCLDBCQUF5QjtFQUN6QixzQkFBc0I7RUFBdEIsdUJBQXNCO0NBQ3ZCOztBQUdIO0VBRUksVUFBUztFQUNULFdBQVU7RUFDVixpQkFBZ0I7Q0FDakI7O0FBTEg7RUFRSSxnQkFBZTtFQUFmLGdCQUFlO0VBQ2YsaUNBQWdDO0NBQ2pDOztBQVZIO0VBYUksc0JBQXFCO0NBQ3RCOztBQUdIO0VBQ0UsZ0JBQWU7RUFDZixVQUFTO0VBQ1QsUUFBTztFQUNQLFlBQVc7RUFDWCxhQUFZO0VBQ1osNkJBQXlCO0VBQ3pCLGdCQUFlO0NBSWhCOztBQVhEO0VBU0ksK0JBQTRCO0NBQzdCOztBQUdIO0VBRUUsZ0JBQWU7RUFDZixjQUFhO0VBQWIsY0FBYTtFQUNiLE9BQU07RUFDTixTQUFRO0VBQ1IsYUFMYTtFQUtiLGFBTGE7RUFNYixhQUFZO0VBQ1osa0NBQXFCO0VBQ3JCLGFBQVk7RUFDWixZQUFXO0VBQ1gscUNBQTZCO01BQTdCLGlDQUE2QjtVQUE3Qiw2QkFBNkI7RUFDN0IsdUNBQThCO0VBQTlCLCtCQUE4QjtFQUM5QixpQkFBZ0I7Q0FXakI7O0FBeEJEO0VBZUksaUNBQXdCO01BQXhCLDZCQUF3QjtVQUF4Qix5QkFBd0I7Q0FDekI7O0FBaEJIO0VBa0JJLGFBQVk7Q0FDYjs7QUFuQkg7RUFxQkksZUFBaUI7RUFBakIsa0JBQWlCO0VBQ2pCLGtEQUFxQztDQUN0QyIsImZpbGUiOiJtYWluLmNzcyIsInNvdXJjZXNDb250ZW50IjpbImh0bWwucHJvdG90eXBlcy1ob21lIHtcbiAgZm9udC1zaXplOiAxOHB4O1xuICBib2R5IHtcbiAgICBiYWNrZ3JvdW5kOiB3aGl0ZTtcbiAgfVxuXG4gIGgxIHtcbiAgICBmb250LXNpemU6IDEuMnJlbTtcbiAgfVxufVxuXG4uc2l0ZS1oZWFkZXIge1xuICBiYWNrZ3JvdW5kOiAjMjIyO1xuICBjb2xvcjogd2hpdGU7XG4gIHBhZGRpbmc6IDAuM3JlbSAwO1xuICBtYXJnaW4tYm90dG9tOiAzcmVtO1xuICBhIHsgXG4gICAgY29sb3I6IHdoaXRlO1xuICAgIHRleHQtZGVjb3JhdGlvbjogbm9uZTtcbiAgICBmb250LXNpemU6IDAuOHJlbTtcbiAgICB0ZXh0LXRyYW5zZm9ybTogdXBwZXJjYXNlO1xuICAgIGxldHRlci1zcGFjaW5nOiAwLjJyZW07XG4gIH1cbn1cblxuLnByb3RvdHlwZS1saXN0IHtcbiAgdWwge1xuICAgIG1hcmdpbjogMDtcbiAgICBwYWRkaW5nOiAwO1xuICAgIGxpc3Qtc3R5bGU6IG5vbmU7XG4gIH1cblxuICBsaSB7XG4gICAgcGFkZGluZzogMXJlbSAwO1xuICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCAjZWZlZmVmO1xuICB9XG5cbiAgYSB7XG4gICAgdGV4dC1kZWNvcmF0aW9uOiBub25lO1xuICB9XG59XG5cbi5oaWRkZW4tbmF2LWJ0biB7XG4gIHBvc2l0aW9uOiBmaXhlZDtcbiAgYm90dG9tOiAwO1xuICBsZWZ0OiAwO1xuICB3aWR0aDogMjVweDtcbiAgaGVpZ2h0OiAyNXB4O1xuICBiYWNrZ3JvdW5kOiByZ2JhKDAsMCwwLDApO1xuICBjdXJzb3I6IHBvaW50ZXI7XG4gICY6aG92ZXIge1xuICAgIGJhY2tncm91bmQ6IHJnYmEoMCwwLDAsIDAuMik7XG4gIH1cbn1cblxuLmhpZGRlbi1uYXYge1xuICAkd2lkdGg6IDIwcmVtO1xuICBwb3NpdGlvbjogZml4ZWQ7XG4gIHBhZGRpbmc6IDFyZW07XG4gIHRvcDogMDtcbiAgcmlnaHQ6IDA7XG4gIHdpZHRoOiAkd2lkdGg7XG4gIGhlaWdodDogMTAwJTtcbiAgYmFja2dyb3VuZDogcmdiYSgjMjIyLCAwLjkpO1xuICBjb2xvcjogd2hpdGU7XG4gIHotaW5kZXg6IDEwO1xuICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVgoJHdpZHRoKTtcbiAgdHJhbnNpdGlvbjogYWxsIDEwMG1zIGVhc2Utb3V0O1xuICBvdmVyZmxvdzogc2Nyb2xsO1xuICAmLmlzLW9wZW4ge1xuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWCgwKTtcbiAgfVxuICBhIHtcbiAgICBjb2xvcjogd2hpdGU7XG4gIH1cbiAgbGkge1xuICAgIHBhZGRpbmc6IDAuNXJlbSAwO1xuICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2JhKCNlZmVmZWYsIDAuMSk7XG4gIH1cbn1cbiJdfQ== */ diff --git a/css/responsive.css b/css/responsive.css index d30995d6ee..9ee962086a 100644 --- a/css/responsive.css +++ b/css/responsive.css @@ -3,4 +3,4 @@ margin-bottom: 2rem; } -/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9iamVjdHMvX2dyb3VwLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSxvQkFBb0I7RUFBcEIsb0JBQW9CO0NBQ3JCIiwiZmlsZSI6InJlc3BvbnNpdmUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmdyb3VwIHtcbiAgbWFyZ2luLWJvdHRvbTogMnJlbTtcbn1cbiJdfQ== */ +/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9iamVjdHMvX2dyb3VwLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSxvQkFBbUI7RUFBbkIsb0JBQW1CO0NBQ3BCIiwiZmlsZSI6InJlc3BvbnNpdmUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmdyb3VwIHtcbiAgbWFyZ2luLWJvdHRvbTogMnJlbTtcbn1cbiJdfQ== */