From 7e159c04cb8e5ca0c92d1a19c6c4eddf708911df Mon Sep 17 00:00:00 2001
From: "sebastian.schreck" <sebastian.schreck@stegschreck.de>
Date: Sun, 11 Dec 2016 21:07:48 +0100
Subject: [PATCH] #99 splitted out account urls

---
 core/account_urls.py                          | 14 ++++++++
 core/templates/core/account/login.html        |  6 ++--
 core/templates/core/account/register.html     |  6 ++--
 core/templates/core/account/settings.html     |  4 +--
 core/templates/core/includes/navbar.html      | 12 +++----
 core/tests/unit/test_home_page.py             |  6 ++--
 core/tests/unit/views/test_login_views.py     | 28 +++++++--------
 .../unit/views/test_registration_views.py     | 26 +++++++-------
 core/tests/unit/views/test_settings_view.py   | 34 ++++++++++---------
 core/urls.py                                  | 11 +-----
 core/views/account_views.py                   | 18 +++++-----
 core/views/settings_views.py                  |  4 +--
 core/views/trigger_parsing_views.py           |  6 ++--
 13 files changed, 91 insertions(+), 84 deletions(-)
 create mode 100644 core/account_urls.py

diff --git a/core/account_urls.py b/core/account_urls.py
new file mode 100644
index 0000000..483b1c9
--- /dev/null
+++ b/core/account_urls.py
@@ -0,0 +1,14 @@
+from django.conf.urls import url
+
+import core.views.account_views
+import core.views.settings_views
+import core.views.trigger_parsing_views
+
+app_name = 'account'
+urlpatterns = [
+    url(r'^register/?$', core.views.account_views.register_view, name='register'),
+    url(r'^login/?$', core.views.account_views.login_view, name='login'),
+    url(r'^$', core.views.account_views.account_view, name='home'),
+    url(r'^logout/?$', core.views.account_views.logout_view, name='logout'),
+    url(r'^settings/?$', core.views.settings_views.settings_view, name='settings'),
+]
diff --git a/core/templates/core/account/login.html b/core/templates/core/account/login.html
index d0aa660..1f3539e 100644
--- a/core/templates/core/account/login.html
+++ b/core/templates/core/account/login.html
@@ -3,7 +3,7 @@
 {% block content %}
 
     <h1 class="page-header">Login</h1>
-    <form method="post" action="{% url 'core:login' %}">
+    <form method="post" action="{% url 'core:account:login' %}">
         {% csrf_token %}
         <div class="form-group">
             <label for="username">Benutzername</label>
@@ -17,6 +17,6 @@ <h1 class="page-header">Login</h1>
     </form>
     <br><br>
     <p>
-        Du hast noch keinen Account? <a href="{% url 'core:register' %}">Hier kannst du dich registrieren</a>.
+        Du hast noch keinen Account? <a href="{% url 'core:account:register' %}">Hier kannst du dich registrieren</a>.
     </p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/core/templates/core/account/register.html b/core/templates/core/account/register.html
index fdee5fd..1416e7c 100644
--- a/core/templates/core/account/register.html
+++ b/core/templates/core/account/register.html
@@ -6,9 +6,9 @@
     <h1>Registrierung</h1>
 
     {% if registered %}
-        <strong>Vielen Dank für die Registrierung!</strong> <a href="{% url 'core:login' %}">Hier geht's zum Login</a>.
+        <strong>Vielen Dank für die Registrierung!</strong> <a href="{% url 'core:account:login' %}">Hier geht's zum Login</a>.
     {% else %}
-        <form id="user_form" method="post" action="{% url 'core:register' %}">
+        <form id="user_form" method="post" action="{% url 'core:account:register' %}">
 
             {% csrf_token %}
 
@@ -63,7 +63,7 @@ <h1>Registrierung</h1>
         </form>
         <br><br>
         <p>
-            Du hast bereits einen Account bei uns? <a href="{% url 'core:login' %}">Hier geht's zum Login</a>.
+            Du hast bereits einen Account bei uns? <a href="{% url 'core:account:login' %}">Hier geht's zum Login</a>.
         </p>
     {% endif %}
 {% endblock %}
diff --git a/core/templates/core/account/settings.html b/core/templates/core/account/settings.html
index 105b142..d622cc4 100644
--- a/core/templates/core/account/settings.html
+++ b/core/templates/core/account/settings.html
@@ -21,7 +21,7 @@ <h4 class="panel-title">
         </div>
         <div id="collapseAccountData" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAccountData">
           <div class="panel-body">
