Skip to content

Commit

Permalink
[#2036] Added single-page tab script
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiromaykin
jiromaykin committed Apr 18, 2024
1 parent a46bbdf commit f774cab
Show file tree
Hide file tree
Showing 19 changed files with 226 additions and 188 deletions.
4 changes: 2 additions & 2 deletions src/eherkenning/tests/test_mock_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class TestAppIndexTests(TestCase):
def test_eherkenning_enabled(self, mock_solo):
mock_solo.return_value.eherkenning_enabled = True

url = reverse("login_business")
url = reverse("login")
response = self.client.get(url)

self.assertEqual(response.status_code, 200)
Expand All @@ -54,7 +54,7 @@ def test_eherkenning_enabled(self, mock_solo):
def test_eherkenning_disabled(self, mock_solo):
mock_solo.return_value.eherkenning_enabled = False

url = reverse("login_business")
url = reverse("login")
response = self.client.get(url)

self.assertEqual(response.status_code, 200)
Expand Down
4 changes: 2 additions & 2 deletions src/open_inwoner/accounts/templates/django_registration/registration_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1 class="utrecht-heading-1">{% trans 'Registreren' %}</h1>
<a href="{{ digid_url }}" class="link digid-logo">
<img class="digid-logo__image" src="{% static 'accounts/digid_logo.svg' %}" alt="DigiD inlogpagina">
</a>
{% link bold=True href=digid_url text=_('Registreren met DigiD') secondary=True icon='arrow_forward' %}
{% link bold=True href=digid_url text=_('Registreren met DigiD') primary=True icon='arrow_forward' %}
{% endrender_card %}
{% endrender_column %}
{% endif %}
Expand All @@ -22,7 +22,7 @@ <h1 class="utrecht-heading-1">{% trans 'Registreren' %}</h1>
<a href="{{ eherkenning_url }}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
</a>
{% link bold=True href=eherkenning_url text=_('Registreren met eHerkenning') secondary=True icon='arrow_forward' %}
{% link bold=True href=eherkenning_url text=_('Registreren met eHerkenning') primary=True icon='arrow_forward' %}
{% endrender_card %}
{% endrender_column %}
{% endif %}
Expand Down
86 changes: 57 additions & 29 deletions src/open_inwoner/accounts/templates/registration/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
<div class="tab--container login-tab--container">
<div class="tabs">
<ul class="list tabs__headers">
<li class="list-item tab__header--item"><a href="/accounts/login" class="link tab__header active">Particulier</a></li>
<li class="list-item tab__header--item"><a href="/accounts/login-business" class="link tab__header">Zakelijk</a></li>
<li class="list-item tab__header--item"><a href="/accounts/login#particulier" class="link tab__header active">Particulier</a></li>
<li class="list-item tab__header--item"><a href="/accounts/login#zakelijk" class="link tab__header">Zakelijk</a></li>
</ul>
{# Panel 1 #}
<div class="tabs__body">
Expand Down Expand Up @@ -54,29 +54,6 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
{# end digid #}

{% if settings.DIGID_ENABLED %}
{% render_column start=4 span=5 %}
{% get_solo 'digid_eherkenning_oidc_generics.OpenIDConnectDigiDConfig' as digid_oidc_config %}
{% if eherkenning_oidc_config.enabled %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{% url 'eherkenning_oidc:init' %}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" width=55 alt="eHerkenning inlogpagina">
</a>
{% url 'eherkenning_oidc:init' as href %}
{% link href=href text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
{% endrender_card %}
{% else %}
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="{% url 'eherkenning:login' %}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" width=55 alt="eHerkenning inlogpagina">
</a>
{% url 'eherkenning:login' as href %}
{% with href|addnexturl:next as href_with_next %}
{% link href=href_with_next text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
{% endwith %}
{% endrender_card %}
{% endif %}
{% endrender_column %}

{% get_solo 'mozilla_django_oidc_db.OpenIDConnectConfig' as oidc_config %}
{% get_solo 'configurations.SiteConfiguration' as site_config %}
{% if oidc_config.enabled and site_config.openid_enabled_for_regular_users %}
Expand All @@ -98,14 +75,31 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
{% endif %}

{% if login_allow_registration %}
{% render_column start=4 span=5 %}
<div class="column column--start-4 column--span-5" id="column__email-toggle">
{% render_card direction='horizontal' tinted=True compact=True %}
<a href="/accounts/login-email" class="link icon--large">
<a href="/accounts/login#particuliermail" class="link icon--large">
{% icon icon="login" icon_position="before" outlined=True %}
</a>
{% link href="/accounts/login-email" text=_('Log in met e-mail adres') primary=True icon='east' extra_classes="link--next link--email" %}
{% link href="/accounts/login#particuliermail" text=_('Log in met e-mail adres') primary=True icon='east' extra_classes="link--next link--email" %}
{% endrender_card %}
{% endrender_column %}
</div>

{# Hide mail login initially #}
<div class="column column--start-4 column--span-5" id="column__login-form">
{% if login_allow_registration %}
{% render_card tinted=True compact=True %}
{% render_form id="login-form" method="POST" form=form show_required=True %}
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}"/>
{% input form.username %}
{% input form.password %}
{% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %}
{% form_actions primary_text=_("Inloggen") primary_icon="arrow_forward" secondary_href='django_registration_register' secondary_text=_('Registreer') secondary_icon='arrow_forward' single=True %}
{% endrender_form %}
{% endrender_card %}
{% endif %}
</div>
{# End hidden #}

{% render_column start=4 span=5 %}
<h2 class="tab__heading-4">Of registreer</h2>
Expand All @@ -125,6 +119,40 @@ <h2 class="tab__heading-4">Of registreer</h2>
{% endrender_grid %}
</div>
{# Panel 1 End #}

{# Panel 2 #}
<div id="zakelijk" class="tab__content">

{% render_grid %}
{% render_column start=4 span=5 %}
{% if eherkenning_enabled %}
{% get_solo 'digid_eherkenning_oidc_generics.OpenIDConnectEHerkenningConfig' as eherkenning_oidc_config %}
{% if eherkenning_oidc_config.enabled %}
{% render_card direction='horizontal' tinted=True %}
<a href="{% url 'eherkenning_oidc:init' %}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
</a>
{% url 'eherkenning_oidc:init' as href %}
{% link href=href text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
{% endrender_card %}
{% else %}
{% render_card direction='horizontal' tinted=True %}
<a href="{% url 'eherkenning:login' %}" class="link eherkenning-logo">
<img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
</a>
{% url 'eherkenning:login' as href %}
{% with href|addnexturl:next as href_with_next %}
{% link href=href_with_next text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
{% endwith %}
{% endrender_card %}
{% endif %}
{% endif %}
{% endrender_column %}
{% endrender_grid %}

</div>
{# Panel 2 End #}

</div>
</div>
</div>
Expand Down
64 changes: 0 additions & 64 deletions src/open_inwoner/accounts/templates/registration/login_business.html
View file

This file was deleted.

41 changes: 0 additions & 41 deletions src/open_inwoner/accounts/templates/registration/login_email.html
View file

This file was deleted.

8 changes: 4 additions & 4 deletions src/open_inwoner/accounts/tests/test_auth.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,7 @@ def test_login_page_has_next_url(self):

def test_login(self):
"""Test that a user is successfully logged in."""
form = self.app.get(reverse("login_email")).forms["login-form"]
form = self.app.get(reverse("login")).forms["login-form"]
form["username"] = self.user.email
form["password"] = "test"
form.submit().follow()
Expand Down Expand Up @@ -1706,7 +1706,7 @@ def test_login_page_shows_correct_eherkenning_login_url(self):
else f"{reverse('eherkenning:login')}?next="
)

response = self.app.get(reverse("login_business"))
response = self.app.get(reverse("login"))

eherkenning_login_title = _("Inloggen met eHerkenning")
eherkenning_login_link = response.pyquery(
Expand All @@ -1720,7 +1720,7 @@ def test_login_for_inactive_user_shows_appropriate_message(self):
self.user.is_active = False
self.user.save()

form = self.app.get(reverse("login_email")).forms["login-form"]
form = self.app.get(reverse("login")).forms["login-form"]
form["username"] = self.user.email
form["password"] = "test"
response = form.submit()
Expand All @@ -1735,7 +1735,7 @@ def test_login_for_inactive_user_shows_appropriate_message(self):
)

def test_login_with_wrong_credentials_shows_appropriate_message(self):
form = self.app.get(reverse("login_email")).forms["login-form"]
form = self.app.get(reverse("login")).forms["login-form"]
form["username"] = self.user.email
form["password"] = "wrong_password"
response = form.submit()
Expand Down
Loading

0 comments on commit f774cab

Please sign in to comment.