diff --git a/_infra/helm/frontstage/Chart.yaml b/_infra/helm/frontstage/Chart.yaml index b3accc0b0..f4f60ffc4 100644 --- a/_infra/helm/frontstage/Chart.yaml +++ b/_infra/helm/frontstage/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # This will be set to an appropriate branch version prior to the final merge to main -version: 0.0.99 +version: 0.0.100 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This will be set to an appropriate branch version prior to the final merge to main -appVersion: 0.0.99 +appVersion: 0.0.100 diff --git a/frontstage/templates/sign-in/sign-in.html b/frontstage/templates/sign-in/sign-in.html index 221816de1..a30f99661 100644 --- a/frontstage/templates/sign-in/sign-in.html +++ b/frontstage/templates/sign-in/sign-in.html @@ -43,7 +43,7 @@ ) %} {% endfor %} {% endif %} - + {% call onsPanel({ "variant": "error", @@ -116,11 +116,7 @@

You've activated your account

You are able to use the system and submit data during this period however your response status may not display as completed until after the maintenance has been completed.

{% endcall %} {% endif %} - -

New to this service? - Create an account -

-

Sign in

+

Sign in

{% endif %} {% if errorType == 'failed' %} @@ -162,17 +158,19 @@

Sign in

}} {% endcall %} +

Need + help signing in?

+
{{ onsButton({ "text": "Sign in", "type": "submit", - "classes": "ons-u-mt-l", + "classes": "ons-u-mb-l", "id": "sign_in_button", "submitType": "timer" }) }} -
- Forgot password? -
+

New to this service?

+ Create an account {% endblock main %} diff --git a/frontstage/views/sign_in/sign_in.py b/frontstage/views/sign_in/sign_in.py index f6ca7c7ce..bfdf50dff 100644 --- a/frontstage/views/sign_in/sign_in.py +++ b/frontstage/views/sign_in/sign_in.py @@ -77,13 +77,21 @@ def login(): # noqa: C901 bound_logger.error("Unexpected error was returned from Auth service", auth_error=error_message) bound_logger.unbind("email") - return render_template("sign-in/sign-in.html", form=form, data={"error": {"type": "failed"}}) + return render_template( + "sign-in/sign-in.html", + form=form, + data={"error": {"type": "failed"}}, + ) bound_logger.info("Successfully found user in auth service. Attempting to find user in party service") party_json = party_controller.get_respondent_by_email(username) if not party_json or "id" not in party_json: bound_logger.error("Respondent has an account in auth but not in party") - return render_template("sign-in/sign-in.html", form=form, data={"error": {"type": "failed"}}) + return render_template( + "sign-in/sign-in.html", + form=form, + data={"error": {"type": "failed"}}, + ) party_id = party_json["id"] bound_logger = bound_logger.bind(party_id=party_id) diff --git a/tests/integration/views/account/test_account_delete.py b/tests/integration/views/account/test_account_delete.py index 356dc141f..1d45b540c 100644 --- a/tests/integration/views/account/test_account_delete.py +++ b/tests/integration/views/account/test_account_delete.py @@ -79,7 +79,7 @@ def test_account_delete_confirm(self, mock_request, get_respondent_party_by_id): self.assertTrue("New to this service?".encode() in response.data) self.assertTrue("Email Address".encode() in response.data) self.assertTrue("Password".encode() in response.data) - self.assertTrue("Forgot password?".encode() in response.data) + self.assertTrue("Create an account".encode() in response.data) @requests_mock.mock() @patch("frontstage.controllers.party_controller.get_respondent_party_by_id")