-            <form id="user_form" method="post" action="{% url 'core:settings' %}">
+            <form id="user_form" method="post" action="{% url 'core:account:settings' %}">
 
                 {% csrf_token %}
 
@@ -62,7 +62,7 @@ <h4 class="panel-title">
         </div>
         <div id="collapseOFMData" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOFMData">
           <div class="panel-body">
-            <form id="ofm_user_form" method="post" action="{% url 'core:settings' %}">
+            <form id="ofm_user_form" method="post" action="{% url 'core:account:settings' %}">
 
                 {% csrf_token %}
 
diff --git a/core/templates/core/includes/navbar.html b/core/templates/core/includes/navbar.html
index 602f7fc..19269e0 100644
--- a/core/templates/core/includes/navbar.html
+++ b/core/templates/core/includes/navbar.html
@@ -6,24 +6,24 @@
     <div class="well bs-sidebar" id="sidebar">
         <ul class="nav nav-pills nav-stacked">
             <li>
-                <a href="{% url 'core:home' %}">
+                <a href="{% url 'core:account:home' %}">
                     <span class="glyphicon glyphicon-home"></span> Home
                 </a>
             </li>
     {% if not user.is_authenticated %}
             <li>
-                <a href="{% url 'core:register' %}">
+                <a href="{% url 'core:account:register' %}">
                     <span class="glyphicon glyphicon-pencil"></span> Registrieren
                 </a>
             </li>
             <li>
-                <a href="{% url 'core:login' %}">
+                <a href="{% url 'core:account:login' %}">
                     <span class="glyphicon glyphicon-log-in"></span> Login
                 </a>
             </li>
     {% else %}
             <li>
-                <a href="{% url 'core:account' %}">
+                <a href="{% url 'core:account:home' %}">
                     <span class="glyphicon glyphicon-user"></span> Mein Account
                 </a>
             </li>
@@ -66,13 +66,13 @@
             {% endif %}
 
             <li>
-                <a href="{% url 'core:settings' %}">
+                <a href="{% url 'core:account:settings' %}">
                     <span class="glyphicon glyphicon-cog"></span> Einstellungen
                 </a>
             </li>
 
             <li>
-                <a href="{% url 'core:logout' %}">
+                <a href="{% url 'core:account:logout' %}">
                     <span class="glyphicon glyphicon-log-out"></span> Logout
                 </a>
             </li>
diff --git a/core/tests/unit/test_home_page.py b/core/tests/unit/test_home_page.py
index ca8f540..d0f24fe 100644
--- a/core/tests/unit/test_home_page.py
+++ b/core/tests/unit/test_home_page.py
@@ -7,13 +7,13 @@ def test_home_page(self):
         self.assertEqual(response.status_code, 200)
 
     def test_register_page(self):
-        response = self.client.get('/register')
+        response = self.client.get('/account/register')
         self.assertEqual(response.status_code, 200)
 
     def test_login_page(self):
-        response = self.client.get('/login')
+        response = self.client.get('/account/login')
         self.assertEqual(response.status_code, 200)
 
     def test_account_page(self):
         response = self.client.get('/account')
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 301)
diff --git a/core/tests/unit/views/test_login_views.py b/core/tests/unit/views/test_login_views.py
index 6171ac4..2ecc1b3 100644
--- a/core/tests/unit/views/test_login_views.py
+++ b/core/tests/unit/views/test_login_views.py
@@ -9,66 +9,66 @@ def setUp(self):
         self.user = OFMUser.objects.create_user('temporary', 'temporary@ofmhelper.com', 'temporary')
 
     def test_login_redirects_for_unknown_user(self):
