diff --git a/components/layout.js b/components/layout.js index dd2b798d8..1d5215e9b 100644 --- a/components/layout.js +++ b/components/layout.js @@ -82,27 +82,33 @@ class Layout extends Component { -
+ {!this.props.parentIsFallbackPage ? ( +
+ {t("current-language-code") === "en" ? ( + + ) : ( + + )} +
+ ) : null} +
{this.props.children}
+ + {!this.props.parentIsFallbackPage ? ( +
+ + + +
+ ) : null} + {!this.props.parentIsFallbackPage ? ( + -
{this.props.children}
- -
- - - -
- + ) : null} {noScriptTag}
@@ -119,7 +125,8 @@ Layout.propTypes = { url: PropTypes.object.isRequired, skipLink: PropTypes.string.isRequired, title: PropTypes.string, - backgroundColor: PropTypes.string + backgroundColor: PropTypes.string, + parentIsFallbackPage: PropTypes.bool }; Layout.defaultProps = { diff --git a/cypress/integration/guided_experience_spec.js b/cypress/integration/guided_experience_spec.js index ca7fb193f..5296d6e23 100644 --- a/cypress/integration/guided_experience_spec.js +++ b/cypress/integration/guided_experience_spec.js @@ -17,7 +17,7 @@ describe("Guided Experience", function() { cy.url().should("include", "benefits-directory"); }); - it("can choose some options and get to summary and benefits directory", () => { + it("can choose some options and get to benefits directory", () => { cy.contains(patronTypeVeteran).click(); cy.get("#nextButton").click(); cy.url().should("include", "serviceType?"); @@ -29,9 +29,9 @@ describe("Guided Experience", function() { cy.contains(patronTypeVeteran); }); - it("can go back from summary and edit answer", () => { - cy.visit("summary"); - cy.get("#edit-patronType").click(); - cy.contains("Select who would be receiving the benefits."); - }); + // it("can go back from summary and edit answer", () => { + // cy.visit("summary"); + // cy.get("#edit-patronType").click(); + // cy.contains("Select who would be receiving the benefits."); + // }); }); diff --git a/fallback-pages/browser-incompatible.html b/fallback-pages/browser-incompatible.html index b9c909cb1..7fbb0a909 100644 --- a/fallback-pages/browser-incompatible.html +++ b/fallback-pages/browser-incompatible.html @@ -1,46 +1,53 @@ - + - - - - Your browser is not supported | Ton navigateur n'est pas supporté - + + + + + Your browser is not supported | Ton navigateur n'est pas supporté + + - - -
-
-
-

- Your current version of this browser is not supported. Please update to the latest version. - To see a list of all benefits click here. -

-

- Votre version actuelle de ce navigateur n'est pas supportée. S'il vous plaît mettre à jour à la dernière version. - Pour voir la liste complète des avantages, cliquez ici. -

-
- + #content-wrapper { + min-height: 100%; + } + + + +
+
+
+

+ Your current version of this browser is not supported. Please update to + the latest version. To see a list of all benefits click + here. +

+

+ Votre version actuelle de ce navigateur n'est pas supportée. S'il vous + plaît mettre à jour à la dernière version. Pour voir la liste complète + des avantages, cliquez ici. +

+
+ diff --git a/pages/all-benefits.js b/pages/all-benefits.js index 906cc9d44..2d0a5bb73 100644 --- a/pages/all-benefits.js +++ b/pages/all-benefits.js @@ -9,6 +9,7 @@ import { connect } from "react-redux"; import BenefitList from "../components/benefit_list"; import Container from "../components/container"; import Header from "../components/typography/header"; +import { globalTheme } from "../theme"; const header = css` padding-bottom: 10px; @@ -28,6 +29,8 @@ export class AllBenefits extends Component { title={t("titles.all_benefits")} skipLink="#mainContent" url={url} + backgroundColor={globalTheme.colour.paleGreyTwo} + parentIsFallbackPage={true} >
diff --git a/server.js b/server.js index 4b4c50833..e6bdb39ef 100644 --- a/server.js +++ b/server.js @@ -139,6 +139,10 @@ Promise.resolve(getAllData()).then(allData => { res .status(404) .send("The Favourites page only exists on the staging app."); + } else if (req.url.includes("summary") && !staging) { + res + .status(404) + .send("The summary page only exists on the staging app."); } else { const favouriteBenefits = new Cookies(req.headers.cookie).get( "favouriteBenefits"