diff --git a/project/accounts/templates/accounts/register/login.html b/project/accounts/templates/accounts/register/login.html index de08c3858..d42b38eba 100644 --- a/project/accounts/templates/accounts/register/login.html +++ b/project/accounts/templates/accounts/register/login.html @@ -40,6 +40,7 @@ +
Forgot your username or password? Click Here diff --git a/project/accounts/tests/test_views.py b/project/accounts/tests/test_views.py index aafb1391e..00d5cb231 100644 --- a/project/accounts/tests/test_views.py +++ b/project/accounts/tests/test_views.py @@ -20,7 +20,7 @@ class LoginViewTests(BaseTestCase): """A class to test login view""" def setUp(self) -> None: - super(LoginViewTests, self).setUp() + super().setUp() url = reverse("accounts_login") self.response = self.client.get(url) @@ -48,7 +48,7 @@ def test_login_view_redirects_on_success(self): response = self.client.post( reverse("accounts_login"), - {"username": "newuser", "password": "password123"}, + {"username": "newuser", "password": "password123", "next": reverse("base")}, ) self.assertRedirects( response, @@ -117,7 +117,7 @@ class SettingsViewTests(BaseTestCase): """A class to test settings view""" def setUp(self) -> None: - super(SettingsViewTests, self).setUp() + super().setUp() self.user.profile.first_name = "Gorkem" self.user.profile.last_name = "Arslan" self.user.profile.save() @@ -202,7 +202,7 @@ class UserProfileView(BaseTestCase): """A class to test user profile view""" def setUp(self) -> None: - super(UserProfileView, self).setUp() + super().setUp() self.user.profile.first_name = "First" self.user.profile.last_name = "Last" self.user.profile.about_me = "About" @@ -222,7 +222,7 @@ class UserProfileCivis(BaseTestCase): """A class to test user profiles following view""" def setUp(self) -> None: - super(UserProfileCivis, self).setUp() + super().setUp() self.user2 = get_user_model().objects.create_user( username="newuser2", email="test2@test2.com", password="password123" diff --git a/project/accounts/views.py b/project/accounts/views.py index 35a5f4d2e..13404ee5b 100644 --- a/project/accounts/views.py +++ b/project/accounts/views.py @@ -82,7 +82,7 @@ def form_valid(self, form): self._send_email(user) self._login(user) - return super(RegisterView, self).form_valid(form) + return super().form_valid(form) class ProfileActivationView(View): @@ -92,7 +92,6 @@ class ProfileActivationView(View): """ def get(self, request, uidb64, token): - try: uid = force_str(urlsafe_base64_decode(uidb64)) user = get_user_model().objects.get(pk=uid) @@ -170,7 +169,7 @@ def get_initial(self): "profile_image": profile.profile_image or None, } ) - return super(SettingsView, self).get_initial() + return super().get_initial() class UserProfileView(LoginRequiredMixin, View): diff --git a/project/core/settings.py b/project/core/settings.py index 5bcb65124..76da8a4df 100644 --- a/project/core/settings.py +++ b/project/core/settings.py @@ -176,7 +176,6 @@ # Login Logout URLS LOGIN_URL = "login/" -LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/" AUTH_PASSWORD_VALIDATORS = [ diff --git a/project/core/templates/about.html b/project/core/templates/about.html index 906234abc..ca3329fa4 100644 --- a/project/core/templates/about.html +++ b/project/core/templates/about.html @@ -2,7 +2,7 @@ {% load static %} {% load i18n %} {% block extra_css %} - + {% endblock extra_css %} {% block page_title %}{% trans "About Us" %}{% endblock page_title %} @@ -186,7 +186,7 @@

{% trans "Sponsors" %}

{% include "static_nav.html" %}
- + diff --git a/project/core/templates/base.html b/project/core/templates/base.html index 10a919710..4102bb9ed 100644 --- a/project/core/templates/base.html +++ b/project/core/templates/base.html @@ -37,8 +37,8 @@ {% include "global_nav.html" %} - {% include "static_footer.html" %} {%block content%}{%endblock content%} + {% include "static_footer.html" %} {% block extra_js %}{% endblock extra_js %} diff --git a/project/core/templates/global_nav.html b/project/core/templates/global_nav.html index be803b120..0279e6de5 100644 --- a/project/core/templates/global_nav.html +++ b/project/core/templates/global_nav.html @@ -37,6 +37,15 @@
+
+ {% if messages %} + {% for message in messages %} +
+ {{message}} +
+ {% endfor %} + {% endif %} +