From 8875e160f2c18ba61dc25d1a6303ba8b31b70a99 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <slamora@users.noreply.github.com>
Date: Wed, 30 Oct 2019 14:35:30 +0100
Subject: [PATCH 1/3] Create base views to all the services.

---
 musician/templates/musician/databases.html    | 9 +++++++++
 musician/templates/musician/mail.html         | 9 +++++++++
 musician/templates/musician/mailinglists.html | 9 +++++++++
 musician/templates/musician/saas.html         | 9 +++++++++
 musician/urls.py                              | 4 ++++
 5 files changed, 40 insertions(+)
 create mode 100644 musician/templates/musician/databases.html
 create mode 100644 musician/templates/musician/mail.html
 create mode 100644 musician/templates/musician/mailinglists.html
 create mode 100644 musician/templates/musician/saas.html

diff --git a/musician/templates/musician/databases.html b/musician/templates/musician/databases.html
new file mode 100644
index 0000000..927ff1c
--- /dev/null
+++ b/musician/templates/musician/databases.html
@@ -0,0 +1,9 @@
+{% extends "musician/base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<h1>Section title</h1>
+<p>Little description of what to be expected...</p>
+
+{% endblock %}
diff --git a/musician/templates/musician/mail.html b/musician/templates/musician/mail.html
new file mode 100644
index 0000000..927ff1c
--- /dev/null
+++ b/musician/templates/musician/mail.html
@@ -0,0 +1,9 @@
+{% extends "musician/base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<h1>Section title</h1>
+<p>Little description of what to be expected...</p>
+
+{% endblock %}
diff --git a/musician/templates/musician/mailinglists.html b/musician/templates/musician/mailinglists.html
new file mode 100644
index 0000000..927ff1c
--- /dev/null
+++ b/musician/templates/musician/mailinglists.html
@@ -0,0 +1,9 @@
+{% extends "musician/base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<h1>Section title</h1>
+<p>Little description of what to be expected...</p>
+
+{% endblock %}
diff --git a/musician/templates/musician/saas.html b/musician/templates/musician/saas.html
new file mode 100644
index 0000000..927ff1c
--- /dev/null
+++ b/musician/templates/musician/saas.html
@@ -0,0 +1,9 @@
+{% extends "musician/base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<h1>Section title</h1>
+<p>Little description of what to be expected...</p>
+
+{% endblock %}
diff --git a/musician/urls.py b/musician/urls.py
index 8e8ff38..08dfd8b 100644
--- a/musician/urls.py
+++ b/musician/urls.py
@@ -15,4 +15,8 @@ urlpatterns = [
     path('auth/login/', views.LoginView.as_view(), name='login'),
     path('auth/logout/', views.LogoutView.as_view(), name='logout'),
     path('dashboard/', views.DashboardView.as_view(), name='dashboard'),
+    path('mails/', views.MailView.as_view(), name='mails'),
+    path('maling-lists/', views.MailingListsView.as_view(), name='mailing-lists'),
+    path('databases/', views.DatabasesView.as_view(), name='databases'),
+    path('software-as-a-service/', views.SaasView.as_view(), name='saas'),
 ]

From 2e283cd39ea63fb9120f6b71903751450946314a Mon Sep 17 00:00:00 2001
From: Santiago Lamora <slamora@users.noreply.github.com>
Date: Wed, 30 Oct 2019 14:36:03 +0100
Subject: [PATCH 2/3] Complete navbar with link to the services.

---
 musician/mixins.py                    | 12 ++++++++++--
 musician/templates/musician/base.html |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/musician/mixins.py b/musician/mixins.py
index 3b6b0bf..cf58bff 100644
--- a/musician/mixins.py
+++ b/musician/mixins.py
@@ -1,15 +1,23 @@
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.views.generic.base import ContextMixin
 
-from . import get_version
+from . import api, get_version
 from .auth import SESSION_KEY_TOKEN
 
 
 class CustomContextMixin(ContextMixin):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        # TODO generate menu items
+        # generate services menu items
+        services_menu = [
+            {'pattern_name': 'musician:dashboard', 'title': 'Domains & websites'},
+            {'pattern_name': 'musician:mails', 'title': 'Mails'},
+            {'pattern_name': 'musician:mailing-lists', 'title': 'Mailing lists'},
+            {'pattern_name': 'musician:databases', 'title': 'Databases'},
+            {'pattern_name': 'musician:saas', 'title': 'SaaS'},
+        ]
         context.update({
+            'services_menu': services_menu,
             'version': get_version(),
         })
 
diff --git a/musician/templates/musician/base.html b/musician/templates/musician/base.html
index 8e1eb35..db5445c 100644
--- a/musician/templates/musician/base.html
+++ b/musician/templates/musician/base.html
@@ -38,11 +38,13 @@
       <h4>{{ version }}</h4>
       <div class="dropdown-divider"></div>
       {# <!-- services menu --> #}
+      {% for item in services_menu %}
       <ul class="nav flex-column">
           <li class="nav-item">
-            <a class="nav-link active" href="#">Domains & websites</a>
+            <a class="nav-link active" href="{% url item.pattern_name %}">{{ item.title }}</a>
           </li>
       </ul>
+      {% endfor %}
       {# <!-- user profile menu --> #}
       <div class="dropdown-divider mt-5"></div>
       <ul class="nav flex-column">

From eef75d379505dd9c7dd98159bd18e3dc586c0c07 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <slamora@users.noreply.github.com>
Date: Thu, 31 Oct 2019 10:46:54 +0100
Subject: [PATCH 3/3] Fix redirect to 'next' URL on login.

---
 musician/views.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/musician/views.py b/musician/views.py
index ce5e52c..7f7e7c3 100644
--- a/musician/views.py
+++ b/musician/views.py
@@ -2,6 +2,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse_lazy
+from django.utils.http import is_safe_url
 from django.views.generic.base import RedirectView, TemplateView
 from django.views.generic.edit import FormView
 
@@ -48,6 +49,7 @@ class LoginView(FormView):
     template_name = 'auth/login.html'
     form_class = LoginForm
     success_url = reverse_lazy('musician:dashboard')
+    redirect_field_name = 'next'
     extra_context = {'version': get_version()}
 
     def get_form_kwargs(self):
@@ -60,6 +62,31 @@ class LoginView(FormView):
         auth_login(self.request, form.username, form.token)
         return HttpResponseRedirect(self.get_success_url())
 
+    def get_success_url(self):
+        url = self.get_redirect_url()
+        return url or self.success_url
+
+    def get_redirect_url(self):
+        """Return the user-originating redirect URL if it's safe."""
+        redirect_to = self.request.POST.get(
+            self.redirect_field_name,
+            self.request.GET.get(self.redirect_field_name, '')
+        )
+        url_is_safe = is_safe_url(
+            url=redirect_to,
+            allowed_hosts={self.request.get_host()},
+            require_https=self.request.is_secure(),
+        )
+        return redirect_to if url_is_safe else ''
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context.update({
+            self.redirect_field_name: self.get_redirect_url(),
+            **(self.extra_context or {})
+        })
+        return context
+
 
 class LogoutView(RedirectView):
     """