diff --git a/app/routes/mvp3/appeal.js b/app/routes/mvp3/appeal.js index 46df6b0..146035f 100644 --- a/app/routes/mvp3/appeal.js +++ b/app/routes/mvp3/appeal.js @@ -18,7 +18,12 @@ module.exports = function (router) { }) /////////////////////////////////////////////////////////////////////////////////////// - //////GOV login variable/////// + ///temp gov routes/// + router.post('/mvp3-gov', function (req, res) { + res.redirect('/mvp3/_family/account/appeal/evidence/have-evidence.html'); +}) + + //////GOV login either or routng - needs fixing/////// // module.exports = function (router) { router.get('/mvp3/_family/parent-soft-check/outcomes/outcome-not-entitled-appeal', (req, res) => { diff --git a/app/views/index.html b/app/views/index.html index e78480a..e208a2b 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -450,7 +450,7 @@

Parent/Guardian individual screens

date # #XX - Not started + WIP New: Gives info on what will come with next step
Also same page that will show summary @@ -459,8 +459,8 @@

Parent/Guardian individual screens

Appeal page 8 - Child details date # - #XX - Not started + #240 + WIP New: DWP flow page 1 @@ -469,8 +469,8 @@

Parent/Guardian individual screens

lookup date # - #XX - Not started + #240 + WIP New: DWP flow page 2 diff --git a/app/views/mvp3/_family/account/appeal/signin/check-your-phone.html b/app/views/mvp3/_family/account/appeal/signin/check-your-phone.html new file mode 100644 index 0000000..49bbaf2 --- /dev/null +++ b/app/views/mvp3/_family/account/appeal/signin/check-your-phone.html @@ -0,0 +1,76 @@ +{% extends "layouts/main.html" %} + + +{% set pageName="Home" %} + +{% block content %} + + +
+
+ +

Check your phone

+ +
+ We have sent a code to *******6975. +
+ +

It might take a few minutes to arrive. The code will expire after 15 minutes.

+ + {% if data['parent-portal'] == 'evidence-required' %} + + {% else %} + +
+ + {% endif %} +
+ + + + +
+ + +
+ +
+ + + Problems with the code? + + +
+ +

+ We can + send the code + again + or you can + use a different phone number. +

+ + +

+ Get a code another way. +

+ + +
+
+ + + +
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/app/views/mvp3/_family/account/appeal/signin/enter-password.html b/app/views/mvp3/_family/account/appeal/signin/enter-password.html new file mode 100644 index 0000000..2b26c24 --- /dev/null +++ b/app/views/mvp3/_family/account/appeal/signin/enter-password.html @@ -0,0 +1,72 @@ +{% extends "layouts/main.html" %} + +{% set pageName="Enter your password" %} + +{% block content %} + +
+
+ +
+ +
+ + +
+

+ +

+
Your password is hidden
+ +
+
+ + + + + + +

+ I’ve forgotten my password +

+ +
+ + + + +
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/app/views/mvp3/_family/account/appeal/signin/login.html b/app/views/mvp3/_family/account/appeal/signin/login.html new file mode 100644 index 0000000..f3eafd2 --- /dev/null +++ b/app/views/mvp3/_family/account/appeal/signin/login.html @@ -0,0 +1,36 @@ +{% extends "layouts/layout-dfe.html" %} + +{% set pageName="Home" %} + +{% block content %} + +
+
+ + + Jonathan Spencer +

+ + + Eligibility checker hub +

+ + +
+ + +
+ + + + + +
+ +
+ + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/views/mvp3/_family/account/appeal/signin/onegov-signin.html b/app/views/mvp3/_family/account/appeal/signin/onegov-signin.html new file mode 100644 index 0000000..ad569fb --- /dev/null +++ b/app/views/mvp3/_family/account/appeal/signin/onegov-signin.html @@ -0,0 +1,50 @@ +{% extends "layouts/mvp1.html" %} + +{% set pageName="Enter your email address" %} + +{% block content %} +
+
+ + +
+ +
+

+ +

+ + + +
+ + + {{ govukButton({ + text: "Continue", + classes:'govuk-!-margin-top-5' + }) }} +
+ + + + +
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/app/views/mvp3/_family/account/appeal/signin/signin-or-create.html b/app/views/mvp3/_family/account/appeal/signin/signin-or-create.html new file mode 100644 index 0000000..a2551ea --- /dev/null +++ b/app/views/mvp3/_family/account/appeal/signin/signin-or-create.html @@ -0,0 +1,80 @@ +{% extends "layouts/mvp1.html" %} + +{% set pageName="Sign in or create a GovUK One Login account" %} + +{% block content %} + +
+
+ + + +

Create a GOV.UK One Login or sign in

+ + +

You’ll need:

+ + + +
+ +You can also + +use GOV.UK One Login in Welsh +(Cymraeg). + +
+ + +
+ + {{ govukButton({ + text: "Create a GOV.UK One Login", + href: "#", + classes: "govuk-button govuk-!-margin-right-3" + }) }} + + {{ govukButton({ + text: "Sign in", + href: "onegov-signin", + classes: "govuk-button--secondary" + + }) }} + +
+ + + + + + + + + + +
+ + +About GOV.UK One Login + + +
+ +

GOV.UK One Login is new. At the moment you can only use it to access some government services.

+

It does not work with all government accounts or services yet (for example Government Gateway or Universal Credit).

+

In the future, you’ll be able to use GOV.UK One Login to access all services on GOV.UK.

+ +
+
+ + + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/views/mvp3/_family/account/check-your-phone.html b/app/views/mvp3/_family/account/check-your-phone.html index 529d3d6..f9f2d03 100644 --- a/app/views/mvp3/_family/account/check-your-phone.html +++ b/app/views/mvp3/_family/account/check-your-phone.html @@ -8,9 +8,7 @@
-

Check your phone

-
We have sent a code to *******6975.
@@ -18,10 +16,10 @@

Check y

It might take a few minutes to arrive. The code will expire after 15 minutes.

{% if data['parent-portal'] == 'evidence-required' %} - - {% else %} + {% else %}
diff --git a/app/views/mvp3/_family/parent-soft-check/outcomes/outcome-not-entitled-appeal.html b/app/views/mvp3/_family/parent-soft-check/outcomes/outcome-not-entitled-appeal.html index 60ef449..59d1eb8 100644 --- a/app/views/mvp3/_family/parent-soft-check/outcomes/outcome-not-entitled-appeal.html +++ b/app/views/mvp3/_family/parent-soft-check/outcomes/outcome-not-entitled-appeal.html @@ -56,7 +56,7 @@

If you think your children are eligible

More information on supporting evidence.

+ class="govuk-link">More information on supporting evidence.

If you have evidence now

You can appeal online and upload your evidence now.

@@ -64,26 +64,27 @@

If you have evidence now

If you need time to find more evidence

You can appeal:

-
    -
  • online now and choose to take your evidence into your children's schools later
    • -
  • in full later through your children's schools
    • -
+
    +
  • online now and choose to take your evidence into your children's schools later
    • +
  • in full later through your children's schools
    • +
- Warning - If want to appeal online, you need to do this now or you will need to apply again later + Warning + If want to appeal online, you need to do this now or you will need to apply again later -
+

{{ govukButton({ text: "Appeal now", - href: "../../account/signin-or-create" + href: "../../account/appeal/signin/signin-or-create" }) }} - Appeal through your children's schools + Appeal through your children's + schools