-        response = self.client.post(reverse('core:login'), {'username': 'john', 'password': 'smith'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'john', 'password': 'smith'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_login_with_correct_credentials(self):
-        response = self.client.post(reverse('core:login'), {'username': 'temporary', 'password': 'temporary'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'temporary', 'password': 'temporary'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/home.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
 
     def test_login_with_wrong_password(self):
-        response = self.client.post(reverse('core:login'), {'username': 'temporary', 'password': 'incorrect'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'temporary', 'password': 'incorrect'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_login_already_logged_in(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:login'), {'username': 'temporary', 'password': 'temporary'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'temporary', 'password': 'temporary'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/home.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
 
     def test_login_with_inactive_account(self):
         OFMUser.objects.create_user('disabled', 'diasabled@gmail.com', 'disabled', is_active=False)
-        response = self.client.post(reverse('core:login'), {'username': 'disabled', 'password': 'disabled'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'disabled', 'password': 'disabled'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_call_login_page_when_already_logged_in(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.get(reverse('core:login'))
+        response = self.client.get(reverse('core:account:login'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/home.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
 
     def test_logout_when_logged_in(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.get(reverse('core:logout'))
+        response = self.client.get(reverse('core:account:logout'))
         self.assertEqual(response.status_code, 302)
         self.assertRedirects(response, reverse('core:home'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_logout_when_not_logged_in(self):
-        response = self.client.get(reverse('core:logout'))
+        response = self.client.get(reverse('core:account:logout'))
         self.assertEqual(response.status_code, 302)
         self.assertRedirects(response, reverse('core:home'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_view_account_when_logged_in(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.get(reverse('core:account'))
+        response = self.client.get(reverse('core:account:home'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/home.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
 
     def test_view_account_when_not_logged_in(self):
-        response = self.client.get(reverse('core:account'))
+        response = self.client.get(reverse('core:account:home'))
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
diff --git a/core/tests/unit/views/test_registration_views.py b/core/tests/unit/views/test_registration_views.py
index a838c69..3b967b4 100644
--- a/core/tests/unit/views/test_registration_views.py
+++ b/core/tests/unit/views/test_registration_views.py
@@ -15,62 +15,62 @@ def setUp(self):
         )
 
     def test_register_new_account(self):
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'new', 'password': '1234', 'password2': '1234',
                                      'email': 'new@ofmhelper.com',
                                      'ofm_username': 'abc', 'ofm_password': 'def', 'ofm_password2': 'def'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_register_with_existing_username(self):
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'temporary', 'password': '1234', 'password2': '1234',
                                      'email': 'new@ofmhelper.com',
                                      'ofm_username': 'abc', 'ofm_password': 'def', 'ofm_password2': 'def'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:register'))
+        self.assertRedirects(response, reverse('core:account:register'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_register_with_unmatching_passwords(self):
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'new', 'password': '1234', 'password2': '12345',
                                      'email': 'new@ofmhelper.com',
                                      'ofm_username': 'abc', 'ofm_password': 'def', 'ofm_password2': 'def'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:register'))
+        self.assertRedirects(response, reverse('core:account:register'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_register_with_unmatching_ofm_passwords(self):
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'new', 'password': '1234', 'password2': '1234',
                                      'email': 'new@ofmhelper.com',
                                      'ofm_username': 'abc', 'ofm_password': 'def', 'ofm_password2': 'ghj'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:register'))
+        self.assertRedirects(response, reverse('core:account:register'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_register_with_already_registered_ofm_username(self):
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'new', 'password': '1234', 'password2': '1234',
                                      'email': 'new@ofmhelper.com',
                                      'ofm_username': 'ofm', 'ofm_password': 'def', 'ofm_password2': 'def'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:register'))
+        self.assertRedirects(response, reverse('core:account:register'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_register_with_already_registered_email(self):
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'new', 'password': '1234', 'password2': '1234',
                                      'email': 'temporary@ofmhelper.com',
                                      'ofm_username': 'new', 'ofm_password': 'def', 'ofm_password2': 'def'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:register'))
+        self.assertRedirects(response, reverse('core:account:register'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_register_when_already_logged_in(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:register'),
+        response = self.client.post(reverse('core:account:register'),
                                     {'username': 'new', 'password': '1234', 'password2': '1234',
                                      'email': 'new@ofmhelper.com',
                                      'ofm_username': 'new', 'ofm_password': 'def', 'ofm_password2': 'def'})
diff --git a/core/tests/unit/views/test_settings_view.py b/core/tests/unit/views/test_settings_view.py
index 917bb45..1ddd805 100644
--- a/core/tests/unit/views/test_settings_view.py
+++ b/core/tests/unit/views/test_settings_view.py
@@ -19,20 +19,20 @@ def setUp(self):
 
     def test_view_account_settings_when_logged_in(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.get(reverse('core:settings'))
+        response = self.client.get(reverse('core:account:settings'))
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/settings.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
 
     def test_view_account_settings_when_not_logged_in(self):
-        response = self.client.get(reverse('core:settings'))
+        response = self.client.get(reverse('core:account:settings'))
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
     def test_change_email(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings'), {'email': 'new@mail.com'})
+        response = self.client.post(reverse('core:account:settings'), {'email': 'new@mail.com'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/settings.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
@@ -41,25 +41,26 @@ def test_change_email(self):
     def test_change_password(self):
         OFMUser.objects.create_user('second', 'second@ofmhelper.com', 'second')
         self.client.login(username='second', password='second')
-        response = self.client.post(reverse('core:settings'), {'password': 'Zillertal', 'password2': 'Zillertal'})
+        response = self.client.post(reverse('core:account:settings'),
+                                    {'password': 'Zillertal', 'password2': 'Zillertal'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/settings.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
-        self.client.get(reverse('core:logout'))
+        self.client.get(reverse('core:account:logout'))
 
-        response = self.client.post(reverse('core:login'), {'username': 'second', 'password': 'second'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'second', 'password': 'second'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
-        response = self.client.post(reverse('core:login'), {'username': 'second', 'password': 'Zillertal'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'second', 'password': 'Zillertal'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/home.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
 
     def test_change_ofm_password(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings'),
+        response = self.client.post(reverse('core:account:settings'),
                                     {'ofm_password': 'Zillertal', 'ofm_password2': 'Zillertal'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/settings.html')
@@ -68,7 +69,8 @@ def test_change_ofm_password(self):
 
     def test_change_ofm_password_when_unmatching(self):
         self.client.login(username='temporary', password='temporary')
-        response = self.client.post(reverse('core:settings'), {'ofm_password': 'Zillertal', 'ofm_password2': 'Berlin'})
+        response = self.client.post(reverse('core:account:settings'),
+                                    {'ofm_password': 'Zillertal', 'ofm_password2': 'Berlin'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/settings.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
@@ -77,18 +79,18 @@ def test_change_ofm_password_when_unmatching(self):
     def test_change_password_when_unmatching(self):
         OFMUser.objects.create_user('third', 'third@ofmhelper.com', 'third')
         self.client.login(username='third', password='third')
-        response = self.client.post(reverse('core:settings'), {'password': 'Zillertal', 'password2': 'Berlin'})
+        response = self.client.post(reverse('core:account:settings'), {'password': 'Zillertal', 'password2': 'Berlin'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/settings.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
-        self.client.get(reverse('core:logout'))
+        self.client.get(reverse('core:account:logout'))
 
-        response = self.client.post(reverse('core:login'), {'username': 'third', 'password': 'Zillertal'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'third', 'password': 'Zillertal'})
         self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, reverse('core:login'))
+        self.assertRedirects(response, reverse('core:account:login'))
         self.assertFalse(response.wsgi_request.user.is_authenticated())
 
-        response = self.client.post(reverse('core:login'), {'username': 'third', 'password': 'third'})
+        response = self.client.post(reverse('core:account:login'), {'username': 'third', 'password': 'third'})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'core/account/home.html')
         self.assertTrue(response.wsgi_request.user.is_authenticated())
diff --git a/core/urls.py b/core/urls.py
index 39281fb..c732d56 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -1,22 +1,13 @@
 from django.conf.urls import include, url
 from django.views.generic.base import RedirectView, TemplateView
 
-import core.views.account_views
-import core.views.settings_views
-import core.views.trigger_parsing_views
-
 app_name = 'core'
 urlpatterns = [
     url(r'^favicon\.ico$', RedirectView.as_view(url='/static/core/img/OFM_favicon.png', permanent=True)),
     url(r'^$', TemplateView.as_view(template_name='core/home.html'), name='home'),
 
-    url(r'^register/?$', core.views.account_views.register_view, name='register'),
-    url(r'^login/?$', core.views.account_views.login_view, name='login'),
-    url(r'^account/?$', core.views.account_views.account_view, name='account'),
-    url(r'^logout/?$', core.views.account_views.logout_view, name='logout'),
-    url(r'^settings/?$', core.views.settings_views.settings_view, name='settings'),
-
     url(r'^ofm/', include('core.ofm_urls'), name='ofm'),
     url(r'^checklist/', include('core.checklist_urls'), name='checklist'),
     url(r'^trigger/', include('core.trigger_parsing_urls'), name='trigger'),
+    url(r'^account/', include('core.account_urls'), name='account'),
 ]
diff --git a/core/views/account_views.py b/core/views/account_views.py
index 76d294b..1927e0c 100644
--- a/core/views/account_views.py
+++ b/core/views/account_views.py
@@ -24,23 +24,23 @@ def register_view(request):
 
         if OFMUser.objects.filter(email=email).exists():
             messages.error(request, EMAIL_ALREADY_EXISTS)
-            return redirect('core:register')
+            return redirect('core:account:register')
 
         if OFMUser.objects.filter(username=username).exists():
             messages.error(request, USERNAME_ALREADY_EXISTS)
-            return redirect('core:register')
+            return redirect('core:account:register')
 
         if password != password2:
             messages.error(request, PASSWORDS_UNEQUAL)
-            return redirect('core:register')
+            return redirect('core:account:register')
 
         if OFMUser.objects.filter(ofm_username=ofm_username).exists():
             messages.error(request, OFM_USERNAME_ALREADY_EXISTS)
-            return redirect('core:register')
+            return redirect('core:account:register')
 
         if ofm_password != ofm_password2:
             messages.error(request, OFM_PASSWORDS_UNEQUAL)
-            return redirect('core:register')
+            return redirect('core:account:register')
 
         OFMUser.objects.create_user(
             username=username,
@@ -51,7 +51,7 @@ def register_view(request):
         )
 
         messages.success(request, ACCOUNT_CREATED)
-        return redirect('core:login')
+        return redirect('core:account:login')
 
     else:
         return render(request, 'core/account/register.html')
@@ -69,10 +69,10 @@ def login_view(request):
                 return render(request, 'core/account/home.html')
             else:
                 messages.error(request, LOGIN_IMPOSSIBLE_ACCOUNT_IS_DEACTIVATED)
-                return redirect('core:login')
+                return redirect('core:account:login')
         else:
             messages.error(request, USERNAME_OR_PASSWORD_INVALID)
-            return redirect('core:login')
+            return redirect('core:account:login')
     else:
         if request.user.is_authenticated():
             return render(request, 'core/account/home.html')
@@ -92,4 +92,4 @@ def account_view(request):
         return render(request, 'core/account/home.html')
     else:
         messages.error(request, NOT_LOGGED_IN)
-        return redirect('core:login')
+        return redirect('core:account:login')
diff --git a/core/views/settings_views.py b/core/views/settings_views.py
index 43b9663..e81e315 100644
--- a/core/views/settings_views.py
+++ b/core/views/settings_views.py
@@ -24,7 +24,7 @@ def _handle_account_data_change(request, email, password, password2):
 def _handle_ofm_data_change(request, ofm_password, ofm_password2):
     if ofm_password != ofm_password2:
         messages.error(request, OFM_PASSWORDS_UNEQUAL)
-        return redirect('core:register')
+        return redirect('core:account:settings')
 
     request.user.ofm_password = ofm_password
     request.user.save()
@@ -50,4 +50,4 @@ def settings_view(request):
         return render(request, 'core/account/settings.html')
     else:
         messages.error(request, NOT_LOGGED_IN)
-        return redirect('core:login')
+        return redirect('core:account:login')
diff --git a/core/views/trigger_parsing_views.py b/core/views/trigger_parsing_views.py
index bbfed9e..6dbf35b 100644
--- a/core/views/trigger_parsing_views.py
+++ b/core/views/trigger_parsing_views.py
@@ -28,10 +28,10 @@ def trigger_parsing(request):
         return redirect('core:ofm:player_statistics')
     else:
         messages.error(request, NOT_LOGGED_IN)
-        return redirect('core:login')
+        return redirect('core:account:login')
 
 
-def trigger_single_parsing(request, parsing_function, redirect_to='core:account'):
+def trigger_single_parsing(request, parsing_function, redirect_to='core:account:home'):
     if request.user.is_authenticated():
         site_manager = SiteManager(request.user)
         site_manager.login()
@@ -39,7 +39,7 @@ def trigger_single_parsing(request, parsing_function, redirect_to='core:account'
         return redirect(redirect_to)
     else:
         messages.error(request, NOT_LOGGED_IN)
-        return redirect('core:login')
+        return redirect('core:account:login')
 
 
 def trigger_matchday_parsing(request):